shithub: n900

Info  •  Files  •  Log  •  Branches

uart: timeout waiting for reset in uartenable

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

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

@@ -151,13 +151,21 @@

 omapuartenable(Uart *uart, int ie)

 {

 	Ctlr *ctlr;

+	int i;

 	ctlr = uart->regs;

 	ilock(ctlr);

 	csr32w(ctlr, Rsysc, SCreset);

-	while(!(csr32r(ctlr, Rsyss) & SSreset))

-		;

+	for(i = 0; i < 100; i++) {

+		if(csr32r(ctlr, Rsyss) & SSreset)

+			break;

+	}

+

+	if(i == 100) {

+		iunlock(ctlr);

+		return;

+	}

 	csr32w(ctlr, Rfcr, FCRen);

 	if(ie) {