Rev 3655 | Rev 3935 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3655 | Rev 3714 | ||
|---|---|---|---|
| Line 84... | Line 84... | ||
| 84 | /* |
84 | /* |
| 85 | * Read 'interrupts' property. |
85 | * Read 'interrupts' property. |
| 86 | */ |
86 | */ |
| 87 | uint32_t interrupts; |
87 | uint32_t interrupts; |
| 88 | prop = ofw_tree_getprop(node, "interrupts"); |
88 | prop = ofw_tree_getprop(node, "interrupts"); |
| 89 | if (!prop || !prop->value) |
89 | if ((!prop) || (!prop->value)) |
| 90 | panic("Can't find \"interrupts\" property.\n"); |
90 | panic("Can't find \"interrupts\" property.\n"); |
| 91 | interrupts = *((uint32_t *) prop->value); |
91 | interrupts = *((uint32_t *) prop->value); |
| 92 | 92 | ||
| 93 | /* |
93 | /* |
| 94 | * Read 'reg' property. |
94 | * Read 'reg' property. |
| 95 | */ |
95 | */ |
| 96 | prop = ofw_tree_getprop(node, "reg"); |
96 | prop = ofw_tree_getprop(node, "reg"); |
| 97 | if (!prop || !prop->value) |
97 | if ((!prop) || (!prop->value)) |
| 98 | panic("Can't find \"reg\" property.\n"); |
98 | panic("Can't find \"reg\" property.\n"); |
| 99 | 99 | ||
| 100 | uintptr_t pa; |
100 | uintptr_t pa; |
| 101 | size_t size; |
101 | size_t size; |
| 102 | inr_t inr; |
102 | inr_t inr; |
| 103 | devno_t devno = device_assign_devno(); |
- | |
| 104 | 103 | ||
| 105 | switch (kbd_type) { |
104 | switch (kbd_type) { |
| 106 | case KBD_Z8530: |
105 | case KBD_Z8530: |
| 107 | size = ((ofw_fhc_reg_t *) prop->value)->size; |
106 | size = ((ofw_fhc_reg_t *) prop->value)->size; |
| 108 | if (!ofw_fhc_apply_ranges(node->parent, |
107 | if (!ofw_fhc_apply_ranges(node->parent, |
| Line 130... | Line 129... | ||
| 130 | &cir_arg)) { |
129 | &cir_arg)) { |
| 131 | printf("Failed to determine keyboard interrupt.\n"); |
130 | printf("Failed to determine keyboard interrupt.\n"); |
| 132 | return; |
131 | return; |
| 133 | }; |
132 | }; |
| 134 | break; |
133 | break; |
| 135 | 134 | ||
| 136 | default: |
135 | default: |
| 137 | panic("Unexpected type.\n"); |
136 | panic("Unexpected keyboard type.\n"); |
| 138 | } |
137 | } |
| 139 | 138 | ||
| 140 | /* |
139 | /* |
| 141 | * We need to pass aligned address to hw_map(). |
140 | * We need to pass aligned address to hw_map(). |
| 142 | * However, the physical keyboard address can |
141 | * However, the physical keyboard address can |
| 143 | * be pretty much unaligned, depending on the |
142 | * be pretty much unaligned, depending on the |
| 144 | * underlying controller. |
143 | * underlying controller. |
| 145 | */ |
144 | */ |
| 146 | aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); |
145 | aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); |
| 147 | offset = pa - aligned_addr; |
146 | offset = pa - aligned_addr; |
| 148 | uintptr_t vaddr = hw_map(aligned_addr, offset + size) + offset; |
- | |
| 149 | 147 | ||
| 150 | switch (kbd_type) { |
148 | switch (kbd_type) { |
| 151 | #ifdef CONFIG_Z8530 |
149 | #ifdef CONFIG_Z8530 |
| 152 | case KBD_Z8530: |
150 | case KBD_Z8530: |
| 153 | z8530_init(devno, vaddr, inr, cir, cir_arg); |
151 | z8530_init(device_assign_devno(), |
| - | 152 | hw_map(aligned_addr, offset + size) + offset, inr, cir, cir_arg); |
|
| 154 | break; |
153 | break; |
| 155 | #endif |
154 | #endif |
| 156 | #ifdef CONFIG_NS16550 |
155 | #ifdef CONFIG_NS16550 |
| 157 | case KBD_NS16550: |
156 | case KBD_NS16550: |
| 158 | ns16550_init(devno, (ioport_t)vaddr, inr, cir, cir_arg); |
157 | ns16550_init(device_assign_devno(), |
| - | 158 | (ioport_t) (hw_map(aligned_addr, offset + size) + offset), inr, cir, cir_arg); |
|
| 159 | break; |
159 | break; |
| 160 | #endif |
160 | #endif |
| 161 | default: |
161 | default: |
| 162 | printf("Kernel is not compiled with the necessary keyboard " |
162 | printf("Kernel is not compiled with the necessary keyboard " |
| 163 | "driver this machine requires.\n"); |
163 | "driver this machine requires.\n"); |