Resync siop with NetBSD. Make strong effort to minimize

differences, undoing whitespace, spelling, etc. changes
and adopting the NetBSD code instead of equivalent home
grown code for PPR negotiation, etc.

siop.c            1.21 -> 1.64
siop_common.c     1.12 -> 1.30
siopreg.h         1.7  -> 1.13
siopvar.h         1.13 -> 1.18
siopvar_common.h  1.10 -> 1.21
ncr53cxxx.c       1.5  -> 1.10
siop.ss           1.12 -> 1.17
siop_pci.c        1.8  -> 1.11
siop_pci_common.c 1.6  -> 1.17
siop_pci_common.h 1.2  -> 1.4

Many fixes, add 1010-66 support, restructure things to prepare for
addition of esiop, osiop and oosiop drivers.

tested on various archs by art@, millert@, wilfried@, jason@,
Dan Weeks.

ok deraadt@.

1 files changed, 9 insertions, 12 deletions

diff --git a/sys/dev/pci/siop_pci_common.h b/sys/dev/pci/siop_pci_common.h
index 0dc24a7c4b2..5d8164c3c85 100644
--- a/sys/dev/pci/siop_pci_common.h
+++ b/sys/dev/pci/siop_pci_common.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: siop_pci_common.h,v 1.4 2002/03/14 01:27:00 millert Exp $ */
-/*	$NetBSD: siop_pci_common.h,v 1.2 2000/10/23 14:57:23 bouyer Exp $	*/
+/*	$OpenBSD: siop_pci_common.h,v 1.5 2002/09/16 00:53:12 krw Exp $ */
+/*	$NetBSD: siop_pci_common.h,v 1.4 2002/04/23 20:41:19 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -14,7 +14,7 @@
  *    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 Manuel Bouyer
+ *	This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -40,24 +40,21 @@ struct siop_product_desc {
 	u_int8_t maxburst;
 	u_int8_t maxoff;  /* maximum supported offset */
 	u_int8_t clock_div; /* clock divider to use for async. logic */
-	u_int8_t scf_index; /* Index into a period_factor_to_scf.scf */
-#define     SF_CLOCK_2500	0
-#define	    SF_CLOCK_1250	1
-#define	    SF_CLOCK_625	2
+	u_int8_t clock_period; /* clock period (ns * 10) */
 	int 	ram_size; /* size of RAM, if appropriate */
 };
 
 const struct siop_product_desc * siop_lookup_product(u_int32_t, int);
 
 /* Driver internal state */
-struct siop_pci_softc {
-	struct siop_softc siop;
+struct siop_pci_common_softc {
 	pci_chipset_tag_t	sc_pc;	/* PCI registers info */
 	pcitag_t		sc_tag;
 	void			*sc_ih;	/* PCI interrupt handle */
 	const struct siop_product_desc *sc_pp; /* Adapter description */
 };
 
-int siop_pci_attach_common(struct siop_pci_softc *,
-	struct pci_attach_args *);
-void siop_pci_reset(struct siop_softc *);
+int siop_pci_attach_common (struct siop_pci_common_softc *,
+	struct siop_common_softc *, struct pci_attach_args *,
+	int (*) (void *));
+void siop_pci_reset(struct siop_common_softc *);