diff --git a/CH32V203/.cproject b/CH32V203/.cproject
index 4336a52..23f900a 100644
--- a/CH32V203/.cproject
+++ b/CH32V203/.cproject
@@ -20,9 +20,9 @@
-
+
-
+
@@ -45,25 +45,23 @@
-
-
-
+
+
+
-
+
-
+
@@ -78,7 +76,7 @@
@@ -117,7 +115,7 @@
-
+
@@ -140,5 +138,5 @@
-
+
diff --git a/CH32V203/.project b/CH32V203/.project
index c583922..f7b3877 100644
--- a/CH32V203/.project
+++ b/CH32V203/.project
@@ -1,18 +1,18 @@
-
+
DAPLink
-
-
+
+
org.eclipse.cdt.managedbuilder.core.genmakebuilder
clean,full,incremental,
-
+
org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
full,incremental,
-
+
@@ -22,8 +22,8 @@
- 1672839367507
-
+ 1595986042669
+
22
org.eclipse.ui.ide.multiFilter
diff --git a/CH32V203/.template b/CH32V203/.template
index eaa9f3f..515add5 100644
--- a/CH32V203/.template
+++ b/CH32V203/.template
@@ -1,17 +1,16 @@
Address=0x08000000
+Target Path=obj/DAPLink.hex
Erase All=true
Program=true
Verify=true
Reset=true
-
Toolchain=RISC-V
Series=CH32V203
-Description=ROM(byte): 64K, SRAM(byte): 20K, CHIP PINS: 32, GPIO PORTS: 27.\nWCH CH32V2 series of mainstream MCUs covers the needs of a large variety of applications in the industrial,medical and consumer markets. High performance with first-class peripherals and low-power,low-voltage operation is paired with a high level of integration at accessible prices with a simple architecture and easy-to-use tools.
-
-PeripheralVersion=1.0
-Target Path=obj/DAPLink.hex
+RTOS=NoneOS
+Description=Website: http://www.wch.cn/products/CH32V203.html?\nROM(byte): 32K, SRAM(byte): 10K, CHIP PINS: 48, GPIO PORTS: 37.\nWCH CH32V2 series of mainstream MCUs covers the needs of a large variety of applications in the industrial,medical and consumer markets. High performance with first-class peripherals and low-power,low-voltage operation is paired with a high level of integration at accessible prices with a simple architecture and easy-to-use tools.
+PeripheralVersion=1.7
Vendor=WCH
MCU=CH32V203F6P6
Mcu Type=CH32V20x
-Link=WCH-Link
+Link=WCH-Link
\ No newline at end of file
diff --git a/CH32V203/DAPLink.launch b/CH32V203/DAPLink.launch
new file mode 100644
index 0000000..022ffea
--- /dev/null
+++ b/CH32V203/DAPLink.launch
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CH32V203/DAPLink.wvproj b/CH32V203/DAPLink.wvproj
index 2cd99d9..6974dad 100644
Binary files a/CH32V203/DAPLink.wvproj and b/CH32V203/DAPLink.wvproj differ
diff --git a/CH32V203/link.ld b/CH32V203/link.ld
new file mode 100644
index 0000000..965aa94
--- /dev/null
+++ b/CH32V203/link.ld
@@ -0,0 +1 @@
+ENTRY( _start )
__stack_size = 4096;
PROVIDE( _stack_size = __stack_size );
MEMORY
{
/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 */
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K
/* CH32V20x_D6 - CH32V203K8-CH32V203C8-CH32V203G8-CH32V203F8 */
/*
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
*/
/* CH32V20x_D8 - CH32V203RB
CH32V20x_D8W - CH32V208x
FLASH + RAM supports the following configuration
FLASH-128K + RAM-64K
FLASH-144K + RAM-48K
FLASH-160K + RAM-32K
*/
/*
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 160K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K
*/
}
SECTIONS
{
.init :
{
_sinit = .;
. = ALIGN(4);
KEEP(*(SORT_NONE(.init)))
. = ALIGN(4);
_einit = .;
} >FLASH AT>FLASH
.vector :
{
*(.vector);
. = ALIGN(64);
} >FLASH AT>FLASH
.text :
{
. = ALIGN(4);
*(.text)
*(.text.*)
*(.rodata)
*(.rodata*)
*(.glue_7)
*(.glue_7t)
*(.gnu.linkonce.t.*)
. = ALIGN(4);
} >FLASH AT>FLASH
.fini :
{
KEEP(*(SORT_NONE(.fini)))
. = ALIGN(4);
} >FLASH AT>FLASH
PROVIDE( _etext = . );
PROVIDE( _eitcm = . );
.preinit_array :
{
PROVIDE_HIDDEN (__preinit_array_start = .);
KEEP (*(.preinit_array))
PROVIDE_HIDDEN (__preinit_array_end = .);
} >FLASH AT>FLASH
.init_array :
{
PROVIDE_HIDDEN (__init_array_start = .);
KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
PROVIDE_HIDDEN (__init_array_end = .);
} >FLASH AT>FLASH
.fini_array :
{
PROVIDE_HIDDEN (__fini_array_start = .);
KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
PROVIDE_HIDDEN (__fini_array_end = .);
} >FLASH AT>FLASH
.ctors :
{
/* gcc uses crtbegin.o to find the start of
the constructors, so we make sure it is
first. Because this is a wildcard, it
doesn't matter if the user does not
actually link against crtbegin.o; the
linker won't look for a file to match a
wildcard. The wildcard also means that it
doesn't matter which directory crtbegin.o
is in. */
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
/* We don't want to include the .ctor section from
the crtend.o file until after the sorted ctors.
The .ctor section from the crtend file contains the
end of ctors marker and it must be last */
KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
KEEP (*(SORT(.ctors.*)))
KEEP (*(.ctors))
} >FLASH AT>FLASH
.dtors :
{
KEEP (*crtbegin.o(.dtors))
KEEP (*crtbegin?.o(.dtors))
KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
KEEP (*(SORT(.dtors.*)))
KEEP (*(.dtors))
} >FLASH AT>FLASH
.dalign :
{
. = ALIGN(4);
PROVIDE(_data_vma = .);
} >RAM AT>FLASH
.dlalign :
{
. = ALIGN(4);
PROVIDE(_data_lma = .);
} >FLASH AT>FLASH
.data :
{
*(.gnu.linkonce.r.*)
*(.data .data.*)
*(.gnu.linkonce.d.*)
. = ALIGN(8);
PROVIDE( __global_pointer$ = . + 0x800 );
*(.sdata .sdata.*)
*(.sdata2.*)
*(.gnu.linkonce.s.*)
. = ALIGN(8);
*(.srodata.cst16)
*(.srodata.cst8)
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
. = ALIGN(4);
PROVIDE( _edata = .);
} >RAM AT>FLASH
.bss :
{
. = ALIGN(4);
PROVIDE( _sbss = .);
*(.sbss*)
*(.gnu.linkonce.sb.*)
*(.bss*)
*(.gnu.linkonce.b.*)
*(COMMON*)
. = ALIGN(4);
PROVIDE( _ebss = .);
} >RAM AT>FLASH
PROVIDE( _end = _ebss);
PROVIDE( end = . );
.stack ORIGIN(RAM) + LENGTH(RAM) - __stack_size :
{
PROVIDE( _heap_end = . );
. = ALIGN(4);
PROVIDE(_susrstack = . );
. = . + __stack_size;
PROVIDE( _eusrstack = .);
} >RAM
}
\ No newline at end of file
diff --git a/CH32V203/src/link.ld b/CH32V203/src/link.ld
deleted file mode 100644
index 7b8d968..0000000
--- a/CH32V203/src/link.ld
+++ /dev/null
@@ -1 +0,0 @@
-ENTRY( _start )
__stack_size = 2048;
PROVIDE( _stack_size = __stack_size );
MEMORY
{
/* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 */
/**/
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K
/* CH32V20x_D6 - CH32V203K8-CH32V203C8-CH32V203G8-CH32V203F8 */
/*
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
*/
/* CH32V20x_D8 - CH32V203RB
CH32V20x_D8W - CH32V208x
FLASH + RAM supports the following configuration
FLASH-128K + RAM-64K
FLASH-144K + RAM-48K
FLASH-160K + RAM-32K
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 160K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K
*/
}
SECTIONS
{
.init :
{
_sinit = .;
. = ALIGN(4);
KEEP(*(SORT_NONE(.init)))
. = ALIGN(4);
_einit = .;
} >FLASH AT>FLASH
.vector :
{
*(.vector);
. = ALIGN(64);
} >FLASH AT>FLASH
.text :
{
. = ALIGN(4);
*(.text)
*(.text.*)
*(.rodata)
*(.rodata*)
*(.gnu.linkonce.t.*)
. = ALIGN(4);
} >FLASH AT>FLASH
.fini :
{
KEEP(*(SORT_NONE(.fini)))
. = ALIGN(4);
} >FLASH AT>FLASH
PROVIDE( _etext = . );
PROVIDE( _eitcm = . );
.preinit_array :
{
PROVIDE_HIDDEN (__preinit_array_start = .);
KEEP (*(.preinit_array))
PROVIDE_HIDDEN (__preinit_array_end = .);
} >FLASH AT>FLASH
.init_array :
{
PROVIDE_HIDDEN (__init_array_start = .);
KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))
KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))
PROVIDE_HIDDEN (__init_array_end = .);
} >FLASH AT>FLASH
.fini_array :
{
PROVIDE_HIDDEN (__fini_array_start = .);
KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))
KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))
PROVIDE_HIDDEN (__fini_array_end = .);
} >FLASH AT>FLASH
.ctors :
{
/* gcc uses crtbegin.o to find the start of
the constructors, so we make sure it is
first. Because this is a wildcard, it
doesn't matter if the user does not
actually link against crtbegin.o; the
linker won't look for a file to match a
wildcard. The wildcard also means that it
doesn't matter which directory crtbegin.o
is in. */
KEEP (*crtbegin.o(.ctors))
KEEP (*crtbegin?.o(.ctors))
/* We don't want to include the .ctor section from
the crtend.o file until after the sorted ctors.
The .ctor section from the crtend file contains the
end of ctors marker and it must be last */
KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))
KEEP (*(SORT(.ctors.*)))
KEEP (*(.ctors))
} >FLASH AT>FLASH
.dtors :
{
KEEP (*crtbegin.o(.dtors))
KEEP (*crtbegin?.o(.dtors))
KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))
KEEP (*(SORT(.dtors.*)))
KEEP (*(.dtors))
} >FLASH AT>FLASH
.dalign :
{
. = ALIGN(4);
PROVIDE(_data_vma = .);
} >RAM AT>FLASH
.dlalign :
{
. = ALIGN(4);
PROVIDE(_data_lma = .);
} >FLASH AT>FLASH
.data :
{
*(.gnu.linkonce.r.*)
*(.data .data.*)
*(.gnu.linkonce.d.*)
. = ALIGN(8);
PROVIDE( __global_pointer$ = . + 0x800 );
*(.sdata .sdata.*)
*(.sdata2.*)
*(.gnu.linkonce.s.*)
. = ALIGN(8);
*(.srodata.cst16)
*(.srodata.cst8)
*(.srodata.cst4)
*(.srodata.cst2)
*(.srodata .srodata.*)
. = ALIGN(4);
PROVIDE( _edata = .);
} >RAM AT>FLASH
.bss :
{
. = ALIGN(4);
PROVIDE( _sbss = .);
*(.sbss*)
*(.gnu.linkonce.sb.*)
*(.bss*)
*(.gnu.linkonce.b.*)
*(COMMON*)
. = ALIGN(4);
PROVIDE( _ebss = .);
} >RAM AT>FLASH
PROVIDE( _end = _ebss);
PROVIDE( end = . );
.stack ORIGIN(RAM) + LENGTH(RAM) - __stack_size :
{
PROVIDE( _heap_end = . );
. = ALIGN(4);
PROVIDE(_susrstack = . );
. = . + __stack_size;
PROVIDE( _eusrstack = .);
} >RAM
}
\ No newline at end of file
diff --git a/CH32V203/src/main.c b/CH32V203/src/main.c
index 5b5b340..27a8cfd 100644
--- a/CH32V203/src/main.c
+++ b/CH32V203/src/main.c
@@ -7,6 +7,9 @@
extern uint8_t usbd_hid_process(void);
+volatile uint32_t SysTick_ms = 0;
+
+void SysTick_Config(uint32_t ticks);
void USB_Config(void);
int main(void)
@@ -16,6 +19,8 @@ int main(void)
VCOM_Init();
USB_Config();
+
+ SysTick_Config(SystemCoreClock / 1000);
while(1)
{
@@ -26,6 +31,27 @@ int main(void)
}
+void SysTick_Config(uint32_t ticks)
+{
+ SysTick->CTLR= 0;
+ SysTick->SR = 0;
+ SysTick->CNT = 0;
+ SysTick->CMP = ticks;
+ SysTick->CTLR= 0x0F;
+
+ NVIC_EnableIRQ(SysTicK_IRQn);
+}
+
+
+void SysTick_Handler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
+void SysTick_Handler(void)
+{
+ SysTick->SR = 0;
+
+ SysTick_ms++;
+}
+
+
void USB_Config(void)
{
NVIC_InitTypeDef NVIC_InitStructure;
diff --git a/CH32V203/src/vcom_serial.c b/CH32V203/src/vcom_serial.c
index d146bdb..e87a191 100644
--- a/CH32V203/src/vcom_serial.c
+++ b/CH32V203/src/vcom_serial.c
@@ -1,3 +1,4 @@
+#include
#include "ch32v20x.h"
#include "usb_lib.h"
#include "usb_regs.h"
@@ -10,35 +11,71 @@ volatile VCOM Vcom = {.in_ready = 1};
VCOM_LINE_CODING LineCfg = {115200, 0, 0, 8}; // Baud rate, stop bits, parity bits, data bits
+#define RXDMA_SZ (CDC_BULK_IN_SZ * 2)
+uint8_t RXBuffer[RXDMA_SZ] __attribute__((aligned(4)));
+uint8_t TXBuffer[CDC_BULK_OUT_SZ] __attribute__((aligned(4)));
+
+
void VCOM_Init(void)
{
GPIO_InitTypeDef GPIO_InitStructure;
USART_InitTypeDef USART_InitStructure;
+ DMA_InitTypeDef DMA_InitStructure;
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE);
+ RCC_AHBPeriphClockCmd (RCC_AHBPeriph_DMA1, ENABLE);
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2;
- GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOA, &GPIO_InitStructure); // PA2 => USART2_TX
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_3;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
GPIO_Init(GPIOA, &GPIO_InitStructure); // PA3 => USART2_RX
+
+ DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralDST;
+ DMA_InitStructure.DMA_PeripheralBaseAddr = (u32)&USART2->DATAR;
+ DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
+ DMA_InitStructure.DMA_MemoryBaseAddr = (u32)TXBuffer;
+ DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
+ DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
+ DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;
+ DMA_InitStructure.DMA_BufferSize = 0;
+ DMA_InitStructure.DMA_Priority = DMA_Priority_High;
+ DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
+ DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
+ DMA_Init(DMA1_Channel7, &DMA_InitStructure);
+ DMA_Cmd(DMA1_Channel7, ENABLE);
+
+ DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC;
+ DMA_InitStructure.DMA_PeripheralBaseAddr = (u32)&USART2->DATAR;
+ DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
+ DMA_InitStructure.DMA_MemoryBaseAddr = (u32)RXBuffer;
+ DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
+ DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
+ DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;
+ DMA_InitStructure.DMA_BufferSize = RXDMA_SZ;
+ DMA_InitStructure.DMA_Priority = DMA_Priority_High;
+ DMA_InitStructure.DMA_Mode = DMA_Mode_Circular;
+ DMA_InitStructure.DMA_M2M = DMA_M2M_Disable;
+ DMA_Init(DMA1_Channel6, &DMA_InitStructure);
+ DMA_Cmd(DMA1_Channel6, ENABLE);
+
+
USART_InitStructure.USART_BaudRate = 115200;
USART_InitStructure.USART_WordLength = USART_WordLength_8b;
USART_InitStructure.USART_StopBits = USART_StopBits_1;
USART_InitStructure.USART_Parity = USART_Parity_No;
- USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
+ USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
USART_Init(USART2, &USART_InitStructure);
- USART_Cmd(USART2, ENABLE);
+ USART_DMACmd(USART2, USART_DMAReq_Tx | USART_DMAReq_Rx, ENABLE);
- USART_ITConfig(USART2, USART_IT_RXNE, ENABLE);
- NVIC_EnableIRQ(USART2_IRQn);
+ USART_Cmd(USART2, ENABLE);
}
@@ -71,88 +108,46 @@ void VCOM_LineCoding(VCOM_LINE_CODING * LineCfgx)
}
USART_InitStructure.USART_BaudRate = LineCfgx->u32DTERate;
- USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
+ USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
__disable_irq();
- // Reset software FIFO
- Vcom.rx_bytes = 0;
- Vcom.rx_wrptr = 0;
- Vcom.rx_rdptr = 0;
-
- Vcom.tx_bytes = 0;
- Vcom.tx_wrptr = 0;
- Vcom.tx_rdptr = 0;
-
USART_Init(USART2, &USART_InitStructure);
__enable_irq();
}
-void USART2_IRQHandler(void) __attribute__((interrupt("WCH-Interrupt-fast")));
-
-void USART2_IRQHandler(void)
-{
- if(USART_GetITStatus(USART2, USART_IT_RXNE) != RESET)
- {
- uint16_t chr = USART_ReceiveData(USART2);
-
- if(Vcom.rx_bytes < RX_BUFF_SIZE)
- {
- Vcom.rx_buff[Vcom.rx_wrptr++] = chr;
- if(Vcom.rx_wrptr == RX_BUFF_SIZE)
- Vcom.rx_wrptr = 0;
-
- Vcom.rx_bytes++;
- }
- }
-
- if(USART_GetITStatus(USART2, USART_IT_TXE) != RESET)
- {
- if(Vcom.tx_bytes)
- {
- USART_SendData(USART2, Vcom.tx_buff[Vcom.tx_rdptr++]);
- if(Vcom.tx_rdptr == TX_BUFF_SIZE)
- Vcom.tx_rdptr = 0;
-
- Vcom.tx_bytes--;
- }
- else
- {
- /* No more data, just stop Tx (Stop work) */
- USART_ITConfig(USART2, USART_IT_TXE, DISABLE);
- }
- }
-}
-
+extern volatile uint32_t SysTick_ms;
void VCOM_TransferData(void)
{
+ static uint32_t last_ms = 0;
+ static uint32_t last_pos = 0;
+
if(Vcom.in_ready) // 可以向主机发送数据
{
- if(Vcom.rx_bytes) // 有新的数据可以发送
+ uint32_t pos = RXDMA_SZ - DMA_GetCurrDataCounter(DMA1_Channel6);
+ if((pos - last_pos >= CDC_BULK_IN_SZ) || ((pos != last_pos) && (SysTick_ms != last_ms)))
{
- Vcom.in_bytes = Vcom.rx_bytes;
- if(Vcom.in_bytes > CDC_BULK_IN_SZ)
- Vcom.in_bytes = CDC_BULK_IN_SZ;
+ if(pos < last_pos)
+ pos = RXDMA_SZ;
- for(int i = 0; i < Vcom.in_bytes; i++)
- {
- Vcom.in_buff[i] = Vcom.rx_buff[Vcom.rx_rdptr++];
- if(Vcom.rx_rdptr >= RX_BUFF_SIZE)
- Vcom.rx_rdptr = 0;
- }
+ if(pos - last_pos > CDC_BULK_IN_SZ)
+ pos = last_pos + CDC_BULK_IN_SZ;
- __disable_irq();
- Vcom.rx_bytes -= Vcom.in_bytes;
- __enable_irq();
+ Vcom.in_bytes = pos - last_pos;
Vcom.in_ready = 0;
- USB_SIL_Write(EP3_IN, (uint8_t *)Vcom.in_buff, Vcom.in_bytes);
+
+ USB_SIL_Write(EP3_IN, &RXBuffer[last_pos], Vcom.in_bytes);
SetEPTxValid(ENDP3);
+
+ last_pos = pos % RXDMA_SZ;
+
+ last_ms = SysTick_ms;
}
else
{
@@ -161,35 +156,25 @@ void VCOM_TransferData(void)
if(Vcom.in_bytes == CDC_BULK_IN_SZ)
{
Vcom.in_bytes = 0;
-
- USB_SIL_Write(EP3_IN, (uint8_t *)Vcom.in_buff, 0);
+
+ USB_SIL_Write(EP3_IN, (uint8_t *)0, 0);
SetEPTxValid(ENDP3);
}
}
}
- /* 从主机接收到数据，且 tx_buff 能够装下它们 */
- if(Vcom.out_ready && (Vcom.out_bytes <= TX_BUFF_SIZE - Vcom.tx_bytes))
+ /* 从主机接收到数据，且前面的数据 DMA 已发送完 */
+ if(Vcom.out_ready && (DMA_GetCurrDataCounter(DMA1_Channel7) == 0))
{
- for(int i = 0; i < Vcom.out_bytes; i++)
- {
- Vcom.tx_buff[Vcom.tx_wrptr++] = Vcom.out_buff[i];
- if(Vcom.tx_wrptr >= TX_BUFF_SIZE)
- Vcom.tx_wrptr = 0;
- }
+ Vcom.out_ready = 0;
- __disable_irq();
- Vcom.tx_bytes += Vcom.out_bytes;
- __enable_irq();
+ memcpy(TXBuffer, (uint8_t *)Vcom.out_buff, Vcom.out_bytes);
- Vcom.out_ready = 0;
+ DMA_Cmd(DMA1_Channel7, DISABLE);
+ DMA_SetCurrDataCounter(DMA1_Channel7, Vcom.out_bytes);
+ DMA_Cmd(DMA1_Channel7, ENABLE);
/* Ready for next BULK OUT */
SetEPRxValid(ENDP3);
}
-
- if(Vcom.tx_bytes && ((USART2->CTLR1 & USART_CTLR1_TXEIE) == 0))
- {
- USART_ITConfig(USART2, USART_IT_TXE, ENABLE);
- }
}