diff options
author | scrappy <scrappy@FreeBSD.org> | 1996-03-28 14:29:52 +0000 |
---|---|---|
committer | scrappy <scrappy@FreeBSD.org> | 1996-03-28 14:29:52 +0000 |
commit | 415585985cb93ec4bd441c45c7bbd43c2529256d (patch) | |
tree | a799d7ab93b91102069e46ed96392e309b7b469f /sys/isa | |
parent | f55298f39fa39052b4a4bb6f1f3a18aa12d6b771 (diff) | |
download | FreeBSD-src-415585985cb93ec4bd441c45c7bbd43c2529256d.zip FreeBSD-src-415585985cb93ec4bd441c45c7bbd43c2529256d.tar.gz |
Switched from using devfs_add_sw() to using devfs_add_swf()
Reviewed by: julian@freebsd.org
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/fd.c | 17 | ||||
-rw-r--r-- | sys/isa/joy.c | 8 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index f62c6ba..3c666a6 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.79 1996/01/27 04:17:50 bde Exp $ + * $Id: fd.c,v 1.80 1996/02/25 21:01:31 bde Exp $ * */ @@ -767,13 +767,14 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_state = DC_IDLE; #ifdef DEVFS mynor = 8 * fdu; - fd->bdev = devfs_add_devsw("/", name + 1, &fd_bdevsw, mynor, - DV_BLK, 0, 0, 0640); - fd->cdev = devfs_add_devsw("/", name, &fd_cdevsw, mynor, - DV_CHR, 0, 0, 0640); - sprintf(name, "rfd%d", fdu); - dev_link("/", name + 1, fd->bdev); - dev_link("/", name, fd->cdev); + fd->bdev = + devfs_add_devswf(&fd_bdevsw, mynor, DV_BLK, 0, 0, + 0640, name + 1); + fd->cdev = + devfs_add_devswf(&fd_cdevsw, mynor, + DV_CHR, 0, 0, 0640, name); + dev_link(fd->bdev, "fd%d", fdu); + dev_link(fd->cdev, "rfd%d", fdu); #endif /* DEVFS */ if (dk_ndrive < DK_NDRIVE) { sprintf(dk_names[dk_ndrive], "fd%d", fdu); diff --git a/sys/isa/joy.c b/sys/isa/joy.c index ffb615d..350d784 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -115,16 +115,14 @@ static int joyattach (struct isa_device *dev) { int unit = dev->id_unit; - char name[32]; joy[unit].port = dev->id_iobase; joy[unit].timeout[0] = joy[unit].timeout[1] = 0; printf("joy%d: joystick\n", unit); #ifdef DEVFS - sprintf(name, "joy%d", unit); - joy[dev->id_unit].devfs_token = devfs_add_devsw( "/", "joy", - &joy_cdevsw, 0, - DV_CHR, 0, 0, 0600); + joy[dev->id_unit].devfs_token = + devfs_add_devswf(&joy_cdevsw, 0, DV_CHR, 0, 0, + 0600, "joy%d", unit); #endif return 1; } |