diff options
| author | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
| commit | 663cbe4fc26065f7af7d10faaee492a626156145 (patch) | |
| tree | 32e619fadb473bfb85ff8e06044176f2ff323cce /sys/dev/ata/atapi-cd.c | |
| parent | 2a5ff1f726f814a9e4717afe3f14250f8030cace (diff) | |
| download | FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz | |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Diffstat (limited to 'sys/dev/ata/atapi-cd.c')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index a0cf35a..439c4d6 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -25,12 +25,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atapi-cd.c,v 1.10 1999/05/31 11:24:27 phk Exp $ + * $Id: atapi-cd.c,v 1.11 1999/06/25 09:03:04 sos Exp $ */ #include "ata.h" #include "atapicd.h" -#include "opt_devfs.h" #if NATA > 0 && NATAPICD > 0 @@ -47,9 +46,6 @@ #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/stat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <pci/pcivar.h> #include <dev/ata/ata-all.h> #include <dev/ata/atapi-all.h> @@ -239,22 +235,14 @@ acd_init_lun(struct atapi_softc *atp, int32_t lun, struct devstat *stats) } else acd->stats = stats; -#ifdef DEVFS - acd->a_cdevfs_token = devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_CHR, UID_ROOT, GID_OPERATOR, 0644, - "racd%da", lun); - acd->c_cdevfs_token = devfs_add_devswf(&acd_cdevsw, - dkmakeminor(lun, 0, RAW_PART), - DV_CHR, UID_ROOT, GID_OPERATOR, 0644, - "racd%dc", lun); - acd->a_bdevfs_token = devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_BLK, UID_ROOT, GID_OPERATOR, 0644, - "acd%da", lun); - acd->c_bdevfs_token = devfs_add_devswf(&acd_cdevsw, - dkmakeminor(lun, 0, RAW_PART), - DV_BLK, UID_ROOT, GID_OPERATOR, 0644, - "acd%dc", lun); -#endif + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0644, "racd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0644, "racd%dc", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0644, "acd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0644, "acd%dc", lun); return acd; } |
