Rev 4345 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4345 | Rev 4346 | ||
---|---|---|---|
Line 35... | Line 35... | ||
35 | #include <arch/console.h> |
35 | #include <arch/console.h> |
36 | #include <arch/types.h> |
36 | #include <arch/types.h> |
37 | 37 | ||
38 | #include <arch/drivers/scr.h> |
38 | #include <arch/drivers/scr.h> |
39 | #include <arch/drivers/kbd.h> |
39 | #include <arch/drivers/kbd.h> |
40 | - | ||
41 | #include <arch/drivers/sgcn.h> |
40 | #include <arch/drivers/sgcn.h> |
42 | - | ||
43 | #ifdef CONFIG_Z8530 |
- | |
44 | #include <genarch/kbd/z8530.h> |
41 | #include <genarch/srln/srln.h> |
45 | #endif |
- | |
46 | #ifdef CONFIG_NS16550 |
- | |
47 | #include <genarch/kbd/ns16550.h> |
- | |
48 | #endif |
- | |
49 | - | ||
50 | #include <console/chardev.h> |
42 | #include <console/chardev.h> |
51 | #include <console/console.h> |
43 | #include <console/console.h> |
52 | #include <arch/asm.h> |
44 | #include <arch/asm.h> |
53 | #include <arch/register.h> |
45 | #include <arch/register.h> |
54 | #include <proc/thread.h> |
46 | #include <proc/thread.h> |
Line 68... | Line 60... | ||
68 | * @param aliases the "/aliases" OBP node |
60 | * @param aliases the "/aliases" OBP node |
69 | */ |
61 | */ |
70 | static void standard_console_init(ofw_tree_node_t *aliases) |
62 | static void standard_console_init(ofw_tree_node_t *aliases) |
71 | { |
63 | { |
72 | #ifdef CONFIG_FB |
64 | #ifdef CONFIG_FB |
73 | stdin = NULL; |
- | |
74 | - | ||
75 | ofw_tree_property_t *prop; |
- | |
76 | ofw_tree_node_t *screen; |
- | |
77 | ofw_tree_node_t *keyboard; |
- | |
78 | - | ||
79 | prop = ofw_tree_getprop(aliases, "screen"); |
65 | ofw_tree_property_t *prop_scr = ofw_tree_getprop(aliases, "screen"); |
80 | if (!prop) |
66 | if (!prop_scr) |
81 | panic("Cannot find property 'screen'."); |
67 | panic("Cannot find property 'screen'."); |
82 | if (!prop->value) |
68 | if (!prop_scr->value) |
83 | panic("Cannot find screen alias."); |
69 | panic("Cannot find screen alias."); |
84 | screen = ofw_tree_lookup(prop->value); |
70 | ofw_tree_node_t *screen = ofw_tree_lookup(prop_scr->value); |
85 | if (!screen) |
71 | if (!screen) |
86 | panic("Cannot find %s.", prop->value); |
72 | panic("Cannot find %s.", prop_scr->value); |
87 | 73 | ||
88 | scr_init(screen); |
74 | scr_init(screen); |
- | 75 | #endif |
|
89 | 76 | ||
- | 77 | #ifdef CONFIG_SUN_KBD |
|
90 | prop = ofw_tree_getprop(aliases, "keyboard"); |
78 | ofw_tree_property_t *prop_kbd = ofw_tree_getprop(aliases, "keyboard"); |
91 | if (!prop) |
79 | if (!prop_kbd) |
92 | panic("Cannot find property 'keyboard'."); |
80 | panic("Cannot find property 'keyboard'."); |
93 | if (!prop->value) |
81 | if (!prop_kbd->value) |
94 | panic("Cannot find keyboard alias."); |
82 | panic("Cannot find keyboard alias."); |
95 | keyboard = ofw_tree_lookup(prop->value); |
83 | ofw_tree_node_t *keyboard = ofw_tree_lookup(prop_kbd->value); |
96 | if (!keyboard) |
84 | if (!keyboard) |
97 | panic("Cannot find %s.", prop->value); |
85 | panic("Cannot find %s.", prop_kbd->value); |
98 | 86 | ||
99 | kbd_init(keyboard); |
87 | kbd_init(keyboard); |
100 | #else |
- | |
101 | panic("Standard console requires FB, " |
- | |
102 | "but the kernel is not compiled with FB support."); |
- | |
103 | #endif |
88 | #endif |
104 | } |
89 | } |
105 | 90 | ||
106 | /** Initilize I/O on the Serengeti machine. */ |
91 | /** Initilize I/O on the Serengeti machine. */ |
107 | static void serengeti_init(void) |
92 | static void serengeti_init(void) |
108 | { |
93 | { |
- | 94 | #ifdef CONFIG_SGCN_KBD |
|
- | 95 | indev_t *kbrdin; |
|
- | 96 | kbrdin = sgcnin_init(); |
|
- | 97 | if (kbrdin) |
|
- | 98 | srlnin_init(kbrdin); |
|
- | 99 | #endif |
|
- | 100 | #ifdef CONFIG_SGCN_PRN |
|
109 | sgcn_init(); |
101 | sgcnout_init(); |
- | 102 | #endif |
|
110 | } |
103 | } |
111 | 104 | ||
112 | /** |
105 | /** |
113 | * Initialize input/output. Auto-detects the type of machine |
106 | * Initialize input/output. Auto-detects the type of machine |
114 | * and calls the appropriate I/O init routine. |
107 | * and calls the appropriate I/O init routine. |
Line 131... | Line 124... | ||
131 | serengeti_init(); |
124 | serengeti_init(); |
132 | } |
125 | } |
133 | } |
126 | } |
134 | 127 | ||
135 | 128 | ||
136 | /** Kernel thread for polling keyboard. |
- | |
137 | * |
- | |
138 | * @param arg Ignored. |
- | |
139 | */ |
- | |
140 | void kkbdpoll(void *arg) |
- | |
141 | { |
- | |
142 | thread_detach(THREAD); |
- | |
143 | - | ||
144 | if (kbd_type != KBD_SGCN) |
- | |
145 | return; |
- | |
146 | - | ||
147 | while (1) { |
- | |
148 | #ifdef CONFIG_SGCN |
- | |
149 | if (kbd_type == KBD_SGCN) |
- | |
150 | sgcn_poll(); |
- | |
151 | #endif |
- | |
152 | thread_usleep(KEYBOARD_POLL_PAUSE); |
- | |
153 | } |
- | |
154 | } |
- | |
155 | - | ||
156 | /** Acquire console back for kernel |
129 | /** Acquire console back for kernel |
157 | * |
130 | * |
158 | */ |
131 | */ |
159 | void arch_grab_console(void) |
132 | void arch_grab_console(void) |
160 | { |
133 | { |