forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed compilation error in the AudioInput demos when MICROPHONE_BIASED_TO_HALF_RAIL is defined (thanks to C. Scott Ananian).

Browse Source 
Minor documentation cleanups.

Make sure HID class driver uses properly cast pointers when writing to the report buffer.
pull/1469/head
Dean Camera 15 years ago
parent 4e99625f7c
commit f79f9abd28
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
Demos/Device/ClassDriver/AudioInput/AudioInput.c
Unescape View File

@ -104,7 +104,7 @@ void ProcessNextSample(void)
#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)
/* Microphone is biased to half rail voltage, subtract the bias from the sample value */ /* Microphone is biased to half rail voltage, subtract the bias from the sample value */
AudioSample -= (SAMPLE_MAX_RANGE / 2)); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample); Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample);

2
Demos/Device/LowLevel/AudioInput/AudioInput.c
Unescape View File

@ -171,7 +171,7 @@ void USB_Audio_Task(void)
#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) #if defined(MICROPHONE_BIASED_TO_HALF_RAIL)
/* Microphone is biased to half rail voltage, subtract the bias from the sample value */ /* Microphone is biased to half rail voltage, subtract the bias from the sample value */
AudioSample -= (SAMPLE_MAX_RANGE / 2)); AudioSample -= (SAMPLE_MAX_RANGE / 2);
#endif #endif
/* Write the sample to the buffer */ /* Write the sample to the buffer */

5
LUFA/Drivers/USB/Class/Host/HID.c
Unescape View File

@ -181,6 +181,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
Pipe_Unfreeze(); Pipe_Unfreeze();
uint16_t ReportSize; uint16_t ReportSize;
uint8_t* BufferPos = Buffer;
#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY) #if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
if (!(HIDInterfaceInfo->State.UsingBootProtocol)) if (!(HIDInterfaceInfo->State.UsingBootProtocol))
@ -190,7 +191,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs) if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)
{ {
ReportID = Pipe_Read_Byte(); ReportID = Pipe_Read_Byte();
*((uint8_t*)Buffer++) = ReportID; *(BufferPos++) = ReportID;
} }
ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In); ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, REPORT_ITEM_TYPE_In);
@ -201,7 +202,7 @@ uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
ReportSize = Pipe_BytesInPipe(); ReportSize = Pipe_BytesInPipe();
} }
if ((ErrorCode = Pipe_Read_Stream_LE(Buffer, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError) if ((ErrorCode = Pipe_Read_Stream_LE(BufferPos, ReportSize, NO_STREAM_CALLBACK)) != PIPE_RWSTREAM_NoError)
return ErrorCode; return ErrorCode;
Pipe_ClearIN(); Pipe_ClearIN();

3
LUFA/Drivers/USB/HighLevel/StdDescriptors.h
Unescape View File

@ -86,7 +86,7 @@
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#endif #endif
/** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */ /** Macro to calculate the power value for the configuration descriptor, from a given number of milliamps. */
#define USB_CONFIG_POWER_MA(mA) ((mA) >> 1) #define USB_CONFIG_POWER_MA(mA) ((mA) >> 1)
/** Macro to calculate the Unicode length of a string with a given number of Unicode characters. /** Macro to calculate the Unicode length of a string with a given number of Unicode characters.
@ -124,7 +124,6 @@
*/ */
#define USB_CONFIG_ATTR_BUSPOWERED 0x80 #define USB_CONFIG_ATTR_BUSPOWERED 0x80
/** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t /** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t
* descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power * descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power
* from the device's own power source. * from the device's own power source.

1
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -30,6 +30,7 @@
* - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the * - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the
* U4 series USB AVR parts * U4 series USB AVR parts
* - Fixed LowLevel MassStorage demo broken on the U2 AVRs due to double-banked endpoints * - Fixed LowLevel MassStorage demo broken on the U2 AVRs due to double-banked endpoints
* - Fixed compilation error in the AudioInput demos when MICROPHONE_BIASED_TO_HALF_RAIL is defined (thanks to C. Scott Ananian)
* *
* \section Sec_ChangeLog100219 Version 100219 * \section Sec_ChangeLog100219 Version 100219
* *

2
Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.h
Unescape View File

@ -64,7 +64,7 @@
/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */
#define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3) #define LEDMASK_USB_ERROR (LEDS_LED1 | LEDS_LED3)
#define AUDIO_SAMPLE_FREQUENCY 24000 #define AUDIO_SAMPLE_FREQUENCY 24000
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);

Write Preview
Loading…
Cancel
Save