From 7ae91099e9b356d3f9fe14b41a53a6af1161690c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 8 Feb 2010 03:16:09 +0000 Subject: Fix AVRISP-MKII clone project's TPI Chip Erase command processing - ensure erase location is the high byte in the given address space, check NVMBUSY for completion rather than the NVM Bus Enable bit. Change If-Else chains over to switch statements in XPROGProtocol.c for clarity. --- LUFA/Drivers/USB/Class/Device/CDC.h | 11 +++++++---- LUFA/Drivers/USB/Class/Host/CDC.h | 13 +++++++++---- LUFA/ManPages/VIDAndPIDValues.txt | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) (limited to 'LUFA') diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h index d248868cd..e6a2bfd5c 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.h +++ b/LUFA/Drivers/USB/Class/Device/CDC.h @@ -104,12 +104,13 @@ struct { uint8_t HostToDevice; /**< Control line states from the host to device, as a set of CDC_CONTROL_LINE_OUT_* - * masks. + * masks. This value is updated each time \ref CDC_Device_USBTask() is called. */ uint8_t DeviceToHost; /**< Control line states from the device to host, as a set of CDC_CONTROL_LINE_IN_* - * masks. + * masks - to notify the host of changes to these values, call the + * \ref CDC_Device_SendControlLineStateChange() function. */ - } ControlLineStates; + } ControlLineStates; /**< Current states of the virtual serial port's control lines between the device and host. */ struct { @@ -121,7 +122,9 @@ * CDCDevice_LineCodingParity_t enum */ uint8_t DataBits; /**< Bits of data per character of the virtual serial port */ - } LineEncoding; + } LineEncoding; /** Line encoding used in the virtual serial port, for the device's information. This is generally + * only used if the virtual serial port data is to be reconstructed on a physical UART. + */ } State; /**< State data for the USB class interface within the device. All elements in this section * are reset to their defaults when the interface is enumerated. */ diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h index 466f141db..9433c59fa 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.h +++ b/LUFA/Drivers/USB/Class/Host/CDC.h @@ -92,12 +92,13 @@ struct { uint8_t HostToDevice; /**< Control line states from the host to device, as a set of CDC_CONTROL_LINE_OUT_* - * masks. + * masks - to notify the device of changes to these values, call the + * \ref CDC_Host_SendControlLineStateChange() function. */ uint8_t DeviceToHost; /**< Control line states from the device to host, as a set of CDC_CONTROL_LINE_IN_* - * masks. + * masks. This value is updated each time \ref CDC_Host_USBTask() is called. */ - } ControlLineStates; + } ControlLineStates; /**< Current states of the virtual serial port's control lines between the device and host. */ struct { @@ -109,7 +110,11 @@ * CDCDevice_LineCodingParity_t enum */ uint8_t DataBits; /**< Bits of data per character of the virtual serial port */ - } LineEncoding; + } LineEncoding; /** Line encoding used in the virtual serial port, for the device's information. This is generally + * only used if the virtual serial port data is to be reconstructed on a physical UART. When set + * by the host application, the \ref CDC_Host_SetLineEncoding() function must be called to push + * the changes to the device. + */ } State; /**< State data for the USB class interface within the device. All elements in this section * may be set to initial values, but may also be ignored to default to sane values when * the interface is enumerated. diff --git a/LUFA/ManPages/VIDAndPIDValues.txt b/LUFA/ManPages/VIDAndPIDValues.txt index 339fd47b2..5c17d52fc 100644 --- a/LUFA/ManPages/VIDAndPIDValues.txt +++ b/LUFA/ManPages/VIDAndPIDValues.txt @@ -193,7 +193,7 @@ * 0x204D * * - * Keyboard and Mouse Combination Demo Application + * Combined Keyboard and Mouse Demo Application * * * -- cgit v1.2.3