Changeset 9cd8165 in mainline for uspace/lib/nic/include

Timestamp:

2012-01-27T12:54:09Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

790d6d1

Parents:

7174403

Message:

NIC does not need nic_device_id_t. Now it exists just inside net. Not sure if
we care to rename it since net is going away soon, anyway.

Location:

uspace/lib/nic/include

Files:

• nic_driver.h (modified) (1 diff)
• nic_ev.h (modified) (1 diff)
• nic_impl.h (modified) (1 diff)

uspace/lib/nic/include/nic_driver.h

@@ -70 +70 @@
          */
         ddf_fun_t *fun;
-        /** Identifier for higher network stack layers */
-        nic_device_id_t device_id;
         /** Current state of the device */
         nic_device_state_t state;

uspace/lib/nic/include/nic_ev.h

@@ -43 +43 @@
 #include <sys/types.h>
 
-extern int nic_ev_addr_changed(async_sess_t *, nic_device_id_t,
-    const nic_address_t *);
-extern int nic_ev_device_state(async_sess_t *, nic_device_id_t, sysarg_t);
-extern int nic_ev_received(async_sess_t *, nic_device_id_t, void *, size_t);
+extern int nic_ev_addr_changed(async_sess_t *, const nic_address_t *);
+extern int nic_ev_device_state(async_sess_t *, sysarg_t);
+extern int nic_ev_received(async_sess_t *, void *, size_t);
 
 #endif

uspace/lib/nic/include/nic_impl.h

@@ -48 +48 @@
 extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
 extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
-extern int nic_callback_create_impl(ddf_fun_t *dev_fun, int device_id);
+extern int nic_callback_create_impl(ddf_fun_t *dev_fun);
 extern int nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state);
 extern int nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state);