Clean up printing of chipset revision/capabilities.

This commit is contained in:
thorpej 1997-10-27 01:08:42 +00:00
parent cc8d1d3968
commit 023044a749
2 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: cia.c,v 1.27 1997/09/17 01:34:18 thorpej Exp $ */
/* $NetBSD: cia.c,v 1.28 1997/10/27 01:08:42 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.27 1997/09/17 01:34:18 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.28 1997/10/27 01:08:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -136,6 +136,7 @@ ciaattach(parent, self, aux)
struct cia_softc *sc = (struct cia_softc *)self;
struct cia_config *ccp;
struct pcibus_attach_args pba;
char bits[64];
/* note that we've attached the chipset; can't have 2 CIAs. */
ciafound = 1;
@ -148,14 +149,11 @@ ciaattach(parent, self, aux)
ccp = sc->sc_ccp = &cia_configuration;
cia_init(ccp, 1);
printf(": DECchip 21171/21172 Core Logic chipset rev. %d\n",
ccp->cc_rev);
/*
* XXX Should we print any more? We only care about BWX right now.
*/
if (ccp->cc_cnfg & CNFG_BWEN)
printf("%s: EV56 BWX enabled\n", self->dv_xname);
printf(": DECchip 2117%d Core Logic chipset\n", ccp->cc_rev);
if (ccp->cc_cnfg)
printf("%s: extended capabilities: %s\n", self->dv_xname,
bitmask_snprintf(ccp->cc_cnfg, CIA_CSR_CNFG_BITS,
bits, sizeof(bits)));
switch (hwrpb->rpb_type) {
#ifdef DEC_KN20AA

View File

@ -1,4 +1,4 @@
/* $NetBSD: ciareg.h,v 1.12 1997/09/17 01:35:34 thorpej Exp $ */
/* $NetBSD: ciareg.h,v 1.13 1997/10/27 01:08:47 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -127,6 +127,8 @@
#define CNFG_DWEN 0x00000020
#define CNFG_WLEN 0x00000100
#define CIA_CSR_CNFG_BITS "\20\11WLEN\6DWEN\5MWEN\1BWEN"
#define CIA_CSR_HAE_MEM (CIA_CSRS + 0x400)
#define HAE_MEM_REG1_START(x) (((u_int32_t)(x) & 0xe0000000UL) << 0)