From owner-p4-projects@FreeBSD.ORG Fri Feb 24 02:28:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CF316A424; Fri, 24 Feb 2006 02:28:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B73C16A422 for ; Fri, 24 Feb 2006 02:28:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF00143D70 for ; Fri, 24 Feb 2006 02:28:08 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1O2S8Bt046503 for ; Fri, 24 Feb 2006 02:28:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1O2S8PY046500 for perforce@freebsd.org; Fri, 24 Feb 2006 02:28:08 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Feb 2006 02:28:08 GMT Message-Id: <200602240228.k1O2S8PY046500@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 92318 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: Fri, 24 Feb 2006 02:28:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=92318 Change 92318 by marcel@marcel_nfs on 2006/02/24 02:27:56 IFC @92317 Affected files ... .. //depot/projects/uart/dev/ic/z8530.h#5 integrate .. //depot/projects/uart/dev/puc/puc_ebus.c#11 integrate .. //depot/projects/uart/dev/puc/puc_sbus.c#12 integrate .. //depot/projects/uart/sys/serial.h#4 integrate Differences ... ==== //depot/projects/uart/dev/ic/z8530.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.3 2005/01/06 01:42:44 imp Exp $ + * $FreeBSD: src/sys/dev/ic/z8530.h,v 1.4 2006/02/24 02:03:35 marcel Exp $ */ #ifndef _DEV_IC_Z8530_H_ ==== //depot/projects/uart/dev/puc/puc_ebus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.6 2005/08/07 13:37:25 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_ebus.c,v 1.7 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" ==== //depot/projects/uart/dev/puc/puc_sbus.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.8 2005/02/26 00:25:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.9 2006/02/24 02:06:57 marcel Exp $"); #include "opt_puc.h" ==== //depot/projects/uart/sys/serial.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * (both async and sync), but which do not necessarily have anything to * do with tty processing. * - * $FreeBSD: src/sys/sys/serial.h,v 1.2 2004/06/25 10:56:43 phk Exp $ + * $FreeBSD: src/sys/sys/serial.h,v 1.4 2006/02/24 02:24:10 marcel Exp $ */ #ifndef _SYS_SERIAL_H_ @@ -52,7 +52,7 @@ #define SER_MASK_STATE 0x00ff /* Delta bits, used to indicate which signals should/was affected */ -#define SER_DELTA(x) ((x) << 8) +#define SER_DELTA(x) ((x) << 8) #define SER_DDTR SER_DELTA(SER_DTR) #define SER_DRTS SER_DELTA(SER_RTS)