From owner-cvs-sys Sun Aug 11 17:53:17 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA22019 for cvs-sys-outgoing; Sun, 11 Aug 1996 17:53:17 -0700 (PDT) Received: (from wpaul@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id RAA22001; Sun, 11 Aug 1996 17:53:05 -0700 (PDT) Date: Sun, 11 Aug 1996 17:53:05 -0700 (PDT) From: Bill Paul Message-Id: <199608120053.RAA22001@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/i386/isa wd.c Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk wpaul 96/08/11 17:53:04 Modified: sys/i386/isa wd.c Log: Apply my small patch to make detection of ATAPI CD-ROMs happen a little more reliably. So far I've received a couple of positive responses and no objections to these changes. There are two one-line changes: - In wdprobe(), when testing the error status of drives, don't unconditionally decide that there is no controller present if we read back a value of 0x81 (drive 0 okay, drive 1 failed) twice in a row. This may be caused by having an ATAPI CD-ROM jumpered as a master on the controller with no slave. - In wdgetctlr(), when checking for a status of WDCS_READY, check the value twice. The first time may be bogus. This stops a phantom wd2 device from being detected when an ATAPI CD-ROM is attached to the secondary controller alone as a slave. (This can cause installation to fail when sysinstall attempts to open the phantom device and wedges the system as a result. This has bitten me a couple of times on some Gateway 2000 machines.) Revision Changes Path 1.114 +11 -3 src/sys/i386/isa/wd.c