webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-28 17:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix when a keepalive packet collides with an ongoing transmission.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-08-20 16:39:08 +02:00
parent 38f0e2cc3a
commit e1dd57067e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/usb/hid/hid.c
View File

@@ -212,10 +212,13 @@ void hid_task(void) {
void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report, uint16_t len) { void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report, uint16_t len) {
if (instance == ITF_HID && len > 0) { if (instance == ITF_HID && len > 0) {
CTAPHID_FRAME *ctap_req = (CTAPHID_FRAME *) report;
if (last_write_result[instance] == WRITE_PENDING) { if (last_write_result[instance] == WRITE_PENDING) {
last_write_result[instance] = WRITE_SUCCESS; last_write_result[instance] = WRITE_SUCCESS;
if (report[4] & TYPE_MASK) { if (FRAME_TYPE(ctap_req) == TYPE_INIT) {
send_buffer_size[instance] -= MIN(64 - 7, send_buffer_size[instance]); if (ctap_req->init.cmd != CTAPHID_KEEPALIVE) {
send_buffer_size[instance] -= MIN(64 - 7, send_buffer_size[instance]);
}
} }
else { else {
send_buffer_size[instance] -= MIN(64 - 5, send_buffer_size[instance]); send_buffer_size[instance] -= MIN(64 - 5, send_buffer_size[instance]);
@@ -223,8 +226,10 @@ void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report, uint16_
} }
if (send_buffer_size[instance] > 0) { if (send_buffer_size[instance] > 0) {
if (last_write_result[instance] == WRITE_SUCCESS) { if (last_write_result[instance] == WRITE_SUCCESS) {
ctap_resp = (CTAPHID_FRAME *) ((uint8_t *) ctap_resp + 64 - 5); if (FRAME_TYPE(ctap_req) != TYPE_INIT || ctap_req->init.cmd != CTAPHID_KEEPALIVE) {
uint8_t seq = report[4] & TYPE_MASK ? 0 : report[4] + 1; ctap_resp = (CTAPHID_FRAME *) ((uint8_t *) ctap_resp + 64 - 5);
}
uint8_t seq = FRAME_TYPE(ctap_req) == TYPE_INIT ? 0 : FRAME_SEQ(ctap_req) + 1;
ctap_resp->cid = ctap_req->cid; ctap_resp->cid = ctap_req->cid;
ctap_resp->cont.seq = seq; ctap_resp->cont.seq = seq;
} }