From nobody@FreeBSD.ORG  Tue Sep 19 05:02:03 2000
Return-Path: <nobody@FreeBSD.ORG>
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F75137B424; Tue, 19 Sep 2000 05:02:03 -0700 (PDT)
Message-Id: <20000919120203.6F75137B424@hub.freebsd.org>
Date: Tue, 19 Sep 2000 05:02:03 -0700 (PDT)
From: alo@iki.fi
Sender: nobody@FreeBSD.ORG
To: freebsd-gnats-submit@FreeBSD.org
Subject: Floppy drive doesn't work on Compaq ProLiant DL380
X-Send-Pr-Version: www-1.0

>Number:         21397
>Category:       kern
>Synopsis:       Floppy drive doesn't work on Compaq ProLiant DL380
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    joerg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 19 05:10:00 PDT 2000
>Closed-Date:    Wed May 15 16:36:14 MEST 2002
>Last-Modified:  Wed May 15 16:36:14 MEST 2002
>Originator:     Antti Louko
>Release:        FreeBSD 4.1
>Organization:
>Environment:
FreeBSD x.yyyyyy.com 4.1-RELEASE FreeBSD 4.1-RELEASE #2: Tue Sep 19 14:03:03 EEST 2000     root@z1.d.openmobile.com:/usr/src/sys/compile/OM  i386

>Description:
Floppy hangs in Compaq DL380.
>How-To-Repeat:
dd if=/dev/rfd0 count=1 of=/dev/null
>Fix:


>Release-Note:
>Audit-Trail:

From: "Jose M. Alcaide" <jose@we.lc.ehu.es>
To: freebsd-gnats-submit@FreeBSD.org, alo@iki.fi
Cc:  
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Thu, 26 Oct 2000 18:19:49 +0200

 I found this problem also happens with the Compaq Deskpro/EP. Any access
 to /dev/fd0 hangs the whole system. Just now I don't have physical access to
 the machine so I cannot install a debug kernel. More info later...
 
 -- JMA
 ****** Jose M. Alcaide  //  jose@we.lc.ehu.es  //  jmas@FreeBSD.org ******
 ** "Beware of Programmers who carry screwdrivers" --  Leonard Brandwein **
 

From: "Jose M. Alcaide" <jose@we.lc.ehu.es>
To: Joerg Wunsch <joerg_wunsch@interface-systems.de>
Cc: freebsd-gnats-submit@FreeBSD.org, Antti Louko <alo@iki.fi>
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Fri, 10 Aug 2001 18:28:16 +0200

 Joerg Wunsch wrote:
 > 
 > You were trying to investigate further in late 2000.  Is this still an
 > issue?
 > 
 
 I did'nt have the opportunity... Once 4.4-RELEASE is out, I'll install
 it on a DeskPro EP and I'll see whether the problem continues alive
 or not.
 
 -- JMA
 ****** Jose M. Alcaide  //  jose@we.lc.ehu.es  //  jmas@FreeBSD.org ******
 ** "Beware of Programmers who carry screwdrivers" --  Leonard Brandwein **

From: alo@iki.fi (Antti Louko)
To: jose@we.lc.ehu.es
Cc: joerg_wunsch@interface-systems.de,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Fri, 10 Aug 2001 20:28:46 +0300 (EEST)

    I did'nt have the opportunity... Once 4.4-RELEASE is out, I'll install
    it on a DeskPro EP and I'll see whether the problem continues alive
    or not.
 
 I don't have any Compaq machines available for testing anymore.  I
 still remember that something made me suspect that the problem is
 somewhere in the ISA bus code (initialization, PCI-ISA bridge).
 Apparently Compaq has some weird hardware in their machines.

