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

* grub-core/term/ieee1275/serial.c (do_real_config): Set handle to

Browse source 
invalid on error.
	(serial_hw_fetch): Don't read invalid handle.
	(serial_hw_put): Don't write into invalid handle.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-08 19:34:57 +02:00
parent 08dafeeaae
commit 08fd129137
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-06-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/ieee1275/serial.c (do_real_config): Set handle to
invalid on error.
(serial_hw_fetch): Don't read invalid handle.
(serial_hw_put): Don't write into invalid handle.
2012-06-08 Vladimir Serbinenko <phcoder@gmail.com>
Add a 1.5 stop bits value.

11
grub-core/term/ieee1275/serial.c
View file

@ -24,6 +24,8 @@
#include <grub/time.h>
#include <grub/i18n.h>
#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_cell_t) 0)
struct ofserial_hash_ent
{
char *devpath;
@ -39,7 +41,9 @@ do_real_config (struct grub_serial_port *port)
if (port->configured)
return;
grub_ieee1275_open (port->elem->devpath, &port->handle);
if (grub_ieee1275_open (port->elem->devpath, &port->handle)
|| port->handle == (grub_ieee1275_cell_t) -1)
port->handle = IEEE1275_IHANDLE_INVALID;
port->configured = 1;
}
@ -53,6 +57,8 @@ serial_hw_fetch (struct grub_serial_port *port)
do_real_config (port);
if (port->handle == IEEE1275_IHANDLE_INVALID)
return -1;
grub_ieee1275_read (port->handle, &c, 1, &actual);
if (actual <= 0)
@ -69,6 +75,9 @@ serial_hw_put (struct grub_serial_port *port, const int c)
do_real_config (port);
if (port->handle == IEEE1275_IHANDLE_INVALID)
return;
grub_ieee1275_write (port->handle, &c0, 1, &actual);
}