projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add makefile template for the AVR32 UC3 architecture.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Class
/
Device
/
Audio.h
diff --git
a/LUFA/Drivers/USB/Class/Device/Audio.h
b/LUFA/Drivers/USB/Class/Device/Audio.h
index
180b9a3
..
a50bd97
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/
LUFA/Drivers/USB/Class/Device/Audio.h
@@
-38,7
+38,7
@@
*/
/** \ingroup Group_USBClassAudio
*/
/** \ingroup Group_USBClassAudio
- *
@
defgroup Group_USBClassAudioDevice Audio Class Device Mode Driver
+ *
\
defgroup Group_USBClassAudioDevice Audio Class Device Mode Driver
*
* \section Sec_Dependencies Module Source Dependencies
* The following files must be built with any user project that uses this module:
*
* \section Sec_Dependencies Module Source Dependencies
* The following files must be built with any user project that uses this module:
@@
-57,8
+57,6
@@
#include "../../USB.h"
#include "../Common/Audio.h"
#include "../../USB.h"
#include "../Common/Audio.h"
- #include <string.h>
-
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
@@
-69,10
+67,6
@@
#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
#endif
#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
#endif
- #if defined(__INCLUDE_FROM_AUDIO_DEVICE_C) && defined(NO_STREAM_CALLBACKS)
- #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
- #endif
-
/* Public Interface - May be used in end-application: */
/* Type Defines: */
/** \brief Audio Class Device Mode Configuration and State Structure.
/* Public Interface - May be used in end-application: */
/* Type Defines: */
/** \brief Audio Class Device Mode Configuration and State Structure.
@@
-209,7
+203,7
@@
(void)AudioInterfaceInfo;
(void)AudioInterfaceInfo;
- Sample = Endpoint_Read_
Byte
();
+ Sample = Endpoint_Read_
8
();
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
@@
-234,7
+228,7
@@
(void)AudioInterfaceInfo;
(void)AudioInterfaceInfo;
- Sample = (int16_t)Endpoint_Read_
Word
_LE();
+ Sample = (int16_t)Endpoint_Read_
16
_LE();
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
@@
-259,7
+253,7
@@
(void)AudioInterfaceInfo;
(void)AudioInterfaceInfo;
- Sample = (((uint32_t)Endpoint_Read_
Byte() << 16) | Endpoint_Read_Word
_LE());
+ Sample = (((uint32_t)Endpoint_Read_
8() << 16) | Endpoint_Read_16
_LE());
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
@@
-280,7
+274,7
@@
static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int8_t Sample)
{
static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int8_t Sample)
{
- Endpoint_Write_
Byte
(Sample);
+ Endpoint_Write_
8
(Sample);
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();
@@
-299,7
+293,7
@@
static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int16_t Sample)
{
static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int16_t Sample)
{
- Endpoint_Write_
Word
_LE(Sample);
+ Endpoint_Write_
16
_LE(Sample);
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();
@@
-318,8
+312,8
@@
static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int32_t Sample)
{
static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
const int32_t Sample)
{
- Endpoint_Write_
Word
_LE(Sample);
- Endpoint_Write_
Byte
(Sample >> 16);
+ Endpoint_Write_
16
_LE(Sample);
+ Endpoint_Write_
8
(Sample >> 16);
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();
if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)
Endpoint_ClearIN();