From: "Tolga \"thorr\" Orhon" <thorr@asenacorp.com>
To: <freebsd-gnats-submit@FreeBSD.org>, <alo@iki.fi>
Cc:  
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Thu, 6 Sep 2001 11:09:36 -0500

 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCAJIAEggVwQ29u
 dGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7DQoJYm91bmRhcnk9Ii0tLS09X05leHRQ
 YXJ0XzAwMF8wMDA1XzAxQzEzNkM0LjY5REFBMDMwIg0KDQpUaGlzIGlzIGEgbXVsdGktcGFydCBt
 ZXNzYWdlIGluIE1JTUUgZm9ybWF0Lg0KDQotLS0tLS09X05leHRQYXJ0XzAwMF8wMDA1XzAxQzEz
 NkM0LjY5REFBMDMwDQpDb250ZW50LVR5cGU6IHRleHQvcGxhaW47DQoJY2hhcnNldD0iaXNvLTg4
 NTktMSINCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDdiaXQNCg0KSSBoYWQgdGhlIHNhbWUg
 cHJvYmxlbSBvbiBvdXIgUHJvbGlhbnQgNTUwMCBzZXJ2ZXJzLiBJZiBJIGhhdmUgYW55dGhpbmcN
 CnRvIGhlbHAgeW91LCBsZXQgbWUga25vdy4gKHdlbGwgbm90IGluIGNvZGUgYnV0IEkgbWF5IHNl
 bmQgZXJyb3JzIG9yDQpsb2dzIG9yIHRyeSBwYXRjaGVzIGV0Yy4uLikNCg0KeW91cnMsDQoNClRv
 bGdhICJ0aG9yciIgT3Job24NCkFzZW5hIENvcnBvcmF0aW9uDQoNCg0KLS0tLS0tPV9OZXh0UGFy
 dF8wMDBfMDAwNV8wMUMxMzZDNC42OURBQTAzMA0KQ29udGVudC1UeXBlOiB0ZXh0L2h0bWw7DQoJ
 Y2hhcnNldD0iaXNvLTg4NTktMSINCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IHF1b3RlZC1w
 cmludGFibGUNCg0KPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDMuMi8v
 RU4iPg0KPEhUTUw+DQo8SEVBRD4NCjxNRVRBIEhUVFAtRVFVSVY9M0QiQ29udGVudC1UeXBlIiBD
 T05URU5UPTNEInRleHQvaHRtbDsgPQ0KY2hhcnNldD0zRGlzby04ODU5LTEiPg0KPE1FVEEgTkFN
 RT0zRCJHZW5lcmF0b3IiIENPTlRFTlQ9M0QiTVMgRXhjaGFuZ2UgU2VydmVyIHZlcnNpb24gPQ0K
 NS41LjI3ODguMCI+DQo8VElUTEU+PC9USVRMRT4NCjwvSEVBRD4NCjxCT0RZPg0KDQo8UD48Rk9O
 VCBTSVpFPTNEMiBGQUNFPTNEIkFyaWFsIj5JIGhhZCB0aGUgc2FtZSBwcm9ibGVtIG9uIG91ciBQ
 cm9saWFudCA9DQo1NTAwIHNlcnZlcnMuIElmIEkgaGF2ZSBhbnl0aGluZyB0byBoZWxwIHlvdSwg
 bGV0IG1lIGtub3cuICh3ZWxsIG5vdCBpbiA9DQpjb2RlIGJ1dCBJIG1heSBzZW5kIGVycm9ycyBv
 ciBsb2dzIG9yIHRyeSBwYXRjaGVzIGV0Yy4uLik8L0ZPTlQ+PC9QPg0KDQo8UD48Rk9OVCBTSVpF
 PTNEMiBGQUNFPTNEIkFyaWFsIj55b3Vycyw8L0ZPTlQ+DQo8L1A+DQoNCjxQPjxGT05UIFNJWkU9
 M0QyIEZBQ0U9M0QiQXJpYWwiPlRvbGdhICZxdW90O3Rob3JyJnF1b3Q7IE9yaG9uPC9GT05UPg0K
 DQo8QlI+PEZPTlQgU0laRT0zRDIgRkFDRT0zRCJBcmlhbCI+QXNlbmEgQ29ycG9yYXRpb248L0ZP
 TlQ+DQo8L1A+DQoNCjwvQk9EWT4NCjwvSFRNTD4NCi0tLS0tLT1fTmV4dFBhcnRfMDAwXzAwMDVf
 MDFDMTM2QzQuNjlEQUEwMzAtLQ0KAAAAAAAAoIIFsTCCAoAwggHpoAMCAQICAwUNSjANBgkqhkiG
 9w0BAQQFADCBkjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
 Q2FwZSBUb3duMQ8wDQYDVQQKEwZUaGF3dGUxHTAbBgNVBAsTFENlcnRpZmljYXRlIFNlcnZpY2Vz
 MSgwJgYDVQQDEx9QZXJzb25hbCBGcmVlbWFpbCBSU0EgMjAwMC44LjMwMB4XDTAxMDYxODE3NDgz
 OFoXDTAyMDYxODE3NDgzOFowRTEfMB0GA1UEAxMWVGhhd3RlIEZyZWVtYWlsIE1lbWJlcjEiMCAG
 CSqGSIb3DQEJARYTdGhvcnJAYXNlbmFjb3JwLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
 gYEAzNGfIi9BQ7nuXlTEuA43qnF9o3hnGyk80VzWBMaKwSemWPM4Rc4TTFzodRaamwiSbTY4l+o3
 tOEXTtuKloet2YVogAFZxL+IuDVRxt+LziJuhIriV6t8CX4svQJ0L5uTBt76hJYtYgL41Q12zihw
 HhtGMs4U50Mc3QmwDur6q1UCAwEAAaMwMC4wHgYDVR0RBBcwFYETdGhvcnJAYXNlbmFjb3JwLmNv
 bTAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBAUAA4GBACTYaCKJ4bMDPZue9DK3WEiqipTxGrQ0
 wwPeCByeGovWAIzKq6M8lZRyybiu8KawBn83MHsv3Szi2UIPSQFeAxkLkXi48FNwGAkqIb4WmH6x
 SRqgF2RlRNmEWeEdPOm2O6uhpKbXv7DOuTZCzBLYSg4RkD/QSMlGiYJbJExoYVYhMIIDKTCCApKg
 AwIBAgIBDDANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4g
 Q2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEoMCYG
 A1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3RlIFBl
 cnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0aGF3
 dGUuY29tMB4XDTAwMDgzMDAwMDAwMFoXDTAyMDgyOTIzNTk1OVowgZIxCzAJBgNVBAYTAlpBMRUw
 EwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEPMA0GA1UEChMGVGhhd3Rl
 MR0wGwYDVQQLExRDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEoMCYGA1UEAxMfUGVyc29uYWwgRnJlZW1h
 aWwgUlNBIDIwMDAuOC4zMDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3jMypmPHCSVFPtJu
 eCdngcXaiBmClw7jRCmKYzUqbXA8+tyu9+50bzC8M5B/+TRxoKNtmPHDT6Jl2w36S/HW3WGl+YXN
 VZo1Gp2Sdagnrthy+boC9tewkd4c6avgGAOofENCUFGHgzzwObSbVIoTh/+zm51JZgAtCYnslGvp
 oWkCAwEAAaNOMEwwKQYDVR0RBCIwIKQeMBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDEtMjk3MBIG
 A1UdEwEB/wQIMAYBAf8CAQAwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBAUAA4GBAHMbbyZli/8V
 NEtZYortRL5Jx+gNu4+5DWomKmKEH7iHY3QcbbfPGlORS+HN5jjZ7VD0Omw0kqzmkpxuwSMBwgmn
 70uuct0GZ/VQby5YuLYLwVBXtewc1+8XttWIm7eiiBrtOVs5fTT8tpYYJU1q9J3Fw5EvqZa4BTxS
 /N3pYgNIMYICqjCCAqYCAQEwgZowgZIxCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
 cGUxEjAQBgNVBAcTCUNhcGUgVG93bjEPMA0GA1UEChMGVGhhd3RlMR0wGwYDVQQLExRDZXJ0aWZp
 Y2F0ZSBTZXJ2aWNlczEoMCYGA1UEAxMfUGVyc29uYWwgRnJlZW1haWwgUlNBIDIwMDAuOC4zMAID
 BQ1KMAkGBSsOAwIaBQCgggFlMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkF
 MQ8XDTAxMDkwNjE2MDkzNlowIwYJKoZIhvcNAQkEMRYEFH4rJlyLR8uPTF7uOvZtP/NnJWMBMFgG
 CSqGSIb3DQEJDzFLMEkwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMAcGBSsOAwIHMA0GCCqG
 SIb3DQMCAgEoMAcGBSsOAwIaMAoGCCqGSIb3DQIFMIGrBgkrBgEEAYI3EAQxgZ0wgZowgZIxCzAJ
 BgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEPMA0G
 A1UEChMGVGhhd3RlMR0wGwYDVQQLExRDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEoMCYGA1UEAxMfUGVy
 c29uYWwgRnJlZW1haWwgUlNBIDIwMDAuOC4zMAIDBQ1KMA0GCSqGSIb3DQEBAQUABIGAq04I7EIG
 pucjVosKZ7tMsMOFUlp1S3hfoBBmkFSuEv9HLDgpYj57XutX/kgMy1I+ylAx2U3/G7g4aOirHI2G
 g+mjUeS7XEzgpjWjV1fXVNzgc1C95G6+6ji1X+J2alGZZgc9fRDK8sw79w2PLqkG4OthHDHSnnH2
 YtuaWCPAl68AAAAAAAA=
 

