diff options
| author | Helge Deller <deller@gmx.de> | 2022-05-14 13:13:22 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-05-14 13:24:38 +0200 |
| commit | 23c1205f77b4f8c6ea6816bb27f16a6ec013ec99 (patch) | |
| tree | e8835dfe7df66b633c836648681f3287ca2924ba | |
| parent | 32ed5df025b306d6e2babb8beff4081b1194dc54 (diff) | |
| download | seabios-hppa-23c1205f77b4f8c6ea6816bb27f16a6ec013ec99.zip seabios-hppa-23c1205f77b4f8c6ea6816bb27f16a6ec013ec99.tar.gz seabios-hppa-23c1205f77b4f8c6ea6816bb27f16a6ec013ec99.tar.bz2 | |
parisc: Add CONSOLE_DEFAULT constant
Add the CONSOLE_DEFAULT constant to make the decision which I/O console to use
easier to understand.
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | src/parisc/parisc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/parisc/parisc.c b/src/parisc/parisc.c index a8dcbc4..54616c2 100644 --- a/src/parisc/parisc.c +++ b/src/parisc/parisc.c @@ -114,6 +114,7 @@ extern unsigned long boot_args[]; int pdc_console; /* flags for pdc_console */ +#define CONSOLE_DEFAULT 0x0000 #define CONSOLE_SERIAL 0x0001 #define CONSOLE_GRAPHICS 0x0002 @@ -583,6 +584,7 @@ int __VISIBLE parisc_iodc_ENTRY_IO(unsigned int *arg FUNC_MANY_ARGS) return PDC_OK; case ENTRY_IO_CIN: /* console input, with 5 seconds timeout */ c = (char*)ARG6; + /* FIXME: Add loop to wait for up to 5 seconds for input */ if (HPA_is_serial_device(hpa)) result[0] = parisc_serial_in(c, ARG7); else if (HPA_is_keyboard_device(hpa)) @@ -1948,7 +1950,7 @@ void __VISIBLE start_parisc_firmware(void) /* use -fw_cfg opt/pdc_debug,string=255 to enable all firmware debug infos */ pdc_debug = romfile_loadstring_to_int("opt/pdc_debug", 0); - pdc_console = 0; /* default */ + pdc_console = CONSOLE_DEFAULT; str = romfile_loadfile("opt/console", NULL); if (str) { if (strcmp(str, "serial") == 0) @@ -2007,7 +2009,13 @@ void __VISIBLE start_parisc_firmware(void) } // Initialize boot paths (graphics & keyboard) - if (artist_present() && (pdc_console != CONSOLE_SERIAL)) { + if (pdc_console == CONSOLE_DEFAULT) { + if (artist_present()) + pdc_console = CONSOLE_GRAPHICS; + else + pdc_console = CONSOLE_SERIAL; + } + if (pdc_console == CONSOLE_GRAPHICS) { prepare_boot_path(&(PAGE0->mem_cons), &mem_cons_sti_boot, 0x60); prepare_boot_path(&(PAGE0->mem_kbd), &mem_kbd_sti_boot, 0xa0); } else { |