Checkpoint the fdc resource changes:

o Allow for up to 3 resource I/O ranges to be given for the floppy
  controller, rather than just two that are allowed for now.
o Make sure that we can work with either a base address of 0x3f0 or 0x3f2.
o Create new inline functions to access the YE DATA's unique BDCR register.
o Update pccard attachment to add the fd device.
o Do some minor style(9) polishing.

# I'm guessing that the fdc pccard attachment broke some time ago, since
# there are a number of issues with it still.

1 files changed, 6 insertions, 3 deletions

diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index 22a4edd..5cfc3d1 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -57,14 +57,17 @@ struct fdc_data {
 	int	fdc_errs;	/* number of logged errors */
 	struct	bio_queue_head head;
 	struct	bio *bp;	/* active buffer */
-	struct	resource *res_ioport, *res_ctl, *res_irq, *res_drq;
-	int	rid_ioport, rid_ctl, rid_irq, rid_drq;
-	int	port_off;
+	struct	resource *res_ioport, *res_sts, *res_ctl, *res_irq, *res_drq;
+	int	rid_ioport, rid_sts, rid_ctl, rid_irq, rid_drq;
 	bus_space_tag_t portt;
 	bus_space_handle_t porth;
+	bus_space_tag_t stst;
+	bus_space_handle_t stsh;
 	bus_space_tag_t ctlt;
 	bus_space_handle_t ctlh;
+	int	port_off;
 	int	ctl_off;
+	int	sts_off;
 	void	*fdc_intr;
 	struct	device *fdc_dev;
 	struct mtx fdc_mtx;