Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Enclose initialization of NCR_VARIANT_NCR53C400 i...



details:   https://anonhg.NetBSD.org/src/rev/1bf227f481e3
branches:  trunk
changeset: 569898:1bf227f481e3
user:      he <he%NetBSD.org@localhost>
date:      Sun Sep 12 18:05:46 2004 +0000

description:
Enclose initialization of NCR_VARIANT_NCR53C400 in an ifdef on
NCR5380_USE_BUS_SPACE, to make this build again on acorn32, mac68k,
pc532, and sun3.  This is done under the assumption that it's
somewhat doubtful that any of those machines will encounter that
chip variant.

The acorn32 and mac68k parent drivers (csa and sbc) are listed in
ncr5380var.h as "easy to convert", but it's evident that noone have
stepped up to that challenge yet.  Sun3 and pc532 needs bus.h first,
which they apparently don't have at the moment.

diffstat:

 sys/dev/ic/ncr5380sbc.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 2dbb635ab894 -r 1bf227f481e3 sys/dev/ic/ncr5380sbc.c
--- a/sys/dev/ic/ncr5380sbc.c   Sun Sep 12 15:32:55 2004 +0000
+++ b/sys/dev/ic/ncr5380sbc.c   Sun Sep 12 18:05:46 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr5380sbc.c,v 1.52 2004/08/10 07:00:30 mycroft Exp $  */
+/*     $NetBSD: ncr5380sbc.c,v 1.53 2004/09/12 18:05:46 he Exp $       */
 
 /*
  * Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.52 2004/08/10 07:00:30 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.53 2004/09/12 18:05:46 he Exp $");
 
 #include "opt_ddb.h"
 
@@ -374,9 +374,11 @@
        sc->sc_prevphase = PHASE_INVALID;
        sc->sc_state = NCR_IDLE;
 
+#ifdef NCR5380_USE_BUS_SPACE
        if (sc->sc_rev == NCR_VARIANT_NCR53C400)
                bus_space_write_1(sc->sc_regt, sc->sc_regh, C400_CSR,
                    C400_CSR_5380_ENABLE);
+#endif
 
        NCR5380_WRITE(sc, sci_tcmd, PHASE_INVALID);
        NCR5380_WRITE(sc, sci_icmd, 0);



Home | Main Index | Thread Index | Old Index