Changeset 8820544 in mainline for uspace/srv/hw
- Timestamp:
- 2014-08-16T00:02:04Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 35b8bfe, 8cd680c
- Parents:
- 83f29e0
- Location:
- uspace/srv/hw
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hw/bus/cuda_adb/cuda_adb.c
r83f29e0 r8820544 55 55 static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg); 56 56 static int cuda_init(void); 57 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call );57 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg); 58 58 59 59 static void cuda_irq_listen(void); … … 282 282 cuda_irq_code.ranges[0].base = (uintptr_t) instance->cuda_physical; 283 283 cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_physical)->ifr; 284 async_ set_interrupt_received(cuda_irq_handler);285 irq_register(10, device_assign_devno(), 0,&cuda_irq_code);284 async_irq_subscribe(10, device_assign_devno(), cuda_irq_handler, NULL, 285 &cuda_irq_code); 286 286 287 287 /* Enable SR interrupt. */ … … 295 295 } 296 296 297 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call )297 static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg) 298 298 { 299 299 uint8_t rbuf[CUDA_RCV_BUF_SIZE]; -
uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
r83f29e0 r8820544 68 68 static s3c24xx_uart_t *uart; 69 69 70 static void s3c24xx_uart_connection(ipc_callid_t iid, ipc_call_t *icall, 71 void *arg); 72 static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call); 73 static int s3c24xx_uart_init(s3c24xx_uart_t *uart); 74 static void s3c24xx_uart_sendb(s3c24xx_uart_t *uart, uint8_t byte); 70 static void s3c24xx_uart_connection(ipc_callid_t, ipc_call_t *, void *); 71 static void s3c24xx_uart_irq_handler(ipc_callid_t, ipc_call_t *, void *); 72 static int s3c24xx_uart_init(s3c24xx_uart_t *); 73 static void s3c24xx_uart_sendb(s3c24xx_uart_t *, uint8_t); 75 74 76 75 int main(int argc, char *argv[]) … … 150 149 } 151 150 152 static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call) 153 { 154 (void) iid; (void) call; 151 static void s3c24xx_uart_irq_handler(ipc_callid_t iid, ipc_call_t *call, 152 void *arg) 153 { 154 (void) iid; 155 (void) call; 156 (void) arg; 155 157 156 158 while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_RX_COUNT) != 0) { … … 192 194 (void *) uart->paddr, inr); 193 195 194 async_set_interrupt_received(s3c24xx_uart_irq_handler); 195 196 irq_register(inr, device_assign_devno(), 0, &uart_irq_code); 196 async_irq_subscribe(inr, device_assign_devno(), s3c24xx_uart_irq_handler, 197 NULL, &uart_irq_code); 197 198 198 199 /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */
Note:
See TracChangeset
for help on using the changeset viewer.