summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2013-12-19 20:11:05 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2013-12-19 20:11:05 +0000
commit8a9124463521387126f83090b1db094735e8c594 (patch)
tree1aec5a01b5ae8dd020e81c6dc849079123c0dff6 /sys/arch/sparc/dev
parent3cd9a1fa25e4c8b76e36e5495f8647ff2e93a740 (diff)
sun4e needs the same 1.6 usec ZS_DELAY() as sun4 does.
Diffstat (limited to 'sys/arch/sparc/dev')
-rw-r--r--sys/arch/sparc/dev/zs.c4
-rw-r--r--sys/arch/sparc/dev/zs_kgdb.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 237f663f2c5..ff36ff0e1d7 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.53 2013/10/21 12:14:52 miod Exp $ */
+/* $OpenBSD: zs.c,v 1.54 2013/12/19 20:11:04 miod Exp $ */
/* $NetBSD: zs.c,v 1.50 1997/10/18 00:00:40 gwr Exp $ */
/*-
@@ -96,7 +96,7 @@ int zs_major = 12;
*/
#define PCLK (9600 * 512) /* PCLK pin input clock rate */
-#define ZS_DELAY() ((CPU_ISSUN4C || CPU_ISSUN4E) ? (0) : delay(2))
+#define ZS_DELAY() (CPU_ISSUN4C ? (0) : delay(2))
/* The layout of this is hardware-dependent (padding, order). */
struct zschan {
diff --git a/sys/arch/sparc/dev/zs_kgdb.c b/sys/arch/sparc/dev/zs_kgdb.c
index f2d8b00d58d..9eae8e2939b 100644
--- a/sys/arch/sparc/dev/zs_kgdb.c
+++ b/sys/arch/sparc/dev/zs_kgdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs_kgdb.c,v 1.5 2013/04/21 14:44:16 sebastia Exp $ */
+/* $OpenBSD: zs_kgdb.c,v 1.6 2013/12/19 20:11:04 miod Exp $ */
/* $NetBSD: zs_kgdb.c,v 1.1 1997/10/18 00:00:51 gwr Exp $ */
/*-
@@ -60,7 +60,7 @@
#define PCLK (9600 * 512) /* PCLK pin input clock rate */
#define ZSHARD_PRI 6 /* Wired on the CPU board... */
-#define ZS_DELAY() ((CPU_ISSUN4C || CPU_ISSUN4E) ? (0) : delay(2))
+#define ZS_DELAY() (CPU_ISSUN4C ? (0) : delay(2))
/* The layout of this is hardware-dependent (padding, order). */
struct zschan {