From owner-freebsd-hackers Thu Apr 18 15: 2:17 2002 Delivered-To: freebsd-hackers@freebsd.org Received: from arjun.niksun.com (gwnew.niksun.com [63.148.27.34]) by hub.freebsd.org (Postfix) with ESMTP id 56FF837B416 for ; Thu, 18 Apr 2002 15:02:11 -0700 (PDT) Received: from niksun.com (daemon.niksun.com [10.0.10.10]) by arjun.niksun.com (8.9.3/8.9.3) with ESMTP id SAA77651; Thu, 18 Apr 2002 18:02:06 -0400 (EDT) (envelope-from jkim@niksun.com) Message-ID: <3CBF425C.7060700@niksun.com> Date: Thu, 18 Apr 2002 18:02:04 -0400 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:0.9.9) Gecko/20020312 X-Accept-Language: ko, en-us MIME-Version: 1.0 To: freebsd-hackers@freebsd.org Cc: Jung-uk Kim Subject: Re: Floppy device driver problem (with patch) References: <3CBF2008.6090009@niksun.com> Content-Type: multipart/mixed; boundary="------------040704010209060508090801" Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This is a multi-part message in MIME format. --------------040704010209060508090801 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. ;-) Thanks, JK --------------040704010209060508090801 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 */ --------------040704010209060508090801-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message