Changeset fdbc3ff in mainline for uspace/srv/net/nil/nildummy

Timestamp:

2010-11-19T23:50:06Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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.

Location:

uspace/srv/net/nil/nildummy

Files:

• nildummy.c (modified) (7 diffs)
• nildummy.h (modified) (2 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -142 +142 @@
  * @param[in] service   The device driver service.
  * @param[in] mtu       The device maximum transmission unit.
- * @returns             EOK on success.
- * @returns             EEXIST if the device with the different service exists.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EEXIST if the device with the different service exists.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
  *                      netif_bind_service() function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      netif_get_addr_req() function.
  */
@@ -153 +153 @@
     size_t mtu)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
         int index;
         int rc;
@@ -192 +192 @@
         
         /* Create a new device */
-        device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
+        device = (nildummy_device_t *) malloc(sizeof(nildummy_device_t));
         if (!device)
                 return ENOMEM;
@@ -248 +248 @@
  */
 static int nildummy_addr_message(device_id_t device_id,
-    measured_string_ref *address)
-{
-        nildummy_device_ref device;
+    measured_string_t **address)
+{
+        nildummy_device_t *device;
 
         if (!address)
@@ -282 +282 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
 
         if (!addr_len || !prefix || !content || !suffix)
@@ -357 +357 @@
     services_t sender)
 {
-        nildummy_device_ref device;
+        nildummy_device_t *device;
 
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
@@ -377 +377 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-        measured_string_ref address;
+        measured_string_t *address;
         packet_t packet;
         size_t addrlen;

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

@@ -54 +54 @@
 typedef struct nildummy_device nildummy_device_t;
 
-/** Type definition of the dummy nil device specific data pointer.
- * @see nildummy_device
- */
-typedef nildummy_device_t *nildummy_device_ref;
-
 /** Type definition of the dummy nil protocol specific data.
  * @see nildummy_proto
  */
 typedef struct nildummy_proto nildummy_proto_t;
-
-/** Type definition of the dummy nil protocol specific data pointer.
- * @see nildummy_proto
- */
-typedef nildummy_proto_t *nildummy_proto_ref;
 
 /** Dummy nil device map.
@@ -86 +76 @@
         size_t mtu;
         /** Actual device hardware address. */
-        measured_string_ref addr;
+        measured_string_t *addr;
         /** Actual device hardware address data. */
         char *addr_data;