bstanwell/wch-uf2-example
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more code squeezing

Browse Source
This commit is contained in:
R
2024-04-14 16:46:19 +01:00
parent cfe827c1ce
commit 2acf794123
1 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootloader.c
+19 -32
View File
@@ -481,7 +481,7 @@ __attribute__((naked)) int main(void) {
CTRL_XFER_STATE = STATE_GET_STR_SERIAL; CTRL_XFER_STATE = STATE_GET_STR_SERIAL;
} else { } else {
USB_DESCS[0].count_tx = 8; USB_DESCS[0].count_tx = 8;
CTRL_XFER_STATE_X = (3 << 8) | (wLength - 8); CTRL_XFER_STATE_X = (8 << 8) | (wLength - 8);
CTRL_XFER_STATE = STATE_GET_STR_SERIAL; CTRL_XFER_STATE = STATE_GET_STR_SERIAL;
} }
set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_STALL, USB_STAT_ACK, 0, 0); set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_STALL, USB_STAT_ACK, 0, 0);
@@ -535,6 +535,7 @@ __attribute__((naked)) int main(void) {
set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_STALL, USB_STAT_STALL, 0, 0); set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_STALL, USB_STAT_STALL, 0, 0);
break; break;
case STATE_GET_DESC: case STATE_GET_DESC:
case STATE_GET_STR_SERIAL:
{ {
uint32_t x = CTRL_XFER_STATE_X; uint32_t x = CTRL_XFER_STATE_X;
uint32_t byte_pos = (x >> 8) & 0xff; uint32_t byte_pos = (x >> 8) & 0xff;
@@ -545,10 +546,23 @@ __attribute__((naked)) int main(void) {
} else { } else {
uint32_t bytes = bytes_left; uint32_t bytes = bytes_left;
if (bytes > 8) bytes = 8; if (bytes > 8) bytes = 8;
if (byte_pos + bytes > CTRL_XFER_DESC_SZ) if (CTRL_XFER_STATE == STATE_GET_DESC) {
bytes = CTRL_XFER_DESC_SZ - byte_pos; if (byte_pos + bytes > CTRL_XFER_DESC_SZ)
for (int i = 0; i < bytes; i+=2) bytes = CTRL_XFER_DESC_SZ - byte_pos;
USB_EP0_IN[i / 2] = *((uint16_t*)(outputting_desc + byte_pos + i)); for (int i = 0; i < bytes; i+=2)
USB_EP0_IN[i / 2] = *((uint16_t*)(outputting_desc + byte_pos + i));
} else {
// todo
uint32_t serial_no_pos = (byte_pos - 2) / 2;
uint32_t ascii_bytes = (bytes + 1) / 2;
if (serial_no_pos + ascii_bytes > 24) {
ascii_bytes = 24 - serial_no_pos;
// xxx this should be fine, reads 8 byte chunks
bytes = ascii_bytes * 2;
}
for (int i = 0; i < ascii_bytes; i++)
USB_EP0_IN[i] = HEXLUT[(ESIG_UNIID((serial_no_pos + i) / 2) >> ((1 - ((serial_no_pos + i) % 2)) * 4)) & 0xf];
}
if (bytes < 8) { if (bytes < 8) {
USB_DESCS[0].count_tx = bytes; USB_DESCS[0].count_tx = bytes;
CTRL_XFER_STATE_X = 0; CTRL_XFER_STATE_X = 0;
@@ -560,33 +574,6 @@ __attribute__((naked)) int main(void) {
} }
} }
break; break;
case STATE_GET_STR_SERIAL:
{
uint32_t x = CTRL_XFER_STATE_X;
uint32_t str_pos = (x >> 8) & 0xff;
uint32_t bytes_left = x & 0xff;
if (bytes_left == 0) {
// ACK for OUT ZLP, STALL for IN
set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_ACK, USB_STAT_STALL, 1 << 8, 0);
} else {
// XXX this is confusing
uint32_t ascii_bytes = (bytes_left + 1) / 2;
if (ascii_bytes > 4) ascii_bytes = 4;
if (str_pos + ascii_bytes > 24)
ascii_bytes = 24 - str_pos;
for (int i = 0; i < ascii_bytes; i++)
USB_EP0_IN[i] = HEXLUT[(ESIG_UNIID((str_pos + i) / 2) >> ((1 - ((str_pos + i) % 2)) * 4)) & 0xf];
if (ascii_bytes < 4) {
USB_DESCS[0].count_tx = bytes_left;
CTRL_XFER_STATE_X = 0;
} else {
USB_DESCS[0].count_tx = 8;
CTRL_XFER_STATE_X = ((str_pos + 4) << 8) | (bytes_left - 8);
}
set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_STALL, USB_STAT_ACK, 0, 0);
}
}
break;
case STATE_CTRL_SIMPLE_IN: case STATE_CTRL_SIMPLE_IN:
// ACK for OUT ZLP, STALL for IN // ACK for OUT ZLP, STALL for IN
set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_ACK, USB_STAT_STALL, 1 << 8, 0); set_ep_mode(0, 0, USB_EPTYPE_CONTROL, USB_STAT_ACK, USB_STAT_STALL, 1 << 8, 0);