Skip to content

Commit

Permalink
[PATCH] PCDP: if PCDP contains parity information, use it
Browse files Browse the repository at this point in the history
If the PCDP supplies parity, use it (only none/even/odd supported), and
don't append parity/stop bit arguments unless baud is present.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Jul 28, 2005
1 parent 8b378de commit 11be00c
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions drivers/firmware/pcdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,22 @@ setup_serial_console(struct pcdp_uart *uart)
#ifdef CONFIG_SERIAL_8250_CONSOLE
int mmio;
static char options[64], *p = options;
char parity;

mmio = (uart->addr.address_space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY);
p += sprintf(p, "console=uart,%s,0x%lx",
mmio ? "mmio" : "io", uart->addr.address);
if (uart->baud)
if (uart->baud) {
p += sprintf(p, ",%lu", uart->baud);
if (uart->bits)
p += sprintf(p, "n%d", uart->bits);
if (uart->bits) {
switch (uart->parity) {
case 0x2: parity = 'e'; break;
case 0x3: parity = 'o'; break;
default: parity = 'n';
}
p += sprintf(p, "%c%d", parity, uart->bits);
}
}

return early_serial_console_init(options);
#else
Expand Down

0 comments on commit 11be00c

Please sign in to comment.