Merge branch 'mtr2d2' into 'master'

Conflicts:
	io-module/mtdc_gpiob.c - remove, replaced by mtac_gpiob.c
	io-module/mtr2.c - remove, dropping support for this HW
	io-module/mts_io.c - keep changes from mtr2d2 branch
	io-module/spi.c - remove, no longer needed

1 files changed, 28 insertions, 15 deletions

diff --git a/io-module/mts_io.h b/io-module/mts_io.h
index fc37ac5..3645e17 100644
--- a/io-module/mts_io.h
+++ b/io-module/mts_io.h
@@ -42,43 +42,35 @@ struct device_attribute _dev_name = { \
 #define VENDOR_ID_MULTITECH			"Multi-Tech Systems"
 #define PRODUCT_ID_MTCDP_E1_DK			"MTCDP-E1-DK"
 #define PRODUCT_ID_MT100EOCG			"MT100EOCG"
-#define PRODUCT_ID_MTR2				"MTR2"
 #define PRODUCT_ID_MTR				"MTR"
-#define PRODUCT_ID_MTOCGD2			"MTOCGD2"
-#define PRODUCT_ID_MTOCGD			"MTOCGD"
 #define PRODUCT_ID_MTR2D2			"MTR2D2"
 
-#define PRODUCT_ID_MTDC_GPIOB			"MTDC-GPIOB"
-
+#define PRODUCT_ID_MTAC_GPIOB			"MTAC-GPIOB"
+#define PRODUCT_ID_MTAC_MFSER			"MTAC-MFSER"
+#define PRODUCT_ID_MTAC_ETH			"MTAC-ETH"
 
 #define HW_VERSION_MTCBA2_2_0			"MTCBA2-2.0"
 #define HW_VERSION_MTCDP_0_0			"MTCDP-0.0"
 #define HW_VERSION_MTCDP_1_0			"MTCDP-1.0"
 #define HW_VERSION_MT100EOCG_0_0		"MT100EOCG-0.0"
-#define HW_VERSION_MTR2_0_0			"MTR2-0.0"
 #define HW_VERSION_MTR_0_0			"MTR-0.0"
 #define HW_VERSION_MTR_0_1			"MTR-0.1"
-#define HW_VERSION_MTOCGD2_0_0			"MTOCGD2-0.0"
-#define HW_VERSION_MTOCGD_0_0			"MTOCGD-0.0"
-#define HW_VERSION_MTOCGD_0_1			"MTOCGD-0.1"
 #define HW_VERSION_MTR2D2_0_0			"MTR2D2-0.0"
 
 enum {
 	MTCDP_E1_DK_0_0,
 	MTCDP_E1_DK_1_0,
 	MT100EOCG_0_0,
-	MTR2_0_0,
 	MTR_0_0,
 	MTR_0_1,
-	MTOCGD2_0_0,
-	MTOCGD_0_0,
-	MTOCGD_0_1,
 	MTR2D2_0_0,
 };
 
 enum {
-	MTDC_NONE,
-	MTDC_GPIOB_0_0,
+	MTAC_NONE,
+	MTAC_GPIOB_0_0,
+	MTAC_MFSER_0_0,
+	MTAC_ETH_0_0,
 };
 
 // GPIO pin types:input, output, open drain (1 = high Z, 0 = output low)
@@ -100,5 +92,26 @@ enum {
 	LED_FLASHING,
 };
 
+enum ap {
+	port_1 = 1,
+	port_2,
+};
+
+enum spi_devices {
+	din = 0,
+	dout = 1,
+	adc = 2,
+};
+
+// info for accessory port
+// contains function pointers for setup and teardown and useful info
+// each type of accessory card should have one of these
+struct ap_info {
+	char  product_id[32];
+	bool (*setup)(enum ap port);
+	bool (*teardown)(enum ap port);
+	char* (*gpio_pin_name_by_attr_name)(const char* name, int port);
+};
+
 #endif /* ~__MTS_IO_H */