Skip to content

Commit ef49b93

Browse files
hathachhathach
committed
rename CFG_TUSB_MEM_SECTION to CFG_TUD_MEM_SECTION in device stack
CFG_TUD_MEM_SECTION is default to CFG_TUSB_MEM_SECTION
1 parent a268e0b commit ef49b93

File tree

26 files changed

+68
-88
lines changed

26 files changed

+68
-88
lines changed

‎hw/bsp/lpc40/family.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ function(add_board_target BOARD_TARGET)
3838
target_compile_definitions(${BOARD_TARGET} PUBLIC
3939
__USE_LPCOPEN
4040
CORE_M4
41+
CFG_TUSB_MEM_SECTION=__attribute__\(\(section\(\".data.$RAM2\"\)\)\)
4142
)
4243
target_include_directories(${BOARD_TARGET} PUBLIC
4344
${SDK_DIR}/inc

‎hw/bsp/lpc40/family.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ CFLAGS += \
99
-nostdlib \
1010
-DCORE_M4 \
1111
-D__USE_LPCOPEN \
12-
-DCFG_TUD_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
13-
-DCFG_TUH_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
12+
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
1413
-DCFG_TUSB_MCU=OPT_MCU_LPC40XX
1514

1615
# mcu driver cause following warnings

‎lib/networking/rndis_reports.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static usb_eth_stat_t usb_eth_stat = { 0, 0, 0, 0 };
4343
static uint32_t oid_packet_filter = 0x0000000;
4444
static rndis_state_t rndis_state;
4545

46-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
46+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN static uint8_t ndis_report[8] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
4747

4848
static const uint32_t OIDSupportedList[] =
4949
{

‎src/class/audio/audio_device.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,21 @@
113113
// EP IN software buffers and mutexes
114114
#if CFG_TUD_AUDIO_ENABLE_EP_IN && !CFG_TUD_AUDIO_ENABLE_ENCODING
115115
#if CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ > 0
116-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ];
116+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ];
117117
#if CFG_FIFO_MUTEX
118118
osal_mutex_def_t ep_in_ff_mutex_wr_1; // No need for read mutex as only USB driver reads from FIFO
119119
#endif
120120
#endif // CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ > 0
121121

122122
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ > 0
123-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ];
123+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ];
124124
#if CFG_FIFO_MUTEX
125125
osal_mutex_def_t ep_in_ff_mutex_wr_2; // No need for read mutex as only USB driver reads from FIFO
126126
#endif
127127
#endif // CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ > 0
128128

129129
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_IN_SW_BUF_SZ > 0
130-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_IN_SW_BUF_SZ];
130+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_IN_SW_BUF_SZ];
131131
#if CFG_FIFO_MUTEX
132132
osal_mutex_def_t ep_in_ff_mutex_wr_3; // No need for read mutex as only USB driver reads from FIFO
133133
#endif
@@ -139,36 +139,36 @@
139139
// - the software encoding is used - in this case the linear buffers serve as a target memory where logical channels are encoded into
140140
#if CFG_TUD_AUDIO_ENABLE_EP_IN && (USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_ENCODING)
141141
#if CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX > 0
142-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_1[CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX];
142+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_1[CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX];
143143
#endif
144144

145145
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_IN_SZ_MAX > 0
146-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_2[CFG_TUD_AUDIO_FUNC_2_EP_IN_SZ_MAX];
146+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_2[CFG_TUD_AUDIO_FUNC_2_EP_IN_SZ_MAX];
147147
#endif
148148

149149
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_IN_SZ_MAX > 0
150-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_3[CFG_TUD_AUDIO_FUNC_3_EP_IN_SZ_MAX];
150+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_in_3[CFG_TUD_AUDIO_FUNC_3_EP_IN_SZ_MAX];
151151
#endif
152152
#endif // CFG_TUD_AUDIO_ENABLE_EP_IN && (USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_DECODING)
153153

