Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5061f11

Browse files
committed
chore(system): update stm32_mw_usb_device to v2.11.1
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent2718bf5 commit5061f11

File tree

82 files changed

+15393
-4039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+15393
-4039
lines changed

‎system/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Inc/usbd_audio.h

Lines changed: 122 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
*<h2><center>&copy;Copyright (c) 2015 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2015 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under Ultimate Liberty license
13-
* SLA0044, the "License"; You may not use this file except in compliance with
14-
* the License. You may obtain a copy of the License at:
15-
* www.st.com/SLA0044
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -58,7 +57,10 @@ extern "C" {
5857
#defineAUDIO_FS_BINTERVAL 0x01U
5958
#endif/* AUDIO_FS_BINTERVAL */
6059

60+
#ifndefAUDIO_OUT_EP
6161
#defineAUDIO_OUT_EP 0x01U
62+
#endif/* AUDIO_OUT_EP */
63+
6264
#defineUSB_AUDIO_CONFIG_DESC_SIZ 0x6DU
6365
#defineAUDIO_INTERFACE_DESC_SIZE 0x09U
6466
#defineUSB_AUDIO_DESC_SIZ 0x09U
@@ -167,6 +169,115 @@ typedef struct
167169
int8_t (*PeriodicTC)(uint8_t*pbuf,uint32_tsize,uint8_tcmd);
168170
int8_t (*GetState)(void);
169171
}USBD_AUDIO_ItfTypeDef;
172+
173+
/*
174+
* Audio Class specification release 1.0
175+
*/
176+
177+
/* Table 4-2: Class-Specific AC Interface Header Descriptor */
178+
typedefstruct
179+
{
180+
uint8_tbLength;
181+
uint8_tbDescriptorType;
182+
uint8_tbDescriptorSubtype;
183+
uint16_tbcdADC;
184+
uint16_twTotalLength;
185+
uint8_tbInCollection;
186+
uint8_tbaInterfaceNr;
187+
}__PACKEDUSBD_SpeakerIfDescTypeDef;
188+
189+
/* Table 4-3: Input Terminal Descriptor */
190+
typedefstruct
191+
{
192+
uint8_tbLength;
193+
uint8_tbDescriptorType;
194+
uint8_tbDescriptorSubtype;
195+
uint8_tbTerminalID;
196+
uint16_twTerminalType;
197+
uint8_tbAssocTerminal;
198+
uint8_tbNrChannels;
199+
uint16_twChannelConfig;
200+
uint8_tiChannelNames;
201+
uint8_tiTerminal;
202+
}__PACKEDUSBD_SpeakerInDescTypeDef;
203+
204+
/* USB Speaker Audio Feature Unit Descriptor */
205+
typedefstruct
206+
{
207+
uint8_tbLength;
208+
uint8_tbDescriptorType;
209+
uint8_tbDescriptorSubtype;
210+
uint8_tbUnitID;
211+
uint8_tbSourceID;
212+
uint8_tbControlSize;
213+
uint16_tbmaControls;
214+
uint8_tiTerminal;
215+
}__PACKEDUSBD_SpeakerFeatureDescTypeDef;
216+
217+
/* Table 4-4: Output Terminal Descriptor */
218+
typedefstruct
219+
{
220+
uint8_tbLength;
221+
uint8_tbDescriptorType;
222+
uint8_tbDescriptorSubtype;
223+
uint8_tbTerminalID;
224+
uint16_twTerminalType;
225+
uint8_tbAssocTerminal;
226+
uint8_tbSourceID;
227+
uint8_tiTerminal;
228+
}__PACKEDUSBD_SpeakerOutDescTypeDef;
229+
230+
/* Table 4-19: Class-Specific AS Interface Descriptor */
231+
typedefstruct
232+
{
233+
uint8_tbLength;
234+
uint8_tbDescriptorType;
235+
uint8_tbDescriptorSubtype;
236+
uint8_tbTerminalLink;
237+
uint8_tbDelay;
238+
uint16_twFormatTag;
239+
}__PACKEDUSBD_SpeakerStreamIfDescTypeDef;
240+
241+
/* USB Speaker Audio Type III Format Interface Descriptor */
242+
typedefstruct
243+
{
244+
uint8_tbLength;
245+
uint8_tbDescriptorType;
246+
uint8_tbDescriptorSubtype;
247+
uint8_tbFormatType;
248+
uint8_tbNrChannels;
249+
uint8_tbSubFrameSize;
250+
uint8_tbBitResolution;
251+
uint8_tbSamFreqType;
252+
uint8_ttSamFreq2;
253+
uint8_ttSamFreq1;
254+
uint8_ttSamFreq0;
255+
}USBD_SpeakerIIIFormatIfDescTypeDef;
256+
257+
/* Table 4-17: Standard AC Interrupt Endpoint Descriptor */
258+
typedefstruct
259+
{
260+
uint8_tbLength;
261+
uint8_tbDescriptorType;
262+
uint8_tbEndpointAddress;
263+
uint8_tbmAttributes;
264+
uint16_twMaxPacketSize;
265+
uint8_tbInterval;
266+
uint8_tbRefresh;
267+
uint8_tbSynchAddress;
268+
}__PACKEDUSBD_SpeakerEndDescTypeDef;
269+
270+
/* Table 4-21: Class-Specific AS Isochronous Audio Data Endpoint Descriptor */
271+
typedefstruct
272+
{
273+
uint8_tbLength;
274+
uint8_tbDescriptorType;
275+
uint8_tbDescriptor;
276+
uint8_tbmAttributes;
277+
uint8_tbLockDelayUnits;
278+
uint16_twLockDelay;
279+
}__PACKEDUSBD_SpeakerEndStDescTypeDef;
280+
170281
/**
171282
* @}
172283
*/
@@ -198,6 +309,11 @@ uint8_t USBD_AUDIO_RegisterInterface(USBD_HandleTypeDef *pdev,
198309
USBD_AUDIO_ItfTypeDef*fops);
199310

200311
voidUSBD_AUDIO_Sync(USBD_HandleTypeDef*pdev,AUDIO_OffsetTypeDefoffset);
312+
313+
#ifdefUSE_USBD_COMPOSITE
314+
uint32_tUSBD_AUDIO_GetEpPcktSze(USBD_HandleTypeDef*pdev,uint8_tIf,uint8_tEp);
315+
#endif/* USE_USBD_COMPOSITE */
316+
201317
/**
202318
* @}
203319
*/
@@ -214,5 +330,3 @@ void USBD_AUDIO_Sync(USBD_HandleTypeDef *pdev, AUDIO_OffsetTypeDef offset);
214330
/**
215331
* @}
216332
*/
217-
218-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Inc/usbd_audio_if_template.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
*<h2><center>&copy;Copyright (c) 2015 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2015 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under Ultimate Liberty license
13-
* SLA0044, the "License"; You may not use this file except in compliance with
14-
* the License. You may obtain a copy of the License at:
15-
* www.st.com/SLA0044
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -41,5 +40,3 @@ extern USBD_AUDIO_ItfTypeDef USBD_AUDIO_Template_fops;
4140
#endif
4241

4342
#endif/* __USBD_AUDIO_IF_TEMPLATE_H */
44-
45-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp