From 7fe8df83a3a689395b3157346f0be76c25b3694c Mon Sep 17 00:00:00 2001 From: jdolecek Date: Fri, 23 Mar 2001 20:04:28 +0000 Subject: [PATCH] cosmetic change for autoconf printing: for memory extension cards, just print ": configured" if they are enabled; they don't need any special driver to work, printing "not configured" might be confusing --- sys/dev/mca/mca.c | 24 +++++++++++++++++++++--- sys/dev/mca/mcadevs | 42 +++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 24 deletions(-) diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c index 966117d86187..0593f9d564e3 100644 --- a/sys/dev/mca/mca.c +++ b/sys/dev/mca/mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: mca.c,v 1.2 2001/02/14 19:31:19 jdolecek Exp $ */ +/* $NetBSD: mca.c,v 1.3 2001/03/23 20:04:28 jdolecek Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ #include #include - +#include int mca_match __P((struct device *, struct cfdata *, void *)); void mca_attach __P((struct device *, struct device *, void *)); @@ -96,7 +96,25 @@ mca_print(aux, pnp) printf("%s slot %d: %s", pnp, ma->ma_slot + 1, devinfo); } - return (UNCONF); + /* + * Print "configured" for Memory Extension boards - there is no + * meaningfull driver for them, they "just work". + */ + switch(ma->ma_id) { + case MCA_PRODUCT_HRAM: case MCA_PRODUCT_IQRAM: case MCA_PRODUCT_MICRAM: + case MCA_PRODUCT_ASTRAM: case MCA_PRODUCT_KINGRAM: + case MCA_PRODUCT_KINGRAM8: case MCA_PRODUCT_KINGRAM16: + case MCA_PRODUCT_KINGRAM609: case MCA_PRODUCT_HYPRAM: + case MCA_PRODUCT_QRAM1: case MCA_PRODUCT_QRAM2: case MCA_PRODUCT_EVERAM: + case MCA_PRODUCT_BOCARAM: case MCA_PRODUCT_IBMRAM1: + case MCA_PRODUCT_IBMRAM2: case MCA_PRODUCT_IBMRAM3: + case MCA_PRODUCT_IBMRAM4: case MCA_PRODUCT_IBMRAM5: + case MCA_PRODUCT_IBMRAM6: case MCA_PRODUCT_IBMRAM7: + printf(": configured\n"); + return (QUIET); + default: + return (UNCONF); + } } int diff --git a/sys/dev/mca/mcadevs b/sys/dev/mca/mcadevs index 96baf5c0e734..7d39b7e65443 100644 --- a/sys/dev/mca/mcadevs +++ b/sys/dev/mca/mcadevs @@ -1,4 +1,4 @@ -$NetBSD: mcadevs,v 1.5 2001/03/23 18:12:13 jdolecek Exp $ +$NetBSD: mcadevs,v 1.6 2001/03/23 20:04:28 jdolecek Exp $ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -254,46 +254,46 @@ product 0x6FF0 "Arnet Multiport/2 Communications Adapter" [6] product 0x7000 "AST Advantage/2" [6] product 0x7001 "AST Advantage/2 w/ Dual Serial Port" [6] product 0x7002 "AST Advantage/2 w/ Serial & Parallel Port" [6] -product 0x7007 "HyperRAM MC 32/16 Memory Expansion" [7] +product 0x7007 HRAM "HyperRAM MC 32/16 Memory Expansion" [7] product 0x7010 "Tecmar MicroRAM 386 Multifunction Board" [6] product 0x7011 "Tecmar MicroRAM Multifunction Board" [6] product 0x7012 "Net/One NIUps LAN Adapter" [6] product 0x7020 "Cumulus 2Mb Memory Multifunction Adapter" [6] product 0x7021 "Cumulus 4Mb Memory Multifunction Adapter" [6] product 0x7022 "Cumulus 8Mb Memory Multifunction Adapter" [6] -product 0x7024 "InterQuadram QuadMEG PS8 Extended Memory/Adapter" [5] +product 0x7024 IQRAM "InterQuadram QuadMEG PS8 Extended Memory/Adapter" [5] product 0x7026 "Cumulus 2400 Baud Internal Modem" [6] product 0x7046 "Alloy IMP8/PS Adapter" [6] product 0x7047 "Alloy IMP2/PS Adapter" [6] product 0x7048 "Excelogic Micromem" [6] -product 0x7049 "Micron Beyond 50/60 Memory Expansion" [5] +product 0x7049 MICRAM "Micron Beyond 50/60 Memory Expansion" [5] product 0x704E "Video Capture Adapter/A" [6] product 0x704F "NCR MPCA/MC Adapter" [6] -product 0x7050 "AST RampagePlus/MC Memory Expansion" PCW Jul 89, p149 +product 0x7050 ASTRAM "AST RampagePlus/MC Memory Expansion" PCW Jul 89, p149 product 0x7064 "AW RCP Adapter" [6] product 0x706F "Aox MicroMASTER 386" [5] product 0x707D "Corollary 8x4mc" [6] product 0x707E "Irwin 4100MC Controller" [6] -product 0x708E "Kingston KTM-8000/286 Memory Expansion" [5] -product 0x708F "Kingston KTM-8000/386 Memory Expansion" [5] +product 0x708E KINGRAM "Kingston KTM-8000/286 Memory Expansion" [5] +product 0x708F KINGRAM8 "Kingston KTM-8000/386 Memory Expansion" [5] product 0x70B0 "Intel AboveBoard MC32" [6] -product 0x70D0 "Kingston KTM-16000/386 Memory Expansion" [6] -product 0x70D4 "Kingston KTM-609/16 Memory Expansion" [4] +product 0x70D0 KINGRAM16 "Kingston KTM-16000/386 Memory Expansion" [6] +product 0x70D4 KINGRAM609 "Kingston KTM-609/16 Memory Expansion" [4] product 0x7151 "Novell NE/2-32 Ethernet Adapter" [6] product 0x7154 "Novell NE/2 Ethernet Adapter" [1] product 0x7188 "Mountain QIC-02 Tape Adapter" [6] product 0x71D4 "Kingston DataCard 16 Adapter" [4] -product 0x72F3 "HyperRAM MC 32/16 SIMM-MF Memory Expansion" [7] +product 0x72F3 HYPRAM "HyperRAM MC 32/16 SIMM-MF Memory Expansion" [7] product 0x7411 "Quadboard PS/Q Multifunction Adapter" [6] product 0x7422 "Quadboard PS/Q Multifunction Adapter" [6] product 0x7520 "ALR MicroChannel AT Embedded Adapter" [6] product 0x7522 "ALR MicroChannel AT Embedded Adapter" [6] -product 0x76DA "Quadmeg PS/Q Memory Adapter" [6] -product 0x76DE "Quadmeg PS/Q Memory Adapter" [6] +product 0x76DA QRAM1 "Quadmeg PS/Q Memory Adapter" [6] +product 0x76DE QRAM2 "Quadmeg PS/Q Memory Adapter" [6] product 0x7788 "Intel AboveBoard 2 Plus" [5] -product 0x77FB "Everex EV-136 4Mb Memory Expansion" [6] +product 0x77FB EVERAM "Everex EV-136 4Mb Memory Expansion" [6] product 0x77FF "Alloy HI-2 PC Expansion Bus Interface" [6] -product 0x7A7A "Boca BOCARAM/2 PLUS Memory Expansion" [6] +product 0x7A7A BOCARAM "Boca BOCARAM/2 PLUS Memory Expansion" [6] product 0x7D7F "Orchid RAMQuest Extra 16/32" [6] product 0x7E76 "Overland XL/2 9-Track Tape Coupler" [7] product 0x7F4C "NCR 53C94 SCSI Host Adapter" [6] @@ -371,11 +371,11 @@ product 0xEFF5 "UB NIC-PS/2 Ethernet Adapter" [1] product 0xEFF6 "IBM PagePrinter Adapter/2" [5] product 0xEFFD "IBM VGA Adapter" [5] product 0xF04F "IBM 3117 Scanner Adapter/A" [5] -product 0xF7F7 "IBM 2-8Mb 80286 Memory Expansion" [5] -product 0xF7FE "IBM Expanded Memory" [5] -product 0xFAFF "IBM 32-bit Memory Expansion" [7] -product 0xFCFF "IBM Memory Expansion" [5] -product 0xFDDE "IBM Enhanced 80386 Memory Expansion w/ROM" [5] -product 0xFDDF "IBM Enhanced 80386 Memory Expansion" [5] -product 0xFEFE "IBM 2Mb 16-bit Memory Adapter" [5] +product 0xF7F7 IBMRAM1 "IBM 2-8Mb 80286 Memory Expansion" [5] +product 0xF7FE IBMRAM2 "IBM Expanded Memory" [5] +product 0xFAFF IBMRAM3 "IBM 32-bit Memory Expansion" [7] +product 0xFCFF IBMRAM4 "IBM Memory Expansion" [5] +product 0xFDDE IBMRAM5 "IBM Enhanced 80386 Memory Expansion w/ROM" [5] +product 0xFDDF IBMRAM6 "IBM Enhanced 80386 Memory Expansion" [5] +product 0xFEFE IBMRAM7 "IBM 2Mb 16-bit Memory Adapter" [5] product 0xFFF8 "IBM 5250 Workstation Emulation Adapter" [5]