diff options
author | julian <julian@FreeBSD.org> | 1995-09-03 05:43:50 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 1995-09-03 05:43:50 +0000 |
commit | 3b421a628b770ce7d903f166e047d7dc8e672ed7 (patch) | |
tree | 48c036cfd246d74ad2a6c99044f9938396941363 /sys/i386/isa/fd.c | |
parent | 6759a9710d59bc29e3766f8fa8c2699111015c60 (diff) | |
download | FreeBSD-src-3b421a628b770ce7d903f166e047d7dc8e672ed7.zip FreeBSD-src-3b421a628b770ce7d903f166e047d7dc8e672ed7.tar.gz |
devfs changes..
changes to allow devices that don't probe (e.g. /dev/mem)
to create devfs entries
this required giving 'configure' its own SYSINIT entry
so we could duck in just before it with a DEVFS init
and some device inits..
my devfs now looks like:
./misc
./misc/speaker
./misc/mem
./misc/kmem
./misc/null
./misc/zero
./misc/io
./misc/console
./misc/pcaudio
./misc/pcaudioctl
./disks
./disks/rfloppy
./disks/rfloppy/fd0.1440
./disks/rfloppy/fd1.1200
./disks/floppy
./disks/floppy/fd0.1440
./disks/floppy/fd1.1200
also some sligt cleanups.. DEVFS needs a lot of work
but I'm getting back to it..
Diffstat (limited to 'sys/i386/isa/fd.c')
-rw-r--r-- | sys/i386/isa/fd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 3c46823..17bef91 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.61.2.1 1995/06/08 10:26:23 davidg Exp $ + * $Id: fd.c,v 1.62 1995/06/11 19:31:19 rgrimes Exp $ * */ @@ -82,6 +82,9 @@ #include <sys/ftape.h> #include <i386/isa/ftreg.h> #endif +#ifdef DEVFS +#include <sys/devfsext.h> +#endif static int fd_goaway(struct kern_devconf *, int); static int fdc_goaway(struct kern_devconf *, int); @@ -557,7 +560,7 @@ fdattach(struct isa_device *dev) int ic_type = 0; #ifdef DEVFS char name[64]; - caddr_t key; + void *key; #endif /* DEVFS */ fdc->fdcu = fdcu; @@ -753,9 +756,9 @@ fdattach(struct isa_device *dev) kdc_fd[fdu].kdc_state = DC_IDLE; #ifdef DEVFS key = dev_add("/disks/rfloppy",name,(caddr_t)Fdopen,fdu * 8, - 0,0,0,0644); + DV_CHR,0,0,0644); key = dev_add("/disks/floppy",name,(caddr_t)Fdopen,fdu * 8, - 1,0,0,0644); + DV_BLK,0,0,0644); #endif /* DEVFS */ if (dk_ndrive < DK_NDRIVE) { sprintf(dk_names[dk_ndrive], "fd%d", fdu); |