GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-02-04 06:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

queue: don't use global q_from_host, use the one from hGS_CAN instead

Browse Source 
The next patch will replace the queue by a list and embed the list
head into the hGS_CAN. This is a preparation patch to make the diff
smaller.
This commit is contained in:
Marc Kleine-Budde 2022-11-10 22:29:22 +01:00
parent 0a864a3cbc
commit 57d9900f5b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -102,7 +102,7 @@ int main(void)
#endif #endif
while (1) { while (1) {
struct gs_host_frame *frame = queue_pop_front(q_from_host); struct gs_host_frame *frame = queue_pop_front(hGS_CAN.q_from_host);
if (frame != 0) { // send can message from host if (frame != 0) { // send can message from host
if (can_send(channel, frame)) { if (can_send(channel, frame)) {
// Echo sent frame back to host // Echo sent frame back to host
@ -113,7 +113,7 @@ int main(void)
led_indicate_trx(&hLED, led_tx); led_indicate_trx(&hLED, led_tx);
} else { } else {
queue_push_front(q_from_host, frame); // retry later queue_push_front(hGS_CAN.q_from_host, frame); // retry later
} }
} }
@ -122,7 +122,7 @@ int main(void)
} }
if (can_is_rx_pending(channel)) { if (can_is_rx_pending(channel)) {
struct gs_host_frame *frame = queue_pop_front(q_frame_pool); struct gs_host_frame *frame = queue_pop_front(hGS_CAN.q_frame_pool);
if (frame != 0) if (frame != 0)
{ {
if (can_receive(channel, frame)) { if (can_receive(channel, frame)) {
@ -139,7 +139,7 @@ int main(void)
} }
else else
{ {
queue_push_back(q_frame_pool, frame); queue_push_back(hGS_CAN.q_frame_pool, frame);
} }
} }
// If there are frames to receive, don't report any error frames. The // If there are frames to receive, don't report any error frames. The
@ -148,14 +148,15 @@ int main(void)
// to report even if multiple pass by. // to report even if multiple pass by.
} else { } else {
uint32_t can_err = can_get_error_status(channel); uint32_t can_err = can_get_error_status(channel);
struct gs_host_frame *frame = queue_pop_front(q_frame_pool); struct gs_host_frame *frame = queue_pop_front(hGS_CAN.q_frame_pool);
if (frame != 0) { if (frame != 0) {
frame->timestamp_us = timer_get(); frame->timestamp_us = timer_get();
if (can_parse_error_status(can_err, last_can_error_status, channel, frame)) { if (can_parse_error_status(can_err, last_can_error_status, channel, frame)) {
queue_push_back(q_to_host, frame); queue_push_back(q_to_host, frame);
last_can_error_status = can_err; last_can_error_status = can_err;
} else { } else {
queue_push_back(q_frame_pool, frame); queue_push_back(hGS_CAN.q_frame_pool, frame);
} }
} }
} }
@ -288,7 +289,7 @@ void send_to_host(void)
return; return;
if (USBD_GS_CAN_SendFrame(&hUSB, frame) == USBD_OK) { if (USBD_GS_CAN_SendFrame(&hUSB, frame) == USBD_OK) {
queue_push_back(q_frame_pool, frame); queue_push_back(hGS_CAN.q_frame_pool, frame);
} else { } else {
queue_push_front(q_to_host, frame); queue_push_front(q_to_host, frame);
} }