154154
// EP OUT software buffers and mutexes
155155
#if CFG_TUD_AUDIO_ENABLE_EP_OUT && !CFG_TUD_AUDIO_ENABLE_DECODING
156156
#if CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ > 0
157-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ];
157+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ];
158158
#if CFG_FIFO_MUTEX
159159
osal_mutex_def_t ep_out_ff_mutex_rd_1; // No need for write mutex as only USB driver writes into FIFO
160160
#endif
161161
#endif // CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ > 0
162162

163163
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ > 0
164-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ];
164+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ];
165165
#if CFG_FIFO_MUTEX
166166
osal_mutex_def_t ep_out_ff_mutex_rd_2; // No need for write mutex as only USB driver writes into FIFO
167167
#endif
168168
#endif // CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ > 0
169169

170170
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_OUT_SW_BUF_SZ > 0
171-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_OUT_SW_BUF_SZ];
171+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_OUT_SW_BUF_SZ];
172172
#if CFG_FIFO_MUTEX
173173
osal_mutex_def_t ep_out_ff_mutex_rd_3; // No need for write mutex as only USB driver writes into FIFO
174174
#endif
@@ -180,27 +180,27 @@
180180
// - the software encoding is used - in this case the linear buffers serve as a target memory where logical channels are encoded into
181181
#if CFG_TUD_AUDIO_ENABLE_EP_OUT && (USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_DECODING)
182182
#if CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX > 0
183-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_1[CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX];
183+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_1[CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX];
184184
#endif
185185

186186
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_OUT_SZ_MAX > 0
187-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_2[CFG_TUD_AUDIO_FUNC_2_EP_OUT_SZ_MAX];
187+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_2[CFG_TUD_AUDIO_FUNC_2_EP_OUT_SZ_MAX];
188188
#endif
189189

190190
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_OUT_SZ_MAX > 0
191-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_3[CFG_TUD_AUDIO_FUNC_3_EP_OUT_SZ_MAX];
191+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t lin_buf_out_3[CFG_TUD_AUDIO_FUNC_3_EP_OUT_SZ_MAX];
192192
#endif
193193
#endif // CFG_TUD_AUDIO_ENABLE_EP_OUT && (USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_DECODING)
194194

195195
// Control buffers
196-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_1[CFG_TUD_AUDIO_FUNC_1_CTRL_BUF_SZ];
196+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_1[CFG_TUD_AUDIO_FUNC_1_CTRL_BUF_SZ];
197197

198198
#if CFG_TUD_AUDIO > 1
199-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_2[CFG_TUD_AUDIO_FUNC_2_CTRL_BUF_SZ];
199+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_2[CFG_TUD_AUDIO_FUNC_2_CTRL_BUF_SZ];
200200
#endif
201201

202202
#if CFG_TUD_AUDIO > 2
203-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_3[CFG_TUD_AUDIO_FUNC_3_CTRL_BUF_SZ];
203+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t ctrl_buf_3[CFG_TUD_AUDIO_FUNC_3_CTRL_BUF_SZ];
204204
#endif
205205

206206
// Active alternate setting of interfaces
@@ -217,23 +217,23 @@ uint8_t alt_setting_3[CFG_TUD_AUDIO_FUNC_3_N_AS_INT];
217217
// Software encoding/decoding support FIFOs
218218
#if CFG_TUD_AUDIO_ENABLE_EP_IN && CFG_TUD_AUDIO_ENABLE_ENCODING
219219
#if CFG_TUD_AUDIO_FUNC_1_TX_SUPP_SW_FIFO_SZ > 0
220-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_1[CFG_TUD_AUDIO_FUNC_1_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_1_TX_SUPP_SW_FIFO_SZ];
220+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_1[CFG_TUD_AUDIO_FUNC_1_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_1_TX_SUPP_SW_FIFO_SZ];
221221
tu_fifo_t tx_supp_ff_1[CFG_TUD_AUDIO_FUNC_1_N_TX_SUPP_SW_FIFO];
222222
#if CFG_FIFO_MUTEX
223223
osal_mutex_def_t tx_supp_ff_mutex_wr_1[CFG_TUD_AUDIO_FUNC_1_N_TX_SUPP_SW_FIFO]; // No need for read mutex as only USB driver reads from FIFO
224224
#endif
225225
#endif
226226

