gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 21:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename incorrectly named XPROGTarget_SendBreak() function to XPROGTarget_SendIdle(), as it is sending idle bits and not break bits.

Browse Source
This commit is contained in:
Dean Camera 2010-11-17 05:46:18 +00:00
parent cbc00c843a
commit 8f7437dda2
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LUFA/ManPages/FutureChanges.txt
View File

@ -20,7 +20,6 @@
* -# Re-add interrupt Pipe/Endpoint support * -# Re-add interrupt Pipe/Endpoint support
* -# Add HID report macros to make HID report editing easier * -# Add HID report macros to make HID report editing easier
* -# Investigate dynamically created device descriptors * -# Investigate dynamically created device descriptors
* -# Add new event for EVENT_USB_Device_ControlRequest() fired before the internal library request handlers
* - Documentation/Support * - Documentation/Support
* -# Add detailed overviews of how each demo works * -# Add detailed overviews of how each demo works
* -# Add board overviews * -# Add board overviews

3
Projects/AVRISP-MKII/Lib/V2Protocol.h
View File

@ -37,6 +37,9 @@
#define _V2_PROTOCOL_ #define _V2_PROTOCOL_
/* Includes: */ /* Includes: */
#include <avr/io.h>
#include <avr/interrupt.h>
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
#include "../Descriptors.h" #include "../Descriptors.h"

20
Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
View File

@ -59,9 +59,9 @@ void XPROGTarget_EnableTargetPDI(void)
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1); UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
/* Send two BREAKs of 12 bits each to enable PDI interface (need at least 16 idle bits) */ /* Send two IDLEs of 12 bits each to enable PDI interface (need at least 16 idle bits) */
XPROGTarget_SendBreak(); XPROGTarget_SendIdle();
XPROGTarget_SendBreak(); XPROGTarget_SendIdle();
} }
/** Enables the target's TPI interface, holding the target in reset until TPI mode is exited. */ /** Enables the target's TPI interface, holding the target in reset until TPI mode is exited. */
@ -83,9 +83,9 @@ void XPROGTarget_EnableTargetTPI(void)
UCSR1B = (1 << TXEN1); UCSR1B = (1 << TXEN1);
UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1); UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
/* Send two BREAKs of 12 bits each to enable TPI interface (need at least 16 idle bits) */ /* Send two IDLEs of 12 bits each to enable TPI interface (need at least 16 idle bits) */
XPROGTarget_SendBreak(); XPROGTarget_SendIdle();
XPROGTarget_SendBreak(); XPROGTarget_SendIdle();
} }
/** Disables the target's PDI interface, exits programming mode and starts the target's application. */ /** Disables the target's PDI interface, exits programming mode and starts the target's application. */
@ -156,14 +156,14 @@ uint8_t XPROGTarget_ReceiveByte(void)
return UDR1; return UDR1;
} }
/** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */ /** Sends an IDLE via the USART to the attached target, consisting of a full frame of idle bits. */
void XPROGTarget_SendBreak(void) void XPROGTarget_SendIdle(void)
{ {
/* Switch to Tx mode if currently in Rx mode */ /* Switch to Tx mode if currently in Rx mode */
if (!(IsSending)) if (!(IsSending))
XPROGTarget_SetTxMode(); XPROGTarget_SetTxMode();
/* Need to do nothing for a full frame to send a BREAK */ /* Need to do nothing for a full frame to send an IDLE */
for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++) for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++)
{ {
/* Wait for a full cycle of the clock */ /* Wait for a full cycle of the clock */

2
Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
View File

@ -115,7 +115,7 @@
void XPROGTarget_DisableTargetTPI(void); void XPROGTarget_DisableTargetTPI(void);
void XPROGTarget_SendByte(const uint8_t Byte); void XPROGTarget_SendByte(const uint8_t Byte);
uint8_t XPROGTarget_ReceiveByte(void); uint8_t XPROGTarget_ReceiveByte(void);
void XPROGTarget_SendBreak(void); void XPROGTarget_SendIdle(void);
bool XPROGTarget_WaitWhileNVMBusBusy(void); bool XPROGTarget_WaitWhileNVMBusBusy(void);
#if (defined(INCLUDE_FROM_XPROGTARGET_C) && defined(ENABLE_XPROG_PROTOCOL)) #if (defined(INCLUDE_FROM_XPROGTARGET_C) && defined(ENABLE_XPROG_PROTOCOL))