From 15e25fe73f2197ed5f4511e74feef78b5c2ab31b Mon Sep 17 00:00:00 2001 From: ad Date: Thu, 19 Oct 2000 14:32:20 +0000 Subject: [PATCH] - ca -> lsu - Hook in twe. --- sys/arch/i386/conf/GENERIC | 8 +++++--- sys/arch/i386/conf/INSTALL | 6 ++++-- sys/arch/i386/conf/INSTALL_SMALL | 11 +++++++---- sys/arch/i386/conf/files.i386 | 6 +++--- sys/arch/i386/i386/autoconf.c | 10 +++++----- sys/arch/i386/i386/conf.c | 12 ++++++------ 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 68f0efb9a901..1939bc020457 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,11 +1,11 @@ -# $NetBSD: GENERIC,v 1.373 2000/10/15 10:08:00 minoura Exp $ +# $NetBSD: GENERIC,v 1.374 2000/10/19 14:32:20 ad Exp $ # # GENERIC -- everything that's currently supported # include "arch/i386/conf/std.i386" -#ident "GENERIC-$Revision: 1.373 $" +#ident "GENERIC-$Revision: 1.374 $" maxusers 32 # estimated number of users @@ -460,7 +460,9 @@ uk* at scsibus? target ? lun ? # SCSI unknown # RAID controllers and devices cac* at eisa? # Compaq EISA array controllers cac* at pci? dev ? function ? # Compaq PCI array controllers -ca* at cac? unit ? # Compaq array disk devices +twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +lsu* at cac? unit ? # Compaq array disk devices +lsu* at twe? unit ? # 3ware array disk devices # IDE and related devices diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL index cd020af9eec6..7f75f5647955 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.157 2000/10/02 18:43:35 abs Exp $ +# $NetBSD: INSTALL,v 1.158 2000/10/19 14:32:20 ad Exp $ # # INSTALL - Installation kernel. # @@ -360,7 +360,9 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives # RAID controllers and devices cac* at eisa? # Compaq EISA array controllers cac* at pci? dev ? function ? # Compaq PCI array controllers -ca* at cac? unit ? # Compaq array disk devices +twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +lsu* at cac? unit ? # Compaq array disk devices +lsu* at twe? unit ? # 3ware array disk devices # IDE and related devices diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL index 4eb1d1352b7f..cfe6c9fdefb7 100644 --- a/sys/arch/i386/conf/INSTALL_SMALL +++ b/sys/arch/i386/conf/INSTALL_SMALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_SMALL,v 1.58 2000/10/02 18:43:35 abs Exp $ +# $NetBSD: INSTALL_SMALL,v 1.59 2000/10/19 14:32:21 ad Exp $ # # INSTALL_SMALL - Small Installation kernel. # @@ -297,7 +297,7 @@ scsibus* at ahb? scsibus* at ahc? scsibus* at aic? scsibus* at bha? -#scsibus* at dpt? +scsibus* at dpt? #scsibus* at isp? #scsibus* at nca? #scsibus* at ncr? @@ -314,8 +314,11 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives #uk* at scsibus? target ? lun ? # SCSI unknown # RAID controllers and devices -#cac* at pci? dev ? function ? # Compaq array controller -#ca* at cac? unit ? # Compaq array disk device +#cac* at eisa? # Compaq EISA array controllers +#cac* at pci? dev ? function ? # Compaq PCI array controllers +#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers +#lsu* at cac? unit ? # Compaq array disk devices +#lsu* at twe? unit ? # 3ware array disk devices # IDE and related devices diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 20c8230ddf3f..e208a075a841 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.167 2000/09/13 04:47:00 thorpej Exp $ +# $NetBSD: files.i386,v 1.168 2000/10/19 14:32:21 ad Exp $ # # new style config file for i386 architecture # @@ -100,8 +100,8 @@ major {md = 17} # RAIDframe major {raid = 18} -# Compaq arrays -major {ca = 19} +# Logical storage units +major {lsu = 19} # attribute used to bring in BIOS trampoline code for real-mode probing # of certain devices/BIOS features diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index b4198819a169..ebd809172782 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.53 2000/06/02 22:09:02 cgd Exp $ */ +/* $NetBSD: autoconf.c,v 1.54 2000/10/19 14:32:23 ad Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -161,7 +161,7 @@ matchbiosdisks() if (dv->dv_class == DV_DISK && (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") || !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") || - !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ca"))) + !strcmp(dv->dv_cfdata->cf_driver->cd_name, "lsu"))) i386_ndisks++; if (i386_ndisks == 0) @@ -198,7 +198,7 @@ matchbiosdisks() #endif if (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") || !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") || - !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ca")) { + !strcmp(dv->dv_cfdata->cf_driver->cd_name, "lsu")) { n++; sprintf(i386_alldisks->dl_nativedisks[n].ni_devname, "%s%d", dv->dv_cfdata->cf_driver->cd_name, @@ -398,7 +398,7 @@ findroot(void) if (!strcmp(dv->dv_cfdata->cf_driver->cd_name, "sd") || !strcmp(dv->dv_cfdata->cf_driver->cd_name, "wd") || - !strcmp(dv->dv_cfdata->cf_driver->cd_name, "ca")) { + !strcmp(dv->dv_cfdata->cf_driver->cd_name, "lsu")) { /* * Don't trust BIOS device numbers, try * to match the information passed by the @@ -411,7 +411,7 @@ findroot(void) goto found; } - /* no "fd", "wd", "sd" or "ca" */ + /* no "fd", "wd", "sd", "lsu" */ continue; found: diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 6186dbe7cd80..2b95f73a4c89 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.129 2000/09/23 04:30:09 augustss Exp $ */ +/* $NetBSD: conf.c,v 1.130 2000/10/19 14:32:23 ad Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -71,8 +71,8 @@ bdev_decl(ccd); bdev_decl(raid); #include "md.h" bdev_decl(md); -#include "ca.h" -bdev_decl(ca); +#include "lsu.h" +bdev_decl(lsu); struct bdevsw bdevsw[] = { @@ -95,7 +95,7 @@ struct bdevsw bdevsw[] = bdev_disk_init(NCCD,ccd), /* 16: concatenated disk driver */ bdev_disk_init(NMD,md), /* 17: memory disk driver */ bdev_disk_init(NRAID,raid), /* 18: RAIDframe disk driver */ - bdev_disk_init(NCA,ca), /* 19: Compaq array */ + bdev_disk_init(NLSU,lsu), /* 19: logical storage unit */ }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); @@ -200,7 +200,7 @@ cdev_decl(music); cdev_decl(svr4_net); cdev_decl(ccd); cdev_decl(raid); -cdev_decl(ca); +cdev_decl(lsu); #include "joy.h" cdev_decl(joy); #include "apm.h" @@ -386,7 +386,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NUCOM, ucom), /* 66: USB tty */ cdev_sysmon_init(NSYSMON, sysmon),/* 67: System Monitor */ cdev_vmegen_init(NVMEGENERIC, vmegeneric), /* 68: generic VME access */ - cdev_disk_init(NCA, ca), /* 69: Compaq array */ + cdev_disk_init(NLSU, lsu), /* 69: logical storage unit */ cdev_usbdev_init(NURIO,urio), /* 70: Diamond Rio 500 */ cdev_bktr_init(NBKTR, bktr), /* 71: Bt848 video capture device */ cdev_notdef(), /* 72 */