Changeset 3f03199 in mainline for uspace/srv/hw/irc/obio/obio.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/hw/irc/obio/obio.c (modified) (3 diffs)

uspace/srv/hw/irc/obio/obio.c

@@ -69 +69 @@
 #define INO_MASK        0x1f
 
-static void *base_phys;
+static uintptr_t base_phys;
 static volatile uint64_t *base_virt;
 
@@ -123 +123 @@
         }
         
-        base_phys = (void *) paddr;
+        base_phys = (uintptr_t) paddr;
         
         int flags = AS_AREA_READ | AS_AREA_WRITE;
@@ -135 +135 @@
         }
         
-        printf("%s: OBIO registers with base at %p\n", NAME, base_phys);
+        printf("%s: OBIO registers with base at %zu\n", NAME, base_phys);
         
         async_set_client_connection(obio_connection);