Changeset 7bdcc45 in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/hw/netif/dp8390/dp8390.c (modified) (3 diffs)

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;
@@ -1516 +1516 @@
         if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep))
         {
-                printf("%s: No ethernet card found at 0x%x\n", 
-                        dep->de_name, dep->de_base_port);
+                printf("%s: No ethernet card found at %#lx\n",
+                    dep->de_name, dep->de_base_port);
                 dep->de_mode= DEM_DISABLED;
                 return;