diff options
author | nyan <nyan@FreeBSD.org> | 2004-07-17 10:07:19 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2004-07-17 10:07:19 +0000 |
commit | bd381ddb1f5e0f5af96a187211575497fe16ffcb (patch) | |
tree | e8affcb302cdb9740cb14b38d33beb0cb2b2ad59 /sys/pc98/cbus/fdcvar.h | |
parent | 2527e9825572f543c4024b5bb50f7a8abaa1d37f (diff) | |
download | FreeBSD-src-bd381ddb1f5e0f5af96a187211575497fe16ffcb.zip FreeBSD-src-bd381ddb1f5e0f5af96a187211575497fe16ffcb.tar.gz |
Merged from the following changes.
- sys/dev/fdc/fdc.c revision 1.281
- sys/dev/fdc/fdcvar.h revision 1.3
- sys/dev/fdc/fdc_isa.c revision 1.7
Diffstat (limited to 'sys/pc98/cbus/fdcvar.h')
-rw-r--r-- | sys/pc98/cbus/fdcvar.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/pc98/cbus/fdcvar.h b/sys/pc98/cbus/fdcvar.h index 77cff79..4ae53d9 100644 --- a/sys/pc98/cbus/fdcvar.h +++ b/sys/pc98/cbus/fdcvar.h @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 2004 M. Warner Losh. * All rights reserved. * @@ -80,7 +80,6 @@ struct fdc_data int dmacnt; int dmachan; int flags; -#define FDC_ATTACHED 0x01 #define FDC_STAT_VALID 0x08 #define FDC_HAS_FIFO 0x10 #define FDC_NEEDS_RESET 0x20 @@ -156,8 +155,13 @@ void fdout_wr(fdc_p, u_int8_t); int fd_cmd(struct fdc_data *, int, ...); void fdc_release_resources(struct fdc_data *); int fdc_attach(device_t); +int fdc_hints_probe(device_t); int fdc_detach(device_t dev); +device_t fdc_add_child(device_t, const char *, int); int fdc_initial_reset(struct fdc_data *); int fdc_print_child(device_t, device_t); int fdc_read_ivar(device_t, device_t, int, uintptr_t *); int fdc_write_ivar(device_t, device_t, int, uintptr_t); +#ifndef PC98 +int fdc_isa_alloc_resources(device_t, struct fdc_data *); +#endif |