system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement the new "struct disk" centered API for device drivers.

Browse source 
This commit should not change anything as no device drivers use the
new API yet.
This commit is contained in:
Poul-Henning Kamp 2003-02-05 21:13:08 +00:00
parent 64537ecdf0
commit 51dd8980f4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110419
2 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
sys/geom/geom_disk.c
View file

@ -99,9 +99,12 @@ g_disk_access(struct g_provider *pp, int r, int w, int e)
dev = dp->d_dev;
error = 0;
if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) {
if (dp->d_open != NULL) {
if (dp->d_open != NULL || dp->d_copen != NULL) {
g_disk_lock_giant(dp);
error = dp->d_open(dev, FREAD | FWRITE, 0, NULL);
if (dp->d_open != NULL)
error = dp->d_open(dp);
else
error = dp->d_copen(dev, FREAD|FWRITE, 0, NULL);
if (error != 0)
printf("Opened disk %s -> %d\n",
pp->name, error);
@ -111,9 +114,12 @@ g_disk_access(struct g_provider *pp, int r, int w, int e)
pp->sectorsize = dp->d_sectorsize;
dp->d_flags |= DISKFLAG_OPEN;
} else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) {
if (dp->d_close != NULL) {
if (dp->d_close != NULL || dp->d_cclose != NULL) {
g_disk_lock_giant(dp);
error = dp->d_close(dev, FREAD | FWRITE, 0, NULL);
if (dp->d_close != NULL)
error = dp->d_close(dp);
else
error = dp->d_cclose(dev, FREAD|FWRITE, 0, NULL);
if (error != 0)
printf("Closed disk %s -> %d\n",
pp->name, error);
@ -202,12 +208,17 @@ g_disk_start(struct bio *bp)
break;
else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
g_disk_kerneldump(bp, dp);
else if (dp->d_ioctl != NULL &&
else if ((dp->d_ioctl != NULL || dp->d_cioctl != NULL) &&
!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
bp->bio_length == sizeof *gio) {
gio = (struct g_ioctl *)bp->bio_data;
gio->func = dp->d_ioctl;
gio->dev = dp->d_dev;
if (dp->d_ioctl != NULL) {
gio->func = (d_ioctl_t *)(dp->d_ioctl);
gio->dev = dp;
} else {
gio->func = dp->d_cioctl;
gio->dev = dp->d_dev;
}
error = EDIRIOCTL;
} else
error = ENOIOCTL;
@ -264,7 +275,7 @@ g_disk_create(void *arg)
gp->access = g_disk_access;
gp->softc = dev->si_disk;
gp->dumpconf = g_disk_dumpconf;
dev->si_disk->d_softc = gp;
dev->si_disk->d_geom = gp;
pp = g_new_providerf(gp, "%s", gp->name);
pp->mediasize = dev->si_disk->d_mediasize;
pp->sectorsize = dev->si_disk->d_sectorsize;
@ -286,10 +297,10 @@ disk_create(int unit, struct disk *dp, int flags, struct cdevsw *cdevsw, void *
dp->d_devsw = cdevsw;
dev->si_devsw = cdevsw;
if (cdevsw != NULL) {
dp->d_open = cdevsw->d_open;
dp->d_close = cdevsw->d_close;
dp->d_copen = cdevsw->d_open;
dp->d_cclose = cdevsw->d_close;
dp->d_cioctl = cdevsw->d_ioctl;
dp->d_strategy = cdevsw->d_strategy;
dp->d_ioctl = cdevsw->d_ioctl;
dp->d_dump = (dumper_t *)cdevsw->d_dump;
dp->d_name = cdevsw->d_name;
}
@ -312,7 +323,7 @@ disk_destroy(dev_t dev)
struct g_geom *gp;
dp = dev->si_disk;
gp = dp->d_softc;
gp = dp->d_geom;
g_free(dev);
gp->flags |= G_GEOM_WITHER;
gp->softc = NULL;

39
sys/sys/disk.h
View file

@ -23,21 +23,37 @@
#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 disk {
u_int d_flags;
/* Fields which are private to geom_disk */
struct cdevsw *d_devsw;
d_open_t *d_open;
d_close_t *d_close;
d_strategy_t *d_strategy;
d_ioctl_t *d_ioctl;
dumper_t *d_dump;
dev_t d_dev;
u_int d_unit;
const char *d_name;
d_open_t *d_copen; /* Compat */
d_close_t *d_cclose; /* Compat */
d_ioctl_t *d_cioctl; /* Compat */
struct g_geom *d_geom;
/* These four fields must be valid while opened */
/* Shared fields */
u_int d_flags;
const char *d_name;
u_int d_unit;
dev_t d_dev; /* Compat */
/* 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;
@ -46,7 +62,8 @@ struct disk {
u_int d_stripe_width;
u_int d_max_request;
struct g_geom *d_softc;
/* Fields private to the driver */
void *d_drv1;
};
#define DISKFLAG_NOGIANT 0x1