Changeset 87b4baac in mainline for uspace/srv/hw

Timestamp:

2010-12-17T20:16:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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) (2 diffs)
• char/s3c24xx_uart/s3c24xx_uart.c (modified) (2 diffs)
• cir/fhc/fhc.c (modified) (2 diffs)
• cir/obio/obio.c (modified) (2 diffs)
• netif/dp8390/dp8390_module.c (modified) (4 diffs)

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

@@ -219 +219 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -248 +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:

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

@@ -116 +116 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         int retval;
 
@@ -124 +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:

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);
@@ -133 +133 @@
         
         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_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.
@@ -197 +197 @@
                 return rc;
         address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
-        address->length = CONVERT_SIZE(ether_addr_t, char, 1);
+        address->length = sizeof(ether_addr_t);
         return EOK;
 }
@@ -306 +306 @@
 
 int netif_initialize(void){
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
 
         async_set_interrupt_received(irq_handler);
 
-        return REGISTER_ME(SERVICE_DP8390, &phonehash);
+        return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash);
 }
 
@@ -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;