|
|
|
@ -17,7 +17,7 @@
|
|
|
|
|
|
|
|
|
|
#define LED_PIN 25
|
|
|
|
|
|
|
|
|
|
#define BUFFER_SIZE 256
|
|
|
|
|
#define BUFFER_SIZE 2560
|
|
|
|
|
|
|
|
|
|
#define DEF_BIT_RATE 115200
|
|
|
|
|
#define DEF_STOP_BITS 1
|
|
|
|
@ -34,11 +34,14 @@ typedef struct {
|
|
|
|
|
cdc_line_coding_t usb_lc;
|
|
|
|
|
cdc_line_coding_t uart_lc;
|
|
|
|
|
mutex_t lc_mtx;
|
|
|
|
|
uint8_t uart_buffer[BUFFER_SIZE];
|
|
|
|
|
uint32_t uart_pos;
|
|
|
|
|
uint8_t uart_rx_buffer[BUFFER_SIZE];
|
|
|
|
|
uint32_t uart_rx_pos;
|
|
|
|
|
uint8_t uart_to_usb_buffer[BUFFER_SIZE];
|
|
|
|
|
uint32_t uart_to_usb_pos;
|
|
|
|
|
mutex_t uart_mtx;
|
|
|
|
|
uint8_t usb_buffer[BUFFER_SIZE];
|
|
|
|
|
uint32_t usb_pos;
|
|
|
|
|
uint8_t usb_to_uart_buffer[BUFFER_SIZE];
|
|
|
|
|
uint32_t usb_to_uart_pos;
|
|
|
|
|
uint32_t usb_to_uart_snd;
|
|
|
|
|
mutex_t usb_mtx;
|
|
|
|
|
} uart_data_t;
|
|
|
|
|
|
|
|
|
@ -94,29 +97,30 @@ static inline uint stopbits_usb2uart(uint8_t stop_bits)
|
|
|
|
|
|
|
|
|
|
void update_uart_cfg(uint8_t itf)
|
|
|
|
|
{
|
|
|
|
|
const uart_id_t *ui = &UART_ID[itf];
|
|
|
|
|
uart_data_t *ud = &UART_DATA[itf];
|
|
|
|
|
|
|
|
|
|
mutex_enter_blocking(&ud->lc_mtx);
|
|
|
|
|
if (mutex_try_enter(&ud->lc_mtx, NULL)) {
|
|
|
|
|
const uart_id_t *ui = &UART_ID[itf];
|
|
|
|
|
|
|
|
|
|
if (ud->usb_lc.bit_rate != ud->uart_lc.bit_rate) {
|
|
|
|
|
uart_set_baudrate(ui->inst, ud->usb_lc.bit_rate);
|
|
|
|
|
ud->uart_lc.bit_rate = ud->usb_lc.bit_rate;
|
|
|
|
|
}
|
|
|
|
|
if (ud->usb_lc.bit_rate != ud->uart_lc.bit_rate) {
|
|
|
|
|
uart_set_baudrate(ui->inst, ud->usb_lc.bit_rate);
|
|
|
|
|
ud->uart_lc.bit_rate = ud->usb_lc.bit_rate;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((ud->usb_lc.stop_bits != ud->uart_lc.stop_bits) ||
|
|
|
|
|
(ud->usb_lc.parity != ud->uart_lc.parity) ||
|
|
|
|
|
(ud->usb_lc.data_bits != ud->uart_lc.data_bits)) {
|
|
|
|
|
uart_set_format(ui->inst,
|
|
|
|
|
if ((ud->usb_lc.stop_bits != ud->uart_lc.stop_bits) ||
|
|
|
|
|
(ud->usb_lc.parity != ud->uart_lc.parity) ||
|
|
|
|
|
(ud->usb_lc.data_bits != ud->uart_lc.data_bits)) {
|
|
|
|
|
uart_set_format(ui->inst,
|
|
|
|
|
databits_usb2uart(ud->usb_lc.data_bits),
|
|
|
|
|
stopbits_usb2uart(ud->usb_lc.stop_bits),
|
|
|
|
|
parity_usb2uart(ud->usb_lc.parity));
|
|
|
|
|
ud->uart_lc.data_bits = ud->usb_lc.data_bits;
|
|
|
|
|
ud->uart_lc.parity = ud->usb_lc.parity;
|
|
|
|
|
ud->uart_lc.stop_bits = ud->usb_lc.stop_bits;
|
|
|
|
|
}
|
|
|
|
|
ud->uart_lc.data_bits = ud->usb_lc.data_bits;
|
|
|
|
|
ud->uart_lc.parity = ud->usb_lc.parity;
|
|
|
|
|
ud->uart_lc.stop_bits = ud->usb_lc.stop_bits;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_exit(&ud->lc_mtx);
|
|
|
|
|
mutex_exit(&ud->lc_mtx);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void usb_read_bytes(uint8_t itf) {
|
|
|
|
@ -127,12 +131,12 @@ void usb_read_bytes(uint8_t itf) {
|
|
|
|
|
|
|
|
|
|
mutex_enter_blocking(&ud->usb_mtx);
|
|
|
|
|
|
|
|
|
|
len = MIN(len, BUFFER_SIZE - ud->usb_pos);
|
|
|
|
|
len = MIN(len, BUFFER_SIZE - ud->usb_to_uart_pos);
|
|
|
|
|
if (len) {
|
|
|
|
|
uint32_t count;
|
|
|
|
|
|
|
|
|
|
count = tud_cdc_n_read(itf, &ud->usb_buffer[ud->usb_pos], len);
|
|
|
|
|
ud->usb_pos += count;
|
|
|
|
|
count = tud_cdc_n_read(itf, &ud->usb_to_uart_buffer[ud->usb_to_uart_pos], len);
|
|
|
|
|
ud->usb_to_uart_pos += count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_exit(&ud->usb_mtx);
|
|
|
|
@ -142,16 +146,15 @@ void usb_read_bytes(uint8_t itf) {
|
|
|
|
|
void usb_write_bytes(uint8_t itf) {
|
|
|
|
|
uart_data_t *ud = &UART_DATA[itf];
|
|
|
|
|
|
|
|
|
|
if (ud->uart_pos) {
|
|
|
|
|
if (ud->uart_to_usb_pos && mutex_try_enter(&ud->uart_mtx, NULL)) {
|
|
|
|
|
uint32_t count;
|
|
|
|
|
|
|
|
|
|
mutex_enter_blocking(&ud->uart_mtx);
|
|
|
|
|
|
|
|
|
|
count = tud_cdc_n_write(itf, ud->uart_buffer, ud->uart_pos);
|
|
|
|
|
if (count < ud->uart_pos)
|
|
|
|
|
memcpy(ud->uart_buffer, &ud->uart_buffer[count],
|
|
|
|
|
ud->uart_pos - count);
|
|
|
|
|
ud->uart_pos -= count;
|
|
|
|
|
count = tud_cdc_n_write(itf, ud->uart_to_usb_buffer, ud->uart_to_usb_pos);
|
|
|
|
|
if (count < ud->uart_to_usb_pos) {
|
|
|
|
|
memcpy(ud->uart_to_usb_buffer, &ud->uart_to_usb_buffer[count],
|
|
|
|
|
ud->uart_to_usb_pos - count);
|
|
|
|
|
}
|
|
|
|
|
ud->uart_to_usb_pos -= count;
|
|
|
|
|
|
|
|
|
|
mutex_exit(&ud->uart_mtx);
|
|
|
|
|
|
|
|
|
@ -181,7 +184,7 @@ void core1_entry(void)
|
|
|
|
|
int con = 0;
|
|
|
|
|
|
|
|
|
|
tud_task();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (itf = 0; itf < CFG_TUD_CDC; itf++) {
|
|
|
|
|
if (tud_cdc_n_connected(itf)) {
|
|
|
|
|
con = 1;
|
|
|
|
@ -193,19 +196,24 @@ void core1_entry(void)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void uart_read_bytes(uint8_t itf) {
|
|
|
|
|
void uart_read_bytes(uint8_t itf)
|
|
|
|
|
{
|
|
|
|
|
const uart_id_t *ui = &UART_ID[itf];
|
|
|
|
|
uart_data_t *ud = &UART_DATA[itf];
|
|
|
|
|
|
|
|
|
|
if (uart_is_readable(ui->inst)) {
|
|
|
|
|
uart_data_t *ud = &UART_DATA[itf];
|
|
|
|
|
|
|
|
|
|
mutex_enter_blocking(&ud->uart_mtx);
|
|
|
|
|
|
|
|
|
|
while (uart_is_readable(ui->inst) &&
|
|
|
|
|
ud->uart_pos < BUFFER_SIZE) {
|
|
|
|
|
ud->uart_buffer[ud->uart_pos] = uart_getc(ui->inst);
|
|
|
|
|
ud->uart_pos++;
|
|
|
|
|
while (uart_is_readable(ui->inst) && ud->uart_rx_pos < BUFFER_SIZE) {
|
|
|
|
|
ud->uart_rx_buffer[ud->uart_rx_pos] = uart_getc(ui->inst);
|
|
|
|
|
ud->uart_rx_pos++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mutex_try_enter(&ud->uart_mtx, NULL)) {
|
|
|
|
|
uint32_t len = MIN(ud->uart_rx_pos, BUFFER_SIZE - ud->uart_to_usb_pos);
|
|
|
|
|
|
|
|
|
|
memcpy(&ud->uart_to_usb_buffer[ud->uart_to_usb_pos], ud->uart_rx_buffer, len);
|
|
|
|
|
ud->uart_to_usb_pos += len;
|
|
|
|
|
ud->uart_rx_pos = 0;
|
|
|
|
|
|
|
|
|
|
mutex_exit(&ud->uart_mtx);
|
|
|
|
|
}
|
|
|
|
@ -214,13 +222,13 @@ void uart_read_bytes(uint8_t itf) {
|
|
|
|
|
void uart_write_bytes(uint8_t itf) {
|
|
|
|
|
uart_data_t *ud = &UART_DATA[itf];
|
|
|
|
|
|
|
|
|
|
if (ud->usb_pos) {
|
|
|
|
|
if ((ud->usb_to_uart_pos) && (ud->usb_to_uart_snd < ud->usb_to_uart_pos) &&
|
|
|
|
|
mutex_try_enter(&ud->usb_mtx, NULL)) {
|
|
|
|
|
const uart_id_t *ui = &UART_ID[itf];
|
|
|
|
|
|
|
|
|
|
mutex_enter_blocking(&ud->usb_mtx);
|
|
|
|
|
|
|
|
|
|
uart_write_blocking(ui->inst, ud->usb_buffer, ud->usb_pos);
|
|
|
|
|
ud->usb_pos = 0;
|
|
|
|
|
while (uart_is_writable(ui->inst)&&(ud->usb_to_uart_snd < ud->usb_to_uart_pos)) {
|
|
|
|
|
uart_putc(ui->inst, ud->usb_to_uart_buffer[ud->usb_to_uart_snd++]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mutex_exit(&ud->usb_mtx);
|
|
|
|
|
}
|
|
|
|
@ -247,8 +255,10 @@ void init_uart_data(uint8_t itf) {
|
|
|
|
|
ud->uart_lc.stop_bits = DEF_STOP_BITS;
|
|
|
|
|
|
|
|
|
|
/* Buffer */
|
|
|
|
|
ud->uart_pos = 0;
|
|
|
|
|
ud->usb_pos = 0;
|
|
|
|
|
ud->uart_rx_pos = 0;
|
|
|
|
|
ud->uart_to_usb_pos = 0;
|
|
|
|
|
ud->usb_to_uart_pos = 0;
|
|
|
|
|
ud->usb_to_uart_snd = 0;
|
|
|
|
|
|
|
|
|
|
/* Mutex */
|
|
|
|
|
mutex_init(&ud->lc_mtx);
|
|
|
|
|