From 4a331aac448bc6ebd006fa2ea80af68f57c666eb Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 31 Dec 2014 19:52:04 +0000 Subject: make more drivers use disk_ioctl, and add a dev parameter to it so that we can merge the "easy" disklabel ioctls to it. Ultimately all this will go do dk_ioctl once all the drivers have been converted. --- sys/dev/ofw/ofdisk.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'sys/dev/ofw') diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c index 4eb2e4bf28a..a14ab2a01e8 100644 --- a/sys/dev/ofw/ofdisk.c +++ b/sys/dev/ofw/ofdisk.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofdisk.c,v 1.49 2014/12/31 17:06:48 christos Exp $ */ +/* $NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.49 2014/12/31 17:06:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.50 2014/12/31 19:52:06 christos Exp $"); #include #include @@ -369,29 +369,11 @@ ofdisk_ioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) return ENOTTY; } - error = disk_ioctl(&of->sc_dk, cmd, data, flag, l); + error = disk_ioctl(&of->sc_dk, dev, cmd, data, flag, l); if (error != EPASSTHROUGH) return error; switch (cmd) { - case DIOCGDINFO: - *(struct disklabel *)data = *of->sc_dk.dk_label; - return 0; -#ifdef __HAVE_OLD_DISKLABEL - case ODIOCGDINFO: - newlabel = *of->sc_dk.dk_label; - if (newlabel.d_npartitions > OLDMAXPARTITIONS) - return ENOTTY; - memcpy(data, &newlabel, sizeof (struct olddisklabel)); - return 0; -#endif - - case DIOCGPART: - ((struct partinfo *)data)->disklab = of->sc_dk.dk_label; - ((struct partinfo *)data)->part = - &of->sc_dk.dk_label->d_partitions[DISKPART(dev)]; - return 0; - case DIOCWDINFO: case DIOCSDINFO: #ifdef __HAVE_OLD_DISKLABEL -- cgit /dist/config/mt-netware
AgeCommit message (Expand)Author
2000-08-10This recursive build structure is now defunct.tv