227227
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_TX_SUPP_SW_FIFO_SZ > 0
228-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_2[CFG_TUD_AUDIO_FUNC_2_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_2_TX_SUPP_SW_FIFO_SZ];
228+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_2[CFG_TUD_AUDIO_FUNC_2_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_2_TX_SUPP_SW_FIFO_SZ];
229229
tu_fifo_t tx_supp_ff_2[CFG_TUD_AUDIO_FUNC_2_N_TX_SUPP_SW_FIFO];
230230
#if CFG_FIFO_MUTEX
231231
osal_mutex_def_t tx_supp_ff_mutex_wr_2[CFG_TUD_AUDIO_FUNC_2_N_TX_SUPP_SW_FIFO]; // No need for read mutex as only USB driver reads from FIFO
232232
#endif
233233
#endif
234234

235235
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_TX_SUPP_SW_FIFO_SZ > 0
236-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_3[CFG_TUD_AUDIO_FUNC_3_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_3_TX_SUPP_SW_FIFO_SZ];
236+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t tx_supp_ff_buf_3[CFG_TUD_AUDIO_FUNC_3_N_TX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_3_TX_SUPP_SW_FIFO_SZ];
237237
tu_fifo_t tx_supp_ff_3[CFG_TUD_AUDIO_FUNC_3_N_TX_SUPP_SW_FIFO];
238238
#if CFG_FIFO_MUTEX
239239
osal_mutex_def_t tx_supp_ff_mutex_wr_3[CFG_TUD_AUDIO_FUNC_3_N_TX_SUPP_SW_FIFO]; // No need for read mutex as only USB driver reads from FIFO
@@ -243,23 +243,23 @@ uint8_t alt_setting_3[CFG_TUD_AUDIO_FUNC_3_N_AS_INT];
243243

244244
#if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_DECODING
245245
#if CFG_TUD_AUDIO_FUNC_1_RX_SUPP_SW_FIFO_SZ > 0
246-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_1[CFG_TUD_AUDIO_FUNC_1_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_1_RX_SUPP_SW_FIFO_SZ];
246+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_1[CFG_TUD_AUDIO_FUNC_1_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_1_RX_SUPP_SW_FIFO_SZ];
247247
tu_fifo_t rx_supp_ff_1[CFG_TUD_AUDIO_FUNC_1_N_RX_SUPP_SW_FIFO];
248248
#if CFG_FIFO_MUTEX
249249
osal_mutex_def_t rx_supp_ff_mutex_rd_1[CFG_TUD_AUDIO_FUNC_1_N_RX_SUPP_SW_FIFO]; // No need for write mutex as only USB driver writes into FIFO
250250
#endif
251251
#endif
252252

253253
#if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_RX_SUPP_SW_FIFO_SZ > 0
254-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_2[CFG_TUD_AUDIO_FUNC_2_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_2_RX_SUPP_SW_FIFO_SZ];
254+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_2[CFG_TUD_AUDIO_FUNC_2_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_2_RX_SUPP_SW_FIFO_SZ];
255255
tu_fifo_t rx_supp_ff_2[CFG_TUD_AUDIO_FUNC_2_N_RX_SUPP_SW_FIFO];
256256
#if CFG_FIFO_MUTEX
257257
osal_mutex_def_t rx_supp_ff_mutex_rd_2[CFG_TUD_AUDIO_FUNC_2_N_RX_SUPP_SW_FIFO]; // No need for write mutex as only USB driver writes into FIFO
258258
#endif
259259
#endif
260260

