svn commit: r313830 - in head: share/man/man4/man4.i386 sys/conf sys/dev/ep sys/dev/vx sys/modules/vx

[Warner Losh]

Author: imp
Date: Thu Feb 16 21:56:46 2017
New Revision: 313830
URL: https://svnweb.freebsd.org/changeset/base/313830

Log:
  Remove references to EISA support from the vx driver, along with EISA
  support. Fix a comment block that's shared with both vx and ep. Remove
  obsolete refernce to statically compiling a kernel with a fixed number
  of vx devices. Have not removed EISA from the title of the document
  the register definitions were originally derived from (though no doubt
  more recent docments were also consulted).

Deleted:
  head/sys/dev/vx/if_vx_eisa.c
Modified:
  head/share/man/man4/man4.i386/vx.4
  head/sys/conf/files
  head/sys/dev/ep/if_epreg.h
  head/sys/dev/vx/if_vxreg.h
  head/sys/modules/vx/Makefile

Modified: head/share/man/man4/man4.i386/vx.4
==============================================================================
--- head/share/man/man4/man4.i386/vx.4	Thu Feb 16 21:56:41 2017	(r313829)
+++ head/share/man/man4/man4.i386/vx.4	Thu Feb 16 21:56:46 2017	(r313830)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 16, 2005
+.Dd February 15, 2017
 .Dt VX 4 i386
 .Os
 .Sh NAME
@@ -79,21 +79,9 @@ driver supports the following cards:
 .It
 3Com 3c590 EtherLink III PCI
 .It
-3Com 3c592 EtherLink III EISA
-.It
 3Com 3c595 Fast EtherLink III PCI in 10 Mbps mode
-.It
-3Com 3c597 Fast EtherLink III EISA in 10 Mbps mode
 .El
 .Sh DIAGNOSTICS
-.Bl -diag
-.It "vx%d: not configured; kernel is built for only %d devices."
-There are not enough devices in the kernel configuration file for the number
-of adapters present in the system.
-Add devices to the configuration file,
-rebuild the kernel, and reboot.
-.El
-.Pp
 All other diagnostics indicate either a hardware problem or a bug in the
 driver.
 .Sh SEE ALSO

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Feb 16 21:56:41 2017	(r313829)
+++ head/sys/conf/files	Thu Feb 16 21:56:46 2017	(r313830)
@@ -3243,7 +3243,6 @@ dev/vt/vt_font.c		optional vt
 dev/vt/vt_sysmouse.c		optional vt
 dev/vte/if_vte.c		optional vte pci
 dev/vx/if_vx.c			optional vx
-dev/vx/if_vx_eisa.c		optional vx eisa
 dev/vx/if_vx_pci.c		optional vx pci
 dev/vxge/vxge.c				optional vxge
 dev/vxge/vxgehal/vxgehal-ifmsg.c	optional vxge

Modified: head/sys/dev/ep/if_epreg.h
==============================================================================
--- head/sys/dev/ep/if_epreg.h	Thu Feb 16 21:56:41 2017	(r313829)
+++ head/sys/dev/ep/if_epreg.h	Thu Feb 16 21:56:46 2017	(r313830)
@@ -113,7 +113,7 @@
 /**************************************************************************
  *									  *
  * These are the registers for the 3Com 3c509 and their bit patterns when *
- * applicable.  They have been taken out the "EtherLink III Parallel  *
+ * applicable.  They have been taken out the "EtherLink III Parallel      *
  * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual *
  * from 3com.								  *
  *									  *

Modified: head/sys/dev/vx/if_vxreg.h
==============================================================================
--- head/sys/dev/vx/if_vxreg.h	Thu Feb 16 21:56:41 2017	(r313829)
+++ head/sys/dev/vx/if_vxreg.h	Thu Feb 16 21:56:46 2017	(r313830)
@@ -77,8 +77,6 @@
 #define EEPROM_MFG_PRODUCT      0x6	/* Product code */
 #define EEPROM_MFG_ID		0x7	/* 0x6d50 */
 #define EEPROM_ADDR_CFG		0x8	/* Base addr */
-#define ADDR_CFG_EISA		0x1f
-#define ADDR_CFG_MASK		0x1f
 #define EEPROM_RESOURCE_CFG	0x9	/* IRQ. Bits 12-15 */
 #define EEPROM_OEM_ADDR0        0xa
 #define EEPROM_OEM_ADDR1        0xb
@@ -87,8 +85,6 @@
 #define EEPROM_COMPAT           0xe
 #define EEPROM_SOFTINFO2        0xf
 #define EEPROM_CAP              0x10
-#define CAP_ISA		0x2083
-#define CAP_PCMCIA		0x2082
 #define EEPROM_INT_CONFIG_0	0x12
 #define EEPROM_INT_CONFIG_1	0x13
 /* RAM Partition TX FIFO/RX FIFO */
@@ -112,7 +108,7 @@
 
 /**************************************************************************
  * These are the registers for the 3Com 3c509 and their bit patterns when *
- * applicable.  They have been taken out the "EtherLink III Parallel  *
+ * applicable.  They have been taken out the "EtherLink III Parallel      *
  * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual *
  * from 3com.								  *
  **************************************************************************/

Modified: head/sys/modules/vx/Makefile
==============================================================================
--- head/sys/modules/vx/Makefile	Thu Feb 16 21:56:41 2017	(r313829)
+++ head/sys/modules/vx/Makefile	Thu Feb 16 21:56:46 2017	(r313830)
@@ -7,7 +7,6 @@ SYSDIR?=${.CURDIR}/../..
 
 KMOD=	if_vx
 SRCS=	if_vx.c if_vx_pci.c
-SRCS.DEV_EISA=	if_vx_eisa.c eisa_if.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>