Browse Source

update:dma合并进platform

alienwalker 3 years ago
parent
commit
9041bbb179
2 changed files with 16 additions and 22 deletions
  1. 0 22
      bsp/air105/include/core_dma.h
  2. 16 0
      bsp/common/include/platform_define.h

+ 0 - 22
bsp/air105/include/core_dma.h

@@ -22,28 +22,6 @@
 #ifndef __CORE_DMA_H__
 #define __CORE_DMA_H__
 
-enum
-{
-	DMA1_STREAM_0,
-	DMA1_STREAM_1,
-	DMA1_STREAM_2,
-	DMA1_STREAM_3,
-	DMA1_STREAM_4,
-	DMA1_STREAM_5,
-	DMA1_STREAM_6,
-	DMA1_STREAM_7,
-//	DMA1_STREAM_QTY,
-//	DMA2_STREAM_0 = DMA1_STREAM_QTY,
-//	DMA2_STREAM_1,
-//	DMA2_STREAM_2,
-//	DMA2_STREAM_3,
-//	DMA2_STREAM_4,
-//	DMA2_STREAM_5,
-//	DMA2_STREAM_6,
-//	DMA2_STREAM_7,
-	DMA2_STREAM_QTY,
-	DMA_STREAM_QTY = DMA2_STREAM_QTY,
-};
 void DMA_GlobalInit(void);
 void *DMA_TakeStream(uint8_t Stream);
 int DMA_CheckStreamLock(uint8_t Stream);

+ 16 - 0
bsp/common/include/platform_define.h

@@ -27,6 +27,7 @@ enum
 	UART_DATA_BIT6 = 6,
 	UART_DATA_BIT7 = 7,
 	UART_DATA_BIT8 = 8,
+	UART_DATA_BIT9 = 9,
 	UART_PARITY_NONE = 0,
 	UART_PARITY_ODD,
 	UART_PARITY_EVEN,
@@ -75,6 +76,7 @@ enum
 
 };
 
+#ifdef __AIR105_BSP__
 enum
 {
 	USB_ID0 = 0,
@@ -119,6 +121,17 @@ enum
 	ADC_CHANNEL_6,
 	ADC_CHANNEL_MAX,
 
+	DMA1_STREAM_0 = 0,
+	DMA1_STREAM_1,
+	DMA1_STREAM_2,
+	DMA1_STREAM_3,
+	DMA1_STREAM_4,
+	DMA1_STREAM_5,
+	DMA1_STREAM_6,
+	DMA1_STREAM_7,
+	DMA1_STREAM_QTY,
+	DMA_STREAM_QTY = DMA1_STREAM_QTY,
+
 	HAL_GPIO_0 = 0,
 	HAL_GPIO_1,
 	HAL_GPIO_2,
@@ -218,6 +231,7 @@ enum
 	HAL_GPIO_MAX,
 	HAL_GPIO_NONE = HAL_GPIO_MAX, //大于等于HAL_GPIO_NONE,说明不存在
 };
+
 enum
 {
 	GPIOA_00 = 0,
@@ -321,3 +335,5 @@ enum
 };
 
 #endif
+
+#endif