projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
958d28d
)
Add to the existing CDC Class Driver's CreateStream() function documentation to expli...
author
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 29 Nov 2009 05:19:41 +0000
(
05:19
+0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Sun, 29 Nov 2009 05:19:41 +0000
(
05:19
+0000)
Bootloaders/DFU/BootloaderDFU.c
patch
|
blob
|
blame
|
history
Bootloaders/DFU/BootloaderDFU.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Class/Device/CDC.h
patch
|
blob
|
blame
|
history
LUFA/Drivers/USB/Class/Host/CDC.h
patch
|
blob
|
blame
|
history
diff --git
a/Bootloaders/DFU/BootloaderDFU.c
b/Bootloaders/DFU/BootloaderDFU.c
index
71b37ea
..
4184b19
100644
(file)
--- a/
Bootloaders/DFU/BootloaderDFU.c
+++ b/
Bootloaders/DFU/BootloaderDFU.c
@@
-690,11
+690,7
@@
static void ProcessReadCommand(void)
uint8_t DataIndexToRead = SentCommand.Data[1];
\r
\r
if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read bootloader info
\r
uint8_t DataIndexToRead = SentCommand.Data[1];
\r
\r
if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read bootloader info
\r
- {
\r
- ResponseByte = BootloaderInfo[DataIndexToRead];
\r
- }
\r
+ ResponseByte = BootloaderInfo[DataIndexToRead];
\r
else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte
\r
else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte
\r
- {
\r
- ResponseByte = SignatureInfo[DataIndexToRead - 0x30];
\r
- }
\r
+ ResponseByte = SignatureInfo[DataIndexToRead - 0x30];
\r
}
\r
}
\r
diff --git
a/Bootloaders/DFU/BootloaderDFU.h
b/Bootloaders/DFU/BootloaderDFU.h
index
a4eb235
..
c711e43
100644
(file)
--- a/
Bootloaders/DFU/BootloaderDFU.h
+++ b/
Bootloaders/DFU/BootloaderDFU.h
@@
-55,7
+55,7
@@
* can protect the AVR's firmware from being dumped from a secured AVR. When false, memory operations are
\r
* allowed at any time.
\r
*/
\r
* can protect the AVR's firmware from being dumped from a secured AVR. When false, memory operations are
\r
* allowed at any time.
\r
*/
\r
- #define SECURE_MODE false
\r
+ #define SECURE_MODE
false
\r
\r
/** Major bootloader version number. */
\r
#define BOOTLOADER_VERSION_MINOR 2
\r
\r
/** Major bootloader version number. */
\r
#define BOOTLOADER_VERSION_MINOR 2
\r
diff --git
a/LUFA/Drivers/USB/Class/Device/CDC.h
b/LUFA/Drivers/USB/Class/Device/CDC.h
index
f7bdee0
..
5cd3aaf
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/
LUFA/Drivers/USB/Class/Device/CDC.h
@@
-212,7
+212,8
@@
void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
\r
\r
/** Creates a standard characer stream for the given CDC Device instance so that it can be used with all the regular
\r
void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
\r
\r
/** Creates a standard characer stream for the given CDC Device instance so that it can be used with all the regular
\r
- * functions in the avr-libc <stdio.h> library that accept a FILE stream as a destination (e.g. fprintf).
\r
+ * functions in the avr-libc <stdio.h> library that accept a FILE stream as a destination (e.g. fprintf). The created
\r
+ * stream is bidirectional and can be used for both input and output functions.
\r
*
\r
* Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
\r
* fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
\r
*
\r
* Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
\r
* fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
\r
diff --git
a/LUFA/Drivers/USB/Class/Host/CDC.h
b/LUFA/Drivers/USB/Class/Host/CDC.h
index
d1ad49c
..
03b31d0
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/
LUFA/Drivers/USB/Class/Host/CDC.h
@@
-215,7
+215,8
@@
uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
\r
\r
/** Creates a standard characer stream for the given CDC Device instance so that it can be used with all the regular
\r
uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
\r
\r
/** Creates a standard characer stream for the given CDC Device instance so that it can be used with all the regular
\r
- * functions in the avr-libc <stdio.h> library that accept a FILE stream as a destination (e.g. fprintf).
\r
+ * functions in the avr-libc <stdio.h> library that accept a FILE stream as a destination (e.g. fprintf). The created
\r
+ * stream is bidirectional and can be used for both input and output functions.
\r
*
\r
* \note The created stream can be given as stdout if desired to direct the standard output from all <stdio.h> functions
\r
* to the given CDC interface.
\r
*
\r
* \note The created stream can be given as stdout if desired to direct the standard output from all <stdio.h> functions
\r
* to the given CDC interface.
\r