[OpenBIOS] r400 - in openbios-devel: arch/ppc/qemu drivers

[svn at openbios.org]

Author: laurent
Date: 2009-01-13 17:42:29 +0100 (Tue, 13 Jan 2009)
New Revision: 400

Modified:
   openbios-devel/arch/ppc/qemu/init.c
   openbios-devel/drivers/escc.c
Log:
ESCC: correctly use CONFIG_SERIAL_PORT

Modified: openbios-devel/arch/ppc/qemu/init.c
===================================================================
--- openbios-devel/arch/ppc/qemu/init.c	2009-01-13 12:19:11 UTC (rev 399)
+++ openbios-devel/arch/ppc/qemu/init.c	2009-01-13 16:42:29 UTC (rev 400)
@@ -148,7 +148,8 @@
 
 	isa_io_base = arch->io_base;
 
-	uart_init(0x80013000ULL, CONFIG_SERIAL_SPEED);
+	uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20,
+		  CONFIG_SERIAL_SPEED);
 
 	printk("\n");
 	printk("=============================================================\n");

Modified: openbios-devel/drivers/escc.c
===================================================================
--- openbios-devel/drivers/escc.c	2009-01-13 12:19:11 UTC (rev 399)
+++ openbios-devel/drivers/escc.c	2009-01-13 16:42:29 UTC (rev 400)
@@ -117,8 +117,7 @@
 
 void serial_putchar(int c)
 {
-    uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT),
-                 (unsigned char) (c & 0xff));
+    uart_putchar((int)serial_dev, (unsigned char) (c & 0xff));
 }
 
 void serial_cls(void)