sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

native: Initial addition of hw 6 support.

This commit is contained in:
Piotr Esden-Tempski 2022-01-08 20:03:07 -08:00
parent 2d63021344
commit bb761e4b38
3 changed files with 217 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platforms/native/platform.c
View File

@ -62,6 +62,7 @@ static void setup_vbus_irq(void);
* 011 - 0xFFFF - 3 - Mini V2.1a and later. * 011 - 0xFFFF - 3 - Mini V2.1a and later.
* 011 - 0xFB04 - 4 - Mini V2.1d and later. * 011 - 0xFB04 - 4 - Mini V2.1d and later.
* xxx - 0xFB05 - 5 - Mini V2.2a and later. * xxx - 0xFB05 - 5 - Mini V2.2a and later.
* xxx - 0xFB06 - 6 - Mini V2.3a and later.
* *
* This function will return -2 if the version number does not make sense. * This function will return -2 if the version number does not make sense.
* This can happen when the Data1 byte contains "garbage". For example a * This can happen when the Data1 byte contains "garbage". For example a

102
src/platforms/native/platform.h
View File

@ -41,6 +41,12 @@ int usbuart_debug_write(const char *buf, size_t len);
#define PLATFORM_IDENT " " #define PLATFORM_IDENT " "
#define UPD_IFACE_STRING "@Internal Flash /0x08000000/8*001Kg" #define UPD_IFACE_STRING "@Internal Flash /0x08000000/8*001Kg"
/* Hardware version switcher helper
* when the hardware version is smaller than ver
* it outputs opt1, otherwise opt2 */
#define HW_SWITCH(ver, opt1, opt2) \
((platform_hwversion() < (ver))?(opt1):(opt2))
/* Important pin mappings for STM32 implementation: /* Important pin mappings for STM32 implementation:
* *
* LED0 = PB2 (Yellow LED : Running) * LED0 = PB2 (Yellow LED : Running)
@ -51,26 +57,46 @@ int usbuart_debug_write(const char *buf, size_t len);
* nTRST = PB1 (output) [blackmagic] * nTRST = PB1 (output) [blackmagic]
* PWR_BR = PB1 (output) [blackmagic_mini] -- supply power to the target, active low * PWR_BR = PB1 (output) [blackmagic_mini] -- supply power to the target, active low
* TMS_DIR = PA1 (output) [blackmagic_mini v2.1] -- choose direction of the TCK pin, input low, output high * TMS_DIR = PA1 (output) [blackmagic_mini v2.1] -- choose direction of the TCK pin, input low, output high
* SRST_OUT = PA2 (output) * SRST_OUT = PA2 (output) -- Hardware 5 and older
* TDI = PA3 (output) * = PA9 (output) -- Hardware 6 and newer
* TDI = PA3 (output) -- Hardware 5 and older
* = PA7 (output) -- Hardware 6 and newer
* TMS = PA4 (input/output for SWDIO) * TMS = PA4 (input/output for SWDIO)
* TCK = PA5 (output SWCLK) * TCK = PA5 (output SWCLK)
* TDO = PA6 (input) * TDO = PA6 (input)
* nSRST = PA7 (input) * TRACESWO = PB7 (input) -- To allow trace decoding using USART1
* Hardware 4 has a normally open jumper between TDO and TRACESWO
* Hardware 5 has hardwired connection between TDO and TRACESWO
* = PA10 (input) -- Hardware 6 and newer
* nSRST = PA7 (input) -- Hardware 5 and older
* = PC13 (input) -- Hardware 6 and newer
* *
* USB_PU = PA8 (output) * USB_PU = PA8 (output)
* USB_VBUS = PB13 (input) -- New on mini design. * USB_VBUS = PB13 (input) -- New on mini design.
* Enable pull up for compatibility. * Enable pull up for compatibility.
* Hardware 4 and older. (we needed the pin for SPI on 5) * Hardware 4 and older. (we needed the pin for SPI on 5)
* PA15 (input) -- Hardware 5 and newer. * = PA15 (input) -- Hardware 5 and newer.
* BTN1 = PB12 (input) -- Force DFU bootloader when pressed during powerup. * BTN1 = PB12 (input) -- Force DFU bootloader when pressed during powerup.
* *
* AUX Interface: * UART_TX = PA9 (output) -- USART1 Hardware 5 and older
* = PA2 (output) -- USART2 Hardware 6 and newer
* UART_RX = PA10 (input) -- USART1 Hardware 5 and older
* = PA3 (input) -- USART2 Hardware 6 and newer
*
* On Board OTG Flash: -- Optional on Hardware 5 and newer, since Hardware 6 can be on the main board
* FLASH_CS = PB5 (output)
* SCLK = PB13 (output) * SCLK = PB13 (output)
* COPI = PB15 (output) * COPI = PB15 (output)
* CIPO = PB14 (input) * CIPO = PB14 (input)
* FLASH_CS = PB5 (output) *
* DISPLAY_CS = PB6 (output) * AUX Interface: -- Hardware 5 and newer
* SCLK = PB13 (output)
* COPI = PB15 (output)
* CIPO = PB14 (input)
* FLASH_CS = PB5 (output) -- Only Hardware 5
* SD_CS = PB6 (output) -- Hardware 6 and newer
* DISPLAY_CS = PB6 (output) -- OnlyHardware 5
* = PB7 (output) -- Hardware 6 and newer
* DISPLAY_DC = PB8 (output) * DISPLAY_DC = PB8 (output)
* BTN1 = PB12 (input) -- Shared with the DFU bootloader button * BTN1 = PB12 (input) -- Shared with the DFU bootloader button
* BTN2 = PB9 (input) * BTN2 = PB9 (input)
@ -84,7 +110,7 @@ int usbuart_debug_write(const char *buf, size_t len);
#define TMS_PORT JTAG_PORT #define TMS_PORT JTAG_PORT
#define TCK_PORT JTAG_PORT #define TCK_PORT JTAG_PORT
#define TDO_PORT JTAG_PORT #define TDO_PORT JTAG_PORT
#define TDI_PIN GPIO3 #define TDI_PIN HW_SWITCH(6, GPIO3, GPIO7)
#define TMS_DIR_PIN GPIO1 #define TMS_DIR_PIN GPIO1
#define TMS_PIN GPIO4 #define TMS_PIN GPIO4
#define TCK_PIN GPIO5 #define TCK_PIN GPIO5
@ -102,9 +128,9 @@ int usbuart_debug_write(const char *buf, size_t len);
#define PWR_BR_PORT GPIOB #define PWR_BR_PORT GPIOB
#define PWR_BR_PIN GPIO1 #define PWR_BR_PIN GPIO1
#define SRST_PORT GPIOA #define SRST_PORT GPIOA
#define SRST_PIN GPIO2 #define SRST_PIN HW_SWITCH(6, GPIO2, GPIO9)
#define SRST_SENSE_PORT GPIOA #define SRST_SENSE_PORT GPIOA
#define SRST_SENSE_PIN GPIO7 #define SRST_SENSE_PIN HW_SWITCH(6, GPIO7, GPIO13)
#define USB_PU_PORT GPIOA #define USB_PU_PORT GPIOA
#define USB_PU_PIN GPIO8 #define USB_PU_PIN GPIO8
@ -128,12 +154,20 @@ int usbuart_debug_write(const char *buf, size_t len);
#define LED_IDLE_RUN LED_1 #define LED_IDLE_RUN LED_1
#define LED_ERROR LED_2 #define LED_ERROR LED_2
/* AUX Port */ /* OTG Flash HW Rev 5 and newer */
#define OTG_PORT GPIOB
#define OTG_CS GPIO5
#define OTG_SCLK GPIO13
#define OTG_COPI GPIO15
#define OTG_CIPO GPIO14
/* AUX Port HW Rev 5 and newer */
#define AUX_PORT GPIOB #define AUX_PORT GPIOB
#define AUX_SCLK_PORT AUX_PORT #define AUX_SCLK_PORT AUX_PORT
#define AUX_COPI_PORT AUX_PORT #define AUX_COPI_PORT AUX_PORT
#define AUX_CIPO_PORT AUX_PORT #define AUX_CIPO_PORT AUX_PORT
#define AUX_FCS_PORT AUX_PORT #define AUX_FCS_PORT AUX_PORT
#define AUX_SDCS_PORT AUX_PORT
#define AUX_DCS_PORT AUX_PORT #define AUX_DCS_PORT AUX_PORT
#define AUX_DDC_PORT AUX_PORT #define AUX_DDC_PORT AUX_PORT
#define AUX_BTN1_PORT AUX_PORT #define AUX_BTN1_PORT AUX_PORT
@ -143,7 +177,9 @@ int usbuart_debug_write(const char *buf, size_t len);
#define AUX_COPI GPIO15 #define AUX_COPI GPIO15
#define AUX_CIPO GPIO14 #define AUX_CIPO GPIO14
#define AUX_FCS GPIO5 #define AUX_FCS GPIO5
#define AUX_SDCS GPIO6
#define AUX_DCS GPIO6 #define AUX_DCS GPIO6
#define AUX_DCS6 GPIO7
#define AUX_DDC GPIO8 #define AUX_DDC GPIO8
#define AUX_BTN1 GPIO12 #define AUX_BTN1 GPIO12
#define AUX_BTN2 GPIO9 #define AUX_BTN2 GPIO9
@ -191,23 +227,39 @@ int usbuart_debug_write(const char *buf, size_t len);
#define IRQ_PRI_USB_VBUS (14 << 4) #define IRQ_PRI_USB_VBUS (14 << 4)
#define IRQ_PRI_TRACE (0 << 4) #define IRQ_PRI_TRACE (0 << 4)
#define USBUSART USART1 #define USBUSART HW_SWITCH(6, USBUSART1, USBUSART2)
#define USBUSART_CR1 USART1_CR1 #define USBUSART_IRQ HW_SWITCH(6, NVIC_USART1_IRQ, NVIC_USART2_IRQ)
#define USBUSART_DR USART1_DR #define USBUSART_CLK HW_SWITCH(6, RCC_USART1, RCC_USART2)
#define USBUSART_IRQ NVIC_USART1_IRQ
#define USBUSART_CLK RCC_USART1
#define USBUSART_PORT GPIOA #define USBUSART_PORT GPIOA
#define USBUSART_TX_PIN GPIO9 #define USBUSART_TX_PIN HW_SWITCH(6, GPIO9, GPIO2)
#define USBUSART_RX_PIN GPIO10 #define USBUSART_RX_PIN HW_SWITCH(6, GPIO10, GPIO3)
#define USBUSART_ISR(x) usart1_isr(x)
#define USBUSART_DMA_BUS DMA1 #define USBUSART_DMA_BUS DMA1
#define USBUSART_DMA_CLK RCC_DMA1 #define USBUSART_DMA_CLK RCC_DMA1
#define USBUSART_DMA_TX_CHAN DMA_CHANNEL4 #define USBUSART_DMA_TX_CHAN HW_SWITCH(6, USBUSART1_DMA_TX_CHAN, USBUSART2_DMA_TX_CHAN)
#define USBUSART_DMA_TX_IRQ NVIC_DMA1_CHANNEL4_IRQ #define USBUSART_DMA_RX_CHAN HW_SWITCH(6, USBUSART1_DMA_RX_CHAN, USBUSART2_DMA_RX_CHAN)
#define USBUSART_DMA_TX_ISR(x) dma1_channel4_isr(x) #define USBUSART_DMA_TX_IRQ HW_SWITCH(6, USBUSART1_DMA_TX_IRQ, USBUSART2_DMA_TX_IRQ)
#define USBUSART_DMA_RX_CHAN DMA_CHANNEL5 #define USBUSART_DMA_RX_IRQ HW_SWITCH(6, USBUSART1_DMA_RX_IRQ, USBUSART2_DMA_RX_IRQ)
#define USBUSART_DMA_RX_IRQ NVIC_DMA1_CHANNEL5_IRQ
#define USBUSART_DMA_RX_ISR(x) dma1_channel5_isr(x) #define USBUSART1 USART1
#define USBUSART1_IRQ NVIC_USART1_IRQ
#define USBUSART1_ISR(x) usart1_isr(x)
#define USBUSART1_DMA_TX_CHAN DMA_CHANNEL4
#define USBUSART1_DMA_TX_IRQ NVIC_DMA1_CHANNEL4_IRQ
#define USBUSART1_DMA_TX_ISR(x) dma1_channel4_isr(x)
#define USBUSART1_DMA_RX_CHAN DMA_CHANNEL5
#define USBUSART1_DMA_RX_IRQ NVIC_DMA1_CHANNEL5_IRQ
#define USBUSART1_DMA_RX_ISR(x) dma1_channel5_isr(x)
#define USBUSART2 USART2
#define USBUSART2_IRQ NVIC_USART2_IRQ
#define USBUSART2_ISR(x) usart2_isr(x)
#define USBUSART2_DMA_TX_CHAN DMA_CHANNEL6
#define USBUSART2_DMA_TX_IRQ NVIC_DMA1_CHANNEL6_IRQ
#define USBUSART2_DMA_TX_ISR(x) dma1_channel6_isr(x)
#define USBUSART2_DMA_RX_CHAN DMA_CHANNEL7
#define USBUSART2_DMA_RX_IRQ NVIC_DMA1_CHANNEL7_IRQ
#define USBUSART2_DMA_RX_ISR(x) dma1_channel7_isr(x)
#define TRACE_TIM TIM3 #define TRACE_TIM TIM3
#define TRACE_TIM_CLK_EN() rcc_periph_clock_enable(RCC_TIM3) #define TRACE_TIM_CLK_EN() rcc_periph_clock_enable(RCC_TIM3)

