/ - Diff - Tooltron - Robotics Club

Revision 168

Bootloader almost works except for ctors end stuff

trunk/toolbox/bootloader/debug.sh
1	1	#!/bin/sh
2	2
3	3	avrdude -c avrispmkii -P usb -p t2313 -U flash:r:$1:i
4		avr-objdump -D -m avr $1 \| less
	4	avr-objdump -D -S -m avr $1 \| less

     #define MAX_WAIT_IN_CYCLES 800000
     #define MAX_TIMEOUT 60000        // Seconds to wait before exiting bootloader mode
     #define MAIN_ADDR 0x000
     #define BOOT_ADDR 0x5A0
     #define JUMP_ADDR 0x590
     #define BOOT_START 0x500
     //Status LED
     #define LED_DDR  DDRB
-...
     //Function prototypes
     void __init(void) __attribute__((naked));
     //void onboard_program_write(uint16_t page, uint8_t *buf);
     void (*main_start)(void) = BOOT_ADDR - 2;
     typedef enum {
         sd,
         src,
-...
         ack
     } state_t;
     typedef union {
         uint8_t bytes[2];
         int16_t sword;
     } rjump_t;
     // Redirect all unused interrupts to reti
     EMPTY_INTERRUPT(__vector_default);
     extern void __ctors_end(void) __attribute__((__noreturn__));
-...
+    }
     BOOTLOADER_SECTION char parse_packet(uint8_t *mbuf) {
       uint8_t r = 0;        // Byte from the network
       uint8_t crc = 0;      // Running checksum of the packet
       uint8_t cmd = 0;      // The command received
       uint8_t pos = 0;      // Position in the message buffer
       uint8_t lim = 0;      // Max number of bytes to read into the message buf
       state_t state = sd;    // State machine
         uint16_t count;
       //reset_timer();
       uint8_t r;        // Byte from the network
       uint8_t crc;      // Running checksum of the packet
       uint8_t cmd;      // The command received
       uint8_t pos;      // Position in the message buffer
       uint8_t lim;      // Max number of bytes to read into the message buf
       state_t state;    // State machine
       uint16_t count;
       r = 0;
       crc = 0;
       cmd = 0;
       pos = 0;
       lim = 0;
       state = sd;
       count = 0;
       while (1) {
-...
       for (i=0; i < SPM_PAGESIZE; i+=2){
         // Set up little-endian word.
         boot_page_fill (i, buf[i] | (buf[i+1] <<8));
         boot_page_fill (page + i, buf[i] | (buf[i+1] <<8));
+      }
       boot_page_write (page);     // Store buffer in flash page.
       boot_spm_busy_wait();       // Wait until the memory is written.
+    }
     BOOTLOADER_SECTION void  __init(void) {
     BOOTLOADER_SECTION void  main(void) {
       uint8_t mbuf[PROGD_PACKET_SIZE];
       uint8_t jbuf[2] = {0, 0};
       rjump_t jbuf;
       uint16_t caddr = MAIN_ADDR;
       uint8_t iteration = 0;
       uint8_t iteration;
       uint8_t resp;
       uint16_t prog_len = 0;
       uint16_t prog_len;
       uint8_t i;
       void (*main_start)(void);
       main_start = BOOT_START - 2;
       iteration = 0;
       init_uart(51); //MAGIC NUMBER??
-...
       //Start bootloading process
       send_packet(TT_BOOT);
       PORTB |= _BV(PORTB0);
       resp = parse_packet(mbuf);
       if (resp == TT_PROGM) {
         prog_len = mbuf[0];
         prog_len |= mbuf[1] << 8;
       } else {
           PORTB = 0;
           //PORTB = 0;
           main_start();
+      }
       send_packet(TT_ACK);
-...
           if (resp == TT_PROGD) {
               if (iteration == 0) {
                   // Store the jump to user code
                   jbuf[0] = mbuf[0];
                   jbuf[1] = mbuf[1];
                   jbuf.bytes[0] = mbuf[0];
                   jbuf.bytes[1] = mbuf[1];
                   jbuf.sword &= 0x0FFF;
                   jbuf.sword -= BOOT_START >> 1;
                   jbuf.sword &= 0x0FFF;
                   jbuf.sword |= 0xC000;
                   *((uint16_t*)mbuf) = pgm_read_word(MAIN_ADDR);
                   mbuf[0] = pgm_read_byte(MAIN_ADDR);
                   mbuf[1] = pgm_read_byte(MAIN_ADDR + 1);
                   //PORTB &= ~_BV(PORTB0);
                   //while(1);
                   iteration = 1;
+              }
               } /*else {
                   PORTB &= ~_BV(PORTB1);
                   while(1);
               }*/
               onboard_program_write(caddr, mbuf);
               caddr += PROGD_PACKET_SIZE;
           } else {
               //main_start();
               PORTB &= ~_BV(PORTB2);
               while(1);
+          }
-...
                   mbuf[i]= 0;
+              }
               mbuf[PROGD_PACKET_SIZE-2] = jbuf[0];
               mbuf[PROGD_PACKET_SIZE-1] = jbuf[1];
               mbuf[PROGD_PACKET_SIZE-2] = jbuf.bytes[0];
               mbuf[PROGD_PACKET_SIZE-1] = jbuf.bytes[1];
               onboard_program_write(JUMP_ADDR, mbuf);
               onboard_program_write(BOOT_START - SPM_PAGESIZE, mbuf);
               PORTB = 0;
               main_start();
-...
+      }
+    }
     /*
     int main (void) {
         while(1);
+    }
     }*/

     #  -Wl,...:     tell GCC to pass this to linker.
     #    -Map:      create map file
     #    --cref:    add cross reference to  map file
     LDFLAGS = -Wl,-Map=$(TARGET).map,--cref,--section-start=.bootloader=0x5A0
     LDFLAGS = -Wl,-Map=$(TARGET).map,--cref,--section-start=.bootloader=0x500
     LDFLAGS += $(EXTMEMOPTS)
     LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)

Also available in: Unified diff

Project

General

Profile

Tooltron

Revision 168