@@ -50,6 +50,14 @@ extern "C" {
50
50
#define USBD_MAX_NUM_INTERFACES 1U
51
51
#endif /* USBD_AUDIO_FREQ */
52
52
53
+ #ifndef AUDIO_HS_BINTERVAL
54
+ #define AUDIO_HS_BINTERVAL 0x01U
55
+ #endif /* AUDIO_HS_BINTERVAL */
56
+
57
+ #ifndef AUDIO_FS_BINTERVAL
58
+ #define AUDIO_FS_BINTERVAL 0x01U
59
+ #endif /* AUDIO_FS_BINTERVAL */
60
+
53
61
#define AUDIO_OUT_EP 0x01U
54
62
#define USB_AUDIO_CONFIG_DESC_SIZ 0x6DU
55
63
#define AUDIO_INTERFACE_DESC_SIZE 0x09U
@@ -91,6 +99,9 @@ extern "C" {
91
99
92
100
#define AUDIO_OUT_STREAMING_CTRL 0x02U
93
101
102
+ #define AUDIO_OUT_TC 0x01U
103
+ #define AUDIO_IN_TC 0x02U
104
+
94
105
95
106
#define AUDIO_OUT_PACKET (uint16_t)(((USBD_AUDIO_FREQ * 2U * 2U) / 1000U))
96
107
#define AUDIO_DEFAULT_VOLUME 70U
@@ -116,8 +127,7 @@ typedef enum
116
127
AUDIO_OFFSET_HALF ,
117
128
AUDIO_OFFSET_FULL ,
118
129
AUDIO_OFFSET_UNKNOWN ,
119
- }
120
- AUDIO_OffsetTypeDef ;
130
+ } AUDIO_OffsetTypeDef ;
121
131
/**
122
132
* @}
123
133
*/
@@ -132,32 +142,29 @@ typedef struct
132
142
uint8_t data [USB_MAX_EP0_SIZE ];
133
143
uint8_t len ;
134
144
uint8_t unit ;
135
- }
136
- USBD_AUDIO_ControlTypeDef ;
137
-
145
+ } USBD_AUDIO_ControlTypeDef ;
138
146
139
147
140
148
typedef struct
141
149
{
142
- uint32_t alt_setting ;
143
- uint8_t buffer [AUDIO_TOTAL_BUF_SIZE ];
144
- AUDIO_OffsetTypeDef offset ;
145
- uint8_t rd_enable ;
146
- uint16_t rd_ptr ;
147
- uint16_t wr_ptr ;
150
+ uint32_t alt_setting ;
151
+ uint8_t buffer [AUDIO_TOTAL_BUF_SIZE ];
152
+ AUDIO_OffsetTypeDef offset ;
153
+ uint8_t rd_enable ;
154
+ uint16_t rd_ptr ;
155
+ uint16_t wr_ptr ;
148
156
USBD_AUDIO_ControlTypeDef control ;
149
- }
150
- USBD_AUDIO_HandleTypeDef ;
157
+ } USBD_AUDIO_HandleTypeDef ;
151
158
152
159
153
160
typedef struct
154
161
{
155
- int8_t (* Init )(uint32_t AudioFreq , uint32_t Volume , uint32_t options );
162
+ int8_t (* Init )(uint32_t AudioFreq , uint32_t Volume , uint32_t options );
156
163
int8_t (* DeInit )(uint32_t options );
157
164
int8_t (* AudioCmd )(uint8_t * pbuf , uint32_t size , uint8_t cmd );
158
165
int8_t (* VolumeCtl )(uint8_t vol );
159
166
int8_t (* MuteCtl )(uint8_t cmd );
160
- int8_t (* PeriodicTC )(uint8_t cmd );
167
+ int8_t (* PeriodicTC )(uint8_t * pbuf , uint32_t size , uint8_t cmd );
161
168
int8_t (* GetState )(void );
162
169
} USBD_AUDIO_ItfTypeDef ;
163
170
/**
@@ -178,19 +185,19 @@ typedef struct
178
185
* @{
179
186
*/
180
187
181
- extern USBD_ClassTypeDef USBD_AUDIO ;
182
- #define USBD_AUDIO_CLASS &USBD_AUDIO
188
+ extern USBD_ClassTypeDef USBD_AUDIO ;
189
+ #define USBD_AUDIO_CLASS &USBD_AUDIO
183
190
/**
184
191
* @}
185
192
*/
186
193
187
194
/** @defgroup USB_CORE_Exported_Functions
188
195
* @{
189
196
*/
190
- uint8_t USBD_AUDIO_RegisterInterface (USBD_HandleTypeDef * pdev ,
191
- USBD_AUDIO_ItfTypeDef * fops );
197
+ uint8_t USBD_AUDIO_RegisterInterface (USBD_HandleTypeDef * pdev ,
198
+ USBD_AUDIO_ItfTypeDef * fops );
192
199
193
- void USBD_AUDIO_Sync (USBD_HandleTypeDef * pdev , AUDIO_OffsetTypeDef offset );
200
+ void USBD_AUDIO_Sync (USBD_HandleTypeDef * pdev , AUDIO_OffsetTypeDef offset );
194
201
/**
195
202
* @}
196
203
*/
0 commit comments