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

Reimplement the FDOPT_NOERROR feature that was kicked out in r134081.

Browse Source 
It is needed for fdread(1) in order to be able to recover from CRC
errors in the data field of a floppy sector (by returning the sector
data that failed CRC, rather than inventing dummy data).

When closing the device, clear all transient device options.

MFC after:	1 week
This commit is contained in:
Joerg Wunsch 2013-08-26 21:15:50 +00:00
parent 3843eba85d
commit acb3b5d2fe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=254937
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/fdc/fdc.c
View File

@ -761,10 +761,13 @@ fdc_worker(struct fdc_data *fdc)
int i, nsect;
int st0, st3, cyl, mfm, steptrac, cylinder, descyl, sec;
int head;
int override_error;
static int need_recal;
struct fdc_readid *idp;
struct fd_formb *finfo;
override_error = 0;
/* Have we exhausted our retries ? */
bp = fdc->bp;
fd = fdc->fd;
@ -1090,7 +1093,10 @@ fdc_worker(struct fdc_data *fdc)
fdc->status[3], fdc->status[4], fdc->status[5]);
}
retry_line = __LINE__;
return (1);
if (fd->options & FDOPT_NOERROR)
override_error = 1;
else
return (1);
}
/* All OK */
switch(bp->bio_cmd) {
@ -1111,10 +1117,16 @@ fdc_worker(struct fdc_data *fdc)
bp->bio_resid -= fd->fd_iosize;
bp->bio_completed += fd->fd_iosize;
fd->fd_ioptr += fd->fd_iosize;
/* Since we managed to get something done, reset the retry */
fdc->retry = 0;
if (bp->bio_resid > 0)
return (0);
if (override_error) {
if ((debugflags & 4))
printf("FDOPT_NOERROR: returning bad data\n");
} else {
/* Since we managed to get something done,
* reset the retry */
fdc->retry = 0;
if (bp->bio_resid > 0)
return (0);
}
break;
case BIO_FMT:
break;
@ -1406,6 +1418,7 @@ fd_access(struct g_provider *pp, int r, int w, int e)
ae = e + pp->ace;
if (ar == 0 && aw == 0 && ae == 0) {
fd->options &= ~(FDOPT_NORETRY | FDOPT_NOERRLOG | FDOPT_NOERROR);
device_unbusy(fd->dev);
return (0);
}