Shift prototypes for some common pciide functions out into

a header file where MD code can get at them.

ok grange@

2 files changed, 37 insertions, 37 deletions

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 832855013ec..e03135a53b0 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.290 2008/10/02 16:00:41 deraadt Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.291 2009/01/04 10:22:01 jsg Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -281,21 +281,6 @@ void ixp_setup_channel(struct channel_softc *);
 void jmicron_chip_map(struct pciide_softc *, struct pci_attach_args *);
 void jmicron_setup_channel(struct channel_softc *);
 
-u_int8_t pciide_dmacmd_read(struct pciide_softc *, int);
-void pciide_dmacmd_write(struct pciide_softc *, int, u_int8_t);
-u_int8_t pciide_dmactl_read(struct pciide_softc *, int);
-void pciide_dmactl_write(struct pciide_softc *, int, u_int8_t);
-void pciide_dmatbl_write(struct pciide_softc *, int, u_int32_t);
-
-void pciide_channel_dma_setup(struct pciide_channel *);
-int  pciide_dma_table_setup(struct pciide_softc *, int, int);
-int  pciide_dma_init(void *, int, int, void *, size_t, int);
-void pciide_dma_start(void *, int, int);
-int  pciide_dma_finish(void *, int, int, int);
-void pciide_irqack(struct channel_softc *);
-void pciide_print_modes(struct pciide_channel *);
-void pciide_print_channels(int, pcireg_t);
-
 struct pciide_product_desc {
 	u_int32_t ide_product;
 	u_short ide_flags;
@@ -1191,26 +1176,6 @@ struct cfdriver pciide_cd = {
 	NULL, "pciide", DV_DULL
 };
 
-int	pciide_mapregs_compat( struct pci_attach_args *,
-	    struct pciide_channel *, int, bus_size_t *, bus_size_t *);
-int	pciide_mapregs_native(struct pci_attach_args *,
-	    struct pciide_channel *, bus_size_t *, bus_size_t *,
-	    int (*pci_intr)(void *));
-void	pciide_mapreg_dma(struct pciide_softc *,
-	    struct pci_attach_args *);
-int	pciide_chansetup(struct pciide_softc *, int, pcireg_t);
-void	pciide_mapchan(struct pci_attach_args *,
-	    struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *,
-	    int (*pci_intr)(void *));
-int	pciide_chan_candisable(struct pciide_channel *);
-void	pciide_map_compat_intr( struct pci_attach_args *,
-	    struct pciide_channel *, int, int);
-void	pciide_unmap_compat_intr( struct pci_attach_args *,
-	    struct pciide_channel *, int, int);
-int	pciide_compat_intr(void *);
-int	pciide_pci_intr(void *);
-int	pciide_intr_flag(struct pciide_channel *);
-
 const struct pciide_product_desc *pciide_lookup_product(u_int32_t);
 
 const struct pciide_product_desc *
diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h
index b552dd60036..c957ba9db2d 100644
--- a/sys/dev/pci/pciidevar.h
+++ b/sys/dev/pci/pciidevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciidevar.h,v 1.16 2004/10/17 19:00:46 grange Exp $	*/
+/*	$OpenBSD: pciidevar.h,v 1.17 2009/01/04 10:22:01 jsg Exp $	*/
 /*	$NetBSD: pciidevar.h,v 1.6 2001/01/12 16:04:00 bouyer Exp $	*/
 
 /*
@@ -122,6 +122,41 @@ struct pciide_softc {
 #define PCIIDE_DMATBL_WRITE(sc, chan, val) \
 	(sc)->sc_dmatbl_write((sc), (chan), (val))
 
+int	pciide_mapregs_compat( struct pci_attach_args *,
+	    struct pciide_channel *, int, bus_size_t *, bus_size_t *);
+int	pciide_mapregs_native(struct pci_attach_args *,
+	    struct pciide_channel *, bus_size_t *, bus_size_t *,
+	    int (*pci_intr)(void *));
+void	pciide_mapreg_dma(struct pciide_softc *,
+	    struct pci_attach_args *);
+int	pciide_chansetup(struct pciide_softc *, int, pcireg_t);
+void	pciide_mapchan(struct pci_attach_args *,
+	    struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *,
+	    int (*pci_intr)(void *));
+int	pciide_chan_candisable(struct pciide_channel *);
+void	pciide_map_compat_intr( struct pci_attach_args *,
+	    struct pciide_channel *, int, int);
+void	pciide_unmap_compat_intr( struct pci_attach_args *,
+	    struct pciide_channel *, int, int);
+int	pciide_compat_intr(void *);
+int	pciide_pci_intr(void *);
+int	pciide_intr_flag(struct pciide_channel *);
+
+u_int8_t pciide_dmacmd_read(struct pciide_softc *, int);
+void	 pciide_dmacmd_write(struct pciide_softc *, int, u_int8_t);
+u_int8_t pciide_dmactl_read(struct pciide_softc *, int);
+void	 pciide_dmactl_write(struct pciide_softc *, int, u_int8_t);
+void	 pciide_dmatbl_write(struct pciide_softc *, int, u_int32_t);
+
+void	 pciide_channel_dma_setup(struct pciide_channel *);
+int	 pciide_dma_table_setup(struct pciide_softc *, int, int);
+int	 pciide_dma_init(void *, int, int, void *, size_t, int);
+void	 pciide_dma_start(void *, int, int);
+int	 pciide_dma_finish(void *, int, int, int);
+void	 pciide_irqack(struct channel_softc *);
+void	 pciide_print_modes(struct pciide_channel *);
+void	 pciide_print_channels(int, pcireg_t);
+
 /*
  * Functions defined by machine-dependent code.
  */