Skip to content

Commit

Permalink
Change pool block size, add nested critical sections
Browse files Browse the repository at this point in the history
  • Loading branch information
@kauwua
kauwua committed Sep 6, 2024
1 parent 38f3b0b commit 2bec84b
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 61 deletions.
2 changes: 1 addition & 1 deletion hydradancer/firmware_hydradancer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/User

#### wch-ch56x-lib options

target_compile_definitions(${PROJECT_NAME} PRIVATE POOL_BLOCK_SIZE=512 POOL_BLOCK_NUM=100 INTERRUPT_QUEUE_SIZE=40)
target_compile_definitions(${PROJECT_NAME} PRIVATE POOL_BLOCK_SIZE=1024 POOL_BLOCK_NUM=50 INTERRUPT_QUEUE_SIZE=40)

#### logging options

Expand Down
6 changes: 4 additions & 2 deletions hydradancer/firmware_hydradancer/User/definitions.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ HYDRA_FIFO_DEF(event_queue, hydradancer_event_t, EVENT_QUEUE_SIZE);

void hydradancer_send_event(void)
{
if (event_transfer_finished)
BSP_ENTER_CRITICAL();
if (hydradancer_get_event_transfer_finished())
{
uint16_t events_count = fifo_count(&event_queue);
if (events_count > 0)
{
event_transfer_finished = false;
hydradancer_set_event_transfer_finished(false);
uint16_t count_read = fifo_read_n(&event_queue, (void*)_events_buffer, events_count);
endp_tx_set_new_buffer(&usb_device_1, 1, (uint8_t*)_events_buffer, count_read * sizeof(hydradancer_event_t));
}
}
BSP_EXIT_CRITICAL();
}
58 changes: 31 additions & 27 deletions hydradancer/firmware_hydradancer/User/definitions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* Global define */
// DEF_ENDP_OUT_BURST_LEVEL / DEF_ENDP_IN_BURST_LEVEL maximum burst size 16 defined by the USB3 specification
// Warning USB3 endpoint bulk with 8 or 16 burst can be problematic on some PC
#define DEF_ENDP_OUT_BURST_LEVEL 4
#define DEF_ENDP_OUT_BURST_LEVEL 1
#define DEF_ENDP_IN_BURST_LEVEL (DEF_ENDP_OUT_BURST_LEVEL)
#define DEF_ENDP_MAX_SIZE (DEF_ENDP1_OUT_BURST_LEVEL * ENDP_1_15_MAX_PACKET_SIZE)

Expand Down Expand Up @@ -89,67 +89,71 @@ void hydradancer_send_event(void);

__attribute__((always_inline)) inline static void write_event(uint8_t type, uint8_t value)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_event_t event = {
.type = type,
.value = value,
};
fifo_write(&event_queue, &event, 1);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static bool hydradancer_get_event_transfer_finished()
{
bool ret = false;
BSP_ENTER_CRITICAL();
ret = event_transfer_finished;
BSP_EXIT_CRITICAL();
return ret;
}

