Garbage collect Falcon/PPC support that has not been used in released

products, based on discussion with Adaptec.

4 files changed, 0 insertions, 128 deletions

diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index f4c57e6..5839895 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -107,28 +107,6 @@ static int	aac_dequeue_fib(struct aac_softc *sc, int queue,
 static int	aac_enqueue_response(struct aac_softc *sc, int queue,
 				     struct aac_fib *fib);
 
-/* Falcon/PPC interface */
-static int	aac_fa_get_fwstatus(struct aac_softc *sc);
-static void	aac_fa_qnotify(struct aac_softc *sc, int qbit);
-static int	aac_fa_get_istatus(struct aac_softc *sc);
-static void	aac_fa_clear_istatus(struct aac_softc *sc, int mask);
-static void	aac_fa_set_mailbox(struct aac_softc *sc, u_int32_t command,
-				   u_int32_t arg0, u_int32_t arg1,
-				   u_int32_t arg2, u_int32_t arg3);
-static int	aac_fa_get_mailbox(struct aac_softc *sc, int mb);
-static void	aac_fa_set_interrupts(struct aac_softc *sc, int enable);
-
-struct aac_interface aac_fa_interface = {
-	aac_fa_get_fwstatus,
-	aac_fa_qnotify,
-	aac_fa_get_istatus,
-	aac_fa_clear_istatus,
-	aac_fa_set_mailbox,
-	aac_fa_get_mailbox,
-	aac_fa_set_interrupts,
-	NULL, NULL, NULL
-};
-
 /* StrongARM interface */
 static int	aac_sa_get_fwstatus(struct aac_softc *sc);
 static void	aac_sa_qnotify(struct aac_softc *sc, int qbit);
@@ -2417,17 +2395,6 @@ aac_rx_get_fwstatus(struct aac_softc *sc)
 }
 
 static int
-aac_fa_get_fwstatus(struct aac_softc *sc)
-{
-	int val;
-
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	val = AAC_MEM0_GETREG4(sc, AAC_FA_FWSTATUS);
-	return (val);
-}
-
-static int
 aac_rkt_get_fwstatus(struct aac_softc *sc)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -2457,15 +2424,6 @@ aac_rx_qnotify(struct aac_softc *sc, int qbit)
 }
 
 static void
-aac_fa_qnotify(struct aac_softc *sc, int qbit)
-{
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL1, qbit);
-	AAC_FA_HACK(sc);
-}
-
-static void
 aac_rkt_qnotify(struct aac_softc *sc, int qbit)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -2493,17 +2451,6 @@ aac_rx_get_istatus(struct aac_softc *sc)
 }
 
 static int
-aac_fa_get_istatus(struct aac_softc *sc)
-{
-	int val;
-
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	val = AAC_MEM0_GETREG2(sc, AAC_FA_DOORBELL0);
-	return (val);
-}
-
-static int
 aac_rkt_get_istatus(struct aac_softc *sc)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -2531,15 +2478,6 @@ aac_rx_clear_istatus(struct aac_softc *sc, int mask)
 }
 
 static void
-aac_fa_clear_istatus(struct aac_softc *sc, int mask)
-{
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask);
-	AAC_FA_HACK(sc);
-}
-
-static void
 aac_rkt_clear_istatus(struct aac_softc *sc, int mask)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -2577,24 +2515,6 @@ aac_rx_set_mailbox(struct aac_softc *sc, u_int32_t command,
 }
 
 static void
-aac_fa_set_mailbox(struct aac_softc *sc, u_int32_t command,
-		u_int32_t arg0, u_int32_t arg1, u_int32_t arg2, u_int32_t arg3)
-{
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX, command);
-	AAC_FA_HACK(sc);
-	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 4, arg0);
-	AAC_FA_HACK(sc);
-	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 8, arg1);
-	AAC_FA_HACK(sc);
-	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 12, arg2);
-	AAC_FA_HACK(sc);
-	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 16, arg3);
-	AAC_FA_HACK(sc);
-}
-
-static void
 aac_rkt_set_mailbox(struct aac_softc *sc, u_int32_t command, u_int32_t arg0,
 		    u_int32_t arg1, u_int32_t arg2, u_int32_t arg3)
 {
@@ -2627,17 +2547,6 @@ aac_rx_get_mailbox(struct aac_softc *sc, int mb)
 }
 
 static int
