Add a ``digi'' driver.

This driver supports PCI Xr-based and ISA Xem Digiboard cards.
dgm will go away soon if there are no problems reported.  For now,
configuring dgm into your kernel warns that you should be using
digi.  This driver is probably close to supporting Xi, Xe and Xeve
cards, but I wouldn't expect them to work properly (hardware
donations welcome).

The digi_* pseudo-drivers are not drivers themselves but contain
the BIOS and FEP/OS binaries for various digiboard cards and are
auto-loaded and auto-unloaded by the digi driver at initialisation
time.  They *may* be configured into the kernel, but waste a lot
of space if they are.  They're intended to be left as modules.

The digictl program is (mainly) used to re-initialise cards that
have external port modules attached such as the PC/Xem.

3 files changed, 29 insertions, 4 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c0f6c5e..2c7115a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1934,7 +1934,8 @@ hint.pca.0.port="0x040"
 # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board
 # cy: Cyclades serial driver
 # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
-# dgm: Digiboard PC/Xem driver
+# dgm: Digiboard PC/Xem driver (obsolete)
+# digi: Digiboard driver
 # gp:  National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB
 # asc: GI1904-based hand scanners, e.g. the Trust Amiscan Grey
 # gsc: Genius GS-4500 hand scanner.
@@ -2086,10 +2087,22 @@ options 	NDGBPORTS=16		# Defaults to 16*NDGB
 hint.dgb.0.at="isa"
 hint.dgb.0.port="0x220"
 hint.dgb.0.maddr="0xfc000"
-device		dgm	1
+device		dgm
 hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
 hint.dgm.0.maddr="0xd0000"
+device		digi
+hint.dgm.0.at="isa"
+hint.dgm.0.port="0x104"
+hint.dgm.0.maddr="0xd0000"
+# BIOS & FEP/OS components of device digi.  Normally left as modules
+device		digi_CX
+device		digi_CX_PCI
+device		digi_EPCX
+device		digi_EPCX_PCI
+device		digi_Xe
+device		digi_Xem
+device		digi_Xr
 device		rc	1
 hint.rc.0.at="isa"
 hint.rc.0.port="0x220"
diff --git a/sys/conf/files b/sys/conf/files
index 794d6e6..0ed4acc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -283,8 +283,19 @@ dev/cs/if_cs.c		optional cs
 dev/cs/if_cs_isa.c	optional cs isa
 dev/cs/if_cs_pccard.c	optional cs card
 dev/cs/if_cs_pccard.c	optional cs pccard
-dev/dgb/dgb.c		count		dgb
-dev/dgb/dgm.c		count		dgm
+dev/dgb/dgb.c		count dgb
+dev/dgb/dgm.c		optional dgm \
+			warning "Please use digi instead of dgm"
+dev/digi/digi.c		optional digi
+dev/digi/digi_isa.c	optional digi
+dev/digi/digi_pci.c	optional digi
+dev/digi/CX.c		optional digi_CX
+dev/digi/CX_PCI.c	optional digi_CX_PCI
+dev/digi/EPCX.c		optional digi_EPCX
+dev/digi/EPCX_PCI.c	optional digi_EPCX_PCI
+dev/digi/Xe.c		optional digi_Xe
+dev/digi/Xem.c		optional digi_Xem
+dev/digi/Xr.c		optional digi_Xr
 #dev/dpt/dpt_control.c	optional dpt
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
diff --git a/sys/conf/majors b/sys/conf/majors
index b1e0a7a..ce2782d 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -178,6 +178,7 @@ chrdev	name		comments
 159	ata		ATA control device
 160	spic		Sony Programmable I/O Controller (jogdial)
 161	swdoc		Sitara networks watchdog device
+162	digi		Digiboard
 200	??		entries from 200-252 are reserved for local use
 252	??		entries from 200-252 are reserved for local use
 253	mfs		Used by MFS