diff options
| author |   miod <miod@openbsd.org> | 2013-12-19 20:11:04 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2013-12-19 20:11:04 +0000 |
| commit | cfe2f4834ce5ea827dc648752832ff6405dde379 (patch) | |
| tree | 94ac7829f3dfd6a266798478ba899fdf2c8f6399 | |
| parent | Amend dired-unmark-backward to fit with recent change and (diff) | |
| download | wireguard-openbsd-cfe2f4834ce5ea827dc648752832ff6405dde379.tar.xz wireguard-openbsd-cfe2f4834ce5ea827dc648752832ff6405dde379.zip | |
sun4e needs the same 1.6 usec ZS_DELAY() as sun4 does.
| -rw-r--r-- | sys/arch/sparc/dev/zs.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/zs_kgdb.c | 4 |
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 { |