eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a device ID (thanks to Andrei Krainev).

This commit is contained in:
Dean Camera 2009-09-28 15:56:27 +00:00
parent 409c49f057
commit e57e08c672
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
View File

@ -77,7 +77,7 @@ uint8_t Printer_SendData(void* PrinterCommands, uint16_t CommandSize)
uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize) uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
{ {
uint8_t ErrorCode = HOST_SENDCONTROL_Successful; uint8_t ErrorCode = HOST_SENDCONTROL_Successful;
uint16_t DeviceIDStringLength; uint16_t DeviceIDStringLength = 0;
USB_ControlRequest = (USB_Request_Header_t) USB_ControlRequest = (USB_Request_Header_t)
{ {
@ -92,6 +92,12 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)
return ErrorCode; return ErrorCode;
if (!(DeviceIDStringLength))
{
DeviceIDString[0] = 0x00;
return HOST_SENDCONTROL_Successful;
}
DeviceIDStringLength = SwapEndian_16(DeviceIDStringLength); DeviceIDStringLength = SwapEndian_16(DeviceIDStringLength);

2
LUFA/Drivers/USB/Class/Host/MassStorage.h
View File

@ -97,7 +97,7 @@
*/ */
typedef struct typedef struct
{ {
uint8_t ReponseCode; uint8_t ResponseCode;
uint8_t SegmentNumber; uint8_t SegmentNumber;

10
LUFA/ManPages/ChangeLog.txt
View File

@ -9,6 +9,16 @@
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLogXXXXXX Version XXXXXX
* *
* <b>New:</b> * <b>New:</b>
*
* <b>Changed:</b>
*
* <b>Fixed:</b>
* - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
* device ID (thanks to Andrei Krainev)
*
* \section Sec_ChangeLog090924 Version 090924
*
* <b>New:</b>
* - Added new host mode class drivers and matching demos to the library for rapid application development * - Added new host mode class drivers and matching demos to the library for rapid application development
* - Added flag to the HID report parser to indicate if a device has multiple reports * - Added flag to the HID report parser to indicate if a device has multiple reports
* - Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and * - Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and

4
LUFA/ManPages/FutureChanges.txt
View File

@ -12,10 +12,10 @@
* or post your suggestion as an enhancement request to the project bug tracker. * or post your suggestion as an enhancement request to the project bug tracker.
* *
* <b>Targeted for This Release (SVN Development Only):</b> * <b>Targeted for This Release (SVN Development Only):</b>
* - N/A * - Add hub support to match Atmel's stack
* - Add ability to get number of bytes not written with pipe/endpoint write routines after an error
* *
* <b>Targeted for Future Releases:</b> * <b>Targeted for Future Releases:</b>
* - Add hub support to match Atmel's stack
* - Add standardized descriptor names to device and host class driver structures * - Add standardized descriptor names to device and host class driver structures
* - Remake AVRStudio project files * - Remake AVRStudio project files
* - Add detailed overviews of how each demo works * - Add detailed overviews of how each demo works

2
LUFA/ManPages/MigrationInformation.txt
View File

@ -12,6 +12,8 @@
* *
* \section Sec_MigrationXXXXXX Migrating from 090810 to XXXXXX * \section Sec_MigrationXXXXXX Migrating from 090810 to XXXXXX
* *
* \section Sec_Migration090924 Migrating from 090810 to 090924
*
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>
* - The ADC_Off() function has been renamed to \ref ADC_ShutDown() to be consistent with the rest of the library. * - The ADC_Off() function has been renamed to \ref ADC_ShutDown() to be consistent with the rest of the library.
* - The \ref SPI_Init() routine's parameters have changed, so that the clock polarity and data sampling modes can be set. See * - The \ref SPI_Init() routine's parameters have changed, so that the clock polarity and data sampling modes can be set. See