Changeset 6610565b in mainline for uspace/srv/hid


Ignore:
Timestamp:
2011-01-10T16:20:56Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1ffa73b, 8048c648, 8426912a, 977fcea, f401312
Parents:
a97ea0f (diff), 4a5c6c1 (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/hid
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/console/console.c

    ra97ea0f r6610565b  
    930930                       
    931931                        if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
    932                                 devmap_hangup_phone(DEVMAP_DRIVER);
    933932                                printf(NAME ": Unable to register device %s\n", vc);
    934933                                return false;

  • uspace/srv/hid/kbd/port/ns16550.c

    ra97ea0f r6610565b  
    3636
    3737#include <ipc/ipc.h>
    38 #include <ipc/bus.h>
     38#include <ipc/irc.h>
    3939#include <async.h>
    4040#include <sysinfo.h>
    … …  
    122122       
    123123        if (cir_service)
    124                 async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
     124                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
    125125                    IPC_GET_IMETHOD(*call));
    126126}

  • uspace/srv/hid/kbd/port/z8530.c

    ra97ea0f r6610565b  
    3636
    3737#include <ipc/ipc.h>
    38 #include <ipc/bus.h>
     38#include <ipc/irc.h>
    3939#include <async.h>
    4040#include <sysinfo.h>
    … …  
    110110       
    111111        if (cir_service)
    112                 async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT,
     112                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
    113113                    IPC_GET_IMETHOD(*call));
    114114}

  • uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

    ra97ea0f r6610565b  
    102102        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
    103103        if (rc != EOK) {
    104                 devmap_hangup_phone(DEVMAP_DRIVER);
    105104                printf(NAME ": Unable to register device %s.\n",
    106105                    NAMESPACE "/mouse");
Note: See TracChangeset for help on using the changeset viewer.