Changeset cfb79747 in mainline for uspace/lib/nic/include/nic_driver.h

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/nic/include/nic_driver.h (modified) (4 diffs)

uspace/lib/nic/include/nic_driver.h

@@ -44 +44 @@
 
 #include <fibril_synch.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <async.h>
 
@@ -50 +50 @@
 #include "nic_rx_control.h"
 #include "nic_wol_virtues.h"
-
-#define DEVICE_CATEGORY_NIC "nic"
 
 struct sw_poll_info {
@@ -72 +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;
@@ -82 +78 @@
         /** Device's default MAC address (assigned the first time, used in STOP) */
         nic_address_t default_mac;
-        /** Session to SERVICE_NETWORKING */
-        async_sess_t *net_session;
-        /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
-        async_sess_t *nil_session;
+        /** Client callback session */
+        async_sess_t *client_session;
         /** Phone to APIC or i8259 */
         async_sess_t *irc_session;