Changeset db96017 in mainline for uspace/srv/net/nil/nildummy/nildummy.h

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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/srv/net/nil/nildummy/nildummy.h (modified) (4 diffs)

uspace/srv/net/nil/nildummy/nildummy.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Radim Vansa
  * All rights reserved.
  *
@@ -40 +41 @@
 #include <async.h>
 #include <fibril_synch.h>
+#include <ipc/loc.h>
 #include <ipc/services.h>
 #include <net/device.h>
-#include <adt/measured_strings.h>
 
 /** Type definition of the dummy nil global data.
@@ -76 +77 @@
 struct nildummy_device {
         /** Device identifier. */
-        device_id_t device_id;
-        
-        /** Device driver service. */
-        services_t service;
-        
+        nic_device_id_t device_id;
+        /** Device service ID. */
+        service_id_t sid;
         /** Driver session. */
         async_sess_t *sess;
@@ -88 +87 @@
         
         /** Actual device hardware address. */
-        measured_string_t *addr;
-        
-        /** Actual device hardware address data. */
-        uint8_t *addr_data;
+        nic_address_t addr;
+        /** Actual device hardware address length. */
+        size_t addr_len;
 };