Changeset bf61d3a in mainline for uspace/srv/hw/netif/dp8390

Timestamp:

2010-11-26T01:34:21Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

273b958

Parents:

4b9a410 (diff), 7e752b2 (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 compile-time printf() argument checking, fixes of actual printf() arguments and related modifications

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (1 diff)
• ne2000.c (modified) (1 diff)

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

@@ -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;

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

@@ -267 +267 @@
         if (!debug)
         {
-                printf("%s: NE%d000 at %X:%d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_irq);
+                printf("%s: NE%d000 at %#lx:%d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_irq);
         }
         else
         {
                 printf("%s: Novell NE%d000 ethernet card at I/O address "
-                        "0x%X, memory size 0x%X, irq %d\n",
-                        dep->de_name, dep->de_16bit ? 2 : 1,
-                        dep->de_base_port, dep->de_ramsize, dep->de_irq);
+                    "%#lx, memory size %#lx, irq %d\n",
+                    dep->de_name, dep->de_16bit ? 2 : 1,
+                    dep->de_base_port, dep->de_ramsize, dep->de_irq);
         }
 }