diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-19 13:18:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-19 13:18:49 +0000 |
| commit | 20b939344eb9db708bbf0878a079ebec3353941f (patch) | |
| tree | ac89401ce4679d824de734b7be7837bf00f98fa2 /sys | |
| parent | ae90c34ba485b899e33f0fb8121bccfecf106876 (diff) | |
delay(2) on sun4; support more than 2 zs chips
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/dev/zsvar.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/zsvar.h b/sys/arch/sparc/dev/zsvar.h index a7bbe9d2049..70dfa59b87e 100644 --- a/sys/arch/sparc/dev/zsvar.h +++ b/sys/arch/sparc/dev/zsvar.h @@ -78,8 +78,9 @@ #define ZRING_MAKE(t, v) ((t) | (v) << 8) struct zs_chanstate { - struct zs_chanstate *cs_next; /* linked list for zshard() */ - volatile struct zschan *cs_zc; /* points to hardware regs */ + struct zs_chanstate *cs_next; /* linked list for zshard() */ + struct zs_softc *cs_sc; /* points to my softc */ + struct zschan *cs_zc; /* points to hardware regs */ int cs_unit; /* unit number */ struct tty *cs_ttyp; /* ### */ @@ -153,9 +154,9 @@ struct zs_chanstate { #define ZS_READ(c, r) zs_read(c, r) #define ZS_WRITE(c, r, v) zs_write(c, r, v) #if defined(SUN4C) || defined(SUN4M) -#define ZS_DELAY() (cputyp == CPU_SUN4 ? delay(1) : 0) +#define ZS_DELAY() (cputyp == CPU_SUN4 ? delay(2) : 0) #else -#define ZS_DELAY() delay(1) +#define ZS_DELAY() delay(2) #endif #else #define ZS_READ(c, r) ((c)->zc_csr = (r), (c)->zc_csr) |