From 024d9b147e9d37cff49c3a8d3bb49524f8e92591 Mon Sep 17 00:00:00 2001 From: julian Date: Sat, 9 Dec 1995 09:11:25 +0000 Subject: clean a few DEVFS things.. fix a bug where you couldn't place devices in the root directory of devfs remove deprecated routines On my machine devfs now shows: julian@erf.tfs.com: julian@erf.tfs.com: ls -RF bpf0 mem ptypb spkr ttyp8 bpf1 null ptypc stderr ttyp9 bpf2 pcaudio ptypd stdin ttypa bpf3 pcaudioctl ptype stdout ttypb console pt ptypf tty ttypc cuaa0 ptyp0 random ttyd0 ttypd cuaia0 ptyp1 rsd0 ttyid0 ttype cuala0 ptyp2 rsd1 ttyld0 ttypf fd/ ptyp3 rvn ttyp0 tun0 fd0.1440 ptyp4 rworm ttyp1 urandom fd1.1200 ptyp5 scsi/ ttyp2 vn io ptyp6 sd0 ttyp3 zero kmem ptyp7 sd1 ttyp4 lkm ptyp8 snp0 ttyp5 log ptyp9 snp1 ttyp6 lpt0 ptypa snp2 ttyp7 ./fd: 0 15 21 28 34 40 47 53 6 9 1 16 22 29 35 41 48 54 60 10 17 23 3 36 42 49 55 61 11 18 24 30 37 43 5 56 62 12 19 25 31 38 44 50 57 63 13 2 26 32 39 45 51 58 7 14 20 27 33 4 46 52 59 8 ./scsi: sctarg ssc julian@erf.tfs.com: which is all devices really there except for disk slices/partitions.. (if I don't have it it's not there, which has GOT to be an improvement..) no DEVFS fixes from device maintainers yet? --- sys/i386/isa/fd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/i386/isa/fd.c') diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 78c4840..4e9c091 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.73 1995/12/08 11:14:10 julian Exp $ + * $Id: fd.c,v 1.74 1995/12/08 23:20:26 phk Exp $ * */ @@ -714,7 +714,7 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_description = "1.2MB (1200K) 5.25in floppy disk drive"; #ifdef DEVFS - sprintf(name,"fd%d.1200",fdu); + sprintf(name,"rfd%d.1200",fdu); #endif /* DEVFS */ break; case RTCFDT_144M: @@ -723,7 +723,7 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_description = "1.44MB (1440K) 3.5in floppy disk drive"; #ifdef DEVFS - sprintf(name,"fd%d.1440",fdu); + sprintf(name,"rfd%d.1440",fdu); #endif /* DEVFS */ break; case RTCFDT_288M: @@ -733,7 +733,7 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_description = "2.88MB (2880K) 3.5in floppy disk drive in 1.44 mode"; #ifdef DEVFS - sprintf(name,"fd%d.1440",fdu); + sprintf(name,"rfd%d.1440",fdu); #endif /* DEVFS */ break; case RTCFDT_360K: @@ -742,7 +742,7 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_description = "360KB 5.25in floppy disk drive"; #ifdef DEVFS - sprintf(name,"fd%d.360",fdu); + sprintf(name,"rfd%d.360",fdu); #endif /* DEVFS */ break; case RTCFDT_720K: @@ -751,14 +751,14 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_description = "720KB 3.5in floppy disk drive"; #ifdef DEVFS - sprintf(name,"fd%d.720",fdu); + sprintf(name,"rfd%d.720",fdu); #endif /* DEVFS */ break; default: printf("unknown\n"); fd->type = NO_TYPE; #ifdef DEVFS - sprintf(name,"fd%d.xxxx",fdu); + sprintf(name,"rfd%d.xxxx",fdu); #endif /* DEVFS */ break; } @@ -768,7 +768,7 @@ fdattach(struct isa_device *dev) "/",name,&fd_cdevsw, fdu * 8, DV_CHR,0,0,0644); fd->fd_devfs_token = devfs_add_devsw( - "/",name, &fd_bdevsw, fdu * 8, + "/",name+1, &fd_bdevsw, fdu * 8, DV_BLK,0,0,0644); #endif /* DEVFS */ if (dk_ndrive < DK_NDRIVE) { -- cgit v1.1