Changeset 1b59023 in mainline

Timestamp:

2010-12-16T17:13:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f87c900

Parents:

7837101e

Message:

Remove the rest of CONVERT_SIZE uses and the CONVERT_SIZE macro altogether.

Location:

uspace

Files:

• lib/c/include/net/modules.h (modified) (1 diff)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (1 diff)
• srv/net/il/ip/ip.c (modified) (2 diffs)

uspace/lib/c/include/net/modules.h

@@ -49 +49 @@
 #include <sys/time.h>
 
-/** Converts the data length between different types.
- *
- * @param[in] type_from The source type.
- * @param[in] type_to   The destination type.
- * @param[in] count     The number units of the source type size.
- */
-#define CONVERT_SIZE(type_from, type_to, count) \
-        ((sizeof(type_from) / sizeof(type_to)) * (count))
-
 /** Registers the module service at the name server.
  *

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -197 +197 @@
                 return rc;
         address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
-        address->length = CONVERT_SIZE(ether_addr_t, char, 1);
+        address->length = sizeof(ether_addr_t);
         return EOK;
 }

uspace/srv/net/il/ip/ip.c

@@ -442 +442 @@
                 if (route) {
                         address.value = (char *) &route->address.s_addr;
-                        address.length = CONVERT_SIZE(in_addr_t, char, 1);
+                        address.length = sizeof(in_addr_t);
                         
                         rc = arp_device_req(ip_netif->arp->phone,
@@ -1005 +1005 @@
                 destination.value = route->gateway.s_addr ?
                     (char *) &route->gateway.s_addr : (char *) &dest.s_addr;
-                destination.length = CONVERT_SIZE(dest.s_addr, char, 1);
+                destination.length = sizeof(dest.s_addr);
 
                 rc = arp_translate_req(netif->arp->phone, netif->device_id,