__attribute__((always_inline)) inline static void hydradancer_set_event_transfer_finished(bool _event_transfer_finished)
{
BSP_ENTER_CRITICAL();
event_transfer_finished = _event_transfer_finished;
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_set_out(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_out_status |= (1 << endp_num);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_set_in(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_in_status |= (1 << endp_num);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_set_nak(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_in_nak |= (1 << endp_num);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_clear_out(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_out_status &= ~(1 << endp_num);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_clear_in(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_in_status &= ~(1 << endp_num);
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

__attribute__((always_inline)) inline static void hydradancer_status_clear_nak(uint8_t endp_num)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_in_nak &= ~(1 << endp_num);
bsp_enable_interrupt();
}

__attribute__((always_inline)) inline static void hydradancer_recover_out_interrupt(uint8_t endp_num)
{
if (hydradancer_status.ep_out_status & (0x01 << endpoint_mapping_reverse[endp_num]))
{
ramx_pool_free(usb_device_1.endpoints.tx[endpoint_mapping[endp_num]].buffer);
hydradancer_status_clear_out(endp_num);
bsp_disable_interrupt();
endp_rx_set_state(&usb_device_0, endp_num, ENDP_STATE_ACK);
bsp_enable_interrupt();
}
BSP_EXIT_CRITICAL();
}

#endif
28 changes: 14 additions & 14 deletions hydradancer/firmware_hydradancer/User/usb_control_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,62 +78,62 @@ void usb_control_init_endpoints(void)
usb_device_1.endpoints.tx[1].buffer = NULL;
usb_device_1.endpoints.tx[1].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[1].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[1].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[1].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[2].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[2].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[2].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[2].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[2].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[2].buffer = NULL;
usb_device_1.endpoints.tx[2].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[2].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[2].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[2].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[3].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[3].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[3].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[3].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[3].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[3].buffer = NULL;
usb_device_1.endpoints.tx[3].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[3].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[3].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[3].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[4].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[4].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[4].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[4].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[4].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[4].buffer = NULL;
usb_device_1.endpoints.tx[4].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[4].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[4].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[4].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[5].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[5].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[5].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[5].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[5].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[5].buffer = NULL;
usb_device_1.endpoints.tx[5].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[5].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[5].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[5].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[6].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[6].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[6].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[6].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[6].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[6].buffer = NULL;
usb_device_1.endpoints.tx[6].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[6].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.tx[6].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.tx[6].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.rx[7].buffer = ramx_pool_alloc_bytes(ENDP_1_15_MAX_PACKET_SIZE);
usb_device_1.endpoints.rx[7].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[7].max_burst = DEF_ENDP_OUT_BURST_LEVEL;
usb_device_1.endpoints.rx[7].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE;
usb_device_1.endpoints.rx[7].max_packet_size_with_burst = ENDP_1_15_MAX_PACKET_SIZE * DEF_ENDP_OUT_BURST_LEVEL;

usb_device_1.endpoints.tx[7].buffer = NULL;
usb_device_1.endpoints.tx[7].max_packet_size = ENDP_1_15_MAX_PACKET_SIZE;
Expand All @@ -145,10 +145,10 @@ bool usb_control_reinit(void)
{
// // uncomment to empty log_buffer on emulated device disconnection
// LOG_DUMP();
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
usb_control_init_endpoints(); // update USB3 backend as well, without rebooting USB3 peripheral
usb30_init_endpoints();
boards_ready = 1;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
return true;
}
12 changes: 6 additions & 6 deletions hydradancer/firmware_hydradancer/User/usb_control_handlers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

__attribute__((always_inline)) static inline void usb_control_endp1_tx_complete(TRANSACTION_STATUS status)
{
event_transfer_finished = true;
hydradancer_set_event_transfer_finished(true);
}

__attribute__((always_inline)) static inline void usb_control_endp_tx_complete(TRANSACTION_STATUS status, uint8_t endp_num)
Expand Down Expand Up @@ -89,9 +89,9 @@ static bool _usb_control_endp_rx_callback(uint8_t* data)
ep_queue_member_t* ep_queue_member = (ep_queue_member_t*)data;
while (true)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
volatile uint16_t status = hydradancer_status.ep_in_status;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
if (status & (0x01 << endpoint_mapping_reverse[ep_queue_member->ep_num]))
break;
}
Expand Down Expand Up @@ -168,15 +168,15 @@ bool _do_disable_usb(uint8_t* data)
{
LOG_IF(LOG_LEVEL_DEBUG, LOG_ID_USER, "DISABLE_USB\r\n");
usb2_device_deinit();
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
boards_ready = 0;
event_transfer_finished = true;
hydradancer_set_event_transfer_finished(true);
start_polling = false;
hydra_interrupt_queue_free_all();
hydra_interrupt_queue_init();
hydra_pool_clean(&ep_queue);
ramx_pool_init();
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
usb_emulation_reinit();
usb_control_reinit();
return true;
Expand Down
4 changes: 2 additions & 2 deletions hydradancer/firmware_hydradancer/User/usb_emulation_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ void usb_emulation_reinit(void)
// // uncomment to empty log_buffer on emulated device disconnection
// LOG_DUMP();

bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
// Setup ramx pool and interrupt_queue
usb_device_set_usb3_device_descriptor(&usb_device_0, NULL);
usb_device_set_usb2_device_descriptor(&usb_device_0, NULL);
Expand All @@ -24,7 +24,7 @@ void usb_emulation_reinit(void)
{
endp_rx_set_state(&usb_device_0, i, ENDP_STATE_ACK);
}
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
}

void usb_emulation_init_endpoints(void)
Expand Down
2 changes: 1 addition & 1 deletion hydradancer/firmware_hydradancer/User/usb_emulation_device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "wch-ch56x-lib/USBDevice/usb_device.h"
#include "wch-ch56x-lib/USBDevice/usb_endpoints.h"

#define USB2_ENDP_1_15_MAX_PACKET_SIZE 512
#define USB2_ENDP_1_15_MAX_PACKET_SIZE 1024

void usb_emulation_reinit(void);

Expand Down
16 changes: 8 additions & 8 deletions hydradancer/firmware_hydradancer/User/usb_emulation_handlers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ bool _usb_emulation_endp0_passthrough_setup_callback(uint8_t* data)

while (true)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
volatile uint16_t status = hydradancer_status.ep_out_status;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
if (!(status & (0x01 << 0)))
break;
if (start_polling)
Expand All @@ -154,9 +154,9 @@ bool _usb_emulation_endp0_passthrough_setup_callback(uint8_t* data)

while (true)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
volatile uint16_t status = hydradancer_status.ep_out_status;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
if (!(status & (0x01 << 0)))
break;
if (start_polling)
Expand Down Expand Up @@ -190,9 +190,9 @@ static bool _usb_emulation_endp_rx_callback(uint8_t* data)

while (true)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
volatile uint16_t status = hydradancer_status.ep_out_status;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();
if (!(status & (0x01 << endp_num)))
{
break;
Expand Down Expand Up @@ -341,7 +341,7 @@ void usb_emulation_nak_callback(uint8_t endp_num)
void usb_emulation_usb2_device_handle_bus_reset(void);
void usb_emulation_usb2_device_handle_bus_reset(void)
{
bsp_disable_interrupt();
BSP_ENTER_CRITICAL();
hydradancer_status.ep_in_status = (0x1 << 0) & 0xff; // keep ep0
hydradancer_status.ep_out_status = 0;
hydradancer_status.ep_in_nak = 0;
Expand All @@ -356,7 +356,7 @@ void usb_emulation_usb2_device_handle_bus_reset(void)
}

boards_ready = 1;
bsp_enable_interrupt();
BSP_EXIT_CRITICAL();

write_event(EVENT_BUS_RESET, 0);
}
Expand Down

0 comments on commit 2bec84b

Please sign in to comment.