hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some assumptions on packet format

Browse Source
xap
zvecr 3 years ago
parent 22b8299230
commit 7f128c5286
4 changed files with 52 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      quantum/xap/xap.h
  2. 20
      tmk_core/protocol/chibios/usb_main.c
  3. 20
      tmk_core/protocol/lufa/lufa.c
  4. 20
      tmk_core/protocol/vusb/vusb.c

12
quantum/xap/xap.h
Unescape View File

@ -41,4 +41,16 @@ bool xap_respond_data_P(xap_token_t token, const void *data, size_t length);
void xap_send(xap_token_t token, xap_response_flags_t response_flags, const void *data, size_t length);
// TODO: gen from xap defs?
typedef struct {
xap_token_t token;
uint8_t length;
} xap_request_header_t;
typedef struct {
xap_token_t token;
xap_response_flags_t flags;
uint8_t length;
} xap_response_header_t;
#include <xap_generated.h>

20
tmk_core/protocol/chibios/usb_main.c
Unescape View File

@ -1139,13 +1139,16 @@ void xap_send_base(uint8_t *data, uint8_t length) {
void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_t length) {
uint8_t rdata[XAP_EPSIZE] = {0};
*(xap_token_t *)&rdata[0] = token;
if (length > (XAP_EPSIZE - 4)) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
rdata[2] = response_flags;
xap_response_header_t *header = (xap_response_header_t *)&rdata[0];
header->token = token;
if (length > (XAP_EPSIZE - sizeof(xap_response_header_t))) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
header->flags = response_flags;
if (response_flags & (XAP_RESPONSE_FLAG_SUCCESS)) {
rdata[3] = (uint8_t)length;
header->length = (uint8_t)length;
if (data != NULL) {
memcpy(&rdata[4], data, length);
memcpy(&rdata[sizeof(xap_response_header_t)], data, length);
}
}
xap_send_base(rdata, sizeof(rdata));
@ -1153,10 +1156,9 @@ void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_
void xap_receive_base(const void *data) {
const uint8_t *u8data = (const uint8_t *)data;
xap_token_t token = *(xap_token_t *)&u8data[0];
uint8_t length = u8data[2];
if (length <= (XAP_EPSIZE - 3)) {
xap_receive(token, &u8data[3], length);
xap_request_header_t *header = (xap_request_header_t *)&u8data[0];
if (header->length <= (XAP_EPSIZE - sizeof(xap_request_header_t))) {
xap_receive(header->token, &u8data[sizeof(xap_request_header_t)], header->length);
}
}

20
tmk_core/protocol/lufa/lufa.c
Unescape View File

@ -245,13 +245,16 @@ void xap_send_base(uint8_t *data, uint8_t length) {
void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_t length) {
uint8_t rdata[XAP_EPSIZE] = {0};
*(xap_token_t *)&rdata[0] = token;
if (length > (XAP_EPSIZE - 4)) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
rdata[2] = response_flags;
xap_response_header_t *header = (xap_response_header_t *)&rdata[0];
header->token = token;
if (length > (XAP_EPSIZE - sizeof(xap_response_header_t))) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
header->flags = response_flags;
if (response_flags & (XAP_RESPONSE_FLAG_SUCCESS)) {
rdata[3] = (uint8_t)length;
header->length = (uint8_t)length;
if (data != NULL) {
memcpy(&rdata[4], data, length);
memcpy(&rdata[sizeof(xap_response_header_t)], data, length);
}
}
xap_send_base(rdata, sizeof(rdata));
@ -259,10 +262,9 @@ void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_
void xap_receive_base(const void *data) {
const uint8_t *u8data = (const uint8_t *)data;
xap_token_t token = *(xap_token_t *)&u8data[0];
uint8_t length = u8data[2];
if (length <= (XAP_EPSIZE - 3)) {
xap_receive(token, &u8data[3], length);
xap_request_header_t *header = (xap_request_header_t *)&u8data[0];
if (header->length <= (XAP_EPSIZE - sizeof(xap_request_header_t))) {
xap_receive(header->token, &u8data[sizeof(xap_request_header_t)], header->length);
}
}

20
tmk_core/protocol/vusb/vusb.c
Unescape View File

@ -206,13 +206,16 @@ void xap_send_base(uint8_t *data, uint8_t length) {
void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_t length) {
uint8_t rdata[XAP_BUFFER_SIZE] = {0};
*(xap_token_t *)&rdata[0] = token;
if (length > (XAP_BUFFER_SIZE - 4)) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
rdata[2] = response_flags;
xap_response_header_t *header = (xap_response_header_t *)&rdata[0];
header->token = token;
if (length > (XAP_BUFFER_SIZE - sizeof(xap_response_header_t))) response_flags &= ~(XAP_RESPONSE_FLAG_SUCCESS);
header->flags = response_flags;
if (response_flags & (XAP_RESPONSE_FLAG_SUCCESS)) {
rdata[3] = (uint8_t)length;
header->length = (uint8_t)length;
if (data != NULL) {
memcpy(&rdata[4], data, length);
memcpy(&rdata[sizeof(xap_response_header_t)], data, length);
}
}
xap_send_base(rdata, sizeof(rdata));
@ -220,10 +223,9 @@ void xap_send(xap_token_t token, uint8_t response_flags, const void *data, size_
void xap_receive_base(const void *data) {
const uint8_t *u8data = (const uint8_t *)data;
xap_token_t token = *(xap_token_t *)&u8data[0];
uint8_t length = u8data[2];
if (length <= (XAP_BUFFER_SIZE - 3)) {
xap_receive(token, &u8data[3], length);
xap_request_header_t *header = (xap_request_header_t *)&u8data[0];
if (header->length <= (XAP_BUFFER_SIZE - sizeof(xap_request_header_t))) {
xap_receive(header->token, &u8data[sizeof(xap_request_header_t)], header->length);
}
}

Write Preview
Loading…
Cancel
Save