-aac_fa_get_mailbox(struct aac_softc *sc, int mb)
-{
-	int val;
-
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
-
-	val = AAC_MEM1_GETREG4(sc, AAC_FA_MAILBOX + (mb * 4));
-	return (val);
-}
-
-static int
 aac_rkt_get_mailbox(struct aac_softc *sc, int mb)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
@@ -2676,20 +2585,6 @@ aac_rx_set_interrupts(struct aac_softc *sc, int enable)
 }
 
 static void
-aac_fa_set_interrupts(struct aac_softc *sc, int enable)
-{
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "%sable interrupts", enable ? "en" : "dis");
-
-	if (enable) {
-		AAC_MEM0_SETREG2((sc), AAC_FA_MASK0_CLEAR, AAC_DB_INTERRUPTS);
-		AAC_FA_HACK(sc);
-	} else {
-		AAC_MEM0_SETREG2((sc), AAC_FA_MASK0, ~0);
-		AAC_FA_HACK(sc);
-	}
-}
-
-static void
 aac_rkt_set_interrupts(struct aac_softc *sc, int enable)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "%sable interrupts", enable ? "en" : "dis");
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 17731a8..bc99379 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -435,10 +435,6 @@ aac_pci_attach(device_t dev)
 		fwprintf(sc, HBA_FLAGS_DBG_INIT_B, "set hardware up for StrongARM");
 		sc->aac_if = aac_sa_interface;
 		break;
-	case AAC_HWIF_FALCON:
-		fwprintf(sc, HBA_FLAGS_DBG_INIT_B, "set hardware up for Falcon/PPC");
-		sc->aac_if = aac_fa_interface;
-		break;
 	case AAC_HWIF_RKT:
 		fwprintf(sc, HBA_FLAGS_DBG_INIT_B, "set hardware up for Rocket/MIPS");
 		sc->aac_if = aac_rkt_interface;
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index d45634a..3235881 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -1453,24 +1453,6 @@ enum {
 };
 
 /*
- * Register set for adapters based on the Falcon bridge and PPC core
- */
-
-#define AAC_FA_DOORBELL0_CLEAR		0x00
-#define AAC_FA_DOORBELL1_CLEAR		0x02
-#define AAC_FA_DOORBELL0		0x04
-#define AAC_FA_DOORBELL1		0x06
-#define AAC_FA_MASK0_CLEAR		0x08
-#define AAC_FA_MASK1_CLEAR		0x0a
-#define	AAC_FA_MASK0			0x0c
-#define AAC_FA_MASK1			0x0e
-#define AAC_FA_MAILBOX			0x10
-#define	AAC_FA_FWSTATUS			0x2c	/* Mailbox 7 */
-#define	AAC_FA_INTSRC			0x900
-
-#define AAC_FA_HACK(sc)	(void)AAC_MEM0_GETREG4(sc, AAC_FA_INTSRC)
-
-/*
  * Register definitions for the Adaptec AAC-364 'Jalapeno I/II' adapters, based
  * on the SA110 'StrongArm'.
  */
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 3f9714d..23ec83c 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -319,7 +319,6 @@ struct aac_softc
 	int			aac_hwif;
 #define AAC_HWIF_I960RX		0
 #define AAC_HWIF_STRONGARM	1
-#define AAC_HWIF_FALCON		2
 #define AAC_HWIF_RKT		3
 #define	AAC_HWIF_NARK		4
 #define AAC_HWIF_UNKNOWN	-1