Author: imp
Date: Thu Feb 16 21:57:02 2017
New Revision: 313833
URL: https://svnweb.freebsd.org/changeset/base/313833
Log:
Remove EISA support from adv driver. Remove references to it from man
page. Remove comment about EISA dual channel card. Remove trivial
references in advlib to avoid false positives with grep. Remove stray
MCA reference not worth a seperate commit.
Deleted:
head/sys/dev/advansys/adv_eisa.c
Modified:
head/share/man/man4/adv.4
head/sys/conf/files
head/sys/dev/advansys/advansys.c
head/sys/dev/advansys/advlib.c
head/sys/dev/advansys/advlib.h
Modified: head/share/man/man4/adv.4
==============================================================================
--- head/share/man/man4/adv.4 Thu Feb 16 21:56:57 2017 (r313832)
+++ head/share/man/man4/adv.4 Thu Feb 16 21:57:02 2017 (r313833)
@@ -28,7 +28,7 @@
.Os
.Sh NAME
.Nm adv
-.Nd Advansys ISA/VL/EISA/PCI 8bit SCSI Host adapter driver
+.Nd Advansys ISA/VL/PCI Narrow 8bit SCSI Host adapter driver
.Sh SYNOPSIS
To compile this driver into the kernel,
place the following lines in your
@@ -37,9 +37,6 @@ kernel configuration file:
.Cd "device scbus"
.Cd "device adv"
.Pp
-For one or more EISA cards:
-.Cd "device eisa"
-.Pp
For one or more VL/ISA cards:
.Cd "device isa"
.Pp
@@ -51,7 +48,7 @@ For one or more PCI cards:
.Cd "device pci"
.Ed
.Sh DESCRIPTION
-This driver provides access to the 8bit
+This driver provides access to the narrow 8bit
.Tn SCSI
bus connected to the Advanced Systems Products, Inc.
.Tn ASC900 ,
@@ -82,8 +79,8 @@ Connectivity Products:
.It "ABP930" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "5"
.It "ABP930U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta ""
.It "ABP930UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta ""
-.It "ABP960" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta ""
-.It "ABP960U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta ""
+.It "ABP960" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "2"
+.It "ABP960U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta "2"
.El
.Pp
Footnotes:
@@ -104,10 +101,9 @@ This board has been sold by SIIG as the
.Ed
.Bd -ragged -offset indent
Single Channel Products:
-.Bl -column "ABPX3X940UA " "EISA " "Floppy " "MaxSync " "Commands"
+.Bl -column "ABPX3X940UA " "PCI " "Floppy " "MaxSync " "Commands"
.Em "Adapter" Ta Em "Bus" Ta Em "Floppy" Ta Em "MaxSync" Ta Em "Commands"
.It "ABP542" Ta "ISA" Ta "Yes" Ta "10MHz" Ta "240"
-.It "ABP742" Ta "EISA" Ta "Yes" Ta "10MHz" Ta "240"
.It "ABP842" Ta "VL" Ta "Yes" Ta "10MHz" Ta "240"
.It "ABP940" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240"
.It "ABP[3]940UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240"
@@ -119,9 +115,8 @@ Single Channel Products:
.Ed
.Bd -ragged -offset indent
Multi Channel Products (Commands are per-channel):
-.Bl -column "ABPX3X980UA " "EISA " "Floppy " "MaxSync " "Commands " "Channels"
+.Bl -column "ABPX3X980UA " "PCI " "Floppy " "MaxSync " "Commands " "Channels"
.Em "Adapter" Ta Em "Bus" Ta Em "Floppy" Ta Em "MaxSync" Ta Em "Commands" Ta
Em "Channels"
-.It "ABP752" Ta "EISA" Ta "Yes" Ta "10MHz" Ta "240" Ta "2"
.It "ABP852" Ta "VL" Ta "Yes" Ta "10MHz" Ta "240" Ta "2"
.It "ABP950" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" Ta "2"
.It "ABP980" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" Ta "4"
@@ -130,15 +125,17 @@ Multi Channel Products (Commands are per
.El
.Ed
.Pp
-.\" For ISA or Vesa Local Bus adapters, one kernel config entry is required
-.\" for every card to be attached by the system. Specific values for the port
-.\" address, irq, and drq may be specified. If wildcard values are used, the
-.\" driver will query the device for its current settings and use those. If
-.\" the port address is a wildcard, the driver consults an internal table of
-.\" possible port address locations and attaches to the first unattached card
-.\" it finds. The possible port addresses for these card are 0x110, 0x130,
-.\" 0x150, 0x190, 0x210, 0x230, 0x250, and 0x330.
-.\" .Pp
+For ISA or Vesa Local Bus adapters, one kernel hints entry is required
+for every card to be attached by the system.
+Specific values for the port address, irq and drq may be specified.
+If unspecified, the driver will query the device for its current
+settings and use those.
+If the port address is unspecified, the driver will search for it at
+one of the possible addresses.
+Cards configured for ISA PNP addresses are found automatically.
+The possible port addresses for these card are 0x110, 0x130,
+0x150, 0x190, 0x210, 0x230, 0x250, and 0x330.
+.Pp
Per target configuration performed in the
.Tn AdvanceWare
menu, which is accessible at boot,
@@ -181,8 +178,6 @@ AdvanSys ABP960, ABP960U
.It
AdvanSys ABP542
.It
-AdvanSys ABP742
-.It
AdvanSys ABP842
.It
AdvanSys ABP940
@@ -195,8 +190,6 @@ AdvanSys ABP3960UA
.It
AdvanSys ABP970, ABP970U
.It
-AdvanSys ABP752
-.It
AdvanSys ABP852
.It
AdvanSys ABP950
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Feb 16 21:56:57 2017 (r313832)
+++ head/sys/conf/files Thu Feb 16 21:57:02 2017 (r313833)
@@ -679,7 +679,6 @@ dev/acpica/acpi_throttle.c optional acpi
dev/acpica/acpi_video.c optional acpi_video acpi
dev/acpica/acpi_dock.c optional acpi_dock acpi
dev/adlink/adlink.c optional adlink
-dev/advansys/adv_eisa.c optional adv eisa
dev/advansys/adv_pci.c optional adv pci
dev/advansys/advansys.c optional adv
dev/advansys/advlib.c optional adv
Modified: head/sys/dev/advansys/advansys.c
==============================================================================
--- head/sys/dev/advansys/advansys.c Thu Feb 16 21:56:57 2017
(r313832)
+++ head/sys/dev/advansys/advansys.c Thu Feb 16 21:57:02 2017
(r313833)
@@ -3,7 +3,6 @@
* Product specific probe and attach routines can be found in:
*
* i386/isa/adv_isa.c ABP5140, ABP542, ABP5150, ABP842, ABP852
- * i386/eisa/adv_eisa.c ABP742, ABP752
* pci/adv_pci.c ABP920, ABP930, ABP930U, ABP930UA, ABP940, ABP940U,
* ABP940UA, ABP950, ABP960, ABP960U, ABP960UA,
* ABP970, ABP970U
@@ -1378,8 +1377,6 @@ adv_attach(adv)
/*
* Register the bus.
- *
- * XXX Twin Channel EISA Cards???
*/
mtx_lock(&adv->lock);
if (xpt_bus_register(adv->sim, adv->dev, 0) != CAM_SUCCESS) {
Modified: head/sys/dev/advansys/advlib.c
==============================================================================
--- head/sys/dev/advansys/advlib.c Thu Feb 16 21:56:57 2017
(r313832)
+++ head/sys/dev/advansys/advlib.c Thu Feb 16 21:57:02 2017
(r313833)
@@ -729,7 +729,7 @@ adv_execute_scsi_queue(struct adv_softc
panic("adv_execute_scsi_queue: "
"Queue with too many segs.");
- if ((adv->type & (ADV_ISA | ADV_VL | ADV_EISA)) != 0) {
+ if ((adv->type & (ADV_ISA | ADV_VL)) != 0) {
int i;
for (i = 0; i < sg_entry_cnt_minus_one; i++) {
Modified: head/sys/dev/advansys/advlib.h
==============================================================================
--- head/sys/dev/advansys/advlib.h Thu Feb 16 21:56:57 2017
(r313832)
+++ head/sys/dev/advansys/advlib.h Thu Feb 16 21:57:02 2017
(r313833)
@@ -66,9 +66,7 @@ typedef enum {
ADV_ISA = 0x001,
ADV_ISAPNP = 0x003,
ADV_VL = 0x004,
- ADV_EISA = 0x008,
ADV_PCI = 0x010,
- ADV_MCA = 0x020,
ADV_PCMCIA = 0x040,
ADV_ULTRA = 0x100,
ADV_WIDE = 0x200,
@@ -170,9 +168,6 @@ struct adv_ccb_info {
#define ADV_CHIP_VER_ISA_BIT 0x30
#define ADV_CHIP_VER_ISAPNP_BIT 0x20
#define ADV_CHIP_VER_ASYN_BUG 0x21
-#define ADV_CHIP_MIN_VER_EISA 0x41
-#define ADV_CHIP_MAX_VER_EISA 0x47
-#define ADV_CHIP_VER_EISA_BIT 0x40
#define ADV_CONFIG_MSW 0x0004
#define ADV_CFG_MSW_SCSI_TARGET_ON 0x0080
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
