Rev 3924 | Rev 4026 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3924 | Rev 3954 | ||
|---|---|---|---|
| Line 48... | Line 48... | ||
| 48 | #define FCR_REG 2 /** FIFO control register (write). */ |
48 | #define FCR_REG 2 /** FIFO control register (write). */ |
| 49 | #define LCR_REG 3 /** Line Control register. */ |
49 | #define LCR_REG 3 /** Line Control register. */ |
| 50 | #define MCR_REG 4 /** Modem Control Register. */ |
50 | #define MCR_REG 4 /** Modem Control Register. */ |
| 51 | #define LSR_REG 5 /** Line Status Register. */ |
51 | #define LSR_REG 5 /** Line Status Register. */ |
| 52 | 52 | ||
| - | 53 | #define LSR_DATA_READY 0x01 |
|
| - | 54 | ||
| 53 | irq_cmd_t ns16550_cmds[1] = { |
55 | static irq_cmd_t ns16550_cmds[] = { |
| - | 56 | { |
|
| 54 | { CMD_PORT_READ_1, 0, 0, 2 }, |
57 | .cmd = CMD_PIO_READ_8, |
| - | 58 | .addr = (void *) 0, /* will be patched in run-time */ |
|
| - | 59 | .dstarg = 1 |
|
| - | 60 | }, |
|
| - | 61 | { |
|
| - | 62 | .cmd = CMD_BTEST, |
|
| - | 63 | .value = LSR_DATA_READY, |
|
| - | 64 | .srcarg = 1, |
|
| - | 65 | .dstarg = 3 |
|
| - | 66 | }, |
|
| - | 67 | { |
|
| - | 68 | .cmd = CMD_PREDICATE, |
|
| - | 69 | .value = 2, |
|
| - | 70 | .srcarg = 3 |
|
| - | 71 | }, |
|
| - | 72 | { |
|
| - | 73 | .cmd = CMD_PIO_READ_8, |
|
| - | 74 | .addr = (void *) 0, /* will be patched in run-time */ |
|
| - | 75 | .dstarg = 2 |
|
| - | 76 | }, |
|
| - | 77 | { |
|
| - | 78 | .cmd = CMD_ACCEPT |
|
| - | 79 | } |
|
| 55 | }; |
80 | }; |
| 56 | 81 | ||
| 57 | irq_code_t ns16550_kbd = { |
82 | irq_code_t ns16550_kbd = { |
| 58 | 1, |
83 | sizeof(ns16550_cmds) / sizeof(irq_cmd_t), |
| 59 | ns16550_cmds |
84 | ns16550_cmds |
| 60 | }; |
85 | }; |
| 61 | 86 | ||
| 62 | static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call); |
87 | static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call); |
| 63 | 88 | ||
| Line 66... | Line 91... | ||
| 66 | int kbd_port_init(void) |
91 | int kbd_port_init(void) |
| 67 | { |
92 | { |
| 68 | async_set_interrupt_received(ns16550_irq_handler); |
93 | async_set_interrupt_received(ns16550_irq_handler); |
| 69 | 94 | ||
| 70 | ns16550_port = sysinfo_value("kbd.port"); |
95 | ns16550_port = sysinfo_value("kbd.port"); |
| - | 96 | ns16550_kbd.cmds[0].addr = (void *) (ns16550_port + LSR_REG); |
|
| 71 | ns16550_kbd.cmds[0].addr = (void *) (ns16550_port + RBR_REG); |
97 | ns16550_kbd.cmds[3].addr = (void *) (ns16550_port + RBR_REG); |
| 72 | ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), |
98 | ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), |
| 73 | 0, &ns16550_kbd); |
99 | 0, &ns16550_kbd); |
| 74 | iospace_enable(task_get_id(), ns16550_port, 8); |
100 | iospace_enable(task_get_id(), ns16550_port, 8); |
| 75 | 101 | ||
| 76 | return 0; |
102 | return 0; |
| 77 | } |
103 | } |
| 78 | 104 | ||
| 79 | #define LSR_DATA_READY 0x01 |
- | |
| 80 | - | ||
| 81 | static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call) |
105 | static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call) |
| 82 | { |
106 | { |
| 83 | int scan_code = IPC_GET_ARG2(*call); |
107 | int scan_code = IPC_GET_ARG2(*call); |
| 84 | kbd_push_scancode(scan_code); |
108 | kbd_push_scancode(scan_code); |
| 85 | } |
109 | } |