Author: imp
Date: Thu Feb 16 21:57:25 2017
New Revision: 313837
URL: https://svnweb.freebsd.org/changeset/base/313837
Log:
Remove EISA support from Buslogic (bt) cards. Remove known models form
man page. Tweak comments to not refer to EISA scenarios now that it is
no longer supported. Remove unused enum.
Deleted:
head/sys/dev/buslogic/bt_eisa.c
Modified:
head/share/man/man4/bt.4
head/sys/conf/files
head/sys/dev/buslogic/bt.c
head/sys/dev/buslogic/bt_isa.c
head/sys/dev/buslogic/btreg.h
Modified: head/share/man/man4/bt.4
==============================================================================
--- head/share/man/man4/bt.4 Thu Feb 16 21:57:19 2017 (r313836)
+++ head/share/man/man4/bt.4 Thu Feb 16 21:57:25 2017 (r313837)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 18, 2006
+.Dd February 15, 2017
.Dt BT 4
.Os
.Sh NAME
@@ -66,9 +66,6 @@ BT-946C PCI 100 Fast SCSI-2
BT-956C PCI 100 Wide Fast SCSI-2
BT-956CD PCI 100 Wide Differential Fast SCSI-2
BT-445C VLB 100 Fast SCSI-2
-BT-747C EISA 100 Fast SCSI-2
-BT-757C EISA 100 Wide Fast SCSI-2
-BT-757CD EISA 100 Wide Differential Fast SCSI-2
BT-545C ISA 50 Fast SCSI-2
BT-540CF ISA 50 Fast SCSI-2
.El
@@ -77,20 +74,14 @@ MultiMaster "S" Series Host Adapters:
.Bl -column "BT-956CD " "ISA " "Commands " "Description"
.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description"
BT-445S VLB 30 Fast SCSI-2
-BT-747S EISA 30 Fast SCSI-2
-BT-747D EISA 30 Differential Fast SCSI-2
-BT-757S EISA 30 Wide Fast SCSI-2
-BT-757D EISA 30 Wide Differential Fast SCSI-2
BT-545S ISA 30 Fast SCSI-2
BT-542D ISA 30 Differential Fast SCSI-2
-BT-742A EISA 30 SCSI-2 (742A revision H)
BT-542B ISA 30 SCSI-2 (542B revision H)
.El
.Pp
MultiMaster "A" Series Host Adapters:
.Bl -column "BT-956CD " "ISA " "Commands " "Description"
.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description"
-BT-742A EISA 30 SCSI-2 (742A revisions A - G)
BT-542B ISA 30 SCSI-2 (542B revisions A - G)
.El
.Ed
@@ -135,24 +126,6 @@ BusLogic BT-545S
.It
BusLogic/BusTek BT-640
.It
-BusLogic BT-742A
-.It
-BusLogic BT-742A
-.It
-BusLogic BT-747C
-.It
-BusLogic BT-747D
-.It
-BusLogic BT-747S
-.It
-BusLogic BT-757C
-.It
-BusLogic BT-757CD
-.It
-BusLogic BT-757D
-.It
-BusLogic BT-757S
-.It
BusLogic BT-946C
.It
BusLogic BT-948
@@ -167,11 +140,6 @@ BusLogic BT-958D
.It
Storage Dimensions SDC3211B / SDC3211F
.El
-.Pp
-AMI FastDisk Host Adapters that are true BusLogic MultiMaster clones
-are also supported by the
-.Nm
-driver.
.Sh SEE ALSO
.Xr cd 4 ,
.Xr da 4 ,
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Feb 16 21:57:19 2017 (r313836)
+++ head/sys/conf/files Thu Feb 16 21:57:25 2017 (r313837)
@@ -1259,7 +1259,6 @@ dev/bnxt/bnxt_sysctl.c optional bnxt if
dev/bnxt/bnxt_txrx.c optional bnxt iflib pci
dev/bnxt/if_bnxt.c optional bnxt iflib pci
dev/buslogic/bt.c optional bt
-dev/buslogic/bt_eisa.c optional bt eisa
dev/buslogic/bt_isa.c optional bt isa
dev/buslogic/bt_pci.c optional bt pci
dev/bwi/bwimac.c optional bwi
Modified: head/sys/dev/buslogic/bt.c
==============================================================================
--- head/sys/dev/buslogic/bt.c Thu Feb 16 21:57:19 2017 (r313836)
+++ head/sys/dev/buslogic/bt.c Thu Feb 16 21:57:25 2017 (r313837)
@@ -3,7 +3,6 @@
* Product specific probe and attach routines can be found in:
* sys/dev/buslogic/bt_isa.c BT-54X, BT-445 cards
* sys/dev/buslogic/bt_mca.c BT-64X, SDC3211B, SDC3211F
- * sys/dev/buslogic/bt_eisa.c BT-74X, BT-75x cards, SDC3222F
* sys/dev/buslogic/bt_pci.c BT-946, BT-948, BT-956, BT-958 cards
*
* Copyright (c) 1998, 1999 Justin T. Gibbs.
@@ -169,7 +168,7 @@ static void bttimeout(void *arg);
* XXX
* Do our own re-probe protection until a configuration
* manager can do it for us. This ensures that we don't
- * reprobe a card already found by the EISA or PCI probes.
+ * reprobe a card already found by the PCI probes.
*/
struct bt_isa_port bt_isa_ports[] =
{
@@ -313,7 +312,6 @@ bt_port_probe(device_t dev, struct bt_pr
return (1);
}
} else {
- /* VL/EISA/PCI DMA */
info->drq = -1;
}
switch (config_data.irq) {
@@ -482,7 +480,6 @@ bt_fetch_adapter_info(device_t dev)
* BT-542B/742A (revision H)
* 2.xx BusLogic "A" Series Host Adapters:
* BT-542B/742A (revision G and below)
- * 0.xx AMI FastDisk VLB/EISA BusLogic Clone Host Adapter
*/
length_param = sizeof(esetup_info);
error = bt_cmd(bt, BOP_INQUIRE_ESETUP_INFO, &length_param, /*parmlen*/1,
@@ -499,19 +496,6 @@ bt_fetch_adapter_info(device_t dev)
if (esetup_info.bus_type == 'A'
&& bt->firmware_ver[0] == '2') {
snprintf(bt->model, sizeof(bt->model), "542B");
- } else if (esetup_info.bus_type == 'E'
- && bt->firmware_ver[0] == '2') {
-
- /*
- * The 742A seems to object if its mailboxes are
- * allocated above the 16MB mark.
- */
- bt->mailbox_addrlimit = BUS_SPACE_MAXADDR_24BIT;
- snprintf(bt->model, sizeof(bt->model), "742A");
- } else if (esetup_info.bus_type == 'E'
- && bt->firmware_ver[0] == '0') {
- /* AMI FastDisk EISA Series 441 0.x */
- snprintf(bt->model, sizeof(bt->model), "747A");
} else {
ha_model_data_t model_data;
int i;
Modified: head/sys/dev/buslogic/bt_isa.c
==============================================================================
--- head/sys/dev/buslogic/bt_isa.c Thu Feb 16 21:57:19 2017
(r313836)
+++ head/sys/dev/buslogic/bt_isa.c Thu Feb 16 21:57:25 2017
(r313837)
@@ -150,7 +150,7 @@ bt_isa_probe(device_t dev)
/*
* Ensure this port has not already been claimed already
- * by a PCI, EISA or ISA adapter.
+ * by a PCI, ISA adapter.
*/
if (bt_check_probed_iop(ioport) != 0)
continue;
Modified: head/sys/dev/buslogic/btreg.h
==============================================================================
--- head/sys/dev/buslogic/btreg.h Thu Feb 16 21:57:19 2017
(r313836)
+++ head/sys/dev/buslogic/btreg.h Thu Feb 16 21:57:25 2017
(r313837)
@@ -4,7 +4,6 @@
* attach routines can be found in:
* sys/dev/buslogic/bt_isa.c BT-54X, BT-445 cards
* sys/dev/buslogic/bt_mca.c BT-64X, SDC3211B, SDC3211F
- * sys/dev/buslogic/bt_eisa.c BT-74X, BT-75x cards, SDC3222F
* sys/dev/buslogic/bt_pci.c BT-946, BT-948, BT-956, BT-958 cards
*
* Copyright (c) 1998, 1999 Justin T. Gibbs.
@@ -238,15 +237,6 @@ typedef struct {
sync : 1;
} targ_syncinfo_t;
-typedef enum {
- HAB_ISA = 'A',
- HAB_MCA = 'B',
- HAB_EISA = 'C',
- HAB_NUBUS = 'D',
- HAB_VESA = 'E',
- HAB_PCI = 'F'
-} ha_type_t;
-
typedef struct {
u_int8_t initiate_sync : 1,
parity_enable : 1,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
