diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-06-29 20:56:11 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-06-29 20:56:11 +0000 |
| commit | 0cae9e01ba13f589cb6f0be1bf5fcb876dd2bd24 (patch) | |
| tree | b57cb0e2699db7adc952b173c2519a206e6ca094 /sys/arch/hppa | |
| parent | dd383cdd3f68e11bd69a53cebcee8e260e25fe5b (diff) | |
do not enable eisa by ourselves, better viper size print
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/mem.c | 27 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/viper.h | 4 |
2 files changed, 21 insertions, 10 deletions
diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c index 012e640c453..abb2bfa5ff7 100644 --- a/sys/arch/hppa/dev/mem.c +++ b/sys/arch/hppa/dev/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.1 1998/12/29 21:38:47 mickey Exp $ */ +/* $OpenBSD: mem.c,v 1.2 1999/06/29 20:56:09 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -161,7 +161,6 @@ memattach(parent, self, aux) ((struct vi_ctrl *)&VI_CTRL)->core_den = 0; ((struct vi_ctrl *)&VI_CTRL)->sgc0_den = 0; ((struct vi_ctrl *)&VI_CTRL)->sgc1_den = 0; - ((struct vi_ctrl *)&VI_CTRL)->eisa_den = 0; ((struct vi_ctrl *)&VI_CTRL)->core_prf = 1; sc->sc_vp->vi_control = VI_CTRL; splx(s); @@ -173,13 +172,12 @@ memattach(parent, self, aux) if ((err = pdc_call((iodcio_t)pdc, 0, PDC_IODC, PDC_IODC_NINIT, &pdc_minit, ca->ca_hpa, PAGE0->imm_spa_size)) < 0) - printf (" WARNING: cannot determine size (%d)\n", err); - else { - printf (" size %d", pdc_minit.max_spa / (1024*1024)); - if (pdc_minit.max_spa % (1024*1024)) - printf (".%d", pdc_minit.max_spa % (1024*1024)); - printf ("MB\n"); - } + pdc_minit.max_spa = PAGE0->imm_max_mem; + + printf (" size %d", pdc_minit.max_spa / (1024*1024)); + if (pdc_minit.max_spa % (1024*1024)) + printf (".%d", pdc_minit.max_spa % (1024*1024)); + printf ("MB\n"); } void @@ -194,6 +192,17 @@ viper_setintrwnd(mask) sc->sc_vp->vi_intrwd; } +void +viper_eisa_en() +{ + register struct mem_softc *sc; + + sc = mem_cd.cd_devs[0]; + + if (sc->sc_vp) + ((struct vi_ctrl *)&VI_CTRL)->eisa_den = 0; +} + int mmopen(dev, flag, ioflag, p) dev_t dev; diff --git a/sys/arch/hppa/dev/viper.h b/sys/arch/hppa/dev/viper.h index 1f8e75dbf5d..9d07c395ed2 100644 --- a/sys/arch/hppa/dev/viper.h +++ b/sys/arch/hppa/dev/viper.h @@ -1,4 +1,4 @@ -/* $OpenBSD: viper.h,v 1.1 1998/12/29 21:34:21 mickey Exp $ */ +/* $OpenBSD: viper.h,v 1.2 1999/06/29 20:56:10 mickey Exp $ */ /* * Copyright 1996 1995 by Open Software Foundation, Inc. @@ -237,3 +237,5 @@ struct vn_supr { }; void viper_setintrwnd __P((u_int32_t mask)); +void viper_eisa_en __P((void)); + |