From f201f6697b7f99b63389509b42112026b8f6f76f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 23 Dec 2011 01:51:39 +0000 Subject: Run wspurify script on /trunk/ and /branches/ C source files, to remove any trailing whitespace at the end of each line. --- Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c | 11 ++++++----- Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 4 ++-- Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib/ISP') diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c index 797fa3655..7368125f6 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c @@ -150,7 +150,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command) Endpoint_Read_Stream_LE(&Write_Memory_Params, (sizeof(Write_Memory_Params) - sizeof(Write_Memory_Params.ProgData)), NULL); Write_Memory_Params.BytesToWrite = SwapEndian_16(Write_Memory_Params.BytesToWrite); - + if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData)) { Endpoint_ClearOUT(); @@ -236,7 +236,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command) /* Must reset the polling address afterwards, so it is not erroneously used for the next byte */ PollAddress = 0; } - + /* EEPROM just increments the address each byte, flash needs to increment on each word and * also check to ensure that a LOAD EXTENDED ADDRESS command is issued each time the extended * address boundary has been crossed during FLASH memory programming */ @@ -248,7 +248,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command) MustLoadExtendedAddress = true; } } - + /* If the current page must be committed, send the PROGRAM PAGE command to the target */ if (Write_Memory_Params.ProgrammingMode & PROG_MODE_COMMIT_PAGE_MASK) { @@ -271,7 +271,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command) /* Check to see if the FLASH address has crossed the extended address boundary */ if ((V2Command == CMD_PROGRAM_FLASH_ISP) && !(CurrentAddress & 0xFFFF)) MustLoadExtendedAddress = true; - } + } Endpoint_Write_8(V2Command); Endpoint_Write_8(ProgrammingStatus); @@ -293,7 +293,7 @@ void ISPProtocol_ReadMemory(uint8_t V2Command) Endpoint_Read_Stream_LE(&Read_Memory_Params, sizeof(Read_Memory_Params), NULL); Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead); - + Endpoint_ClearOUT(); Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM); Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN); @@ -526,3 +526,4 @@ void ISPProtocol_DelayMS(uint8_t DelayMS) } #endif + diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index a6ec53600..04bfcb5f8 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -178,7 +178,7 @@ void ISPTarget_DisableTargetISP(void) { DDRB &= ~((1 << 1) | (1 << 2)); PORTB &= ~((1 << 0) | (1 << 3)); - + /* Must re-enable rescue clock once software ISP has exited, as the timer for the rescue clock is * re-purposed for software SPI */ ISPTarget_ConfigureRescueClock(); @@ -195,7 +195,7 @@ void ISPTarget_ConfigureRescueClock(void) #if defined(XCK_RESCUE_CLOCK_ENABLE) /* Configure XCK as an output for the specified AVR model */ DDRD |= (1 << 5); - + /* Start USART to generate a 4MHz clock on the XCK pin */ UBRR1 = ((F_CPU / 2 / ISP_RESCUE_CLOCK_SPEED) - 1); UCSR1B = (1 << TXEN1); diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h index 350283f5e..d8ace7a7d 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h @@ -113,7 +113,7 @@ if (HardwareSPIMode) return ~SPI_ReceiveByte(); else - return ~ISPTarget_TransferSoftSPIByte(0x00); + return ~ISPTarget_TransferSoftSPIByte(0x00); #endif } @@ -135,7 +135,7 @@ if (HardwareSPIMode) return ~SPI_TransferByte(Byte); else - return ~ISPTarget_TransferSoftSPIByte(Byte); + return ~ISPTarget_TransferSoftSPIByte(Byte); #endif } -- cgit v1.2.3