From: Joerg Wunsch <j@ida.interface-business.de>
To: "Jose M. Alcaide" <jose@we.lc.ehu.es>
Cc: freebsd-gnats-submit@FreeBSD.org, Antti Louko <alo@iki.fi>
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Wed, 9 Jan 2002 12:18:02 +0100

 As Jose M. Alcaide wrote:
 
 > Joerg Wunsch wrote:
 > > 
 > > You were trying to investigate further in late 2000.  Is this still an
 > > issue?
 > > 
 > 
 > I did'nt have the opportunity... Once 4.4-RELEASE is out, I'll install
 > it on a DeskPro EP and I'll see whether the problem continues alive
 > or not.
 
 Any news on that?
 
 -- 
 J"org Wunsch					       Unix support engineer
 joerg_wunsch@interface-systems.de        http://www.interface-systems.de/~j/
State-Changed-From-To: open->feedback 
State-Changed-By: sheldonh 
State-Changed-When: Wed Jan 9 04:33:16 PST 2002 
State-Changed-Why:  
Joerg is waiting for feedback. 


Responsible-Changed-From-To: freebsd-bugs->joerg 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Wed Jan 9 04:33:16 PST 2002 
Responsible-Changed-Why:  
Mr Floppy. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=21397 

From: Jung-uk Kim <jkim@niksun.com>
To: freebsd-gnats-submit@FreeBSD.org, alo@iki.fi
Cc:  
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Mon, 15 Apr 2002 13:38:17 -0400

 Compaq ProLiant DL380 G2 (generation 2) seems to have the same problem 
 with 4.2-RELEASE, 4.5-RELEASE, and 4.5-STABLE.
 

