Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/netif/dp8390/dp8390_module.c

    r37f7cfe ra9b6bec  
    6363 *  @param[in] call The interrupt call.
    6464 */
    65 #define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_METHOD(*call)
     65#define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_IMETHOD(*call)
    6666
    6767/** Returns the interrupt status register from the interrupt call.
     
    306306
    307307int netif_initialize(void){
    308         ipcarg_t phonehash;
     308        sysarg_t phonehash;
    309309
    310310        async_set_interrupt_received(irq_handler);
     
    343343               
    344344                /* End if said to either by the message or the processing result */
    345                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
     345                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
    346346                        return;
    347347               
Note: See TracChangeset for help on using the changeset viewer.