Changeset 0b4a67a in mainline for uspace/srv/hw/netif

Timestamp:

2010-11-20T15:33:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7e1f9b7

Parents:

a9c6b966

Message:

Use a more portable definition of NULL.

Location:

uspace/srv/hw/netif/dp8390

Files:

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

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

@@ -432 +432 @@
         dep->de_write_iovec.iod_iovec[0].iov_size = size;
         dep->de_write_iovec.iod_iovec_s = 1;
-        dep->de_write_iovec.iod_iovec_addr = NULL;
+        dep->de_write_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED)
@@ -1015 +1015 @@
         dep->de_read_iovec.iod_iovec[0].iov_size = length;
         dep->de_read_iovec.iod_iovec_s = 1;
-        dep->de_read_iovec.iod_iovec_addr = NULL;
+        dep->de_read_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         last = page + (length - 1) / DP_PAGESIZE;

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

@@ -127 +127 @@
                 dep->received_count = 0;
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, NULL);
+                nil_received_msg(phone, device_id, received, SERVICE_NONE);
         }else{
                 fibril_rwlock_write_unlock(&netif_globals.lock);