diff options
| author | bde <bde@FreeBSD.org> | 1998-12-14 16:29:58 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-14 16:29:58 +0000 |
| commit | 746dcb079d5a1644ad2fbf1b52d3ca2be47597ac (patch) | |
| tree | 61e0280f06ced7139ff38fe3974e0a562c929dbc /sys/isa | |
| parent | b1c84799bb53797a0961851392b9f99fb23023e0 (diff) | |
| download | FreeBSD-src-746dcb079d5a1644ad2fbf1b52d3ca2be47597ac.zip FreeBSD-src-746dcb079d5a1644ad2fbf1b52d3ca2be47597ac.tar.gz | |
Fixed LINT breakage in previous commit. Option FDC_YE enabled a
syntax error. Options FDC_YE and DEVFS together enabled references
to a nonexistent variable and calls of a nonexistent function.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index e139cd7..e644f78 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.127 1998/12/10 19:56:59 eivind Exp $ + * $Id: fd.c,v 1.128 1998/12/12 08:16:01 imp Exp $ * */ @@ -278,7 +278,7 @@ static char const * const fdstates[] = "IOTIMEDOUT", "RESETCOMPLETE", #ifdef FDC_YE -,"PIOREAD" +"PIOREAD", #endif }; @@ -1021,7 +1021,7 @@ static int yeattach(struct isa_device *dev) #ifdef DEVFS mynor = fdcu << 6; - fd->bdevs[0] = devfs_add_devswf(&fd_bdevsw, mynor, DV_BLK, + fd->bdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_BLK, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fdu); fd->cdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_CHR, @@ -1041,16 +1041,16 @@ static int yeattach(struct isa_device *dev) typesize = 1480; if (typesize == 1722) typesize = 1720; - fd->bdevs[FD_1440] = devfs_add_devswf(&fd_bdevsw, typemynor, + fd->bdevs[FD_1440] = devfs_add_devswf(&fd_cdevsw, typemynor, DV_BLK, UID_ROOT, GID_OPERATOR, 0640, "fd%d.%d", fdu, typesize); fd->cdevs[FD_1440] = devfs_add_devswf(&fd_cdevsw, typemynor, DV_CHR, UID_ROOT, GID_OPERATOR, 0640,"rfd%d.%d", fdu, typesize); for (i = 0; i < MAXPARTITIONS; i++) { - fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0], + fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0], "fd%d%c", fdu, 'a' + i); - fd->cdevs[1 + NUMDENS + i] = devfs_link(fd->cdevs[0], + fd->cdevs[1 + NUMDENS + i] = devfs_makelink(fd->cdevs[0], "rfd%d%c", fdu, 'a' + i); } #endif /* DEVFS */ |
