diff options
| author | phk <phk@FreeBSD.org> | 2002-03-26 19:16:37 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-03-26 19:16:37 +0000 |
| commit | 3d1eaf5230c1501812cb5815688365e0caa84bf6 (patch) | |
| tree | 62c93e6c49702a2110d3cbf1a0a56809d9b199d6 | |
| parent | 6de60b263643abe348242c70caf77261f0d05a55 (diff) | |
| download | FreeBSD-src-3d1eaf5230c1501812cb5815688365e0caa84bf6.zip FreeBSD-src-3d1eaf5230c1501812cb5815688365e0caa84bf6.tar.gz | |
Push BIO_FORMAT into a local hack inside the floppy drivers where
it belongs.
| -rw-r--r-- | sys/dev/fdc/fdc.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_io.c | 1 | ||||
| -rw-r--r-- | sys/isa/fd.c | 2 | ||||
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 1 | ||||
| -rw-r--r-- | sys/pc98/pc98/fd.c | 1 | ||||
| -rw-r--r-- | sys/sys/bio.h | 5 |
6 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 788a780..0d659ab 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -165,6 +165,8 @@ struct fdc_data void (*fdctl_wr)(struct fdc_data *fdc, u_int8_t v); }; +#define BIO_FORMAT BIO_CMD2 + typedef int fdu_t; typedef int fdcu_t; typedef int fdsu_t; diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index c43e568..c0eded7 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -249,7 +249,6 @@ g_io_request(struct bio *bp, struct g_consumer *cp) break; case BIO_SETATTR: case BIO_DELETE: - case BIO_FORMAT: if ((cp->acw == 0) || (cp->ace == 0)) error = EPERM; break; diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 788a780..0d659ab 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -165,6 +165,8 @@ struct fdc_data void (*fdctl_wr)(struct fdc_data *fdc, u_int8_t v); }; +#define BIO_FORMAT BIO_CMD2 + typedef int fdu_t; typedef int fdcu_t; typedef int fdsu_t; diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 5e2b78c..d52138d 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -251,6 +251,7 @@ FDC_ACCESSOR(fdunit, FDUNIT, int) #endif #define BIO_RDSECTID BIO_CMD1 +#define BIO_FORMAT BIO_CMD2 /* * List of native drive densities. Order must match enum fd_drivetype diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 5e2b78c..d52138d 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -251,6 +251,7 @@ FDC_ACCESSOR(fdunit, FDUNIT, int) #endif #define BIO_RDSECTID BIO_CMD1 +#define BIO_FORMAT BIO_CMD2 /* * List of native drive densities. Order must match enum fd_drivetype diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 6701507..5d35eee 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -95,9 +95,8 @@ struct bio { #define BIO_READ 0x00000001 #define BIO_WRITE 0x00000002 #define BIO_DELETE 0x00000004 -#define BIO_FORMAT 0x00000008 -#define BIO_GETATTR 0x00000010 -#define BIO_SETATTR 0x00000020 +#define BIO_GETATTR 0x00000008 +#define BIO_SETATTR 0x00000010 #define BIO_CMD1 0x40000000 /* Available for local hacks */ #define BIO_CMD2 0x80000000 /* Available for local hacks */ |
