Changeset 7bdcc45 in mainline for uspace/srv/hw/cir

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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.

Location:

uspace/srv/hw/cir

Files:

• fhc/fhc.c (modified) (2 diffs)
• obio/obio.c (modified) (2 diffs)

uspace/srv/hw/cir/fhc/fhc.c

@@ -82 +82 @@
         
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case BUS_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
@@ -129 +129 @@
         }
         
-        printf(NAME ": FHC UART registers at %p, %d bytes\n", fhc_uart_phys,
+        printf(NAME ": FHC UART registers at %p, %zu bytes\n", fhc_uart_phys,
             fhc_uart_size);
         
         async_set_client_connection(fhc_connection);
-        ipcarg_t phonead;
+        sysarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_FHC, 0, 0, &phonead);
         

uspace/srv/hw/cir/obio/obio.c

@@ -92 +92 @@
         
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case BUS_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
@@ -134 +134 @@
         
         async_set_client_connection(obio_connection);
-        ipcarg_t phonead;
+        sysarg_t phonead;
         ipc_connect_to_me(PHONE_NS, SERVICE_OBIO, 0, 0, &phonead);