From owner-p4-projects@FreeBSD.ORG Wed Feb 20 18:00:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D07716A52C; Wed, 20 Feb 2008 18:00:51 +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 44CBD16A401 for ; Wed, 20 Feb 2008 18:00:51 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A0A013C507 for ; Wed, 20 Feb 2008 18:00:51 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1KI0pix075815 for ; Wed, 20 Feb 2008 18:00:51 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KI0pqv075812 for perforce@freebsd.org; Wed, 20 Feb 2008 18:00:51 GMT (envelope-from rrs@cisco.com) Date: Wed, 20 Feb 2008 18:00:51 GMT Message-Id: <200802201800.m1KI0pqv075812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 135811 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: Wed, 20 Feb 2008 18:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=135811 Change 135811 by rrs@rrs-mips2-jnpr on 2008/02/20 18:00:25 s9 indent. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#6 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#6 (text+ko) ==== @@ -76,7 +76,7 @@ #include /* Cavium specific defines pulled from there update of ns16559.h */ -#define USR_TXFIFO_NOTFULL 2 /* Uart TX FIFO Not full */ +#define USR_TXFIFO_NOTFULL 2 /* Uart TX FIFO Not full */ #include "uart_if.h" @@ -338,13 +338,13 @@ uart_barrier(bas); } -static inline void +static inline void oct16550_wait_txhr_empty(struct uart_bas *bas, int limit, int delay) { while (((uart_getreg(bas, OCT_REG_LSR) & LSR_THRE) == 0) && ((uart_getreg(bas, OCT_REG_USR) & USR_TX_FIFO_NOTFULL) == 0) && --limit) DELAY(delay); -} +} static void oct16550_putc(struct uart_bas *bas, int c) @@ -548,8 +548,7 @@ case UART_IOCTL_BREAK: lcr = uart_getreg(bas, OCT_REG_LCR); if (data) - - lcr |= LCR_SBREAK; + lcr |= LCR_SBREAK; else lcr &= ~LCR_SBREAK; uart_setreg(bas, OCT_REG_LCR, lcr);