Rev 4327 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4327 | Rev 4718 | ||
|---|---|---|---|
| Line 35... | Line 35... | ||
| 35 | 35 | ||
| 36 | #include <arch.h> |
36 | #include <arch.h> |
| 37 | #include <config.h> |
37 | #include <config.h> |
| 38 | #include <genarch/fb/fb.h> |
38 | #include <genarch/fb/fb.h> |
| 39 | #include <genarch/fb/visuals.h> |
39 | #include <genarch/fb/visuals.h> |
| 40 | #include <genarch/drivers/dsrln/dsrlnin.h> |
- | |
| 41 | #include <genarch/drivers/dsrln/dsrlnout.h> |
- | |
| 42 | #include <genarch/srln/srln.h> |
- | |
| 43 | #include <sysinfo/sysinfo.h> |
40 | #include <sysinfo/sysinfo.h> |
| 44 | #include <console/console.h> |
41 | #include <console/console.h> |
| 45 | #include <ddi/irq.h> |
42 | #include <ddi/irq.h> |
| 46 | #include <arch/drivers/gxemul.h> |
- | |
| 47 | #include <print.h> |
43 | #include <print.h> |
| 48 | #include <config.h> |
44 | #include <config.h> |
| 49 | #include <interrupt.h> |
45 | #include <interrupt.h> |
| 50 | #include <arch/regutils.h> |
46 | #include <arch/regutils.h> |
| 51 | #include <userspace.h> |
47 | #include <userspace.h> |
| 52 | #include <macros.h> |
48 | #include <macros.h> |
| 53 | #include <string.h> |
49 | #include <string.h> |
| 54 | 50 | ||
| - | 51 | #ifdef MACHINE_testarm |
|
| - | 52 | #include <arch/mach/testarm/testarm.h> |
|
| - | 53 | #endif |
|
| - | 54 | ||
| - | 55 | #ifdef MACHINE_integratorcp |
|
| - | 56 | #include <arch/mach/integratorcp/integratorcp.h> |
|
| - | 57 | #endif |
|
| - | 58 | ||
| - | 59 | ||
| 55 | /** Performs arm32-specific initialization before main_bsp() is called. */ |
60 | /** Performs arm32-specific initialization before main_bsp() is called. */ |
| 56 | void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) |
61 | void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) |
| 57 | { |
62 | { |
| 58 | unsigned int i; |
63 | unsigned int i; |
| 59 | 64 | ||
| Line 75... | Line 80... | ||
| 75 | } |
80 | } |
| 76 | 81 | ||
| 77 | /** Performs arm32 specific initialization afterr mm is initialized. */ |
82 | /** Performs arm32 specific initialization afterr mm is initialized. */ |
| 78 | void arch_post_mm_init(void) |
83 | void arch_post_mm_init(void) |
| 79 | { |
84 | { |
| 80 | gxemul_init(); |
85 | machine_init(); |
| 81 | 86 | ||
| 82 | /* Initialize exception dispatch table */ |
87 | /* Initialize exception dispatch table */ |
| 83 | exception_init(); |
88 | exception_init(); |
| 84 | interrupt_init(); |
89 | interrupt_init(); |
| 85 | 90 | ||
| 86 | #ifdef CONFIG_FB |
91 | #ifdef CONFIG_FB |
| 87 | fb_properties_t prop = { |
- | |
| 88 | .addr = GXEMUL_FB_ADDRESS, |
- | |
| 89 | .offset = 0, |
- | |
| 90 | .x = 640, |
- | |
| 91 | .y = 480, |
- | |
| 92 | .scan = 1920, |
- | |
| 93 | .visual = VISUAL_BGR_8_8_8, |
- | |
| 94 | }; |
- | |
| 95 | fb_init(&prop); |
92 | machine_fb_init(); |
| 96 | #else |
93 | #else |
| 97 | #ifdef CONFIG_ARM_PRN |
94 | #ifdef CONFIG_ARM_PRN |
| 98 | dsrlnout_init((ioport8_t *) gxemul_kbd); |
95 | machine_output_init(); |
| 99 | #endif /* CONFIG_ARM_PRN */ |
96 | #endif /* CONFIG_ARM_PRN */ |
| 100 | #endif /* CONFIG_FB */ |
97 | #endif /* CONFIG_FB */ |
| 101 | } |
98 | } |
| 102 | 99 | ||
| 103 | /** Performs arm32 specific tasks needed after cpu is initialized. |
100 | /** Performs arm32 specific tasks needed after cpu is initialized. |
| Line 124... | Line 121... | ||
| 124 | * |
121 | * |
| 125 | * Currently the function is empty because SMP is not supported. |
122 | * Currently the function is empty because SMP is not supported. |
| 126 | */ |
123 | */ |
| 127 | void arch_post_smp_init(void) |
124 | void arch_post_smp_init(void) |
| 128 | { |
125 | { |
| 129 | #ifdef CONFIG_ARM_KBD |
- | |
| 130 | /* |
- | |
| 131 | * Initialize the GXemul keyboard port. Then initialize the serial line |
- | |
| 132 | * module and connect it to the GXemul keyboard. |
- | |
| 133 | */ |
- | |
| 134 | dsrlnin_instance_t *dsrlnin_instance |
- | |
| 135 | = dsrlnin_init((dsrlnin_t *) gxemul_kbd, GXEMUL_KBD_IRQ); |
- | |
| 136 | if (dsrlnin_instance) { |
- | |
| 137 | srln_instance_t *srln_instance = srln_init(); |
- | |
| 138 | if (srln_instance) { |
- | |
| 139 | indev_t *sink = stdin_wire(); |
126 | machine_input_init(); |
| 140 | indev_t *srln = srln_wire(srln_instance, sink); |
- | |
| 141 | dsrlnin_wire(dsrlnin_instance, srln); |
- | |
| 142 | } |
- | |
| 143 | } |
- | |
| 144 | - | ||
| 145 | /* |
- | |
| 146 | * This is the necessary evil until the userspace driver is entirely |
- | |
| 147 | * self-sufficient. |
- | |
| 148 | */ |
- | |
| 149 | sysinfo_set_item_val("kbd", NULL, true); |
- | |
| 150 | sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ); |
- | |
| 151 | sysinfo_set_item_val("kbd.address.virtual", NULL, (unative_t) gxemul_kbd); |
- | |
| 152 | #endif |
- | |
| 153 | } |
127 | } |
| 154 | 128 | ||
| 155 | 129 | ||
| 156 | /** Performs arm32 specific tasks needed before the new task is run. */ |
130 | /** Performs arm32 specific tasks needed before the new task is run. */ |
| 157 | void before_task_runs_arch(void) |
131 | void before_task_runs_arch(void) |
| 158 | { |
132 | { |
| 159 | tlb_invalidate_all(); |
- | |
| 160 | } |
133 | } |
| 161 | 134 | ||
| 162 | 135 | ||
| 163 | /** Performs arm32 specific tasks needed before the new thread is scheduled. |
136 | /** Performs arm32 specific tasks needed before the new thread is scheduled. |
| 164 | * |
137 | * |
| Line 166... | Line 139... | ||
| 166 | */ |
139 | */ |
| 167 | void before_thread_runs_arch(void) |
140 | void before_thread_runs_arch(void) |
| 168 | { |
141 | { |
| 169 | uint8_t *stck; |
142 | uint8_t *stck; |
| 170 | 143 | ||
| - | 144 | tlb_invalidate_all(); |
|
| 171 | stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]; |
145 | stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]; |
| 172 | supervisor_sp = (uintptr_t) stck; |
146 | supervisor_sp = (uintptr_t) stck; |
| 173 | } |
147 | } |
| 174 | 148 | ||
| 175 | /** Performs arm32 specific tasks before a thread stops running. |
149 | /** Performs arm32 specific tasks before a thread stops running. |
| Line 181... | Line 155... | ||
| 181 | } |
155 | } |
| 182 | 156 | ||
| 183 | /** Halts CPU. */ |
157 | /** Halts CPU. */ |
| 184 | void cpu_halt(void) |
158 | void cpu_halt(void) |
| 185 | { |
159 | { |
| 186 | *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET)) |
160 | machine_cpu_halt(); |
| 187 | = 0; |
- | |
| 188 | } |
161 | } |
| 189 | 162 | ||
| 190 | /** Reboot. */ |
163 | /** Reboot. */ |
| 191 | void arch_reboot() |
164 | void arch_reboot() |
| 192 | { |
165 | { |
| Line 209... | Line 182... | ||
| 209 | } |
182 | } |
| 210 | 183 | ||
| 211 | /** Acquire console back for kernel. */ |
184 | /** Acquire console back for kernel. */ |
| 212 | void arch_grab_console(void) |
185 | void arch_grab_console(void) |
| 213 | { |
186 | { |
| - | 187 | machine_grab_console(); |
|
| 214 | #ifdef CONFIG_FB |
188 | #ifdef CONFIG_FB |
| 215 | fb_redraw(); |
189 | fb_redraw(); |
| 216 | #endif |
190 | #endif |
| 217 | } |
191 | } |
| 218 | 192 | ||
| 219 | /** Return console to userspace. */ |
193 | /** Return console to userspace. */ |
| 220 | void arch_release_console(void) |
194 | void arch_release_console(void) |
| 221 | { |
195 | { |
| - | 196 | machine_release_console(); |
|
| 222 | } |
197 | } |
| 223 | 198 | ||
| 224 | /** @} |
199 | /** @} |
| 225 | */ |
200 | */ |