d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Changed retry count from 1000000 to 10000 (same as IBM-PC's).

Browse Source 
- Deleted unnecessary DELAY().
- Deleted space character at the end of line.
This commit is contained in:
KATO Takenori 1997-01-18 15:51:43 +00:00
parent c6a86c7775
commit c59a3dbd01
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/pc98/cbus/fdc.c
View File

@ -1145,7 +1145,7 @@ int
in_fdc(fdcu_t fdcu)
{
int baseport = fdc_data[fdcu].baseport;
int i, j = 1000000;
int i, j = 100000;
while ((i = inb(baseport+FDSTS) & (NE7_DIO|NE7_RQM))
!= (NE7_DIO|NE7_RQM) && j-- > 0)
if (i == NE7_RQM)
@ -1168,13 +1168,11 @@ static int
fd_in(fdcu_t fdcu, int *ptr)
{
int baseport = fdc_data[fdcu].baseport;
int i, j = 1000000;
int i, j = 100000;
while ((i = inb(baseport+FDSTS) & (NE7_DIO|NE7_RQM))
!= (NE7_DIO|NE7_RQM) && j-- > 0) {
DELAY(10);
!= (NE7_DIO|NE7_RQM) && j-- > 0)
if (i == NE7_RQM)
return fdc_err(fdcu, "ready for output in input\n");
}
if (j <= 0)
return fdc_err(fdcu, bootverbose? "input ready timeout\n": 0);
#ifdef DEBUG
@ -1197,21 +1195,18 @@ out_fdc(fdcu_t fdcu, int x)
int i;
/* Check that the direction bit is set */
i = 1000000;
while ((inb(baseport+FDSTS) & NE7_DIO) && i-- > 0)
DELAY(10);
i = 100000;
while ((inb(baseport+FDSTS) & NE7_DIO) && i-- > 0);
if (i <= 0) return fdc_err(fdcu, "direction bit not set\n");
/* Check that the floppy controller is ready for a command */
i = 1000000;
while ((inb(baseport+FDSTS) & NE7_RQM) == 0 && i-- > 0)
DELAY(10);
i = 100000;
while ((inb(baseport+FDSTS) & NE7_RQM) == 0 && i-- > 0);
if (i <= 0)
return fdc_err(fdcu, bootverbose? "output ready timeout\n": 0);
/* Send the command and return */
outb(baseport+FDDATA, x);
DELAY(10);
TRACE1("[0x%x->FDDATA]", x);
return (0);
}
@ -1853,7 +1848,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
sec = sec % sectrac + 1;
fd->hddrv = ((head&1)<<2)+fdu;
if (nrdsec++ >= nrd_sec())
if (nrdsec++ >= nrd_sec())
nrdaddr = (nrd_t)(fd->track * 8 + head * 4);
nrdsec = sec;
fdc->state = IOCOMPLETE;

21
sys/pc98/pc98/fd.c
View File

@ -1145,7 +1145,7 @@ int
in_fdc(fdcu_t fdcu)
{
int baseport = fdc_data[fdcu].baseport;
int i, j = 1000000;
int i, j = 100000;
while ((i = inb(baseport+FDSTS) & (NE7_DIO|NE7_RQM))
!= (NE7_DIO|NE7_RQM) && j-- > 0)
if (i == NE7_RQM)
@ -1168,13 +1168,11 @@ static int
fd_in(fdcu_t fdcu, int *ptr)
{
int baseport = fdc_data[fdcu].baseport;
int i, j = 1000000;
int i, j = 100000;
while ((i = inb(baseport+FDSTS) & (NE7_DIO|NE7_RQM))
!= (NE7_DIO|NE7_RQM) && j-- > 0) {
DELAY(10);
!= (NE7_DIO|NE7_RQM) && j-- > 0)
if (i == NE7_RQM)
return fdc_err(fdcu, "ready for output in input\n");
}
if (j <= 0)
return fdc_err(fdcu, bootverbose? "input ready timeout\n": 0);
#ifdef DEBUG
@ -1197,21 +1195,18 @@ out_fdc(fdcu_t fdcu, int x)
int i;
/* Check that the direction bit is set */
i = 1000000;
while ((inb(baseport+FDSTS) & NE7_DIO) && i-- > 0)
DELAY(10);
i = 100000;
while ((inb(baseport+FDSTS) & NE7_DIO) && i-- > 0);
if (i <= 0) return fdc_err(fdcu, "direction bit not set\n");
/* Check that the floppy controller is ready for a command */
i = 1000000;
while ((inb(baseport+FDSTS) & NE7_RQM) == 0 && i-- > 0)
DELAY(10);
i = 100000;
while ((inb(baseport+FDSTS) & NE7_RQM) == 0 && i-- > 0);
if (i <= 0)
return fdc_err(fdcu, bootverbose? "output ready timeout\n": 0);
/* Send the command and return */
outb(baseport+FDDATA, x);
DELAY(10);
TRACE1("[0x%x->FDDATA]", x);
return (0);
}
@ -1853,7 +1848,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
sec = sec % sectrac + 1;
fd->hddrv = ((head&1)<<2)+fdu;
if (nrdsec++ >= nrd_sec())
if (nrdsec++ >= nrd_sec())
nrdaddr = (nrd_t)(fd->track * 8 + head * 4);
nrdsec = sec;
fdc->state = IOCOMPLETE;