Skip to content

Commit ad7bacb

Browse files
hathachhathach
authored
Merge pull request hathach#1978 from hathach/fix-align-host
separate CFG_TUSB_MEM_SECTION/ALIGN to host and device specific macros
2 parents 7440782 + 76dae8d commit ad7bacb

File tree

18 files changed

+96
-47
lines changed

18 files changed

+96
-47
lines changed

‎examples/dual/host_hid_to_device_cdc/src/tusb_config.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
9696
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
9797
*/
98-
#ifndef CFG_TUSB_MEM_SECTION
99-
#define CFG_TUSB_MEM_SECTION
98+
#ifndef CFG_TUD_MEM_SECTION
99+
#define CFG_TUD_MEM_SECTION
100100
#endif
101101

102-
#ifndef CFG_TUSB_MEM_ALIGN
103-
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
102+
#ifndef CFG_TUD_MEM_ALIGN
103+
#define CFG_TUD_MEM_ALIGN __attribute__ ((aligned(4)))
104104
#endif
105105

106106
//--------------------------------------------------------------------
@@ -128,6 +128,14 @@
128128
// Size of buffer to hold descriptors and other data used for enumeration
129129
#define CFG_TUH_ENUMERATION_BUFSIZE 256
130130

131+
#ifndef CFG_TUH_MEM_SECTION
132+
#define CFG_TUH_MEM_SECTION
133+
#endif
134+
135+
#ifndef CFG_TUH_MEM_ALIGN
136+
#define CFG_TUH_MEM_ALIGN __attribute__ ((aligned(4)))
137+
#endif
138+
131139
#define CFG_TUH_HUB 1
132140
// max device support (excluding hub device)
133141
#define CFG_TUH_DEVICE_MAX (CFG_TUH_HUB ? 4 : 1) // hub typically has 4 ports

‎examples/host/bare_api/src/tusb_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
8181
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
8282
*/
83-
#ifndef CFG_TUSB_MEM_SECTION
84-
#define CFG_TUSB_MEM_SECTION
83+
#ifndef CFG_TUH_MEM_SECTION
84+
#define CFG_TUH_MEM_SECTION
8585
#endif
8686

87-
#ifndef CFG_TUSB_MEM_ALIGN
88-
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
87+
#ifndef CFG_TUH_MEM_ALIGN
88+
#define CFG_TUH_MEM_ALIGN __attribute__ ((aligned(4)))
8989
#endif
9090

9191
//--------------------------------------------------------------------

‎examples/host/cdc_msc_hid/src/tusb_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
8181
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
8282
*/
83-
#ifndef CFG_TUSB_MEM_SECTION
84-
#define CFG_TUSB_MEM_SECTION
83+
#ifndef CFG_TUH_MEM_SECTION
84+
#define CFG_TUH_MEM_SECTION
8585
#endif
8686

87-
#ifndef CFG_TUSB_MEM_ALIGN
88-
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
87+
#ifndef CFG_TUH_MEM_ALIGN
88+
#define CFG_TUH_MEM_ALIGN __attribute__ ((aligned(4)))
8989
#endif
9090

9191
//--------------------------------------------------------------------

‎examples/host/hid_controller/src/tusb_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
8181
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
8282
*/
83-
#ifndef CFG_TUSB_MEM_SECTION
84-
#define CFG_TUSB_MEM_SECTION
83+
#ifndef CFG_TUH_MEM_SECTION
84+
#define CFG_TUH_MEM_SECTION
8585
#endif
8686

87-
#ifndef CFG_TUSB_MEM_ALIGN
88-
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
87+
#ifndef CFG_TUH_MEM_ALIGN
88+
#define CFG_TUH_MEM_ALIGN __attribute__ ((aligned(4)))
8989
#endif
9090

9191
//--------------------------------------------------------------------

‎examples/host/msc_file_explorer/src/tusb_config.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
8181
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
8282
*/
83-
#ifndef CFG_TUSB_MEM_SECTION
84-
#define CFG_TUSB_MEM_SECTION
83+
#ifndef CFG_TUH_MEM_SECTION
84+
#define CFG_TUH_MEM_SECTION
8585
#endif
8686

87-
#ifndef CFG_TUSB_MEM_ALIGN
88-
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
87+
#ifndef CFG_TUH_MEM_ALIGN
88+
#define CFG_TUH_MEM_ALIGN __attribute__ ((aligned(4)))
8989
#endif
9090

9191
//--------------------------------------------------------------------