From: Jung-uk Kim <jkim@niksun.com>
To: freebsd-gnats-submit@FreeBSD.org, alo@iki.fi, joerg@FreeBSD.org
Cc:  
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Tue, 16 Apr 2002 20:54:03 -0400

 This is a multi-part message in MIME format.
 --------------070409080102070607040704
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Please try this patch, which I made. This patch is against 4.5-STABLE 
 and it works with my Compaq ProLiant DL380 G2. Note that  FDSTS_TIMEOUT 
 is an arbitrary number out of my hat. ;-)
 
 --------------070409080102070607040704
 Content-Type: text/plain;
  name="fd.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="fd.diff"
 
 --- sys/isa/fd.c.old	Fri Apr  5 07:37:04 2002
 +++ sys/isa/fd.c	Tue Apr 16 19:59:03 2002
 @@ -424,13 +424,15 @@
  			return fdc_err(fdc, "Enable FIFO failed\n");
  		
  		/* If command is invalid, return */
 -		j = 100000;
 +		j = FDSTS_TIMEOUT;
  		while ((i = fdsts_rd(fdc) & (NE7_DIO | NE7_RQM))
 -		       != NE7_RQM && j-- > 0)
 +		       != NE7_RQM && j-- > 0) {
  			if (i == (NE7_DIO | NE7_RQM)) {
  				fdc_reset(fdc);
  				return FD_FAILED;
  			}
 +			DELAY(1);
 +		}
  		if (j<0 || 
  		    fd_cmd(fdc, 3,
  			   0, (fifo_threshold - 1) & 0xf, 0, 0) < 0) {
 @@ -1296,11 +1298,13 @@
  int
  in_fdc(struct fdc_data *fdc)
  {
 -	int i, j = 100000;
 +	int i, j = FDSTS_TIMEOUT;
  	while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM))
 -		!= (NE7_DIO|NE7_RQM) && j-- > 0)
 +		!= (NE7_DIO|NE7_RQM) && j-- > 0) {
  		if (i == NE7_RQM)
  			return fdc_err(fdc, "ready for output in input\n");
 +		DELAY(1);
 +	}
  	if (j <= 0)
  		return fdc_err(fdc, bootverbose? "input ready timeout\n": 0);
  #ifdef	FDC_DEBUG
 @@ -1318,11 +1322,13 @@
  static int
  fd_in(struct fdc_data *fdc, int *ptr)
  {
 -	int i, j = 100000;
 +	int i, j = FDSTS_TIMEOUT;
  	while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM))
 -		!= (NE7_DIO|NE7_RQM) && j-- > 0)
 +		!= (NE7_DIO|NE7_RQM) && j-- > 0) {
  		if (i == NE7_RQM)
  			return fdc_err(fdc, "ready for output in input\n");
 +		DELAY(1);
 +	}
  	if (j <= 0)
  		return fdc_err(fdc, bootverbose? "input ready timeout\n": 0);
  #ifdef	FDC_DEBUG
 @@ -1344,13 +1350,15 @@
  	int i;
  
  	/* Check that the direction bit is set */
 -	i = 100000;
 -	while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0);
 +	i = FDSTS_TIMEOUT;
 +	while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0)
 +		DELAY(1);
  	if (i <= 0) return fdc_err(fdc, "direction bit not set\n");
  
  	/* Check that the floppy controller is ready for a command */
 -	i = 100000;
 -	while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0);
 +	i = FDSTS_TIMEOUT;
 +	while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0)
 +		DELAY(1);
  	if (i <= 0)
  		return fdc_err(fdc, bootverbose? "output ready timeout\n": 0);
  
 --- sys/isa/fdreg.h.old	Thu Jan  6 02:13:54 2000
 +++ sys/isa/fdreg.h	Tue Apr 16 19:54:28 2002
 @@ -72,3 +72,4 @@
  #define	FDI_DCHG	0x80	/* diskette has been changed */
  				/* requires drive and motor being selected */
  				/* is cleared by any step pulse to drive */
 +#define FDSTS_TIMEOUT	200	/* fdsts_rd() timeout */
 
 --------------070409080102070607040704--
 

