Changeset 7a68fe5 in mainline for uspace/srv/net/nil/eth/eth.h

Timestamp:

2011-10-10T06:58:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 with mainline

File:

• uspace/srv/net/nil/eth/eth.h (modified) (5 diffs)

uspace/srv/net/nil/eth/eth.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -43 +44 @@
 #include <net/device.h>
 #include <adt/measured_strings.h>
+#include <devman.h>
 
 /** Ethernet address length. */
@@ -220 +222 @@
 struct eth_device {
         /** Device identifier. */
-        device_id_t device_id;
-        /** Device driver service. */
-        services_t service;
+        nic_device_id_t device_id;
+        /** Device handle */
+        devman_handle_t handle;
         /** Driver session. */
         async_sess_t *sess;
@@ -236 +238 @@
         
         /** Actual device hardware address. */
-        measured_string_t *addr;
-        
-        /** Actual device hardware address data. */
-        uint8_t *addr_data;
+        nic_address_t addr;
 };
 
@@ -270 +269 @@
         
         /** Broadcast device hardware address. */
-        measured_string_t *broadcast_addr;
+        uint8_t broadcast_addr[ETH_ADDR];
 };