LiftDriver bootloder format

Author: piotrs1

bootloaders/atmega/ATmegaBOOT_168.c

@@ -113,7 +113,7 @@
 #define BL_PIN  PINF
 #define BL0     PINF7
 #define BL1     PINF6
-#elif defined __AVR_ATmega1280__ 
+#elif defined __AVR_ATmega1280__
 /* we just don't do anything for the MEGA and enter bootloader on reset anyway*/
 #else
 /* other ATmegas have only one UART, so only one pin is defined to enter bootloader */
@@ -133,7 +133,7 @@
 #define LED_PIN  PINB
 #define LED      PINB7
 #else
-/* Onboard LED is connected to pin PB5 in Arduino NG, Diecimila, and Duomilanuove */ 
+/* Onboard LED is connected to pin PB5 in Arduino NG, Diecimila, and Duomilanuove */
 /* other boards like e.g. Crumb8, Crumb168 are using PB2 */
 #define LED_DDR  DDRB
 #define LED_PORT PORTB
@@ -142,6 +142,7 @@
 #endif
 
 
+
 /* monitor functions will only be compiled when using ATmega128, due to bootblock size constraints */
 #if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
 #define MONITOR 1
@@ -343,7 +344,7 @@ int main(void)
 #endif
 	}
 
-#ifdef __AVR_ATmega128__    
+#ifdef __AVR_ATmega128__
 	/* no bootuart was selected, default to uart 0 */
 	if(!bootuart) {
 		bootuart = 1;
@@ -371,7 +372,7 @@ int main(void)
 	UBRR = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
 	UBRRHI = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
 	UCSRA = 0x00;
-	UCSRB = _BV(TXEN)|_BV(RXEN);	
+	UCSRB = _BV(TXEN)|_BV(RXEN);
 #elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__) || defined (__AVR_ATmega328__)
 
 #ifdef DOUBLE_SPEED
@@ -440,7 +441,7 @@ int main(void)
 
 	/* A bunch of if...else if... gives smaller code than switch...case ! */
 
-	/* Hello is anyone home ? */ 
+	/* Hello is anyone home ? */
 	if(ch=='0') {
 		nothing_response();
 	}
@@ -537,10 +538,10 @@ int main(void)
 			if (ch == 0) {
 				byte_response(SIG1);
 			} else if (ch == 1) {
-				byte_response(SIG2); 
+				byte_response(SIG2);
 			} else {
 				byte_response(SIG3);
-			} 
+			}
 		} else {
 			getNch(3);
 			byte_response(0x00);
@@ -571,7 +572,7 @@ int main(void)
 					eeprom_write_byte((void *)address.word,buff[w]);
 #endif
 					address.word++;
-				}			
+				}
 			}
 			else {					        //Write to FLASH one page at a time
 				if (address.byte[1]>127) address_high = 0x01;	//Only possible with m128, m256 will need 3rd address byte. FIXME
@@ -596,17 +597,17 @@ int main(void)
 					 "ldi	r29,hi8(buff)	\n\t"
 					 "lds	r24,length	\n\t"	//Length of data to be written (in bytes)
 					 "lds	r25,length+1	\n\t"
-					 "length_loop:		\n\t"	//Main loop, repeat for number of words in block							 							 
+					 "length_loop:		\n\t"	//Main loop, repeat for number of words in block
 					 "cpi	r17,0x00	\n\t"	//If page_word_count=0 then erase page
-					 "brne	no_page_erase	\n\t"						 
+					 "brne	no_page_erase	\n\t"
 					 "wait_spm1:		\n\t"
 					 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
 					 "andi	r16,1           \n\t"
 					 "cpi	r16,1           \n\t"
 					 "breq	wait_spm1       \n\t"
 					 "ldi	r16,0x03	\n\t"	//Erase page pointed to by Z
 					 "sts	%0,r16		\n\t"
-					 "spm			\n\t"							 
+					 "spm			\n\t"
 #ifdef __AVR_ATmega163__
 					 ".word 0xFFFF		\n\t"
 					 "nop			\n\t"
@@ -615,19 +616,19 @@ int main(void)
 					 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
 					 "andi	r16,1           \n\t"
 					 "cpi	r16,1           \n\t"
-					 "breq	wait_spm2       \n\t"									 
+					 "breq	wait_spm2       \n\t"
 
 					 "ldi	r16,0x11	\n\t"	//Re-enable RWW section
-					 "sts	%0,r16		\n\t"						 			 
+					 "sts	%0,r16		\n\t"
 					 "spm			\n\t"
 #ifdef __AVR_ATmega163__
 					 ".word 0xFFFF		\n\t"
 					 "nop			\n\t"
 #endif
-					 "no_page_erase:		\n\t"							 
+					 "no_page_erase:		\n\t"
 					 "ld	r0,Y+		\n\t"	//Write 2 bytes into page buffer
-					 "ld	r1,Y+		\n\t"							 
-								 
+					 "ld	r1,Y+		\n\t"
+
 					 "wait_spm3:		\n\t"
 					 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
 					 "andi	r16,1           \n\t"
@@ -636,7 +637,7 @@ int main(void)
 					 "ldi	r16,0x01	\n\t"	//Load r0,r1 into FLASH page buffer
 					 "sts	%0,r16		\n\t"
 					 "spm			\n\t"
-								 
+
 					 "inc	r17		\n\t"	//page_word_count++
 					 "cpi r17,%1	        \n\t"
 					 "brlo	same_page	\n\t"	//Still same page in FLASH
@@ -649,7 +650,7 @@ int main(void)
 					 "breq	wait_spm4       \n\t"
 #ifdef __AVR_ATmega163__
 					 "andi	r30,0x80	\n\t"	// m163 requires Z6:Z1 to be zero during page write
-#endif							 							 
+#endif
 					 "ldi	r16,0x05	\n\t"	//Write page pointed to by Z
 					 "sts	%0,r16		\n\t"
 					 "spm			\n\t"
@@ -662,15 +663,15 @@ int main(void)
 					 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
 					 "andi	r16,1           \n\t"
 					 "cpi	r16,1           \n\t"
-					 "breq	wait_spm5       \n\t"									 
+					 "breq	wait_spm5       \n\t"
 					 "ldi	r16,0x11	\n\t"	//Re-enable RWW section
-					 "sts	%0,r16		\n\t"						 			 
-					 "spm			\n\t"					 		 
+					 "sts	%0,r16		\n\t"
+					 "spm			\n\t"
 #ifdef __AVR_ATmega163__
 					 ".word 0xFFFF		\n\t"
 					 "nop			\n\t"
 #endif
-					 "same_page:		\n\t"							 
+					 "same_page:		\n\t"
 					 "adiw	r30,2		\n\t"	//Next word in FLASH
 					 "sbiw	r24,2		\n\t"	//length-2
 					 "breq	final_write	\n\t"	//Finished
@@ -696,7 +697,7 @@ int main(void)
 		} else {
 			if (++error_count == MAX_ERROR_COUNT)
 				app_start();
-		}		
+		}
 	}
 
 
