Changeset a9b6bec in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2010-12-14T20:19:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

11658b64

Parents:

37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:

• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (3 diffs)

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.
@@ -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;