vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

account for absence of NS8250 on emu

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-18 19:09:54 +02:00
parent 24494d478a
commit 44e7b8cb49
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
term/serial.c
View file

@ -131,6 +131,7 @@ grub_serial_find (char *name)
if (grub_strcmp (port->name, name) == 0) if (grub_strcmp (port->name, name) == 0)
break; break;
#ifndef GRUB_MACHINE_EMU
if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0 if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0
&& grub_isdigit (name [sizeof ("port") - 1])) && grub_isdigit (name [sizeof ("port") - 1]))
{ {
@ -143,6 +144,7 @@ grub_serial_find (char *name)
if (grub_strcmp (port->name, name) == 0) if (grub_strcmp (port->name, name) == 0)
break; break;
} }
#endif
return port; return port;
} }
@ -215,6 +217,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
err = port->driver->configure (port, &config); err = port->driver->configure (port, &config);
if (err) if (err)
return err; return err;
#ifndef GRUB_MACHINE_EMU
/* Compatibility kludge. */ /* Compatibility kludge. */
if (port->driver == &grub_ns8250_driver) if (port->driver == &grub_ns8250_driver)
{ {
@ -227,6 +230,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
grub_serial_terminfo_input.port = port; grub_serial_terminfo_input.port = port;
registered = 1; registered = 1;
} }
#endif
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@ -341,8 +345,9 @@ GRUB_MOD_INIT(serial)
GRUB_COMMAND_FLAG_BOTH, GRUB_COMMAND_FLAG_BOTH,
N_("[OPTIONS...]"), N_("[OPTIONS...]"),
N_("Configure serial port."), options); N_("Configure serial port."), options);
#ifndef GRUB_MACHINE_EMU
grub_ns8250_init (); grub_ns8250_init ();
#endif
} }
GRUB_MOD_FINI(serial) GRUB_MOD_FINI(serial)