X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcortexelf-v1%2Fao_pins.h;h=258ffe31f79e43518cce3575086614777219eea8;hb=6efa53bafda18313742849a6c4992f09c3e403c3;hp=d580ce3d2f4efcdab7eb79c5c6a81dceedeb6e1f;hpb=280eefc8f86e90e742c536a074d7284cce03af15;p=fw%2Faltos

diff --git a/src/cortexelf-v1/ao_pins.h b/src/cortexelf-v1/ao_pins.h
index d580ce3d..258ffe31 100644
--- a/src/cortexelf-v1/ao_pins.h
+++ b/src/cortexelf-v1/ao_pins.h
@@ -90,12 +90,12 @@
 #define HAS_SPI_2		1
 #define SPI_2_PB13_PB14_PB15	0
 #define SPI_2_PD1_PD3_PD4	1	/* LED displays, microSD */
-#define SPI_2_OSPEEDR		STM_OSPEEDR_10MHz
+#define SPI_2_OSPEEDR		STM_OSPEEDR_40MHz
 
 #define SPI_2_PORT		(&stm_gpiod)
-#define SPI_2_SCK_PIN		1
-#define SPI_2_MISO_PIN		3
-#define SPI_2_MOSI_PIN		4
+//#define SPI_2_SCK_PIN		1
+//#define SPI_2_MISO_PIN		3
+//#define SPI_2_MOSI_PIN		4
 
 #define HAS_I2C_1		0
 #define I2C_1_PB8_PB9		0
@@ -125,6 +125,8 @@
 #define AO_SDCARD_SPI_MISO_PIN	3
 #define AO_SDCARD_SPI_MOSI_PIN	4
 
+/* VGA */
+#define STM_DMA1_3_STOLEN	1
 /* Buttons */
 
 #define AO_EVENT		1
@@ -207,12 +209,6 @@
 #define AO_MATRIX_COL_3_PIN	6
 
 /* 1802 connections */
-#define MA_PORT			(&stm_gpioe)
-#define MA_SHIFT		0
-
-#define DATA_PORT		(&stm_gpioe)
-#define DATA_SHIFT		8
-
 #define MRD_PORT		(&stm_gpiob)
 #define MRD_BIT			15
 
@@ -225,34 +221,45 @@
 #define TPA_PORT		(&stm_gpioa)
 #define TPA_BIT			6
 
-#define MUX_PORT		(&stm_gpiob)
-#define MUX_BIT			1
+#define MA_PORT			(&stm_gpioe)
+#define MA_SHIFT		0
+#define MA_MASK			0xff
 
-#define WAIT_PORT		(&stm_gpioa)
-#define WAIT_PIN		4
+#define BUS_PORT		(&stm_gpioe)
+#define BUS_SHIFT		8
+#define BUS_MASK		0xff
 
-#define CLEAR_PORT		(&stm_gpioa)
-#define CLEAR_PIN		10
+#define SC_PORT			(&stm_gpiob)
+#define SC_SHIFT		13
+#define SC_MASK			3
 
 #define Q_PORT			(&stm_gpiob)
 #define Q_BIT			12
 
-#define SC_PORT			(&stm_gpiob)
-#define SC_SHIFT		13
-
 #define N_PORT			(&stm_gpiod)
 #define N_SHIFT			13
+#define N_MASK			7
+
+#define EF_PORT			(&stm_gpiob)
+#define EF_SHIFT		8
+#define EF_MASK			0xf
 
 #define DMA_IN_PORT		(&stm_gpioa)
-#define DMA_IN_PIN		0
+#define DMA_IN_BIT		0
 
 #define DMA_OUT_PORT		(&stm_gpioa)
-#define DMA_OUT_PIN		9
+#define DMA_OUT_BIT		9
 
-#define INTERRUPT_PORT		(&stm_gpioa)
-#define INTERRUPT_PIN		2
+#define INT_PORT		(&stm_gpioa)
+#define INT_BIT			2
 
-#define EF_PORT			(&stm_gpiob)
-#define EF_SHIFT		8
+#define CLEAR_PORT		(&stm_gpioa)
+#define CLEAR_BIT		10
+
+#define WAIT_PORT		(&stm_gpioa)
+#define WAIT_BIT		4
+
+#define MUX_PORT		(&stm_gpiob)
+#define MUX_BIT			1
 
 #endif /* _AO_PINS_H_ */