@@ -761,7 +762,7 @@ int main(void)
 	}
 
 
-#if defined MONITOR 
+#if defined MONITOR
 
 	/* here come the extended monitor commands by Erik Lins */
 
@@ -783,7 +784,7 @@ int main(void)
 			welcome = "ATmegaBOOT / PROBOmega128 - (C) J.P.Kyle, E.Lins - 050815\n\r";
 #elif defined SAVVY128
 			welcome = "ATmegaBOOT / Savvy128 - (C) J.P.Kyle, E.Lins - 050815\n\r";
-#elif defined __AVR_ATmega1280__ 
+#elif defined __AVR_ATmega1280__
 			welcome = "ATmegaBOOT / Arduino Mega - (C) Arduino LLC - 090930\n\r";
 #endif
 
@@ -815,7 +816,7 @@ int main(void)
 						LED_PORT |= _BV(LED);
 						putch('0');
 					}
-				} 
+				}
 
 				/* read byte from address */
 				else if(ch == 'r') {
@@ -907,14 +908,14 @@ void puthex(char ch) {
 	} else {
 		ah += '0';
 	}
-	
+
 	ch &= 0x0f;
 	if(ch >= 0x0a) {
 		ch = ch - 0x0a + 'a';
 	} else {
 		ch += '0';
 	}
-	
+
 	putch(ah);
 	putch(ch);
 }
@@ -948,7 +949,7 @@ char getch(void)
 	uint32_t count = 0;
 	if(bootuart == 1) {
 		while(!(UCSR0A & _BV(RXC0))) {
-			/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+			/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
 			/* HACKME:: here is a good place to count times*/
 			count++;
 			if (count > MAX_TIME_COUNT)
@@ -959,7 +960,7 @@ char getch(void)
 	}
 	else if(bootuart == 2) {
 		while(!(UCSR1A & _BV(RXC1))) {
-			/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+			/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
 			/* HACKME:: here is a good place to count times*/
 			count++;
 			if (count > MAX_TIME_COUNT)
@@ -972,7 +973,7 @@ char getch(void)
 #elif defined(__AVR_ATmega168__)  || defined(__AVR_ATmega328P__) || defined (__AVR_ATmega328__)
 	uint32_t count = 0;
 	while(!(UCSR0A & _BV(RXC0))){
-		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
 		/* HACKME:: here is a good place to count times*/
 		count++;
 		if (count > MAX_TIME_COUNT)
@@ -983,7 +984,7 @@ char getch(void)
 	/* m8,16,32,169,8515,8535,163 */
 	uint32_t count = 0;
 	while(!(UCSRA & _BV(RXC))){
-		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
 		/* HACKME:: here is a good place to count times*/
 		count++;
 		if (count > MAX_TIME_COUNT)
@@ -1001,7 +1002,7 @@ void getNch(uint8_t count)
 		if(bootuart == 1) {
 			while(!(UCSR0A & _BV(RXC0)));
 			UDR0;
-		} 
+		}
 		else if(bootuart == 2) {
 			while(!(UCSR1A & _BV(RXC1)));
 			UDR1;
@@ -1010,11 +1011,11 @@ void getNch(uint8_t count)
 		getch();
 #else
 		/* m8,16,32,169,8515,8535,163 */
-		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
+		/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/
 		//while(!(UCSRA & _BV(RXC)));
 		//UDR;
 		getch(); // need to handle time out
-#endif		
+#endif
 	}
 }