Obliterate old PnP `code' and outright replace with christos' code.

1 files changed, 170 insertions, 70 deletions

diff --git a/sys/dev/isa/isapnpvar.h b/sys/dev/isa/isapnpvar.h
index 5458419fc46..5feb9ea17a7 100644
--- a/sys/dev/isa/isapnpvar.h
+++ b/sys/dev/isa/isapnpvar.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: isapnpvar.h,v 1.2 1997/07/12 23:22:02 weingart Exp $	*/
+/*	$OpenBSD: isapnpvar.h,v 1.3 1997/12/21 14:41:27 downsj Exp $	*/
+/*	$NetBSD: isapnpvar.h,v 1.5.4.2 1997/10/29 00:40:49 thorpej Exp $	*/
 
 /*
- * Copyright (c) 1996, Shawn Hsiao <shawn@alpha.secc.fju.edu.tw>
- * All rights reserved.
+ * Copyright (c) 1996 Christos Zoulas.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,92 +12,192 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Christos Zoulas.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _DEV_ISA_ISAPNPVAR_H_
-#define _DEV_ISA_ISAPNPVAR_H_
+#ifndef _DEV_ISAPNP_ISAPNPVAR_H_
+#define _DEV_ISAPNP_ISAPNPVAR_H_
 
-struct irq_format {
-	int num;		/* IRQ number */
-	int info;		/* IRQ type */
-};
+/*
+ * ISA Plug and Play register definitions;
+ * From Plug and Play ISA Specification V1.0a, May 5 1994
+ */
 
-struct dma_format {
-	int channel;	/* DMA channel */
-	int info;		/* DMA type */
+/*
+ * Structures and definitions needed by the machine-dependent header.
+ */
+struct isapnp_softc;
+
+#if (i386 != 1)
+ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE.
+#endif
+#if i386
+#include <i386/isa/isapnp_machdep.h>
+#endif
+
+#ifndef _KERNEL
+
+# include <stdlib.h>
+# include <string.h>
+# include <unistd.h>
+
+# define ISAPNP_WRITE_ADDR(sc, v) outb(ISAPNP_ADDR, v)
+# define ISAPNP_WRITE_DATA(sc, v) outb(ISAPNP_WRDATA, v)
+# define ISAPNP_READ_DATA(sc) inb(sc->sc_read_port)
+
+# define DELAY(us) usleep(us)
+# define ISAPNP_MALLOC(a) malloc(a)
+# define ISAPNP_FREE(a) free(a)
+
+# define panic printf
+
+#else
+
+/* XXX */
+# define memset(a, b, c)	bzero(a, c)
+
+# define ISAPNP_WRITE_ADDR(sc, v) \
+    bus_space_write_1(sc->sc_iot, sc->sc_addr_ioh, 0, v)
+# define ISAPNP_WRITE_DATA(sc, v) \
+    bus_space_write_1(sc->sc_iot, sc->sc_wrdata_ioh, 0, v)
+# define ISAPNP_READ_DATA(sc) \
+    bus_space_read_1(sc->sc_iot, sc->sc_read_ioh, 0)
+
+# define ISAPNP_MALLOC(a) malloc(a, M_DEVBUF, M_WAITOK)
+# define ISAPNP_FREE(a) free(a, M_DEVBUF)
+
+#endif
+
+#ifdef DEBUG_ISAPNP
+# define DPRINTF(a) printf a
+#else
+# define DPRINTF(a)
+#endif
+
+struct isapnp_softc {
+	struct device		sc_dev;
+	int			sc_read_port;
+	bus_space_tag_t		sc_iot;
+	bus_space_tag_t		sc_memt;
+	bus_space_handle_t	sc_addr_ioh;
+	bus_space_handle_t	sc_wrdata_ioh;
+	bus_space_handle_t	sc_read_ioh;
+	bus_space_handle_t	sc_memh;
+	u_int8_t		sc_ncards;
+    	u_int8_t		sc_id[ISAPNP_MAX_CARDS][ISAPNP_SERIAL_SIZE];
 };
 
-struct io_descriptor {
-	int type;		/* normal or fixed I/O descriptor */
-	int info;		/* decoding information */
-	int min_base;	/* minimum base I/O address */	
-	int max_base;	/* maximum base I/O address */
-	int alignment;	/* alignment for base address */
-	int size;		/* number of contiguous ports */
-};
+struct isapnp_region {
+	bus_space_handle_t h;
+	u_int32_t base;
 
-struct mem_descriptor {
-	int type;		/* 24 or 32bit memory descriptor */
-	int info;		/* misc. memory information */
-	int min_base;	/* minimum base mem address */
-	int max_base;	/* maximum base mem address */
-	int alignment;	/* aligment for base address */
-	int size;		/* number of memory range length */
+	u_int32_t minbase;
+	u_int32_t maxbase;
+	u_int32_t length;
+	u_int32_t align;
+	u_int8_t  flags;
 };
 
-struct confinfo {
-	int prio;
-	struct irq_format *irq[2];
-	struct dma_format *dma[2];
-	struct io_descriptor *io[8];
-	struct mem_descriptor *mem[4];
-
-	TAILQ_ENTRY(confinfo) conf_link;
+struct isapnp_pin {
+	u_int8_t  num;
+	u_int8_t  flags:4;
+	u_int8_t  type:4;
+	u_int16_t bits;
 };
 
-struct devinfo {
-	u_int32_t id;
-	u_int32_t comp_id;
-	char *id_string;
+struct isapnp_attach_args {
+	struct device  *ipa_isa;	/* isa device */
+	bus_space_tag_t ipa_iot;	/* isa i/o space tag */
+	bus_space_tag_t ipa_memt;	/* isa mem space tag */
 
-	int ldn;
-	int io_range_check;
+	bus_space_handle_t ipa_delaybah;
 
-	TAILQ_HEAD(, confinfo) q_conf;
-	struct confinfo *conf;
-	struct confinfo *basic;
+	isa_chipset_tag_t ipa_ic;
 
-	TAILQ_ENTRY(devinfo) dev_link;
-};
+	struct isapnp_attach_args *ipa_sibling;
+	struct isapnp_attach_args *ipa_child;
+
+	char	ipa_devident[ISAPNP_MAX_IDENT];
+	char	ipa_devlogic[ISAPNP_MAX_DEVCLASS];
+	char	ipa_devcompat[ISAPNP_MAX_DEVCLASS];
+	char	ipa_devclass[ISAPNP_MAX_DEVCLASS];
 
-struct cardinfo {
-	char serial[9];
-	char pnp_version[2];
-	int csn;
-	char *id_string;
+	u_char	ipa_pref;
+	u_char	ipa_devnum;
 
-	int num_ld;
+	u_char	ipa_nio;
+	u_char	ipa_nirq;
+	u_char	ipa_ndrq;
+	u_char	ipa_nmem;
+	u_char	ipa_nmem32;
 
-	TAILQ_HEAD(, devinfo) q_dev;
-	struct devinfo *dev;
-	TAILQ_ENTRY(cardinfo) card_link;
+	struct isapnp_region	ipa_io[ISAPNP_NUM_IO];
+	struct isapnp_region	ipa_mem[ISAPNP_NUM_MEM];
+	struct isapnp_region	ipa_mem32[ISAPNP_NUM_MEM32];
+	struct isapnp_pin	ipa_irq[ISAPNP_NUM_IRQ];
+	struct isapnp_pin	ipa_drq[ISAPNP_NUM_DRQ];
 };
 
-struct pnp_knowndev {
-	char *pnpid;
-	char *driver;
+struct isapnp_knowndev {
+	const char *pnpid;
+	const char *driver;
 };
 
-#endif /* !_DEV_ISA_ISAPNPVAR_H_ */
+static __inline void isapnp_write_reg __P((struct isapnp_softc *, int, u_char));
+static __inline u_char isapnp_read_reg __P((struct isapnp_softc *, int));
+
+static __inline void
+isapnp_write_reg(sc, r, v)
+	struct isapnp_softc *sc;
+	int r;
+	u_char v;
+{
+	ISAPNP_WRITE_ADDR(sc, r);
+	ISAPNP_WRITE_DATA(sc, v);
+}
+
+static __inline u_char
+isapnp_read_reg(sc, r)
+	struct isapnp_softc *sc;
+{
+	ISAPNP_WRITE_ADDR(sc, r);
+	return ISAPNP_READ_DATA(sc);
+}
+
+struct isapnp_attach_args *
+    isapnp_get_resource __P((struct isapnp_softc *, int));
+char *isapnp_id_to_vendor __P((char *, const u_char *));
+
+int isapnp_config __P((bus_space_tag_t, bus_space_tag_t,
+    struct isapnp_attach_args *));
+void isapnp_unconfig __P((bus_space_tag_t, bus_space_tag_t,
+    struct isapnp_attach_args *));
+
+#ifdef DEBUG_ISAPNP
+void isapnp_print_mem __P((const char *, const struct isapnp_region *));
+void isapnp_print_io __P((const char *, const struct isapnp_region *));
+void isapnp_print_irq __P((const char *, const struct isapnp_pin *));
+void isapnp_print_drq __P((const char *, const struct isapnp_pin *));
+void isapnp_print_dep_start __P((const char *, const u_char));
+void isapnp_print_attach __P((const struct isapnp_attach_args *));
+void isapnp_get_config __P((struct isapnp_softc *,
+	struct isapnp_attach_args *));
+void isapnp_print_config __P((const struct isapnp_attach_args *));
+#endif
+
+#endif /* ! _DEV_ISAPNP_ISAPNPVAR_H_ */