From owner-p4-projects@FreeBSD.ORG Sat Aug 18 12:32:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52FC416A421; Sat, 18 Aug 2007 12:32:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26E2916A41B for ; Sat, 18 Aug 2007 12:32:25 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 159AF13C45D for ; Sat, 18 Aug 2007 12:32:25 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7ICWOnx018399 for ; Sat, 18 Aug 2007 12:32:24 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7ICWObU018394 for perforce@freebsd.org; Sat, 18 Aug 2007 12:32:24 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 18 Aug 2007 12:32:24 GMT Message-Id: <200708181232.l7ICWObU018394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 125296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2007 12:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=125296 Change 125296 by gonzo@gonzo_jeeves on 2007/08/18 12:32:03 o Give TX intr enable/disable functions proper names: use enable/disable instead of start/stop o Speed up serial console by using RX/TX FIFOs. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 (text+ko) ==== @@ -185,7 +185,7 @@ * Disable TX interrupt. uart should be locked */ static __inline void -adm5120_uart_stop_tx(struct uart_softc *sc) +adm5120_uart_disable_txintr(struct uart_softc *sc) { uint8_t cr; @@ -198,7 +198,7 @@ * Enable TX interrupt. uart should be locked */ static __inline void -adm5120_uart_start_tx(struct uart_softc *sc) +adm5120_uart_enable_txintr(struct uart_softc *sc) { uint8_t cr; @@ -221,12 +221,12 @@ /* TODO: set parameters 115200, 8N1 */ } - sc->sc_rxfifosz = 1; - sc->sc_txfifosz = 1; + sc->sc_rxfifosz = 16; + sc->sc_txfifosz = 16; (void)adm5120_uart_bus_getsig(sc); -#if 0 +#if 1 /* Enable FIFO */ uart_setreg(bas, UART_LCR_H_REG, uart_getreg(bas, UART_LCR_H_REG) | UART_LCR_H_FEN); @@ -334,7 +334,7 @@ if (fr & UART_FR_TX_FIFO_EMPTY) { if (ir & UART_IR_TX_INT) { - adm5120_uart_stop_tx(sc); + adm5120_uart_disable_txintr(sc); ipend |= SER_INT_TXIDLE; } } @@ -438,15 +438,15 @@ bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); - while (uart_getreg(bas, UART_FR_REG) & UART_FR_TX_FIFO_FULL) - ; - uart_setreg(bas, UART_DR_REG, sc->sc_txbuf[0]); - uart_barrier(bas); - sc->sc_txbusy = 1; + for (int i = 0; i < sc->sc_txdatasz; i++) { + if (uart_getreg(bas, UART_FR_REG) & UART_FR_TX_FIFO_FULL) + break; + uart_setreg(bas, UART_DR_REG, sc->sc_txbuf[i]); + } /* Enable TX interrupt */ - adm5120_uart_start_tx(sc); + adm5120_uart_enable_txintr(sc); uart_unlock(sc->sc_hwmtx); return (0); }