fdc.c (62da7a2d68510c673507574e5667c690172c407f) | fdc.c (1217bf6a9bd7819aa5b12d72499fb28ddd284b52) |
---|---|
1/*- 2 * Copyright (c) 2004 Poul-Henning Kamp 3 * Copyright (c) 1990 The Regents of the University of California. 4 * All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Don Ahn. 8 * --- 731 unchanged lines hidden (view full) --- 740 static int need_recal; 741 struct fdc_readid *idp; 742 struct fd_formb *finfo; 743 744 /* Have we exhausted our retries ? */ 745 bp = fdc->bp; 746 fd = fdc->fd; 747 if (bp != NULL && | 1/*- 2 * Copyright (c) 2004 Poul-Henning Kamp 3 * Copyright (c) 1990 The Regents of the University of California. 4 * All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Don Ahn. 8 * --- 731 unchanged lines hidden (view full) --- 740 static int need_recal; 741 struct fdc_readid *idp; 742 struct fd_formb *finfo; 743 744 /* Have we exhausted our retries ? */ 745 bp = fdc->bp; 746 fd = fdc->fd; 747 if (bp != NULL && |
748 (fdc->retry >= retries || (fd->flags & FDOPT_NORETRY))) { | 748 (fdc->retry >= retries || (fd->options & FDOPT_NORETRY))) { |
749 if ((debugflags & 4)) 750 printf("Too many retries (EIO)\n"); 751 return (fdc_biodone(fdc, EIO)); 752 } 753 754 /* Disable ISADMA if we bailed while it was active */ 755 if (fd != NULL && (fd->flags & FD_ISADMA)) { 756 mtx_lock(&Giant); --- 1267 unchanged lines hidden --- | 749 if ((debugflags & 4)) 750 printf("Too many retries (EIO)\n"); 751 return (fdc_biodone(fdc, EIO)); 752 } 753 754 /* Disable ISADMA if we bailed while it was active */ 755 if (fd != NULL && (fd->flags & FD_ISADMA)) { 756 mtx_lock(&Giant); --- 1267 unchanged lines hidden --- |