Changeset 7bdcc45 in mainline for uspace/srv/hw

Timestamp:

2010-12-16T16:38:49Z (15 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.

Location:

uspace/srv/hw

Files:

• bus/cuda_adb/cuda_adb.c (modified) (2 diffs)
• char/i8042/i8042.c (modified) (5 diffs)
• char/s3c24xx_uart/s3c24xx_uart.c (modified) (6 diffs)
• cir/fhc/fhc.c (modified) (2 diffs)
• cir/obio/obio.c (modified) (2 diffs)
• netif/dp8390/dp8390.c (modified) (3 diffs)
• netif/dp8390/dp8390_module.c (modified) (4 diffs)
• netif/dp8390/ne2000.c (modified) (1 diff)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -195 +195 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -220 +220 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:

uspace/srv/hw/char/i8042/i8042.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -201 +202 @@
         ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, inr_b);
 
         wait_ready();
@@ -217 +219 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -246 +248 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -262 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -48 +48 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_uart.h"
@@ -95 +96 @@
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n");
+                printf(NAME ": Unable to register device %s.\n",
+                    NAMESPACE "/" NAME);
                 return -1;
         }
@@ -114 +116 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         int retval;
 
@@ -122 +124 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -134 +136 @@
                         break;
                 case CHAR_WRITE_BYTE:
-                        printf(NAME ": write %d to device\n",
+                        printf(NAME ": write %" PRIun " to device\n",
                             IPC_GET_ARG1(call));
                         s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
@@ -185 +187 @@
         uart->client_phone = -1;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            uart->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) uart->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_uart_irq_handler);

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

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;

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

@@ -63 +63 @@
  *  @param[in] call The interrupt call.
  */
-#define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_METHOD(*call)
+#define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_IMETHOD(*call)
 
 /** Returns the interrupt status register from the interrupt call.
@@ -127 +127 @@
                 dep->received_count = 0;
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, NULL);
+                nil_received_msg(phone, device_id, received, SERVICE_NONE);
         }else{
                 fibril_rwlock_write_unlock(&netif_globals.lock);
@@ -306 +306 @@
 
 int netif_initialize(void){
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
 
         async_set_interrupt_received(irq_handler);
@@ -343 +343 @@
                 
                 /* End if said to either by the message or the processing result */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
                         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);
         }
 }