diff options
author | msmith <msmith@FreeBSD.org> | 1996-11-11 09:09:37 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 1996-11-11 09:09:37 +0000 |
commit | f37672c1a74df60c665173c00e8002a365140172 (patch) | |
tree | a0fca80b619773873908e31e50606380af55c9be | |
parent | 54ae6f79418fd5ef063d25de3d52872307de2551 (diff) | |
download | FreeBSD-src-f37672c1a74df60c665173c00e8002a365140172.zip FreeBSD-src-f37672c1a74df60c665173c00e8002a365140172.tar.gz |
Update the database of known devices (people, please consider this when you
are adding new drivers...) to match, as best I can tell, majors.i386.
Improve behaviour when attempting to save changes for devices that should
not be changeable. Now correclty avoids non-device items, PCI devices and
devices with no isa_device structure.
Submitted by: (observations from) joerg, bde
-rw-r--r-- | sys/i386/i386/userconfig.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index f5441c8..2e602ef 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.64 1996/11/05 05:52:36 msmith Exp $ + ** $Id: userconfig.c,v 1.65 1996/11/07 01:13:37 msmith Exp $ **/ /** @@ -259,6 +259,11 @@ static DEV_INFO device_info[] = { {"cx", "Cronyx/Sigma multiport sync/async adapter",0, CLS_COMMS}, {"rc", "RISCom/8 multiport async adapter", 0, CLS_COMMS}, {"cy", "Cyclades multiport async adapter", 0, CLS_COMMS}, +{"cyy", "Cyclades Ye/PCI multiport async adapter",FLG_INVISBLE, CLS_COMMS}, +{"dgb", "Digiboard PC/Xe, PC/Xi async adapter", 0, CLS_COMMS}, +{"si", "Specialix SI/XIO async adapter", 0, CLS_COMMS}, +{"stl", "Stallion EasyIO/Easy Connection 8/32 async adapter",0, CLS_COMMS}, +{"stli", "Stallion intelligent async adapter" ,0, CLS_COMMS}, {"lpt", "Parallel printer port", 0, CLS_COMMS}, {"gp", "National Instruments AT-GPIB/TNT driver", 0, CLS_COMMS}, @@ -282,7 +287,9 @@ static DEV_INFO device_info[] = { {"pca", "PC speaker PCM audio driver", FLG_FIXED, CLS_MMEDIA}, {"ctx", "Coretex-I frame grabber", 0, CLS_MMEDIA}, {"spigot", "Creative Labs Video Spigot video capture", 0, CLS_MMEDIA}, +{"scc", "IBM Smart Capture Card", 0, CLS_MMEDIA}, {"gsc", "Genius GS-4500 hand scanner", 0, CLS_MMEDIA}, +{"asc", "AmiScan scanner", 0, CLS_MMEDIA}, {"qcam", "QuickCam parallel port camera", 0, CLS_MMEDIA}, {"apm", "Advanced Power Management", FLG_FIXED, CLS_MISC}, @@ -673,11 +680,10 @@ savelist(DEV_LIST *list, int active) while (list) { - if ((list->comment == DEV_DEVICE) && list->changed) - { - if ((list->iobase == -2) || /* is a PCI device; can't save */ - (list->device == NULL)) /* no isa_device associated at all?! */ - continue; + if ((list->comment == DEV_DEVICE) && /* is a device */ + (list->changed) && /* has been changed */ + (list->iobase != -2) && /* is not a PCI device */ + (list->device != NULL)) { /* has an isa_device structure */ setdev(list,active); /* set the device itself */ @@ -2217,7 +2223,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.64 1996/11/05 05:52:36 msmith Exp $ + * $Id: userconfig.c,v 1.65 1996/11/07 01:13:37 msmith Exp $ */ #include "scbus.h" |