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