Rev 3593 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3593 | Rev 3665 | ||
|---|---|---|---|
| Line 61... | Line 61... | ||
| 61 | { |
61 | { |
| 62 | size_t offset; |
62 | size_t offset; |
| 63 | uintptr_t aligned_addr; |
63 | uintptr_t aligned_addr; |
| 64 | ofw_tree_property_t *prop; |
64 | ofw_tree_property_t *prop; |
| 65 | const char *name; |
65 | const char *name; |
| - | 66 | cir_t cir; |
|
| - | 67 | void *cir_arg; |
|
| 66 | 68 | ||
| 67 | name = ofw_tree_node_name(node); |
69 | name = ofw_tree_node_name(node); |
| 68 | 70 | ||
| 69 | /* |
71 | /* |
| 70 | * Determine keyboard serial controller type. |
72 | * Determine keyboard serial controller type. |
| Line 101... | Line 103... | ||
| 101 | devno_t devno = device_assign_devno(); |
103 | devno_t devno = device_assign_devno(); |
| 102 | 104 | ||
| 103 | switch (kbd_type) { |
105 | switch (kbd_type) { |
| 104 | case KBD_Z8530: |
106 | case KBD_Z8530: |
| 105 | size = ((ofw_fhc_reg_t *) prop->value)->size; |
107 | size = ((ofw_fhc_reg_t *) prop->value)->size; |
| - | 108 | if (!ofw_fhc_apply_ranges(node->parent, |
|
| 106 | if (!ofw_fhc_apply_ranges(node->parent, ((ofw_fhc_reg_t *) prop->value) , &pa)) { |
109 | ((ofw_fhc_reg_t *) prop->value), &pa)) { |
| 107 | printf("Failed to determine keyboard address.\n"); |
110 | printf("Failed to determine keyboard address.\n"); |
| 108 | return; |
111 | return; |
| 109 | } |
112 | } |
| - | 113 | if (!ofw_fhc_map_interrupt(node->parent, |
|
| 110 | if (!ofw_fhc_map_interrupt(node->parent, ((ofw_fhc_reg_t *) prop->value), interrupts, &inr)) { |
114 | ((ofw_fhc_reg_t *) prop->value), interrupts, &inr, &cir, |
| - | 115 | &cir_arg)) { |
|
| 111 | printf("Failed to determine keyboard interrupt.\n"); |
116 | printf("Failed to determine keyboard interrupt.\n"); |
| 112 | return; |
117 | return; |
| 113 | } |
118 | } |
| 114 | break; |
119 | break; |
| 115 | 120 | ||
| 116 | case KBD_NS16550: |
121 | case KBD_NS16550: |
| 117 | size = ((ofw_ebus_reg_t *) prop->value)->size; |
122 | size = ((ofw_ebus_reg_t *) prop->value)->size; |
| - | 123 | if (!ofw_ebus_apply_ranges(node->parent, |
|
| 118 | if (!ofw_ebus_apply_ranges(node->parent, ((ofw_ebus_reg_t *) prop->value) , &pa)) { |
124 | ((ofw_ebus_reg_t *) prop->value), &pa)) { |
| 119 | printf("Failed to determine keyboard address.\n"); |
125 | printf("Failed to determine keyboard address.\n"); |
| 120 | return; |
126 | return; |
| 121 | } |
127 | } |
| - | 128 | if (!ofw_ebus_map_interrupt(node->parent, |
|
| 122 | if (!ofw_ebus_map_interrupt(node->parent, ((ofw_ebus_reg_t *) prop->value), interrupts, &inr)) { |
129 | ((ofw_ebus_reg_t *) prop->value), interrupts, &inr, &cir, |
| - | 130 | &cir_arg)) { |
|
| 123 | printf("Failed to determine keyboard interrupt.\n"); |
131 | printf("Failed to determine keyboard interrupt.\n"); |
| 124 | return; |
132 | return; |
| 125 | }; |
133 | }; |
| 126 | break; |
134 | break; |
| 127 | 135 | ||
| Line 140... | Line 148... | ||
| 140 | uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset; |
148 | uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset; |
| 141 | 149 | ||
| 142 | switch (kbd_type) { |
150 | switch (kbd_type) { |
| 143 | #ifdef CONFIG_Z8530 |
151 | #ifdef CONFIG_Z8530 |
| 144 | case KBD_Z8530: |
152 | case KBD_Z8530: |
| 145 | z8530_init(devno, inr, vaddr); |
153 | z8530_init(devno, vaddr, inr, cir, cir_arg); |
| 146 | break; |
154 | break; |
| 147 | #endif |
155 | #endif |
| 148 | #ifdef CONFIG_NS16550 |
156 | #ifdef CONFIG_NS16550 |
| 149 | case KBD_NS16550: |
157 | case KBD_NS16550: |
| 150 | ns16550_init(devno, inr, (ioport_t)vaddr); |
158 | ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg); |
| 151 | break; |
159 | break; |
| 152 | #endif |
160 | #endif |
| 153 | default: |
161 | default: |
| 154 | printf("Kernel is not compiled with the necessary keyboard driver this machine requires.\n"); |
162 | printf("Kernel is not compiled with the necessary keyboard " |
| - | 163 | "driver this machine requires.\n"); |
|
| 155 | } |
164 | } |
| 156 | } |
165 | } |
| 157 | 166 | ||
| 158 | /** @} |
167 | /** @} |
| 159 | */ |
168 | */ |