shithub: n900

Info  •  Files  •  Log  •  Branches

uart: enable console when console= is set, probe in case uart is missing.

on the n900, the uart will be powered off unless the system is in r&d mode
and the uart is enabled. otherwise reads and writes will fault.

it should not be enabled by default, and it should be probed in case it is off.

--- a/sys/src/9/omap/uartomap.c

+++ b/sys/src/9/omap/uartomap.c

@@ -280,7 +280,27 @@

 void

 uartinit(void)

 {

-	consuart = &omapuart[2];

+	Uart *u;

+	Ctlr *c;

+	char *p, *pe;

+	ulong n;

+

+	p = getconf("console");

+	if(p == nil)

+		return;

+

+	n = strtoul(p, &pe, 0);

+	if(pe == p || n > nelem(omapuart))

+		return;

+

+	u = &omapuart[n];

+	c = omapuart[n].regs;

+	if(!probeaddr((uintptr)c->io))

+		return;

+

+	(*u->phys->enable)(u, 0);

+

+	consuart = u;

 	consuart->console = 1;

 	uartputs(kmesg.buf, kmesg.n);

 }