Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CPU-type macros.

This commit is contained in:
pk 1996-02-25 22:03:20 +00:00
parent 3d182fe265
commit a3ab0e81da
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/sparc/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.32 1995/11/29 23:41:35 pk Exp $ */
/* $NetBSD: zs.c,v 1.33 1996/02/25 22:03:20 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@ -213,7 +213,8 @@ zsmatch(parent, vcf, aux)
if (strcmp(cf->cf_driver->cd_name, ra->ra_name))
return (0);
if (ca->ca_bustype==BUS_MAIN && cputyp!=CPU_SUN4)
if ((ca->ca_bustype == BUS_MAIN && !CPU_ISSUN4) ||
(ca->ca_bustype == BUS_OBIO && CPU_ISSUN4M))
return (getpropint(ra->ra_node, "slave", -2) == cf->cf_unit);
ra->ra_len = NBPG;
return (probeget(ra->ra_vaddr, 1) != -1);
@ -418,10 +419,8 @@ zscnputc(c)
* lowering current ipl. Need a better way.
*/
s = splhigh();
#ifdef SUN4C /* XXX */
if (cputyp==CPU_SUN4C && s <= (12 << 8))
if (CPU_ISSUN4C && s <= (12 << 8)) /* XXX */
(void) splzs();
#endif
while ((zc->zc_csr & ZSRR0_TX_READY) == 0)
ZS_DELAY();
zc->zc_data = c;
@ -781,8 +780,7 @@ zshard(intrarg)
#undef b
if (intflags & 1) {
#if defined(SUN4C) || defined(SUN4M)
if (cputyp==CPU_SUN4M || cputyp==CPU_SUN4C) {
if (CPU_ISSUN4COR4M) {
/* XXX -- but this will go away when zshard moves to locore.s */
struct clockframe *p = intrarg;
@ -796,6 +794,11 @@ zshard(intrarg)
return (zssoft(intrarg));
}
}
#if defined(SUN4M)
if (CPU_ISSUN4M)
raise(0, PIL_TTY);
else
#endif
ienab_bis(IE_ZSSOFT);
}
@ -915,16 +918,14 @@ zssint(cs, zc)
}
}
if ((rr0 & ZSRR0_BREAK) && cs->cs_brkabort) {
#ifdef SUN4
/*
* XXX This might not be necessary. Test and
* delete if it isn't.
*/
if (cputyp==CPU_SUN4) {
if (CPU_ISSUN4) {
while (zc->zc_csr & ZSRR0_BREAK)
ZS_DELAY();
}
#endif
zsabort();
return (0);
}

25
sys/arch/sparc/dev/zsvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: zsvar.h,v 1.6 1996/01/24 19:52:57 gwr Exp $ */
/* $NetBSD: zsvar.h,v 1.7 1996/02/25 22:03:23 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@ -162,17 +162,22 @@ struct zs_chanstate {
* On the SparcStation the 1.6 microsecond recovery time is
* handled in hardware. On the older Sun4 machine it isn't, and
* software must deal with the problem.
*
* However, it *is* a problem on some Sun4m's (i.e. the SS20) (XXX: why?).
* Thus we leave in the delay.
*
* %%%: Think about this more.
*/
#ifdef SUN4
#if defined(SUN4)
#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)
#else
#define ZS_DELAY() delay(1)
#endif
#else
#define ZS_DELAY() (CPU_ISSUN4C ? (0) : delay(1))
#else /* SUN4 */
#define ZS_READ(c, r) ((c)->zc_csr = (r), (c)->zc_csr)
#define ZS_WRITE(c, r, v) ((c)->zc_csr = (r), (c)->zc_csr = (v))
#define ZS_DELAY()
#endif
#define ZS_DELAY() (CPU_ISSUN4M ? delay(1) : 0)
#endif /* SUN4 */