Changeset 7bdcc45 in mainline for uspace/srv/hw/netif/dp8390/ne2000.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/ne2000.c (modified) (1 diff)

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);
         }
 }