| 26,7 → 26,7 |
|---|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| |
| /** @addtogroup sparc64 |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| 92,10 → 92,15 |
|---|
| static void serengeti_init(void) |
| { |
| #ifdef CONFIG_SGCN_KBD |
| indev_t *kbrdin; |
| kbrdin = sgcnin_init(); |
| if (kbrdin) |
| srlnin_init(kbrdin); |
| sgcn_instance_t *sgcn_instance = sgcnin_init(); |
| if (sgcn_instance) { |
| srln_instance_t *srln_instance = srln_init(); |
| if (srln_instance) { |
| indev_t *sink = stdin_wire(); |
| indev_t *srln = srln_wire(srln_instance, sink); |
| sgcnin_wire(sgcn_instance, srln); |
| } |
| } |
| #endif |
| #ifdef CONFIG_SGCN_PRN |
| sgcnout_init(); |
| 118,7 → 123,7 |
|---|
| /* "def-cn" = "default console" */ |
| prop = ofw_tree_getprop(aliases, "def-cn"); |
| |
| if ((!prop) || (!prop->value) || (strcmp(prop->value, "/sgcn") != 0)) { |
| if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) { |
| standard_console_init(aliases); |
| } else { |
| serengeti_init(); |
| 134,15 → 139,10 |
|---|
| #ifdef CONFIG_FB |
| scr_redraw(); |
| #endif |
| switch (kbd_type) { |
| #ifdef CONFIG_SGCN |
| case KBD_SGCN: |
| sgcn_grab(); |
| break; |
| |
| #ifdef CONFIG_SGCN_KBD |
| sgcn_grab(); |
| #endif |
| default: |
| break; |
| } |
| } |
| |
| /** Return console to userspace |
| 150,15 → 150,9 |
|---|
| */ |
| void arch_release_console(void) |
| { |
| switch (kbd_type) { |
| #ifdef CONFIG_SGCN |
| case KBD_SGCN: |
| sgcn_release(); |
| break; |
| #ifdef CONFIG_SGCN_KBD |
| sgcn_release(); |
| #endif |
| default: |
| break; |
| } |
| } |
| |
| /** @} |