mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-03-02 05:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename CFG_TUD_ENDPOINT0_BUFSIZE to make it more consistent

Browse Source 
use uint8_t for dfu state and status to reduce size
This commit is contained in:
hathach
2025-11-19 13:36:32 +07:00
parent 1df116adfc
commit b2dc419270
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/class/dfu/dfu_device.c
View File

@ -50,19 +50,17 @@
typedef struct {
uint8_t attrs;
uint8_t alt;
uint8_t state;
uint8_t status;
dfu_state_t state;
dfu_status_t status;
bool flashing_in_progress;
bool flashing_in_progress;
uint16_t block;
uint16_t length;
} dfu_state_ctx_t;
// Only a single dfu state is allowed
static dfu_state_ctx_t _dfu_ctx;
CFG_TUD_MEM_ALIGN uint8_t _transfer_buf[CFG_TUD_DFU_XFER_BUFSIZE];
TU_ATTR_ALIGNED(4) uint8_t _transfer_buf[CFG_TUD_DFU_XFER_BUFSIZE];
static void reset_state(void) {
_dfu_ctx.state = DFU_IDLE;

8
src/device/usbd_control.c
View File

@ -60,7 +60,7 @@ typedef struct {
static usbd_control_xfer_t _ctrl_xfer;
CFG_TUD_MEM_SECTION static struct {
TUD_EPBUF_DEF(buf, CFG_TUD_EP0_BUFSIZE);
TUD_EPBUF_DEF(buf, CFG_TUD_ENDPOINT0_BUFSIZE);
} _ctrl_epbuf;
//--------------------------------------------------------------------+
@ -88,13 +88,13 @@ bool tud_control_status(uint8_t rhport, const tusb_control_request_t* request) {
// Each transaction has up to Endpoint0's max packet size.
// This function can also transfer an zero-length packet
static bool data_stage_xact(uint8_t rhport) {
const uint16_t xact_len = tu_min16(_ctrl_xfer.data_len - _ctrl_xfer.total_xferred, CFG_TUD_EP0_BUFSIZE);
const uint16_t xact_len = tu_min16(_ctrl_xfer.data_len - _ctrl_xfer.total_xferred, CFG_TUD_ENDPOINT0_BUFSIZE);
uint8_t ep_addr = EDPT_CTRL_OUT;
if (_ctrl_xfer.request.bmRequestType_bit.direction == TUSB_DIR_IN) {
ep_addr = EDPT_CTRL_IN;
if (0u != xact_len) {
TU_VERIFY(0 == tu_memcpy_s(_ctrl_epbuf.buf, CFG_TUD_EP0_BUFSIZE, _ctrl_xfer.buffer, xact_len));
TU_VERIFY(0 == tu_memcpy_s(_ctrl_epbuf.buf, CFG_TUD_ENDPOINT0_BUFSIZE, _ctrl_xfer.buffer, xact_len));
}
}
@ -179,7 +179,7 @@ bool usbd_control_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result,
// Data Stage is complete when all request's length are transferred or
// a short packet is sent including zero-length packet.
if ((_ctrl_xfer.request.wLength == _ctrl_xfer.total_xferred) ||
(xferred_bytes < CFG_TUD_EP0_BUFSIZE)) {
(xferred_bytes < CFG_TUD_ENDPOINT0_BUFSIZE)) {
// DATA stage is complete
bool is_ok = true;

4
src/tusb_option.h
View File

@ -485,8 +485,8 @@
#define CFG_TUD_ENDPOINT0_SIZE 64
#endif
#ifndef CFG_TUD_EP0_BUFSIZE
#define CFG_TUD_EP0_BUFSIZE CFG_TUD_ENDPOINT0_SIZE
#ifndef CFG_TUD_ENDPOINT0_BUFSIZE
#define CFG_TUD_ENDPOINT0_BUFSIZE CFG_TUD_ENDPOINT0_SIZE
#endif
#ifndef CFG_TUD_INTERFACE_MAX