Module Name: src
Committed By: christos
Date: Sat Nov 15 19:20:02 UTC 2014
Modified Files:
src/sys/arch/arm/at91: at91dbgu.c at91usart.c
src/sys/arch/arm/clps711x: clpscom.c
src/sys/arch/arm/ep93xx: epcom.c
src/sys/arch/arm/imx: imxuart.c
src/sys/arch/arm/ixp12x0: ixp12x0_com.c
src/sys/arch/arm/sa11x0: sa11x0_com.c
src/sys/arch/atari/dev: ser.c zsvar.h
src/sys/arch/epoc32/windermere: wmcom.c
src/sys/arch/evbarm/dev: plcom.c
src/sys/arch/hp300/dev: dcm.c
src/sys/arch/hpcmips/tx: txcom.c
src/sys/arch/mips/sibyte/dev: sbjcnvar.h sbscnvar.h
src/sys/arch/sh3/dev: sci.c scif.c
src/sys/arch/sparc64/dev: sab.c
Log Message:
centralize the call unit / dialout macros
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/at91/at91dbgu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/at91/at91usart.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/clps711x/clpscom.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/ep93xx/epcom.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/imx/imxuart.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arm/ixp12x0/ixp12x0_com.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/sa11x0/sa11x0_com.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/atari/dev/ser.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/atari/dev/zsvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/windermere/wmcom.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/dev/plcom.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/hp300/dev/dcm.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hpcmips/tx/txcom.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/sibyte/dev/sbjcnvar.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/sibyte/dev/sbscnvar.h
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sh3/dev/sci.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sh3/dev/scif.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/dev/sab.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/at91/at91dbgu.c
diff -u src/sys/arch/arm/at91/at91dbgu.c:1.12 src/sys/arch/arm/at91/at91dbgu.c:1.13
--- src/sys/arch/arm/at91/at91dbgu.c:1.12 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/at91/at91dbgu.c Sat Nov 15 14:20:01 2014
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.12 2014/08/10 16:44:33 tls Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.12 2014/08/10 16:44:33 tls Exp $ */
+/* $Id: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $ */
/*
*
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.12 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.13 2014/11/15 19:20:01 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -205,11 +205,8 @@ struct consdev at91dbgu_cons = {
#define DEFAULT_COMSPEED 115200
#endif
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define COM_ISALIVE(sc) ((sc)->enabled != 0 && device_is_active((sc)->sc_dev))
Index: src/sys/arch/arm/at91/at91usart.c
diff -u src/sys/arch/arm/at91/at91usart.c:1.11 src/sys/arch/arm/at91/at91usart.c:1.12
--- src/sys/arch/arm/at91/at91usart.c:1.11 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/at91/at91usart.c Sat Nov 15 14:20:01 2014
@@ -1,5 +1,5 @@
-/* $Id: at91usart.c,v 1.11 2014/08/10 16:44:33 tls Exp $ */
-/* $NetBSD: at91usart.c,v 1.11 2014/08/10 16:44:33 tls Exp $ */
+/* $Id: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $ */
+/* $NetBSD: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.11 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.12 2014/11/15 19:20:01 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -210,11 +210,8 @@ struct consdev at91usart_cons = {
#define DEFAULT_COMSPEED 115200
#endif
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define COM_ISALIVE(sc) ((sc)->enabled != 0 && device_is_active((sc)->sc_dev))
Index: src/sys/arch/arm/clps711x/clpscom.c
diff -u src/sys/arch/arm/clps711x/clpscom.c:1.4 src/sys/arch/arm/clps711x/clpscom.c:1.5
--- src/sys/arch/arm/clps711x/clpscom.c:1.4 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/clps711x/clpscom.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: clpscom.c,v 1.4 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: clpscom.c,v 1.5 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clpscom.c,v 1.4 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clpscom.c,v 1.5 2014/11/15 19:20:01 christos Exp $");
#include "rnd.h"
@@ -56,11 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: clpscom.c,v
#include "ioconf.h"
#include "locators.h"
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define CLPSCOM_RING_SIZE 2048
#define UART_FIFO_SIZE 16
Index: src/sys/arch/arm/ep93xx/epcom.c
diff -u src/sys/arch/arm/ep93xx/epcom.c:1.28 src/sys/arch/arm/ep93xx/epcom.c:1.29
--- src/sys/arch/arm/ep93xx/epcom.c:1.28 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/ep93xx/epcom.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.28 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: epcom.c,v 1.29 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.28 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.29 2014/11/15 19:20:01 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -185,11 +185,8 @@ struct consdev epcomcons = {
#define DEFAULT_COMSPEED 115200
#endif
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define COM_ISALIVE(sc) ((sc)->enabled != 0 && \
device_is_active((sc)->sc_dev))
Index: src/sys/arch/arm/imx/imxuart.c
diff -u src/sys/arch/arm/imx/imxuart.c:1.15 src/sys/arch/arm/imx/imxuart.c:1.16
--- src/sys/arch/arm/imx/imxuart.c:1.15 Thu Sep 25 01:05:28 2014
+++ src/sys/arch/arm/imx/imxuart.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: imxuart.c,v 1.15 2014/09/25 05:05:28 ryo Exp $ */
+/* $NetBSD: imxuart.c,v 1.16 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.15 2014/09/25 05:05:28 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.16 2014/11/15 19:20:01 christos Exp $");
#include "opt_imxuart.h"
#include "opt_ddb.h"
@@ -382,11 +382,10 @@ int imxuart_kgdb_getc(void *);
void imxuart_kgdb_putc(void *, int);
#endif /* KGDB */
-#define IMXUART_UNIT_MASK 0x7ffff
-#define IMXUART_DIALOUT_MASK 0x80000
+#define IMXUART_DIALOUT_MASK TTDIALOUT_MASK
-#define IMXUART_UNIT(x) (minor(x) & IMXUART_UNIT_MASK)
-#define IMXUART_DIALOUT(x) (minor(x) & IMXUART_DIALOUT_MASK)
+#define IMXUART_UNIT(x) TTUNIT(x)
+#define IMXUART_DIALOUT(x) TTDIALOUT(x)
#define IMXUART_ISALIVE(sc) ((sc)->enabled != 0 && \
device_is_active((sc)->sc_dev))
Index: src/sys/arch/arm/ixp12x0/ixp12x0_com.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.45 src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.46
--- src/sys/arch/arm/ixp12x0/ixp12x0_com.c:1.45 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/ixp12x0/ixp12x0_com.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_com.c,v 1.45 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: ixp12x0_com.c,v 1.46 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.45 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.46 2014/11/15 19:20:01 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -174,11 +174,8 @@ struct consdev ixpcomcons = {
#define DEFAULT_COMSPEED 38400
#endif
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define COM_ISALIVE(sc) ((sc)->enabled != 0 && \
device_is_active((sc)->sc_dev))
Index: src/sys/arch/arm/sa11x0/sa11x0_com.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_com.c:1.53 src/sys/arch/arm/sa11x0/sa11x0_com.c:1.54
--- src/sys/arch/arm/sa11x0/sa11x0_com.c:1.53 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/arm/sa11x0/sa11x0_com.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_com.c,v 1.53 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: sa11x0_com.c,v 1.54 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.53 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.54 2014/11/15 19:20:01 christos Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -172,11 +172,10 @@ static inline void sacom_schedrx(struct
static void sacom_j720_init(device_t, device_t);
#endif
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
+#define COMDIALOUT_MASK TTDIALOUT_MASK
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define COM_ISALIVE(sc) ((sc)->enabled != 0 && \
device_is_active((sc)->sc_dev))
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.55 src/sys/arch/atari/dev/ser.c:1.56
--- src/sys/arch/atari/dev/ser.c:1.55 Fri Jul 25 04:10:32 2014
+++ src/sys/arch/atari/dev/ser.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.55 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: ser.c,v 1.56 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.55 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.56 2014/11/15 19:20:01 christos Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -144,8 +144,8 @@ __KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.55
/* #define SER_DEBUG */
-#define SERUNIT(x) (minor(x) & 0x7ffff)
-#define SERDIALOUT(x) (minor(x) & 0x80000)
+#define SERUNIT(x) TTUNIT(x)
+#define SERDIALOUT(x) TTDIALOUT(x)
/* XXX */
#define CONSBAUD 9600
Index: src/sys/arch/atari/dev/zsvar.h
diff -u src/sys/arch/atari/dev/zsvar.h:1.16 src/sys/arch/atari/dev/zsvar.h:1.17
--- src/sys/arch/atari/dev/zsvar.h:1.16 Fri Apr 9 13:38:43 2010
+++ src/sys/arch/atari/dev/zsvar.h Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: zsvar.h,v 1.16 2010/04/09 17:38:43 tsutsui Exp $ */
+/* $NetBSD: zsvar.h,v 1.17 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -179,6 +179,6 @@ struct zs_chanstate {
/*
* Split minor into unit, dialin/dialout & flag nibble.
*/
-#define ZS_UNIT(dev) ((minor(dev) >> 4) & 0xf)
-#define ZS_FLAGS(dev) (minor(dev) & 0xf)
-#define ZS_DIALOUT(dev) (minor(dev) & 0x80000)
+#define ZS_UNIT(dev) (TTUNIT(dev) >> 4)
+#define ZS_FLAGS(dev) (TTUNIT(dev) & 0xf)
+#define ZS_DIALOUT(dev) TTDIALOUT(dev)
Index: src/sys/arch/epoc32/windermere/wmcom.c
diff -u src/sys/arch/epoc32/windermere/wmcom.c:1.4 src/sys/arch/epoc32/windermere/wmcom.c:1.5
--- src/sys/arch/epoc32/windermere/wmcom.c:1.4 Sun Aug 10 12:44:33 2014
+++ src/sys/arch/epoc32/windermere/wmcom.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wmcom.c,v 1.4 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: wmcom.c,v 1.5 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1.4 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1.5 2014/11/15 19:20:01 christos Exp $");
#include "rnd.h"
@@ -56,11 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: wmcom.c,v 1.
#include "ioconf.h"
#include "locators.h"
-#define COMUNIT_MASK 0x7ffff
-#define COMDIALOUT_MASK 0x80000
-
-#define COMUNIT(x) (minor(x) & COMUNIT_MASK)
-#define COMDIALOUT(x) (minor(x) & COMDIALOUT_MASK)
+#define COMUNIT(x) TTUNIT(x)
+#define COMDIALOUT(x) TTDIALOUT(x)
#define WMCOM_RING_SIZE 2048
Index: src/sys/arch/evbarm/dev/plcom.c
diff -u src/sys/arch/evbarm/dev/plcom.c:1.50 src/sys/arch/evbarm/dev/plcom.c:1.51
--- src/sys/arch/evbarm/dev/plcom.c:1.50 Sun Aug 10 12:44:34 2014
+++ src/sys/arch/evbarm/dev/plcom.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.50 2014/08/10 16:44:34 tls Exp $ */
+/* $NetBSD: plcom.c,v 1.51 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.50 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.51 2014/11/15 19:20:01 christos Exp $");
#include "opt_plcom.h"
#include "opt_ddb.h"
@@ -245,11 +245,10 @@ int plcom_kgdb_getc (void *);
void plcom_kgdb_putc (void *, int);
#endif /* KGDB */
-#define PLCOMUNIT_MASK 0x7ffff
-#define PLCOMDIALOUT_MASK 0x80000
+#define PLCOMDIALOUT_MASK TTDIALOUT_MASK
-#define PLCOMUNIT(x) (minor(x) & PLCOMUNIT_MASK)
-#define PLCOMDIALOUT(x) (minor(x) & PLCOMDIALOUT_MASK)
+#define PLCOMUNIT(x) TTUNIT(x)
+#define PLCOMDIALOUT(x) TTDIALOUT(x)
#define PLCOM_ISALIVE(sc) ((sc)->enabled != 0 && \
device_is_active((sc)->sc_dev))
Index: src/sys/arch/hp300/dev/dcm.c
diff -u src/sys/arch/hp300/dev/dcm.c:1.87 src/sys/arch/hp300/dev/dcm.c:1.88
--- src/sys/arch/hp300/dev/dcm.c:1.87 Fri Jul 25 04:10:33 2014
+++ src/sys/arch/hp300/dev/dcm.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dcm.c,v 1.87 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: dcm.c,v 1.88 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.87 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.88 2014/11/15 19:20:01 christos Exp $");
#include "opt_kgdb.h"
@@ -191,8 +191,8 @@ struct dcmstats {
};
#endif
-#define DCMUNIT(x) (minor(x) & 0x7ffff)
-#define DCMDIALOUT(x) (minor(x) & 0x80000)
+#define DCMUNIT(x) TTUNIT(x)
+#define DCMDIALOUT(x) TTDIALOUT(x)
#define DCMBOARD(x) (((x) >> 2) & 0x3f)
#define DCMPORT(x) ((x) & 3)
Index: src/sys/arch/hpcmips/tx/txcom.c
diff -u src/sys/arch/hpcmips/tx/txcom.c:1.48 src/sys/arch/hpcmips/tx/txcom.c:1.49
--- src/sys/arch/hpcmips/tx/txcom.c:1.48 Fri Jul 25 04:10:33 2014
+++ src/sys/arch/hpcmips/tx/txcom.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: txcom.c,v 1.48 2014/07/25 08:10:33 dholland Exp $ */
+/* $NetBSD: txcom.c,v 1.49 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.48 2014/07/25 08:10:33 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.49 2014/11/15 19:20:01 christos Exp $");
#include "opt_tx39uart_debug.h"
@@ -857,7 +857,7 @@ txcomopen(dev_t dev, int flag, int mode,
}
splx(s);
-#define TXCOMDIALOUT(x) (minor(x) & 0x80000)
+#define TXCOMDIALOUT(x) TTDIALOUT(x)
if ((err = ttyopen(tp, TXCOMDIALOUT(dev), ISSET(flag, O_NONBLOCK)))) {
DPRINTF("ttyopen failed\n");
goto out;
Index: src/sys/arch/mips/sibyte/dev/sbjcnvar.h
diff -u src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.4 src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.5
--- src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.4 Thu Feb 2 14:43:00 2012
+++ src/sys/arch/mips/sibyte/dev/sbjcnvar.h Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcnvar.h,v 1.4 2012/02/02 19:43:00 tls Exp $ */
+/* $NetBSD: sbjcnvar.h,v 1.5 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -71,9 +71,9 @@
#include <sys/callout.h>
-#define SBJCN_CHAN(x) ((minor(x) & 0x00001) >> 0)
-#define SBJCN_UNIT(x) ((minor(x) & 0x7fffe) >> 1)
-#define SBJCN_DIALOUT(x) ((minor(x) & 0x80000) != 0)
+#define SBJCN_CHAN(x) (TTUNIT(x) & 1)
+#define SBJCN_UNIT(x) (TTUNIT(x) >> 1)
+#define SBJCN_DIALOUT(x) TTDIALOUT(x)
#define SBJCN_TOLERANCE 30 /* baud rate tolerance, in 0.1% units */
Index: src/sys/arch/mips/sibyte/dev/sbscnvar.h
diff -u src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.6 src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.7
--- src/sys/arch/mips/sibyte/dev/sbscnvar.h:1.6 Thu Feb 2 14:43:00 2012
+++ src/sys/arch/mips/sibyte/dev/sbscnvar.h Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sbscnvar.h,v 1.6 2012/02/02 19:43:00 tls Exp $ */
+/* $NetBSD: sbscnvar.h,v 1.7 2014/11/15 19:20:01 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -71,9 +71,9 @@
#include <sys/callout.h>
-#define SBSCN_CHAN(x) ((minor(x) & 0x00001) >> 0)
-#define SBSCN_UNIT(x) ((minor(x) & 0x7fffe) >> 1)
-#define SBSCN_DIALOUT(x) ((minor(x) & 0x80000) != 0)
+#define SBSCN_CHAN(x) (TTUNIT(x) & 1)
+#define SBSCN_UNIT(x) (TTUNIT(x) >> 1)
+#define SBSCN_DIALOUT(x) TTDIALOUT(x)
#define SBSCN_TOLERANCE 30 /* baud rate tolerance, in 0.1% units */
Index: src/sys/arch/sh3/dev/sci.c
diff -u src/sys/arch/sh3/dev/sci.c:1.60 src/sys/arch/sh3/dev/sci.c:1.61
--- src/sys/arch/sh3/dev/sci.c:1.60 Fri Jul 25 04:10:34 2014
+++ src/sys/arch/sh3/dev/sci.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sci.c,v 1.60 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: sci.c,v 1.61 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu. All rights reserved.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.60 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.61 2014/11/15 19:20:01 christos Exp $");
#include "opt_kgdb.h"
#include "opt_sci.h"
@@ -196,11 +196,8 @@ integrate void sci_stsoft(struct sci_sof
integrate void sci_schedrx(struct sci_softc *);
void scidiag(void *);
-#define SCIUNIT_MASK 0x7ffff
-#define SCIDIALOUT_MASK 0x80000
-
-#define SCIUNIT(x) (minor(x) & SCIUNIT_MASK)
-#define SCIDIALOUT(x) (minor(x) & SCIDIALOUT_MASK)
+#define SCIUNIT(x) TTUNIT(x)
+#define SCIDIALOUT(x) TTDIALOUT(x)
/* Hardware flag masks */
#define SCI_HW_NOIEN 0x01
Index: src/sys/arch/sh3/dev/scif.c
diff -u src/sys/arch/sh3/dev/scif.c:1.64 src/sys/arch/sh3/dev/scif.c:1.65
--- src/sys/arch/sh3/dev/scif.c:1.64 Fri Jul 25 04:10:34 2014
+++ src/sys/arch/sh3/dev/scif.c Sat Nov 15 14:20:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scif.c,v 1.64 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: scif.c,v 1.65 2014/11/15 19:20:01 christos Exp $ */
/*-
* Copyright (C) 1999 T.Horiuchi and SAITOH Masanobu. All rights reserved.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.64 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scif.c,v 1.65 2014/11/15 19:20:01 christos Exp $");
#include "opt_kgdb.h"
#include "opt_scif.h"
@@ -187,11 +187,8 @@ static int scif_attached = 0; /* XXX: FI
extern struct cfdriver scif_cd;
-#define SCIFUNIT_MASK 0x7ffff
-#define SCIFDIALOUT_MASK 0x80000
-
-#define SCIFUNIT(x) (minor(x) & SCIFUNIT_MASK)
-#define SCIFDIALOUT(x) (minor(x) & SCIFDIALOUT_MASK)
+#define SCIFUNIT(x) TTUNIT(x)
+#define SCIFDIALOUT(x) TTDIALOUT(x)
/* console */
Index: src/sys/arch/sparc64/dev/sab.c
diff -u src/sys/arch/sparc64/dev/sab.c:1.53 src/sys/arch/sparc64/dev/sab.c:1.54
--- src/sys/arch/sparc64/dev/sab.c:1.53 Sat Nov 1 12:45:16 2014
+++ src/sys/arch/sparc64/dev/sab.c Sat Nov 15 14:20:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sab.c,v 1.53 2014/11/01 16:45:16 nakayama Exp $ */
+/* $NetBSD: sab.c,v 1.54 2014/11/15 19:20:02 christos Exp $ */
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.53 2014/11/01 16:45:16 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.54 2014/11/15 19:20:02 christos Exp $");
#include "opt_kgdb.h"
#include <sys/types.h>
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.53
#include "locators.h"
-#define SABUNIT(x) (minor(x) & 0x7ffff)
-#define SABDIALOUT(x) (minor(x) & 0x80000)
+#define SABUNIT(x) TTUNIT(x)
+#define SABDIALOUT(x) TTDIALOUT(x)
#define SABTTY_RBUF_SIZE 1024 /* must be divisible by 2 */
