- Timestamp:
- 2011-01-29T12:05:14Z (14 years ago)
- 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. - Location:
- uspace
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/trace/syscalls.c
r46b881c r0b6931a 64 64 [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, 65 65 [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, 66 [SYS_IPC_REGISTER_IRQ] = { "ipc_register_irq", 4, V_ERRNO },67 [SYS_IPC_UNREGISTER_IRQ] = { "ipc_unregister_irq", 2, V_ERRNO },68 66 69 67 [SYS_EVENT_SUBSCRIBE] = { "event_subscribe", 2, V_ERRNO }, … … 73 71 [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, 74 72 [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, 73 [SYS_REGISTER_IRQ] = { "register_irq", 4, V_ERRNO }, 74 [SYS_UNREGISTER_IRQ] = { "unregister_irq", 2, V_ERRNO }, 75 75 76 76 [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag", 2, V_INTEGER }, -
uspace/lib/c/generic/ddi.c
r46b881c r0b6931a 139 139 int register_irq(int inr, int devno, int method, irq_code_t *ucode) 140 140 { 141 return __SYSCALL4(SYS_ IPC_REGISTER_IRQ, inr, devno, method,141 return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method, 142 142 (sysarg_t) ucode); 143 143 } … … 153 153 int unregister_irq(int inr, int devno) 154 154 { 155 return __SYSCALL2(SYS_ IPC_UNREGISTER_IRQ, inr, devno);155 return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno); 156 156 } 157 157 -
uspace/srv/hid/fb/serial_console.c
r46b881c r0b6931a 318 318 319 319 if (client_connected) { 320 ipc_answer_0(iid, ELIMIT);320 async_answer_0(iid, ELIMIT); 321 321 return; 322 322 } 323 323 324 324 client_connected = 1; 325 ipc_answer_0(iid, EOK);325 async_answer_0(iid, EOK); 326 326 327 327 /* Clear the terminal, set scrolling region … … 347 347 case IPC_M_PHONE_HUNGUP: 348 348 client_connected = 0; 349 ipc_answer_0(callid, EOK);349 async_answer_0(callid, EOK); 350 350 351 351 /* Exit thread */ … … 406 406 break; 407 407 case FB_GET_CSIZE: 408 ipc_answer_2(callid, EOK, scr_width, scr_height);408 async_answer_2(callid, EOK, scr_width, scr_height); 409 409 continue; 410 410 case FB_GET_COLOR_CAP: 411 ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :411 async_answer_1(callid, EOK, color ? FB_CCAP_INDEXED : 412 412 FB_CCAP_STYLE); 413 413 continue; … … 477 477 retval = ENOENT; 478 478 } 479 ipc_answer_0(callid, retval);479 async_answer_0(callid, retval); 480 480 } 481 481 } -
uspace/srv/hid/kbd/port/adb.c
r46b881c r0b6931a 70 70 71 71 /* NB: The callback connection is slotted for removal */ 72 sysarg_t taskhash; 73 sysarg_t phonehash; 74 if (ipc_connect_to_me(dev_phone, 0, 0, 0, &taskhash, &phonehash) != 0) { 72 if (async_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) { 75 73 printf(NAME ": Failed to create callback from device\n"); 76 74 return false; 77 75 } 78 79 async_new_connection(taskhash, phonehash, 0, NULL, kbd_port_events);80 76 81 77 return 0; … … 115 111 retval = ENOENT; 116 112 } 117 ipc_answer_0(callid, retval);113 async_answer_0(callid, retval); 118 114 } 119 115 } -
uspace/srv/hid/kbd/port/gxemul.c
r46b881c r0b6931a 73 73 async_set_interrupt_received(gxemul_irq_handler); 74 74 gxemul_cmds[0].addr = (void *) addr; 75 ipc_register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);75 register_irq(inr, device_assign_devno(), 0, &gxemul_kbd); 76 76 return 0; 77 77 } -
uspace/srv/hid/kbd/port/msim.c
r46b881c r0b6931a 73 73 msim_cmds[0].addr = (void *) vaddr; 74 74 async_set_interrupt_received(msim_irq_handler); 75 ipc_register_irq(inr, device_assign_devno(), 0, &msim_kbd);75 register_irq(inr, device_assign_devno(), 0, &msim_kbd); 76 76 77 77 return 0; -
uspace/srv/hid/kbd/port/ns16550.c
r46b881c r0b6931a 110 110 111 111 async_set_interrupt_received(ns16550_irq_handler); 112 ipc_register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);112 register_irq(inr, device_assign_devno(), inr, &ns16550_kbd); 113 113 114 114 return pio_enable((void *) ns16550_physical, 8, &vaddr); -
uspace/srv/hid/kbd/port/pl050.c
r46b881c r0b6931a 100 100 101 101 async_set_interrupt_received(pl050_irq_handler); 102 ipc_register_irq(inr, device_assign_devno(), 0, &pl050_kbd);102 register_irq(inr, device_assign_devno(), 0, &pl050_kbd); 103 103 104 104 return 0; -
uspace/srv/hid/kbd/port/z8530.c
r46b881c r0b6931a 98 98 99 99 async_set_interrupt_received(z8530_irq_handler); 100 ipc_register_irq(inr, device_assign_devno(), inr, &z8530_kbd);100 register_irq(inr, device_assign_devno(), inr, &z8530_kbd); 101 101 102 102 return 0; -
uspace/srv/hw/bus/cuda_adb/cuda_adb.c
r46b881c r0b6931a 209 209 210 210 if (dev_addr < 0) { 211 ipc_answer_0(iid, EINVAL);211 async_answer_0(iid, EINVAL); 212 212 return; 213 213 } 214 214 215 215 /* Answer the IPC_M_CONNECT_ME_TO call. */ 216 ipc_answer_0(iid, EOK);216 async_answer_0(iid, EOK); 217 217 218 218 while (1) { … … 222 222 case IPC_M_PHONE_HUNGUP: 223 223 /* The other side has hung up. */ 224 ipc_answer_0(callid, EOK);224 async_answer_0(callid, EOK); 225 225 return; 226 226 case IPC_M_CONNECT_TO_ME: … … 245 245 break; 246 246 } 247 ipc_answer_0(callid, retval);247 async_answer_0(callid, retval); 248 248 } 249 249 } … … 276 276 cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr; 277 277 async_set_interrupt_received(cuda_irq_handler); 278 ipc_register_irq(10, device_assign_devno(), 0, &cuda_irq_code);278 register_irq(10, device_assign_devno(), 0, &cuda_irq_code); 279 279 280 280 /* Enable SR interrupt. */
Note:
See TracChangeset
for help on using the changeset viewer.