Changeset 4f14e1f8 in mainline

Timestamp:

2011-01-29T12:04:43Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0b6931a

Parents:

8add9ca5

Message:

do not intermix low-level IPC methods with async framework methods

Location:

uspace/srv

Files:

• hid/fb/serial_console.c (modified) (4 diffs)
• hid/kbd/port/adb.c (modified) (2 diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (3 diffs)

uspace/srv/hid/fb/serial_console.c

@@ -318 +318 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
         
         client_connected = 1;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         /* Clear the terminal, set scrolling region
@@ -347 +347 @@
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         /* Exit thread */
@@ -406 +406 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, scr_width, scr_height);
+                        async_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
+                        async_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
                             FB_CCAP_STYLE);
                         continue;
@@ -477 +477 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }

uspace/srv/hid/kbd/port/adb.c

@@ -70 +70 @@
 
         /* NB: The callback connection is slotted for removal */
-        sysarg_t taskhash;
-        sysarg_t phonehash;
-        if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) {
+        if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-
-        async_new_connection(taskhash, phonehash, 0, NULL, kbd_port_events);
 
         return 0;
@@ -115 +111 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -209 +209 @@
 
         if (dev_addr < 0) {
-                ipc_answer_0(iid, EINVAL);
+                async_answer_0(iid, EINVAL);
                 return;
         }
 
         /* Answer the IPC_M_CONNECT_ME_TO call. */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -222 +222 @@
                 case IPC_M_PHONE_HUNGUP:
                         /* The other side has hung up. */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -245 +245 @@
                         break;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }