]> git.donarmstrong.com Git - kiibohd-controller.git/blobdiff - Bootloader/main.c
Fixing bugs in mk20dx128vlf5 support
[kiibohd-controller.git] / Bootloader / main.c
index a61de7a0f4aeacc51bcb005a586678a373d12092..8ca8d28fce626306d2a0ba8c7120d3a9bbc4588e 100644 (file)
@@ -21,6 +21,8 @@
 #include "mchck.h"
 #include "dfu.desc.h"
 
+#include "debug.h"
+
 
 
 // ----- Variables -----
 /**
  * Unfortunately we can't DMA directly to FlexRAM, so we'll have to stage here.
  */
-static char staging[FLASH_SECTOR_SIZE];
+static char staging[ USB_DFU_TRANSFER_SIZE ];
 
 
 
 // ----- Functions -----
 
-static enum dfu_status setup_write(size_t off, size_t len, void **buf)
+int sector_print( void* buf, size_t sector, size_t chunks )
+{
+       uint8_t* start = (uint8_t*)buf + sector * USB_DFU_TRANSFER_SIZE;
+       uint8_t* end = (uint8_t*)buf + (sector + 1) * USB_DFU_TRANSFER_SIZE;
+       uint8_t* pos = start;
+
+       // Verify if sector erased
+       FTFL.fccob.read_1s_section.fcmd = FTFL_FCMD_READ_1s_SECTION;
+       FTFL.fccob.read_1s_section.addr = (uintptr_t)start;
+       FTFL.fccob.read_1s_section.margin = FTFL_MARGIN_NORMAL;
+       FTFL.fccob.read_1s_section.num_words = 250; // 2000 kB / 64 bits
+       int retval = ftfl_submit_cmd();
+
+       print( NL );
+       print("Block ");
+       printHex( sector );
+       print(" ");
+       printHex( (size_t)start );
+       print(" -> ");
+       printHex( (size_t)end );
+       print(" Erased: ");
+       printHex( retval );
+       print( NL );
+
+       // Display sector
+       for ( size_t line = 0; pos < end - 24; line++ )
+       {
+               // Each Line
+               printHex_op( (size_t)pos, 4 );
+               print(": ");
+
+               // Each 2 byte chunk
+               for ( size_t chunk = 0; chunk < chunks; chunk++ )
+               {
+                       // Print out the two bytes (second one first)
+                       printHex_op( *(pos + 1), 2 );
+                       printHex_op( *pos, 2 );
+                       print(" ");
+                       pos += 2;
+               }
+
+               print( NL );
+       }
+
+       return retval;
+}
+
+static enum dfu_status setup_read( size_t off, size_t *len, void **buf )
+{
+       // Calculate starting address from offset
+       *buf = (void*)&_app_rom + (USB_DFU_TRANSFER_SIZE / 4) * off;
+
+       // Calculate length of transfer
+       /*
+       *len = *buf > (void*)(&_app_rom_end) - USB_DFU_TRANSFER_SIZE
+               ? 0 : USB_DFU_TRANSFER_SIZE;
+       */
+
+       // Check for error
+       /*
+       if ( *buf > (void*)&_app_rom_end )
+               return (DFU_STATUS_errADDRESS);
+       */
+
+       return (DFU_STATUS_OK);
+}
+
+static enum dfu_status setup_write( size_t off, size_t len, void **buf )
 {
        static int last = 0;
 
-       if (len > sizeof(staging))
+       if ( len > sizeof(staging) )
                return (DFU_STATUS_errADDRESS);
 
        // We only allow the last write to be less than one sector size.
-       if (off == 0)
+       if ( off == 0 )
                last = 0;
-       if (last && len != 0)
+       if ( last && len != 0 )
                return (DFU_STATUS_errADDRESS);
-       if (len != FLASH_SECTOR_SIZE) {
+       if ( len != FLASH_SECTOR_SIZE )
+       {
                last = 1;
-               memset(staging, 0xff, sizeof(staging));
+               memset( staging, 0xff, sizeof(staging) );
        }
 
        *buf = staging;
@@ -58,16 +128,30 @@ static enum dfu_status setup_write(size_t off, size_t len, void **buf)
 static enum dfu_status finish_write( void *buf, size_t off, size_t len )
 {
        void *target;
-       if (len == 0)
+       if ( len == 0 )
                return (DFU_STATUS_OK);
 
        target = flash_get_staging_area(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE);
-       if (!target)
+       if ( !target )
                return (DFU_STATUS_errADDRESS);
-       memcpy(target, buf, len);
-       if (flash_program_sector(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE) != 0)
+       memcpy( target, buf, len );
+
+       // Depending on the error return a different status
+       switch ( flash_program_sector(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE) )
+       {
+       /*
+       case FTFL_FSTAT_RDCOLERR: // Flash Read Collision Error
+       case FTFL_FSTAT_ACCERR:   // Flash Access Error
+       case FTFL_FSTAT_FPVIOL:   // Flash Protection Violation Error
                return (DFU_STATUS_errADDRESS);
-       return (DFU_STATUS_OK);
+       case FTFL_FSTAT_MGSTAT0:  // Memory Controller Command Completion Error
+               return (DFU_STATUS_errADDRESS);
+       */
+
+       case 0:
+       default: // No error
+               return (DFU_STATUS_OK);
+       }
 }
 
 
@@ -75,7 +159,7 @@ static struct dfu_ctx dfu_ctx;
 
 void init_usb_bootloader( int config )
 {
-       dfu_init(setup_write, finish_write, &dfu_ctx);
+       dfu_init( setup_read, setup_write, finish_write, &dfu_ctx );
 }
 
 void main()
@@ -93,14 +177,132 @@ void main()
        // Enabling LED to indicate we are in the bootloader
        GPIOA_PDDR |= (1<<5);
        // Setup pin - A5 - See Lib/pin_map.mchck for more details on pins
-       PORTA_PCR19 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       PORTA_PCR5 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
        GPIOA_PSOR |= (1<<5);
-
+#else
+#error "Incompatible chip for bootloader"
 #endif
 
+       uart_serial_setup();
+       printNL( NL "Bootloader DFU-Mode" );
+
+       // XXX REMOVEME
+       /*
+       GPIOB_PDDR |= (1<<16);
+       PORTB_PCR16 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOB_PSOR |= (1<<16);
+
+       // RST
+       GPIOC_PDDR |= (1<<8);
+       PORTC_PCR8 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOC_PSOR |= (1<<8);
+
+       // CS1B
+       GPIOC_PDDR |= (1<<4);
+       PORTC_PCR4 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOC_PCOR |= (1<<4);
+       */
+       // Backlight
+       /*
+       GPIOC_PDDR |= (1<<1);
+       PORTC_PCR1 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOC_PCOR |= (1<<1);
+       GPIOC_PDDR |= (1<<2);
+       PORTC_PCR2 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOC_PCOR |= (1<<2);
+       GPIOC_PDDR |= (1<<3);
+       PORTC_PCR3 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
+       GPIOC_PCOR |= (1<<3);
+       */
+
+       /*
+       // Read Firmware 1 Status
+       FTFL.fccob.read_1s_block.fcmd = FTFL_FCMD_READ_1s_BLOCK;
+       FTFL.fccob.read_1s_block.addr = (uintptr_t)&_app_rom;
+       FTFL.fccob.read_1s_block.margin = FTFL_MARGIN_NORMAL;
+
+       int retval = ftfl_submit_cmd();
+       print("Firmware Erase Status: ");
+       printHex( retval );
+       print( NL );
+
+
+       // Read Bootloader 1 Status
+       FTFL.fccob.read_1s_block.fcmd = FTFL_FCMD_READ_1s_BLOCK;
+       FTFL.fccob.read_1s_block.addr = (uintptr_t)&_bootloader;
+       FTFL.fccob.read_1s_block.margin = FTFL_MARGIN_NORMAL;
+
+       retval = ftfl_submit_cmd();
+       print("Bootloader Erase Status: ");
+       printHex( retval );
+       print( NL );
+       */
+
+       /*
+       // Program First Longword of firmware
+       FTFL.fccob.program_longword.fcmd = FTFL_FCMD_PROGRAM_LONGWORD;
+       FTFL.fccob.program_longword.addr = (uintptr_t)&_app_rom;
+       FTFL.fccob.program_longword.data_be[0] = 0x1;
+       FTFL.fccob.program_longword.data_be[1] = 0x2;
+       FTFL.fccob.program_longword.data_be[2] = 0x4;
+       FTFL.fccob.program_longword.data_be[3] = 0x8;
+       int retval = ftfl_submit_cmd();
+       print("Write Longword Status: ");
+       printHex( retval );
+       print( NL );
+       */
+
+       /*
+       // Erase Sector
+       FTFL.fccob.erase.fcmd = FTFL_FCMD_ERASE_SECTOR;
+       FTFL.fccob.erase.addr = (uintptr_t)&_app_rom;
+       int retval = ftfl_submit_cmd();
+       print("Erase Status: ");
+       printHex( retval );
+       print( NL );
+
+       // Prepare FlexRAM
+       FTFL.fccob.set_flexram.fcmd = FTFL_FCMD_SET_FLEXRAM;
+       FTFL.fccob.set_flexram.flexram_function = FTFL_FLEXRAM_RAM;
+       retval = ftfl_submit_cmd();
+       print("Set FlexRAM Status: ");
+       printHex( retval );
+       print( NL );
+
+       // Write to FlexRAM
+       memset( FlexRAM, 0xB4, 1000 );
+       memset( &FlexRAM[1000], 0xE3, 1000 );
+
+       // Program Sector
+       FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
+       FTFL.fccob.program_section.addr = (uintptr_t)&_app_rom;
+       FTFL.fccob.program_section.num_words = 128;
+       //FTFL.fccob.program_section.num_words = 250; // 2000 kb / 64 bits
+       retval = ftfl_submit_cmd();
+       print("Program Sector1 Status: ");
+       printHex( retval );
+       print( NL );
+
+       FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
+       FTFL.fccob.program_section.addr = (uintptr_t)&_app_rom + 0x400;
+       FTFL.fccob.program_section.num_words = 128;
+       //FTFL.fccob.program_section.num_words = 250; // 2000 kb / 64 bits
+       retval = ftfl_submit_cmd();
+       print("Program Sector2 Status: ");
+       printHex( retval );
+       print( NL );
+
+       for ( uint8_t sector = 0; sector < 1; sector++ )
+               //sector_print( &_bootloader, sector, 16 );
+               sector_print( &_app_rom, sector, 16 );
+       print( NL );
+       */
+
        flash_prepare_flashing();
 
+       //uint32_t *position = &_app_rom;
        usb_init( &dfu_device );
+
        for (;;)
        {
                usb_poll();