From: Jung-uk Kim <jkim@niksun.com>
To: freebsd-gnats-submit@FreeBSD.org, alo@iki.fi, joerg@FreeBSD.org
Cc:  
Subject: Re: kern/21397: Floppy drive doesn't work on Compaq ProLiant DL380
Date: Thu, 18 Apr 2002 18:08:26 -0400

 This is a multi-part message in MIME format.
 --------------080308010201080706010605
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Here is the patch against 5.0-CURRENT. Please note that it wasn't
 tested. ;-)
 
 JK
 
 --------------080308010201080706010605
 Content-Type: text/plain;
  name="fd.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="fd.diff"
 
 --- sys/isa/fd.c.old	Tue Apr  2 13:29:43 2002
 +++ sys/isa/fd.c	Thu Apr 18 17:42:03 2002
 @@ -563,13 +563,15 @@
  			return fdc_err(fdc, "Enable FIFO failed\n");
  		
  		/* If command is invalid, return */
 -		j = 100000;
 +		j = FDSTS_TIMEOUT;
  		while ((i = fdsts_rd(fdc) & (NE7_DIO | NE7_RQM))
 -		       != NE7_RQM && j-- > 0)
 +		       != NE7_RQM && j-- > 0) {
  			if (i == (NE7_DIO | NE7_RQM)) {
  				fdc_reset(fdc);
  				return FD_FAILED;
  			}
 +			DELAY(1);
 +		}
  		if (j<0 || 
  		    fd_cmd(fdc, 3,
  			   0, (fifo_threshold - 1) & 0xf, 0, 0) < 0) {
 @@ -1473,11 +1475,13 @@
  static int
  fd_in(struct fdc_data *fdc, int *ptr)
  {
 -	int i, j = 100000;
 +	int i, j = FDSTS_TIMEOUT;
  	while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM))
 -		!= (NE7_DIO|NE7_RQM) && j-- > 0)
 +		!= (NE7_DIO|NE7_RQM) && j-- > 0) {
  		if (i == NE7_RQM)
  			return fdc_err(fdc, "ready for output in input\n");
 +		DELAY(1);
 +	}
  	if (j <= 0)
  		return fdc_err(fdc, bootverbose? "input ready timeout\n": 0);
  #ifdef	FDC_DEBUG
 @@ -1499,13 +1503,15 @@
  	int i;
  
  	/* Check that the direction bit is set */
 -	i = 100000;
 -	while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0);
 +	i = FDSTS_TIMEOUT;
 +	while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0)
 +		DELAY(1);
  	if (i <= 0) return fdc_err(fdc, "direction bit not set\n");
  
  	/* Check that the floppy controller is ready for a command */
 -	i = 100000;
 -	while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0);
 +	i = FDSTS_TIMEOUT;
 +	while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0)
 +		DELAY(1);
  	if (i <= 0)
  		return fdc_err(fdc, bootverbose? "output ready timeout\n": 0);
  
 --- sys/isa/fdreg.h.old	Sat Dec 15 14:07:58 2001
 +++ sys/isa/fdreg.h	Thu Apr 18 17:42:42 2002
 @@ -69,3 +69,4 @@
  #define	FDI_DCHG	0x80	/* diskette has been changed */
  				/* requires drive and motor being selected */
  				/* is cleared by any step pulse to drive */
 +#define	FDSTS_TIMEOUT	200	/* fdsts_rd() timeout */
 
 --------------080308010201080706010605--
 
State-Changed-From-To: feedback->closed 
State-Changed-By: joerg 
State-Changed-When: Wed May 15 16:35:26 MEST 2002 
State-Changed-Why:  
Fixed in rev 1.233, and 1.176.2.7 (RELENG_4) of sys/isa/fd.c. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=21397 
>Unformatted:
