o Sync the device list with OLDCARD.

o Remove bogus flags that aren't used (if we need them in the future, we can
  add them back).
o Add support for the TI-1031.  This is the only YENTA compatible PCI-PCMCIA
  bridge that I'm aware of (all the others are PCIC on a PCI bus, which is
  different).

1 files changed, 46 insertions, 51 deletions

diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 1e9aa32..ce0331b 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -118,73 +118,73 @@ struct yenta_chipinfo {
 	int	yc_flags;
 } yc_chipsets[] = {
 	/* Texas Instruments chips */
-	{PCI_DEVICE_ID_PCIC_TI1130, "TI1130 PCI-CardBus Bridge", CB_TI113X,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1131, "TI1131 PCI-CardBus Bridge", CB_TI113X,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-
-	{PCI_DEVICE_ID_PCIC_TI1211, "TI1211 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1220, "TI1220 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1221, "TI1221 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1225, "TI1225 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1250, "TI1250 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1251, "TI1251 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1251B,"TI1251B PCI-CardBus Bridge",CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1410, "TI1410 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1420, "TI1420 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1450, "TI1450 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI1451, "TI1451 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI4410, "TI4410 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
-	{PCI_DEVICE_ID_PCIC_TI4451, "TI4451 PCI-CardBus Bridge", CB_TI12XX,
-	    PCCBB_PCIC_IO_RELOC | PCCBB_PCIC_MEM_32},
+	{PCI_DEVICE_ID_PCIC_TI1031, "TI1031 PCI-PCCard Bridge", CB_TI113X, 0},
+	{PCI_DEVICE_ID_PCIC_TI1130, "TI1130 PCI-CardBus Bridge", CB_TI113X, 0},
+	{PCI_DEVICE_ID_PCIC_TI1131, "TI1131 PCI-CardBus Bridge", CB_TI113X, 0},
+
+	{PCI_DEVICE_ID_PCIC_TI1210, "TI1210 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1211, "TI1211 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1220, "TI1220 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1221, "TI1221 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1225, "TI1225 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1250, "TI1250 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1251, "TI1251 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1251B,"TI1251B PCI-CardBus Bridge",CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1260, "TI1260 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1260B, "TI1260B PCI-CardBus Bridge", CB_TI12XX,
+	    0},
+	{PCI_DEVICE_ID_PCIC_TI1410, "TI1410 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1420, "TI1420 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1421, "TI1421 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1450, "TI1450 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI1451, "TI1451 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI4410, "TI4410 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI4450, "TI4450 PCI-CardBus Bridge", CB_TI12XX, 0},
+	{PCI_DEVICE_ID_PCIC_TI4451, "TI4451 PCI-CardBus Bridge", CB_TI12XX, 0},
 
 	/* Ricoh chips */
 	{PCI_DEVICE_ID_RICOH_RL5C465, "RF5C465 PCI-CardBus Bridge",
-	    CB_RF5C46X, PCCBB_PCIC_MEM_32},
+	    CB_RF5C46X, 0},
 	{PCI_DEVICE_ID_RICOH_RL5C466, "RF5C466 PCI-CardBus Bridge",
-	    CB_RF5C46X, PCCBB_PCIC_MEM_32},
+	    CB_RF5C46X, 0},
 	{PCI_DEVICE_ID_RICOH_RL5C475, "RF5C475 PCI-CardBus Bridge",
-	    CB_RF5C47X, PCCBB_PCIC_MEM_32},
+	    CB_RF5C47X, 0},
 	{PCI_DEVICE_ID_RICOH_RL5C476, "RF5C476 PCI-CardBus Bridge",
-	    CB_RF5C47X, PCCBB_PCIC_MEM_32},
+	    CB_RF5C47X, 0},
 	{PCI_DEVICE_ID_RICOH_RL5C478, "RF5C478 PCI-CardBus Bridge",
-	    CB_RF5C47X, PCCBB_PCIC_MEM_32},
+	    CB_RF5C47X, 0},
 
 	/* Toshiba products */
 	{PCI_DEVICE_ID_TOSHIBA_TOPIC95, "ToPIC95 PCI-CardBus Bridge",
-	    CB_TOPIC95, PCCBB_PCIC_MEM_32},
+	    CB_TOPIC95, 0},
 	{PCI_DEVICE_ID_TOSHIBA_TOPIC95B, "ToPIC95B PCI-CardBus Bridge",
-	    CB_TOPIC95B, PCCBB_PCIC_MEM_32},
+	    CB_TOPIC95B, 0},
 	{PCI_DEVICE_ID_TOSHIBA_TOPIC97, "ToPIC97 PCI-CardBus Bridge",
-	    CB_TOPIC97, PCCBB_PCIC_MEM_32},
+	    CB_TOPIC97, 0},
 	{PCI_DEVICE_ID_TOSHIBA_TOPIC100, "ToPIC100 PCI-CardBus Bridge",
-	    CB_TOPIC97, PCCBB_PCIC_MEM_32},
+	    CB_TOPIC97, 0},
 
 	/* Cirrus Logic */
 	{PCI_DEVICE_ID_PCIC_CLPD6832, "CLPD6832 PCI-CardBus Bridge",
-	    CB_CIRRUS, PCCBB_PCIC_MEM_32},
+	    CB_CIRRUS, 0},
 	{PCI_DEVICE_ID_PCIC_CLPD6833, "CLPD6833 PCI-CardBus Bridge",
-	    CB_CIRRUS, PCCBB_PCIC_MEM_32},
+	    CB_CIRRUS, 0},
+	{PCI_DEVICE_ID_PCIC_CLPD6834, "CLPD6834 PCI-CardBus Bridge",
+	    CB_CIRRUS, 0},
 
 	/* 02Micro */
 	{PCI_DEVICE_ID_PCIC_OZ6832, "O2Mirco OZ6832/6833 PCI-CardBus Bridge",
-	    CB_CIRRUS, PCCBB_PCIC_MEM_32},
+	    CB_CIRRUS, 0},
 	{PCI_DEVICE_ID_PCIC_OZ6860, "O2Mirco OZ6836/6860 PCI-CardBus Bridge",
-	    CB_CIRRUS, PCCBB_PCIC_MEM_32},
+	    CB_CIRRUS, 0},
 	{PCI_DEVICE_ID_PCIC_OZ6872, "O2Mirco OZ6812/6872 PCI-CardBus Bridge",
-	    CB_CIRRUS, PCCBB_PCIC_MEM_32},
+	    CB_CIRRUS, 0},
+	{PCI_DEVICE_ID_PCIC_OZ6912, "O2Mirco OZ6912/6972 PCI-CardBus Bridge",
+	    CB_CIRRUS, 0},
+	{PCI_DEVICE_ID_PCIC_OZ6922, "O2Mirco OZ6822 PCI-CardBus Bridge",
+	    CB_CIRRUS, 0},
+	{PCI_DEVICE_ID_PCIC_OZ6933, "O2Mirco OZ6833 PCI-CardBus Bridge",
+	    CB_CIRRUS, 0},
 
 	/* sentinel */
 	{0 /* null id */, "unknown",
@@ -402,7 +402,7 @@ pccbb_chipinit(struct pccbb_softc *sc)
 	switch (sc->sc_chipset) {
 	case CB_TI113X:
 		/*
-		 * The TI 1030, TI 1130 and TI 1131 all require another bit
+		 * The TI 1031, TI 1130 and TI 1131 all require another bit
 		 * be set to enable PCI routing of interrupts, and then
 		 * a bit for each of the CSC and Function interrupts we
 		 * want routed.
@@ -1818,11 +1818,6 @@ pccbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid,
 	struct pccbb_reslist *rle;
 	int tmp;
 
-	if ((sc->sc_flags & PCCBB_PCIC_MEM_32) == 0) {
-		/* XXX: how do we do this? */
-		panic("PCCBB bridge cannot handle non MEM_32 bridges\n");
-	}
-
 	switch (type) {
 	case SYS_RES_MEMORY:
 		if (start < pccbb_start_mem)