jzh/free-dap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed multiple DAP buffers

Browse Source
This commit is contained in:
Alex Taradov 2022-08-07 13:55:33 -07:00
parent 2f73d7cbee
commit e7752beb5e
1 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
platform/samd11/main.c
View File

@ -27,9 +27,7 @@ static alignas(4) uint8_t app_req_buf[DAP_CONFIG_PACKET_SIZE];
static alignas(4) uint8_t app_resp_buf[DAP_CONFIG_PACKET_SIZE]; static alignas(4) uint8_t app_resp_buf[DAP_CONFIG_PACKET_SIZE];
static int app_req_buf_hid_size = 0; static int app_req_buf_hid_size = 0;
static int app_req_buf_bulk_size = 0; static int app_req_buf_bulk_size = 0;
static int app_resp_size = 0;
static bool app_resp_free = true; static bool app_resp_free = true;
static int app_resp_interface;
static uint64_t app_system_time = 0; static uint64_t app_system_time = 0;
static uint64_t app_status_timeout = 0; static uint64_t app_status_timeout = 0;
static bool app_dap_event = false; static bool app_dap_event = false;
@ -279,10 +277,53 @@ static void usb_bulk_recv_callback(int size)
app_req_buf_bulk_size = size; app_req_buf_bulk_size = size;
} }
//-----------------------------------------------------------------------------
static void dap_task(void)
{
int interface, size;
if (!app_resp_free)
return;
if (app_req_buf_hid_size)
{
interface = USB_INTF_HID;
size = app_req_buf_hid_size;
app_req_buf_hid_size = 0;
memcpy(app_req_buf, app_req_buf_hid, size);
usb_hid_recv(app_req_buf_hid, sizeof(app_req_buf_hid));
}
else if (app_req_buf_bulk_size)
{
interface = USB_INTF_BULK;
size = app_req_buf_bulk_size;
app_req_buf_bulk_size = 0;
memcpy(app_req_buf, app_req_buf_bulk, size);
usb_recv(USB_BULK_EP_RECV, app_req_buf_bulk, sizeof(app_req_buf_bulk));
}
else
{
return;
}
size = dap_process_request(app_req_buf, size, app_resp_buf, sizeof(app_resp_buf));
if (USB_INTF_BULK == interface)
usb_send(USB_BULK_EP_SEND, app_resp_buf, size);
else
usb_hid_send(app_resp_buf, sizeof(app_resp_buf));
app_resp_free = false;
app_dap_event = true;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void usb_configuration_callback(int config) void usb_configuration_callback(int config)
{ {
app_resp_size = 0;
app_resp_free = true; app_resp_free = true;
app_req_buf_hid_size = 0; app_req_buf_hid_size = 0;
app_req_buf_bulk_size = 0; app_req_buf_bulk_size = 0;
@ -328,52 +369,6 @@ static void status_timer_task(void)
#endif #endif
} }
//-----------------------------------------------------------------------------
static void dap_task(void)
{
int size;
if (app_resp_size && app_resp_free)
{
if (USB_INTF_BULK == app_resp_interface)
usb_send(USB_BULK_EP_SEND, app_resp_buf, app_resp_size);
else
usb_hid_send(app_resp_buf, sizeof(app_resp_buf));
app_resp_free = false;
app_resp_size = 0;
}
if (app_req_buf_hid_size)
{
size = app_req_buf_hid_size;
app_req_buf_hid_size = 0;
app_resp_interface = USB_INTF_HID;
memcpy(app_req_buf, app_req_buf_hid, size);
usb_hid_recv(app_req_buf_hid, sizeof(app_req_buf_hid));
}
else if (app_req_buf_bulk_size)
{
size = app_req_buf_bulk_size;
app_req_buf_bulk_size = 0;
app_resp_interface = USB_INTF_BULK;
memcpy(app_req_buf, app_req_buf_bulk, size);
usb_recv(USB_BULK_EP_RECV, app_req_buf_bulk, sizeof(app_req_buf_bulk));
}
else
{
return;
}
app_dap_event = true;
app_resp_size = dap_process_request(app_req_buf, size, app_resp_buf, sizeof(app_resp_buf));
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int main(void) int main(void)
{ {