Changeset 8d7ec69d in mainline for uspace/lib/c/include

Timestamp:

2012-01-22T10:40:07Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c38e417, cf9cb36

Parents:

e98fe28c

Message:

NIC should talk to its client via a callback connection with NIC-defined
protocol (was using nil, was connecting via NS).

Location:

uspace/lib/c/include

Files:

• device/nic.h (modified) (2 diffs)
• ipc/nil.h (modified) (2 diffs)

uspace/lib/c/include/device/nic.h

@@ -39 +39 @@
 #include <net/device.h>
 #include <net/packet.h>
+#include <ipc/common.h>
 #include <ipc/services.h>
 
 typedef enum {
         NIC_SEND_MESSAGE = 0,
-        NIC_CONNECT_TO_NIL,
+        NIC_CALLBACK_CREATE,
         NIC_GET_STATE,
         NIC_SET_STATE,
@@ -85 +86 @@
 } nic_funcs_t;
 
+typedef enum {
+        NIC_EV_ADDR_CHANGED = IPC_FIRST_USER_METHOD,
+        NIC_EV_RECEIVED,
+        NIC_EV_DEVICE_STATE
+} nic_event_t;
+
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t);
+extern int nic_callback_create(async_sess_t *, nic_device_id_t,
+    async_client_conn_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);

uspace/lib/c/include/ipc/nil.h

@@ -46 +46 @@
          */
         NET_NIL_DEVICE = NET_NIL_FIRST,
-        /** New device state message.
-         * @see nil_device_state_msg()
-         */
-        NET_NIL_DEVICE_STATE,
-        /** Received packet queue message.
-         * @see nil_received_msg()
-         */
-        NET_NIL_RECEIVED,
         /** Send packet queue message.
          * @see nil_send_msg()
@@ -69 +61 @@
          * @see nil_get_broadcast_addr()
          */
-        NET_NIL_BROADCAST_ADDR,
-        /** Device has changed address
-         * @see nil_addr_changed_msg()
-         */
-        NET_NIL_ADDR_CHANGED
+        NET_NIL_BROADCAST_ADDR
 } nil_messages;