Changeset 357b5f5 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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.

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (2 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -102 +102 @@
         rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/mouse");
@@ -382 +381 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         if (ts->client_phone != -1) {