192
src/platforms/stm32/usbuart.c
View File

@ -119,14 +119,18 @@ void usbuart_init(void)
usart_set_mode(USBUSART, USART_MODE_TX_RX); usart_set_mode(USBUSART, USART_MODE_TX_RX);
usart_set_parity(USBUSART, USART_PARITY_NONE); usart_set_parity(USBUSART, USART_PARITY_NONE);
usart_set_flow_control(USBUSART, USART_FLOWCONTROL_NONE); usart_set_flow_control(USBUSART, USART_FLOWCONTROL_NONE);
USBUSART_CR1 |= USART_CR1_IDLEIE; USART_CR1(USBUSART) |= USART_CR1_IDLEIE;
/* Setup USART TX DMA */ /* Setup USART TX DMA */
#if !defined(USBUSART_TDR) && defined(USBUSART_DR) #if !defined(USBUSART_TDR) && defined(USBUSART_DR)
# define USBUSART_TDR USBUSART_DR # define USBUSART_TDR USBUSART_DR
#else
# define USBUSART_TDR USART_DR(USBUSART)
#endif #endif
#if !defined(USBUSART_RDR) && defined(USBUSART_DR) #if !defined(USBUSART_RDR) && defined(USBUSART_DR)
# define USBUSART_RDR USBUSART_DR # define USBUSART_RDR USBUSART_DR
#else
# define USBUSART_RDR USART_DR(USBUSART)
#endif #endif
dma_channel_reset(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN); dma_channel_reset(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN);
dma_set_peripheral_address(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN, (uint32_t)&USBUSART_TDR); dma_set_peripheral_address(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN, (uint32_t)&USBUSART_TDR);
@ -402,72 +406,154 @@ static void usbuart_run(void)
nvic_enable_irq(USB_IRQ); nvic_enable_irq(USB_IRQ);
} }
#if defined(USART_ICR)
#define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) \
nvic_disable_irq(DMA_IRQ); \
\
/* Get IDLE flag and reset interrupt flags */ \
const bool isIdle = usart_get_flag(USART, USART_FLAG_IDLE); \
usart_recv(USART); \
\
/* If line is now idle, then transmit a packet */ \
if (isIdle) { \
USART_ICR(USART) = USART_ICR_IDLECF; \
usbuart_run(); \
} \
\
nvic_enable_irq(DMA_IRQ);
#else
#define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) \
nvic_disable_irq(DMA_IRQ); \
\
/* Get IDLE flag and reset interrupt flags */ \
const bool isIdle = usart_get_flag(USART, USART_FLAG_IDLE); \
usart_recv(USART); \
\
/* If line is now idle, then transmit a packet */ \
if (isIdle) { \
/* On the older uarts, the sequence "read flags", */ \
/* "read DR" clears the flags */ \
\
usbuart_run(); \
} \
\
nvic_enable_irq(DMA_IRQ)
#endif
#if defined(USBUSART_ISR)
void USBUSART_ISR(void) void USBUSART_ISR(void)
{ {
#if defined(USBUSART_DMA_RXTX_IRQ) #if defined(USBUSART_DMA_RXTX_IRQ)
nvic_disable_irq(USBUSART_DMA_RXTX_IRQ); USBUSART_ISR_TEMPLATE(USBUSART, USBUSART_DMA_RXTX_IRQ);
#else #else
nvic_disable_irq(USBUSART_DMA_RX_IRQ); USBUSART_ISR_TEMPLATE(USBUSART, USBUSART_DMA_RX_IRQ);
#endif
/* Get IDLE flag and reset interrupt flags */
const bool isIdle = usart_get_flag(USBUSART, USART_FLAG_IDLE);
usart_recv(USBUSART);
/* If line is now idle, then transmit a packet */
if (isIdle) {
#if defined(USART_ICR)
USART_ICR(USBUSART) = USART_ICR_IDLECF;
#else
/* On the older uarts, the sequence "read flags", "read DR"
* as above cleared the flags */
#endif
usbuart_run();
}
#if defined(USBUSART_DMA_RXTX_IRQ)
nvic_enable_irq(USBUSART_DMA_RXTX_IRQ);
#else
nvic_enable_irq(USBUSART_DMA_RX_IRQ);
#endif #endif
} }
#endif
#if defined(USBUSART1_ISR)
void USBUSART1_ISR(void)
{
#if defined(USBUSART1_DMA_RXTX_IRQ)
USBUSART_ISR_TEMPLATE(USBUSART1, USBUSART1_DMA_RXTX_IRQ);
#else
USBUSART_ISR_TEMPLATE(USBUSART1, USBUSART1_DMA_RX_IRQ);
#endif
}
#endif
#if defined(USBUSART2_ISR)
void USBUSART2_ISR(void)
{
#if defined(USBUSART2_DMA_RXTX_IRQ)
USBUSART_ISR_TEMPLATE(USBUSART2, USBUSART2_DMA_RXTX_IRQ);
#else
USBUSART_ISR_TEMPLATE(USBUSART2, USBUSART2_DMA_RX_IRQ);
#endif
}
#endif
#define USBUSART_DMA_TX_ISR_TEMPLATE(DMA_TX_CHAN) \
nvic_disable_irq(USB_IRQ); \
\
/* Stop DMA */ \
dma_disable_channel(USBUSART_DMA_BUS, DMA_TX_CHAN); \
dma_clear_interrupt_flags(USBUSART_DMA_BUS, DMA_TX_CHAN, DMA_CGIF); \
\
/* If new buffer is ready, continue transmission. \
* Otherwise report transfer completion. \
*/ \
if (buf_tx_act_sz) \
{ \
usbuart_change_dma_tx_buf(); \
usbd_ep_nak_set(usbdev, CDCACM_UART_ENDPOINT, 0); \
} \
else \
{ \
usbuart_set_led_state(TX_LED_ACT, false); \
tx_trfr_cplt = true; \
} \
\
nvic_enable_irq(USB_IRQ)
#if defined(USBUSART_DMA_TX_ISR)
void USBUSART_DMA_TX_ISR(void) void USBUSART_DMA_TX_ISR(void)
{ {
nvic_disable_irq(USB_IRQ); USBUSART_DMA_TX_ISR_TEMPLATE(USBUSART_DMA_TX_CHAN);
/* Stop DMA */
dma_disable_channel(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN);
dma_clear_interrupt_flags(USBUSART_DMA_BUS, USBUSART_DMA_TX_CHAN, DMA_CGIF);
/* If new buffer is ready, continue transmission.
* Otherwise report transfer completion.
*/
if (buf_tx_act_sz)
{
usbuart_change_dma_tx_buf();
usbd_ep_nak_set(usbdev, CDCACM_UART_ENDPOINT, 0);
}
else
{
usbuart_set_led_state(TX_LED_ACT, false);
tx_trfr_cplt = true;
}
nvic_enable_irq(USB_IRQ);
} }
#endif
#if defined(USBUSART1_DMA_TX_ISR)
void USBUSART1_DMA_TX_ISR(void)
{
USBUSART_DMA_TX_ISR_TEMPLATE(USBUSART1_DMA_TX_CHAN);
}
#endif
#if defined(USBUSART2_DMA_TX_ISR)
void USBUSART2_DMA_TX_ISR(void)
{
USBUSART_DMA_TX_ISR_TEMPLATE(USBUSART2_DMA_TX_CHAN);
}
#endif
#if defined(USBUSART_DMA_TX_ISR)
void USBUSART_DMA_TX_ISR(void)
{
USBUSART_DMA_TX_ISR_TEMPLATE(USBUSART_DMA_TX_CHAN);
}
#endif
#define USBUSART_DMA_RX_ISR_TEMPLATE(USART_IRQ, DMA_RX_CHAN) \
nvic_disable_irq(USART_IRQ); \
\
/* Clear flags */ \
dma_clear_interrupt_flags(USBUSART_DMA_BUS, DMA_RX_CHAN, DMA_CGIF); \
/* Transmit a packet */ \
usbuart_run(); \
\
nvic_enable_irq(USART_IRQ)
#if defined(USBUSART_DMA_RX_ISR)
void USBUSART_DMA_RX_ISR(void) void USBUSART_DMA_RX_ISR(void)
{ {
nvic_disable_irq(USBUSART_IRQ); USBUSART_DMA_RX_ISR_TEMPLATE(USBUSART_IRQ, USBUSART_DMA_RX_CHAN);
/* Clear flags */
dma_clear_interrupt_flags(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN, DMA_CGIF);
/* Transmit a packet */
usbuart_run();
nvic_enable_irq(USBUSART_IRQ);
} }
#endif
#if defined(USBUSART1_DMA_RX_ISR)
void USBUSART1_DMA_RX_ISR(void)
{
USBUSART_DMA_RX_ISR_TEMPLATE(USBUSART1_IRQ, USBUSART1_DMA_RX_CHAN);
}
#endif
#if defined(USBUSART2_DMA_RX_ISR)
void USBUSART2_DMA_RX_ISR(void)
{
USBUSART_DMA_RX_ISR_TEMPLATE(USBUSART2_IRQ, USBUSART2_DMA_RX_CHAN);
}
#endif
#if defined(USBUSART_DMA_RXTX_ISR) #if defined(USBUSART_DMA_RXTX_ISR)
void USBUSART_DMA_RXTX_ISR(void) void USBUSART_DMA_RXTX_ISR(void)