‎hw/bsp/ea4088qs/board.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ CFLAGS += \
1010
-nostdlib \
1111
-DCORE_M4 \
1212
-D__USE_LPCOPEN \
13-
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
13+
-DCFG_TUD_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
14+
-DCFG_TUH_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
1415
-DCFG_TUSB_MCU=OPT_MCU_LPC40XX
1516

1617
# mcu driver cause following warnings

‎src/class/cdc/cdc_host.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ typedef struct {
6262
tu_edpt_stream_t rx;
6363

6464
uint8_t tx_ff_buf[CFG_TUH_CDC_TX_BUFSIZE];
65-
CFG_TUSB_MEM_ALIGN uint8_t tx_ep_buf[CFG_TUH_CDC_TX_EPSIZE];
65+
CFG_TUH_MEM_ALIGN uint8_t tx_ep_buf[CFG_TUH_CDC_TX_EPSIZE];
6666

6767
uint8_t rx_ff_buf[CFG_TUH_CDC_TX_BUFSIZE];
68-
CFG_TUSB_MEM_ALIGN uint8_t rx_ep_buf[CFG_TUH_CDC_TX_EPSIZE];
68+
CFG_TUH_MEM_ALIGN uint8_t rx_ep_buf[CFG_TUH_CDC_TX_EPSIZE];
6969
} stream;
7070

7171
} cdch_interface_t;
@@ -74,7 +74,7 @@ typedef struct {
7474
// INTERNAL OBJECT & FUNCTION DECLARATION
7575
//--------------------------------------------------------------------+
7676

77-
CFG_TUSB_MEM_SECTION
77+
CFG_TUH_MEM_SECTION
7878
static cdch_interface_t cdch_data[CFG_TUH_CDC];
7979

8080
static inline cdch_interface_t* get_itf(uint8_t idx)

‎src/class/cdc/cdc_rndis_host.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
//--------------------------------------------------------------------+
5151
#define RNDIS_MSG_PAYLOAD_MAX (1024*4)
5252

53-
CFG_TUSB_MEM_SECTION static uint8_t msg_notification[CFG_TUH_DEVICE_MAX][8];
54-
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
53+
CFG_TUH_MEM_SECTION static uint8_t msg_notification[CFG_TUH_DEVICE_MAX][8];
54+
CFG_TUH_MEM_SECTION CFG_TUH_MEM_ALIGN static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
5555

5656
static rndish_data_t rndish_data[CFG_TUH_DEVICE_MAX];
5757

‎src/class/hid/hid_host.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ typedef struct
5454
uint16_t epin_size;
5555
uint16_t epout_size;
5656

57-
uint8_t epin_buf[CFG_TUH_HID_EPIN_BUFSIZE];
58-
uint8_t epout_buf[CFG_TUH_HID_EPOUT_BUFSIZE];
57+
CFG_TUH_MEM_ALIGN uint8_t epin_buf[CFG_TUH_HID_EPIN_BUFSIZE];
58+
CFG_TUH_MEM_ALIGN uint8_t epout_buf[CFG_TUH_HID_EPOUT_BUFSIZE];
5959
} hidh_interface_t;
6060

61-
CFG_TUSB_MEM_SECTION
61+
CFG_TUH_MEM_SECTION
6262
tu_static hidh_interface_t _hidh_itf[CFG_TUH_HID];
6363

6464
//--------------------------------------------------------------------+

‎src/class/msc/msc_host.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ typedef struct
7171
tuh_msc_complete_cb_t complete_cb;
7272
uintptr_t complete_arg;
7373

74-
msc_cbw_t cbw;
75-
msc_csw_t csw;
74+
CFG_TUH_MEM_ALIGN msc_cbw_t cbw;
75+
CFG_TUH_MEM_ALIGN msc_csw_t csw;
7676
}msch_interface_t;
7777

78-
CFG_TUSB_MEM_SECTION static msch_interface_t _msch_itf[CFG_TUH_DEVICE_MAX];
78+
CFG_TUH_MEM_SECTION static msch_interface_t _msch_itf[CFG_TUH_DEVICE_MAX];
7979

8080
// buffer used to read scsi information when mounted
8181
// largest response data currently is inquiry TODO Inquiry is not part of enum anymore
82-
CFG_TUSB_MEM_SECTION TU_ATTR_ALIGNED(4)
82+
CFG_TUH_MEM_SECTION CFG_TUH_MEM_ALIGN
8383
static uint8_t _msch_buffer[sizeof(scsi_inquiry_resp_t)];
8484

8585
TU_ATTR_ALWAYS_INLINE

0 commit comments

Comments
 (0)