Changeset 61bfc370 in mainline for uspace/srv/hw/netif

Timestamp:

2011-01-07T18:57:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e08a733

Parents:

7c34b28f

Message:

• make measured_string and other network-related data types binary-safe
• fix several network-related routines binary-safe (replace clearly suspicious use of str_lcmp() with bcmp())
• rename spawn() to net_spawn()

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (1 diff)
• dp8390_module.c (modified) (1 diff)
• dp8390_port.h (modified) (1 diff)
• ne2000.c (modified) (2 diffs)

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

@@ -550 +550 @@
                 if ((length < ETH_MIN_PACK_SIZE) || (length > ETH_MAX_PACK_SIZE_TAGGED)) {
                         printf("Packet with strange length arrived: %zu\n", length);
-                        next= curr;
+                        next = curr;
                 } else if ((next < dep->de_startpage) || (next >= dep->de_stoppage)) {
                         printf("Strange next page\n");
-                        next= curr;
+                        next = curr;
                 } else if (header.dr_status & RSR_FO) {
                         /*

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

@@ -213 +213 @@
                 return rc;
         
-        address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
+        address->value = (uint8_t *) &((dpeth_t *) device->specific)->de_address;
         address->length = sizeof(ether_addr_t);
         return EOK;

uspace/srv/hw/netif/dp8390/dp8390_port.h

@@ -43 +43 @@
 #include <libarch/ddi.h>
 #include <sys/types.h>
-
-/** Compares two memory blocks.
- *  @param[in] first The first memory block.
- *  @param[in] second The second memory block.
- *  @param[in] size The blocks size in bytes.
- *  @returns 0 if equeal.
- *  @returns -1 if the first is greater than the second.
- *  @returns 1 if the second is greater than the first.
- */
-#define memcmp(first, second, size)  bcmp((char *) (first), (char *) (second), (size))
 
 /** Reads 1 byte.

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

@@ -241 +241 @@
                 buf[i] = inb_ne(dep, NE_DATA);
         
-        return (memcmp(buf, pat, 4) == 0);
+        return (bcmp(buf, pat, 4) == 0);
 }
 
@@ -280 +280 @@
                 *(uint16_t *)(buf + i) = inw_ne(dep, NE_DATA);
         
-        return (memcmp(buf, pat, 4) == 0);
+        return (bcmp(buf, pat, 4) == 0);
 }