Rev 1474 | Rev 1619 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1474 | Rev 1480 | ||
---|---|---|---|
Line 33... | Line 33... | ||
33 | #include <arch/interrupt.h> |
33 | #include <arch/interrupt.h> |
34 | #include <genarch/fb/fb.h> |
34 | #include <genarch/fb/fb.h> |
35 | #include <userspace.h> |
35 | #include <userspace.h> |
36 | #include <proc/uarg.h> |
36 | #include <proc/uarg.h> |
37 | #include <console/console.h> |
37 | #include <console/console.h> |
- | 38 | #include <arch/drivers/pic.h> |
|
38 | 39 | ||
39 | bootinfo_t bootinfo; |
40 | bootinfo_t bootinfo; |
40 | 41 | ||
41 | void arch_pre_main(void) |
42 | void arch_pre_main(void) |
42 | { |
43 | { |
Line 53... | Line 54... | ||
53 | 54 | ||
54 | void arch_pre_mm_init(void) |
55 | void arch_pre_mm_init(void) |
55 | { |
56 | { |
56 | /* Initialize dispatch table */ |
57 | /* Initialize dispatch table */ |
57 | interrupt_init(); |
58 | interrupt_init(); |
58 | 59 | ||
59 | /* Start decrementer */ |
60 | /* Start decrementer */ |
60 | start_decrementer(); |
61 | start_decrementer(); |
61 | cuda_init(); |
- | |
62 | } |
62 | } |
63 | 63 | ||
64 | void arch_post_mm_init(void) |
64 | void arch_post_mm_init(void) |
65 | { |
65 | { |
66 | if (config.cpu_active == 1) { |
66 | if (config.cpu_active == 1) { |
67 | fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); |
67 | fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline); |
68 | 68 | ||
- | 69 | /* Initialize PIC */ |
|
- | 70 | pic_init(); |
|
- | 71 | ||
- | 72 | cuda_init(); |
|
69 | /* Merge all zones to 1 big zone */ |
73 | /* Merge all zones to 1 big zone */ |
70 | zone_merge_all(); |
74 | zone_merge_all(); |
71 | } |
75 | } |
72 | } |
76 | } |
73 | 77 |