Hrmpf. nyan's rev 1.25 commit to fdc.h crossed with my removal of it.

Back-integrate his (PC98) changes into fd.c.
vstakhov · Jul 14, 2001 · bffdead · bffdead
1 parent cc1c4ca
commit bffdead
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
@@ -145,23 +145,40 @@ struct fdc_data
 	int	fdu;		/* the active drive	*/
 	enum	fdc_states state;
 	int	retry;
+#ifndef PC98
 	int	fdout;		/* mirror of the w/o digital output reg */
+#endif
 	u_int	status[7];	/* copy of the registers */
 	enum	fdc_type fdct;	/* chip version of FDC */
 	int	fdc_errs;	/* number of logged errors */
 	int	dma_overruns;	/* number of DMA overruns */
 	struct	bio_queue_head head;
 	struct	bio *bp;	/* active buffer */
+#ifdef PC98
+	struct	resource *res_ioport, *res_fdsio, *res_fdemsio;
+	struct	resource *res_irq, *res_drq;
+	int	rid_ioport, rid_irq, rid_drq;
+#else
 	struct	resource *res_ioport, *res_ctl, *res_irq, *res_drq;
 	int	rid_ioport, rid_ctl, rid_irq, rid_drq;
+#endif
 	int	port_off;
 	bus_space_tag_t portt;
 	bus_space_handle_t porth;
+#ifdef PC98
+        bus_space_tag_t		sc_fdsiot;
+        bus_space_handle_t	sc_fdsioh;
+        bus_space_tag_t		sc_fdemsiot;
+        bus_space_handle_t	sc_fdemsioh;
+#else
 	bus_space_tag_t ctlt;
 	bus_space_handle_t ctlh;
+#endif
 	void	*fdc_intr;
 	struct	device *fdc_dev;
+#ifndef PC98
 	void	(*fdctl_wr)(struct fdc_data *fdc, u_int8_t v);
+#endif
 };
 
 typedef int	fdu_t;

diff --git a/sys/isa/fd.c b/sys/isa/fd.c
@@ -145,23 +145,40 @@ struct fdc_data
 	int	fdu;		/* the active drive	*/
 	enum	fdc_states state;
 	int	retry;
+#ifndef PC98
 	int	fdout;		/* mirror of the w/o digital output reg */
+#endif
 	u_int	status[7];	/* copy of the registers */
 	enum	fdc_type fdct;	/* chip version of FDC */
 	int	fdc_errs;	/* number of logged errors */
 	int	dma_overruns;	/* number of DMA overruns */
 	struct	bio_queue_head head;
 	struct	bio *bp;	/* active buffer */
+#ifdef PC98
+	struct	resource *res_ioport, *res_fdsio, *res_fdemsio;
+	struct	resource *res_irq, *res_drq;
+	int	rid_ioport, rid_irq, rid_drq;
+#else
 	struct	resource *res_ioport, *res_ctl, *res_irq, *res_drq;
 	int	rid_ioport, rid_ctl, rid_irq, rid_drq;
+#endif
 	int	port_off;
 	bus_space_tag_t portt;
 	bus_space_handle_t porth;
+#ifdef PC98
+        bus_space_tag_t		sc_fdsiot;
+        bus_space_handle_t	sc_fdsioh;
+        bus_space_tag_t		sc_fdemsiot;
+        bus_space_handle_t	sc_fdemsioh;
+#else
 	bus_space_tag_t ctlt;
 	bus_space_handle_t ctlh;
+#endif
 	void	*fdc_intr;
 	struct	device *fdc_dev;
+#ifndef PC98
 	void	(*fdctl_wr)(struct fdc_data *fdc, u_int8_t v);
+#endif
 };
 
 typedef int	fdu_t;