261261
#if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_RX_SUPP_SW_FIFO_SZ > 0
262-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_3[CFG_TUD_AUDIO_FUNC_3_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_3_RX_SUPP_SW_FIFO_SZ];
262+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t rx_supp_ff_buf_3[CFG_TUD_AUDIO_FUNC_3_N_RX_SUPP_SW_FIFO][CFG_TUD_AUDIO_FUNC_3_RX_SUPP_SW_FIFO_SZ];
263263
tu_fifo_t rx_supp_ff_3[CFG_TUD_AUDIO_FUNC_3_N_RX_SUPP_SW_FIFO];
264264
#if CFG_FIFO_MUTEX
265265
osal_mutex_def_t rx_supp_ff_mutex_rd_3[CFG_TUD_AUDIO_FUNC_3_N_RX_SUPP_SW_FIFO]; // No need for write mutex as only USB driver writes into FIFO
@@ -416,7 +416,7 @@ typedef struct
416416
//--------------------------------------------------------------------+
417417
// INTERNAL OBJECT & FUNCTION DECLARATION
418418
//--------------------------------------------------------------------+
419-
CFG_TUSB_MEM_SECTION audiod_function_t _audiod_fct[CFG_TUD_AUDIO];
419+
CFG_TUD_MEM_SECTION audiod_function_t _audiod_fct[CFG_TUD_AUDIO];
420420

421421
#if CFG_TUD_AUDIO_ENABLE_EP_OUT
422422
static bool audiod_rx_done_cb(uint8_t rhport, audiod_function_t* audio, uint16_t n_bytes_received);

‎src/class/bth/bth_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef struct
5555
//--------------------------------------------------------------------+
5656
// INTERNAL OBJECT & FUNCTION DECLARATION
5757
//--------------------------------------------------------------------+
58-
CFG_TUSB_MEM_SECTION btd_interface_t _btd_itf;
58+
CFG_TUD_MEM_SECTION btd_interface_t _btd_itf;
5959

6060
static bool bt_tx_data(uint8_t ep, void *data, uint16_t len)
6161
{

‎src/class/cdc/cdc_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ typedef struct
7676
//--------------------------------------------------------------------+
7777
// INTERNAL OBJECT & FUNCTION DECLARATION
7878
//--------------------------------------------------------------------+
79-
CFG_TUSB_MEM_SECTION tu_static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
79+
CFG_TUD_MEM_SECTION tu_static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];
8080

8181
static bool _prep_out_transaction (cdcd_interface_t* p_cdc)
8282
{

‎src/class/dfu/dfu_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef struct
5656
} dfu_state_ctx_t;
5757

5858
// Only a single dfu state is allowed
59-
CFG_TUSB_MEM_SECTION tu_static dfu_state_ctx_t _dfu_ctx;
59+
CFG_TUD_MEM_SECTION tu_static dfu_state_ctx_t _dfu_ctx;
6060

6161
static void reset_state(void)
6262
{

‎src/class/hid/hid_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ typedef struct
5858
tusb_hid_descriptor_hid_t const * hid_descriptor;
5959
} hidd_interface_t;
6060

61-
CFG_TUSB_MEM_SECTION tu_static hidd_interface_t _hidd_itf[CFG_TUD_HID];
61+
CFG_TUD_MEM_SECTION tu_static hidd_interface_t _hidd_itf[CFG_TUD_HID];
6262

6363
/*------------- Helpers -------------*/
6464
static inline uint8_t get_index_by_itfnum(uint8_t itf_num)

‎src/class/midi/midi_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ typedef struct
8282
//--------------------------------------------------------------------+
8383
// INTERNAL OBJECT & FUNCTION DECLARATION
8484
//--------------------------------------------------------------------+
85-
CFG_TUSB_MEM_SECTION midid_interface_t _midid_itf[CFG_TUD_MIDI];
85+
CFG_TUD_MEM_SECTION midid_interface_t _midid_itf[CFG_TUD_MIDI];
8686

8787
bool tud_midi_n_mounted (uint8_t itf)
8888
{

‎src/class/msc/msc_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ typedef struct
7474
uint8_t add_sense_qualifier;
7575
}mscd_interface_t;
7676

77-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static mscd_interface_t _mscd_itf;
78-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static uint8_t _mscd_buf[CFG_TUD_MSC_EP_BUFSIZE];
77+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static mscd_interface_t _mscd_itf;
78+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static uint8_t _mscd_buf[CFG_TUD_MSC_EP_BUFSIZE];
7979

8080
//--------------------------------------------------------------------+
8181
// INTERNAL OBJECT & FUNCTION DECLARATION

