Changes in kernel/arch/sparc64/src/console.c [336d2f52:7e752b2] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/sparc64/src/console.c
r336d2f52 r7e752b2 38 38 #include <arch/drivers/scr.h> 39 39 #include <arch/drivers/kbd.h> 40 #include <arch/drivers/sgcn.h> 40 41 #include <genarch/srln/srln.h> 41 42 #include <console/chardev.h> … … 88 89 } 89 90 91 /** Initilize I/O on the Serengeti machine. */ 92 static void serengeti_init(void) 93 { 94 #ifdef CONFIG_SGCN_KBD 95 sgcn_instance_t *sgcn_instance = sgcnin_init(); 96 if (sgcn_instance) { 97 srln_instance_t *srln_instance = srln_init(); 98 if (srln_instance) { 99 indev_t *sink = stdin_wire(); 100 indev_t *srln = srln_wire(srln_instance, sink); 101 sgcnin_wire(sgcn_instance, srln); 102 } 103 } 104 #endif 105 106 #ifdef CONFIG_SGCN_PRN 107 outdev_t *sgcndev = sgcnout_init(); 108 if (sgcndev) 109 stdout_wire(sgcndev); 110 #endif 111 } 112 90 113 /** 91 114 * Initialize input/output. Auto-detects the type of machine … … 104 127 prop = ofw_tree_getprop(aliases, "def-cn"); 105 128 106 if ((!prop) || (!prop->value) )129 if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) { 107 130 standard_console_init(aliases); 131 } else { 132 serengeti_init(); 133 } 108 134 } 109 135
Note:
See TracChangeset
for help on using the changeset viewer.