Changeset 0b6931a in mainline for uspace

Timestamp:

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

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d7533c7

Parents:

46b881c (diff), 4f14e1f8 (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:

finish API and ABI changes

Location:

uspace

Files:

• app/trace/syscalls.c (modified) (2 diffs)
• lib/c/generic/ddi.c (modified) (2 diffs)
• srv/hid/fb/serial_console.c (modified) (4 diffs)
• srv/hid/kbd/port/adb.c (modified) (2 diffs)
• srv/hid/kbd/port/gxemul.c (modified) (1 diff)
• srv/hid/kbd/port/msim.c (modified) (1 diff)
• srv/hid/kbd/port/ns16550.c (modified) (1 diff)
• srv/hid/kbd/port/pl050.c (modified) (1 diff)
• srv/hid/kbd/port/z8530.c (modified) (1 diff)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (4 diffs)

uspace/app/trace/syscalls.c

@@ -64 +64 @@
     [SYS_IPC_POKE] = { "ipc_poke",                      0,      V_ERRNO },
     [SYS_IPC_HANGUP] = { "ipc_hangup",                  1,      V_ERRNO },
-    [SYS_IPC_REGISTER_IRQ] = { "ipc_register_irq",      4,      V_ERRNO },
-    [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq",  2,      V_ERRNO },
 
     [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",        2,      V_ERRNO },
@@ -73 +71 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
+    [SYS_REGISTER_IRQ] = { "register_irq",      4,      V_ERRNO },
+    [SYS_UNREGISTER_IRQ] = { "unregister_irq",  2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },

uspace/lib/c/generic/ddi.c

@@ -139 +139 @@
 int register_irq(int inr, int devno, int method, irq_code_t *ucode)
 {
-        return __SYSCALL4(SYS_IPC_REGISTER_IRQ, inr, devno, method,
+        return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
             (sysarg_t) ucode);
 }
@@ -153 +153 @@
 int unregister_irq(int inr, int devno)
 {
-        return __SYSCALL2(SYS_IPC_UNREGISTER_IRQ, inr, devno);
+        return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
 }
 

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/hid/kbd/port/gxemul.c

@@ -73 +73 @@
         async_set_interrupt_received(gxemul_irq_handler);
         gxemul_cmds[0].addr = (void *) addr;
-        ipc_register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
+        register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
         return 0;
 }

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

@@ -73 +73 @@
         msim_cmds[0].addr = (void *) vaddr;
         async_set_interrupt_received(msim_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        register_irq(inr, device_assign_devno(), 0, &msim_kbd);
         
         return 0;

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

@@ -110 +110 @@
         
         async_set_interrupt_received(ns16550_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+        register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
         
         return pio_enable((void *) ns16550_physical, 8, &vaddr);

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

@@ -100 +100 @@
         
         async_set_interrupt_received(pl050_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
         
         return 0;

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

@@ -98 +98 @@
         
         async_set_interrupt_received(z8530_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
+        register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
         
         return 0;

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);
         }
 }
@@ -276 +276 @@
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
         async_set_interrupt_received(cuda_irq_handler);
-        ipc_register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
+        register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
 
         /* Enable SR interrupt. */