diff options
| -rw-r--r-- | sys/geom/geom_disk.h | 93 | ||||
| -rw-r--r-- | sys/sys/disk.h | 48 |
2 files changed, 94 insertions, 47 deletions
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h new file mode 100644 index 0000000..7cd079e --- /dev/null +++ b/sys/geom/geom_disk.h @@ -0,0 +1,93 @@ +/*- + * Copyright (c) 2003 Poul-Henning Kamp + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Poul-Henning Kamp + * and NAI Labs, the Security Research Division of Network Associates, Inc. + * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the + * DARPA CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _GEOM_GEOM_DISK_H_ +#define _GEOM_GEOM_DISK_H_ + +#ifdef _KERNEL + +#include <sys/queue.h> + +typedef int disk_open_t(struct disk *); +typedef int disk_close_t(struct disk *); +typedef void disk_strategy_t(struct bio *bp); +typedef int disk_ioctl_t(struct disk *, u_long cmd, void *data, + int fflag, struct thread *td); + /* NB: disk_ioctl_t SHALL be cast'able to d_ioctl_t */ + +struct g_geom; +struct devstat; + +struct disk { + /* Fields which are private to geom_disk */ + struct g_geom *d_geom; + struct devstat *d_devstat; + + /* Shared fields */ + u_int d_flags; + const char *d_name; + u_int d_unit; + + /* Disk methods */ + disk_open_t *d_open; + disk_close_t *d_close; + disk_strategy_t *d_strategy; + disk_ioctl_t *d_ioctl; + dumper_t *d_dump; + + /* Info fields from driver to geom_disk.c. Valid when open */ + u_int d_sectorsize; + off_t d_mediasize; + u_int d_fwsectors; + u_int d_fwheads; + u_int d_maxsize; + u_int d_stripeoffset; + u_int d_stripesize; + + /* Fields private to the driver */ + void *d_drv1; +}; + +#define DISKFLAG_NOGIANT 0x1 +#define DISKFLAG_OPEN 0x2 +#define DISKFLAG_CANDELETE 0x4 + +void disk_create(int unit, struct disk *disk, int flags, void *unused, void *unused2); +void disk_destroy(struct disk *disk); + + +#endif /* _KERNEL */ +#endif /* _GEOM_GEOM_DISK_H_ */ diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 063100c..f0d5042 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -17,58 +17,12 @@ #ifdef _KERNEL -#include <sys/queue.h> - #ifndef _SYS_CONF_H_ #include <sys/conf.h> /* XXX: temporary to avoid breakage */ #endif -typedef int disk_open_t(struct disk *); -typedef int disk_close_t(struct disk *); -typedef void disk_strategy_t(struct bio *bp); -typedef int disk_ioctl_t(struct disk *, u_long cmd, void *data, - int fflag, struct thread *td); - /* NB: disk_ioctl_t SHALL be cast'able to d_ioctl_t */ - -struct g_geom; -struct devstat; - -struct disk { - /* Fields which are private to geom_disk */ - struct g_geom *d_geom; - struct devstat *d_devstat; - - /* Shared fields */ - u_int d_flags; - const char *d_name; - u_int d_unit; - - /* Disk methods */ - disk_open_t *d_open; - disk_close_t *d_close; - disk_strategy_t *d_strategy; - disk_ioctl_t *d_ioctl; - dumper_t *d_dump; - - /* Info fields from driver to geom_disk.c. Valid when open */ - u_int d_sectorsize; - off_t d_mediasize; - u_int d_fwsectors; - u_int d_fwheads; - u_int d_maxsize; - u_int d_stripeoffset; - u_int d_stripesize; - - /* Fields private to the driver */ - void *d_drv1; -}; - -#define DISKFLAG_NOGIANT 0x1 -#define DISKFLAG_OPEN 0x2 -#define DISKFLAG_CANDELETE 0x4 +#include <geom/geom_disk.h> -void disk_create(int unit, struct disk *disk, int flags, void *unused, void *unused2); -void disk_destroy(struct disk *disk); struct disk *disk_enumerate(struct disk *disk); void disk_err(struct bio *bp, const char *what, int blkdone, int nl); |
