|
110 | 110 | #error Maximum number of audio functions restricted to three! |
111 | 111 | #endif |
112 | 112 |
|
| 113 | +// Put sw_buf in USB section only if necessary |
| 114 | +#if USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_ENCODING |
| 115 | +#define IN_SW_BUF_MEM_SECTION |
| 116 | +#else |
| 117 | +#define IN_SW_BUF_MEM_SECTION CFG_TUD_MEM_SECTION |
| 118 | +#endif |
| 119 | +#if USE_LINEAR_BUFFER || CFG_TUD_AUDIO_ENABLE_DECODING |
| 120 | +#define OUT_SW_BUF_MEM_SECTION |
| 121 | +#else |
| 122 | +#define OUT_SW_BUF_MEM_SECTION CFG_TUD_MEM_SECTION |
| 123 | +#endif |
| 124 | + |
113 | 125 | // EP IN software buffers and mutexes |
114 | 126 | #if CFG_TUD_AUDIO_ENABLE_EP_IN && !CFG_TUD_AUDIO_ENABLE_ENCODING |
115 | 127 | #if CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ > 0 |
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]; |
| 128 | + IN_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ]; |
117 | 129 | #if CFG_FIFO_MUTEX |
118 | 130 | osal_mutex_def_t ep_in_ff_mutex_wr_1; // No need for read mutex as only USB driver reads from FIFO |
119 | 131 | #endif |
120 | 132 | #endif // CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ > 0 |
121 | 133 |
|
122 | 134 | #if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ > 0 |
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]; |
| 135 | + IN_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ]; |
124 | 136 | #if CFG_FIFO_MUTEX |
125 | 137 | osal_mutex_def_t ep_in_ff_mutex_wr_2; // No need for read mutex as only USB driver reads from FIFO |
126 | 138 | #endif |
127 | 139 | #endif // CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_IN_SW_BUF_SZ > 0 |
128 | 140 |
|
129 | 141 | #if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_IN_SW_BUF_SZ > 0 |
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]; |
| 142 | + IN_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_in_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_IN_SW_BUF_SZ]; |
131 | 143 | #if CFG_FIFO_MUTEX |
132 | 144 | osal_mutex_def_t ep_in_ff_mutex_wr_3; // No need for read mutex as only USB driver reads from FIFO |
133 | 145 | #endif |
|
154 | 166 | // EP OUT software buffers and mutexes |
155 | 167 | #if CFG_TUD_AUDIO_ENABLE_EP_OUT && !CFG_TUD_AUDIO_ENABLE_DECODING |
156 | 168 | #if CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ > 0 |
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]; |
| 169 | + OUT_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_1[CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ]; |
158 | 170 | #if CFG_FIFO_MUTEX |
159 | 171 | osal_mutex_def_t ep_out_ff_mutex_rd_1; // No need for write mutex as only USB driver writes into FIFO |
160 | 172 | #endif |
161 | 173 | #endif // CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ > 0 |
162 | 174 |
|
163 | 175 | #if CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ > 0 |
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]; |
| 176 | + OUT_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_2[CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ]; |
165 | 177 | #if CFG_FIFO_MUTEX |
166 | 178 | osal_mutex_def_t ep_out_ff_mutex_rd_2; // No need for write mutex as only USB driver writes into FIFO |
167 | 179 | #endif |
168 | 180 | #endif // CFG_TUD_AUDIO > 1 && CFG_TUD_AUDIO_FUNC_2_EP_OUT_SW_BUF_SZ > 0 |
169 | 181 |
|
170 | 182 | #if CFG_TUD_AUDIO > 2 && CFG_TUD_AUDIO_FUNC_3_EP_OUT_SW_BUF_SZ > 0 |
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]; |
| 183 | + OUT_SW_BUF_MEM_SECTION CFG_TUSB_MEM_ALIGN uint8_t audio_ep_out_sw_buf_3[CFG_TUD_AUDIO_FUNC_3_EP_OUT_SW_BUF_SZ]; |
172 | 184 | #if CFG_FIFO_MUTEX |
173 | 185 | osal_mutex_def_t ep_out_ff_mutex_rd_3; // No need for write mutex as only USB driver writes into FIFO |
174 | 186 | #endif |
|
0 commit comments