‎src/class/net/ecm_rndis_device.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ typedef struct
6161
#define CFG_TUD_NET_PACKET_PREFIX_LEN sizeof(rndis_data_packet_t)
6262
#define CFG_TUD_NET_PACKET_SUFFIX_LEN 0
6363

64-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static
64+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static
6565
uint8_t received[CFG_TUD_NET_PACKET_PREFIX_LEN + CFG_TUD_NET_MTU + CFG_TUD_NET_PACKET_PREFIX_LEN];
6666

67-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static
67+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static
6868
uint8_t transmitted[CFG_TUD_NET_PACKET_PREFIX_LEN + CFG_TUD_NET_MTU + CFG_TUD_NET_PACKET_PREFIX_LEN];
6969

7070
struct ecm_notify_struct
@@ -94,8 +94,8 @@ tu_static const struct ecm_notify_struct ecm_notify_csc =
9494
.uplink = 9728000,
9595
};
9696

97-
// TODO remove CFG_TUSB_MEM_SECTION, control internal buffer is already in this special section
98-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static union
97+
// TODO remove CFG_TUD_MEM_SECTION, control internal buffer is already in this special section
98+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static union
9999
{
100100
uint8_t rndis_buf[120];
101101
struct ecm_notify_struct ecm_buf;
@@ -104,8 +104,8 @@ CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static union
104104
//--------------------------------------------------------------------+
105105
// INTERNAL OBJECT & FUNCTION DECLARATION
106106
//--------------------------------------------------------------------+
107-
// TODO remove CFG_TUSB_MEM_SECTION
108-
CFG_TUSB_MEM_SECTION tu_static netd_interface_t _netd_itf;
107+
// TODO remove CFG_TUD_MEM_SECTION
108+
CFG_TUD_MEM_SECTION tu_static netd_interface_t _netd_itf;
109109

110110
tu_static bool can_xmit;
111111

‎src/class/net/ncm_device.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ typedef struct
130130
// INTERNAL OBJECT & FUNCTION DECLARATION
131131
//--------------------------------------------------------------------+
132132

133-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static const ntb_parameters_t ntb_parameters = {
133+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static const ntb_parameters_t ntb_parameters = {
134134
.wLength = sizeof(ntb_parameters_t),
135135
.bmNtbFormatsSupported = 0x01,
136136
.dwNtbInMaxSize = CFG_TUD_NCM_IN_NTB_MAX_SIZE,
@@ -145,9 +145,9 @@ CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static const ntb_parameters_t ntb_par
145145
.wNtbOutMaxDatagrams = 0
146146
};
147147

148-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static transmit_ntb_t transmit_ntb[2];
148+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static transmit_ntb_t transmit_ntb[2];
149149

150-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static uint8_t receive_ntb[CFG_TUD_NCM_OUT_NTB_MAX_SIZE];
150+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN tu_static uint8_t receive_ntb[CFG_TUD_NCM_OUT_NTB_MAX_SIZE];
151151

152152
tu_static ncm_interface_t ncm_interface;
153153

‎src/class/usbtmc/usbtmc_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ typedef struct
143143
usbtmc_capabilities_specific_t const * capabilities;
144144
} usbtmc_interface_state_t;
145145

146-
CFG_TUSB_MEM_SECTION tu_static usbtmc_interface_state_t usbtmc_state =
146+
CFG_TUD_MEM_SECTION tu_static usbtmc_interface_state_t usbtmc_state =
147147
{
148148
.itf_id = 0xFF,
149149
};

‎src/class/vendor/vendor_device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct
5959
CFG_TUSB_MEM_ALIGN uint8_t epin_buf[CFG_TUD_VENDOR_EPSIZE];
6060
} vendord_interface_t;
6161

62-
CFG_TUSB_MEM_SECTION tu_static vendord_interface_t _vendord_itf[CFG_TUD_VENDOR];
62+
CFG_TUD_MEM_SECTION tu_static vendord_interface_t _vendord_itf[CFG_TUD_VENDOR];
6363

6464
#define ITF_MEM_RESET_SIZE offsetof(vendord_interface_t, rx_ff)
6565

