diff options
| author | Nathan Binkert <nate@cvs.openbsd.org> | 2001-10-26 01:28:07 +0000 |
|---|---|---|
| committer | Nathan Binkert <nate@cvs.openbsd.org> | 2001-10-26 01:28:07 +0000 |
| commit | 17959c041a742b16ab2422cff8775ac92ff015c0 (patch) | |
| tree | 7d12e180e149953a11188ca60919f41ff0cbaf0e /sys/dev | |
| parent | 20e08fcb211a654a427c41d04318e7ae669d1a81 (diff) | |
First cut at a port of isadma and floppy driver. ok art@
From NetBSD via jay@rootaction.net
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/fd.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index bbeac5297a4..5e7883f13fa 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.42 2001/03/06 13:55:02 ho Exp $ */ +/* $OpenBSD: fd.c,v 1.43 2001/10/26 01:28:06 nate Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -255,6 +255,13 @@ fdattach(parent, self, aux) case 6: /* 1.2 MB japanese format */ type = &fd_types[8]; break; +#ifdef __alpha__ + default: + /* 1.44MB, how to detect others? + * idea from NetBSD -- jay@rootaction.net + */ + type = &fd_types[0]; +#endif } } @@ -296,6 +303,12 @@ fd_nvtotype(fdc, nvraminfo, drive) char *fdc; int nvraminfo, drive; { +#ifdef __alpha__ + /* Alpha: assume 1.44MB, idea from NetBSD sys/dev/isa/fd.c + * -- jay@rootaction.net + */ + return &fd_types[0]; /* 1.44MB */ +#else int type; type = (drive == 0 ? nvraminfo : nvraminfo << 4) & 0xf0; @@ -318,6 +331,7 @@ fd_nvtotype(fdc, nvraminfo, drive) fdc, drive, type); return NULL; } +#endif } __inline struct fd_type * |