Rev 4311 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4311 | Rev 4669 | ||
|---|---|---|---|
| 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> |
43 | #include <arch/machine.h> |
| 47 | #include <print.h> |
44 | #include <print.h> |
| 48 | #include <config.h> |
45 | #include <config.h> |
| 49 | #include <interrupt.h> |
46 | #include <interrupt.h> |
| 50 | #include <arch/regutils.h> |
47 | #include <arch/regutils.h> |
| 51 | #include <userspace.h> |
48 | #include <userspace.h> |
| Line 75... | Line 72... | ||
| 75 | } |
72 | } |
| 76 | 73 | ||
| 77 | /** Performs arm32 specific initialization afterr mm is initialized. */ |
74 | /** Performs arm32 specific initialization afterr mm is initialized. */ |
| 78 | void arch_post_mm_init(void) |
75 | void arch_post_mm_init(void) |
| 79 | { |
76 | { |
| 80 | gxemul_init(); |
77 | machine_init(); |
| 81 | 78 | ||
| 82 | /* Initialize exception dispatch table */ |
79 | /* Initialize exception dispatch table */ |
| 83 | exception_init(); |
80 | exception_init(); |
| 84 | interrupt_init(); |
81 | interrupt_init(); |
| 85 | 82 | ||
| 86 | #ifdef CONFIG_FB |
83 | #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); |
84 | machine_fb_init(); |
| 96 | #else |
85 | #else |
| 97 | #ifdef CONFIG_ARM_PRN |
86 | #ifdef CONFIG_ARM_PRN |
| 98 | dsrlnout_init((ioport8_t *) gxemul_kbd); |
87 | machine_output_init(); |
| 99 | #endif /* CONFIG_ARM_PRN */ |
88 | #endif /* CONFIG_ARM_PRN */ |
| 100 | #endif /* CONFIG_FB */ |
89 | #endif /* CONFIG_FB */ |
| 101 | } |
90 | } |
| 102 | 91 | ||
| 103 | /** Performs arm32 specific tasks needed after cpu is initialized. |
92 | /** Performs arm32 specific tasks needed after cpu is initialized. |
| Line 124... | Line 113... | ||
| 124 | * |
113 | * |
| 125 | * Currently the function is empty because SMP is not supported. |
114 | * Currently the function is empty because SMP is not supported. |
| 126 | */ |
115 | */ |
| 127 | void arch_post_smp_init(void) |
116 | void arch_post_smp_init(void) |
| 128 | { |
117 | { |
| 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(); |
118 | 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 | } |
119 | } |
| 154 | 120 | ||
| 155 | 121 | ||
| 156 | /** Performs arm32 specific tasks needed before the new task is run. */ |
122 | /** Performs arm32 specific tasks needed before the new task is run. */ |
| 157 | void before_task_runs_arch(void) |
123 | void before_task_runs_arch(void) |
| 158 | { |
124 | { |
| 159 | tlb_invalidate_all(); |
- | |
| 160 | } |
125 | } |
| 161 | 126 | ||
| 162 | 127 | ||
| 163 | /** Performs arm32 specific tasks needed before the new thread is scheduled. |
128 | /** Performs arm32 specific tasks needed before the new thread is scheduled. |
| 164 | * |
129 | * |
| Line 166... | Line 131... | ||
| 166 | */ |
131 | */ |
| 167 | void before_thread_runs_arch(void) |
132 | void before_thread_runs_arch(void) |
| 168 | { |
133 | { |
| 169 | uint8_t *stck; |
134 | uint8_t *stck; |
| 170 | 135 | ||
| - | 136 | tlb_invalidate_all(); |
|
| 171 | stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]; |
137 | stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]; |
| 172 | supervisor_sp = (uintptr_t) stck; |
138 | supervisor_sp = (uintptr_t) stck; |
| 173 | } |
139 | } |
| 174 | 140 | ||
| 175 | /** Performs arm32 specific tasks before a thread stops running. |
141 | /** Performs arm32 specific tasks before a thread stops running. |
| Line 181... | Line 147... | ||
| 181 | } |
147 | } |
| 182 | 148 | ||
| 183 | /** Halts CPU. */ |
149 | /** Halts CPU. */ |
| 184 | void cpu_halt(void) |
150 | void cpu_halt(void) |
| 185 | { |
151 | { |
| 186 | *((char *) (gxemul_kbd + GXEMUL_HALT_OFFSET)) |
152 | machine_cpu_halt(); |
| 187 | = 0; |
- | |
| 188 | } |
153 | } |
| 189 | 154 | ||
| 190 | /** Reboot. */ |
155 | /** Reboot. */ |
| 191 | void arch_reboot() |
156 | void arch_reboot() |
| 192 | { |
157 | { |
| Line 209... | Line 174... | ||
| 209 | } |
174 | } |
| 210 | 175 | ||
| 211 | /** Acquire console back for kernel. */ |
176 | /** Acquire console back for kernel. */ |
| 212 | void arch_grab_console(void) |
177 | void arch_grab_console(void) |
| 213 | { |
178 | { |
| - | 179 | machine_grab_console(); |
|
| 214 | #ifdef CONFIG_FB |
180 | #ifdef CONFIG_FB |
| 215 | fb_redraw(); |
181 | fb_redraw(); |
| 216 | #endif |
182 | #endif |
| 217 | } |
183 | } |
| 218 | 184 | ||
| 219 | /** Return console to userspace. */ |
185 | /** Return console to userspace. */ |
| 220 | void arch_release_console(void) |
186 | void arch_release_console(void) |
| 221 | { |
187 | { |
| - | 188 | machine_release_console(); |
|
| 222 | } |
189 | } |
| 223 | 190 | ||
| 224 | /** @} |
191 | /** @} |
| 225 | */ |
192 | */ |