‎src/class/video/video_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ typedef struct TU_ATTR_PACKED {
130130
//--------------------------------------------------------------------+
131131
// INTERNAL OBJECT & FUNCTION DECLARATION
132132
//--------------------------------------------------------------------+
133-
CFG_TUSB_MEM_SECTION tu_static videod_interface_t _videod_itf[CFG_TUD_VIDEO];
134-
CFG_TUSB_MEM_SECTION tu_static videod_streaming_interface_t _videod_streaming_itf[CFG_TUD_VIDEO_STREAMING];
133+
CFG_TUD_MEM_SECTION tu_static videod_interface_t _videod_itf[CFG_TUD_VIDEO];
134+
CFG_TUD_MEM_SECTION tu_static videod_streaming_interface_t _videod_streaming_itf[CFG_TUD_VIDEO_STREAMING];
135135

136136
tu_static uint8_t const _cap_get = 0x1u; /* support for GET */
137137
tu_static uint8_t const _cap_get_set = 0x3u; /* support for GET and SET */

‎src/device/usbd_control.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ typedef struct
5555

5656
tu_static usbd_control_xfer_t _ctrl_xfer;
5757

58-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
58+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN
5959
tu_static uint8_t _usbd_ctrl_buf[CFG_TUD_ENDPOINT0_SIZE];
6060

6161
//--------------------------------------------------------------------+

‎src/portable/bridgetek/ft9xx/dcd_ft9xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ extern int8_t board_ft9xx_vbus(void);
5151
extern int board_uart_write(void const *buf, int len);
5252

5353
// Static array to store an incoming SETUP request for processing by tinyusb.
54-
CFG_TUSB_MEM_SECTION CFG_TUSB_MEM_ALIGN
54+
CFG_TUD_MEM_SECTION CFG_TUSB_MEM_ALIGN
5555
static uint8_t _ft9xx_setup_packet[8];
5656

5757
struct ft9xx_xfer_state

‎src/portable/chipidea/ci_fs/dcd_ci_fs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ typedef struct
116116
// INTERNAL OBJECT & FUNCTION DECLARATION
117117
//--------------------------------------------------------------------+
118118
// BDT(Buffer Descriptor Table) must be 256-byte aligned
119-
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(512) static dcd_data_t _dcd;
119+
CFG_TUD_MEM_SECTION TU_ATTR_ALIGNED(512) static dcd_data_t _dcd;
120120

121121
TU_VERIFY_STATIC( sizeof(_dcd.bdt) == 512, "size is not correct" );
122122

‎src/portable/chipidea/ci_hs/dcd_ci_hs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ typedef struct {
175175
dcd_qtd_t qtd[TUP_DCD_ENDPOINT_MAX][2] TU_ATTR_ALIGNED(32);
176176
}dcd_data_t;
177177

178-
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(2048)
178+
CFG_TUD_MEM_SECTION TU_ATTR_ALIGNED(2048)
179179
static dcd_data_t _dcd_data;
180180

181181
//--------------------------------------------------------------------+

‎src/portable/microchip/pic/dcd_pic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ typedef struct
189189
// INTERNAL OBJECT & FUNCTION DECLARATION
190190
//--------------------------------------------------------------------+
191191
// BDT(Buffer Descriptor Table) must be 256-byte aligned
192-
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(512) volatile static dcd_data_t _dcd;
192+
CFG_TUD_MEM_SECTION TU_ATTR_ALIGNED(512) volatile static dcd_data_t _dcd;
193193

194194
#if TU_PIC_INT_SIZE == 4
195195
TU_VERIFY_STATIC( sizeof(_dcd.bdt) == 512, "size is not correct" );

‎src/portable/microchip/samx7x/dcd_samx7x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static tusb_speed_t get_speed(void);
7777
static void dcd_transmit_packet(xfer_ctl_t * xfer, uint8_t ep_ix);
7878

7979
// DMA descriptors shouldn't be placed in ITCM !
80-
CFG_TUSB_MEM_SECTION static dma_desc_t dma_desc[6];
80+
CFG_TUD_MEM_SECTION static dma_desc_t dma_desc[6];
8181

8282
static xfer_ctl_t xfer_status[EP_MAX];
8383

0 commit comments

Comments
 (0)