Initial STLcd code.

[kiibohd-controller.git] / Bootloader / main.c

diff --git a/Bootloader/main.c b/Bootloader/main.c
index 5e975ac39d31236f1dca58e77dcc167f073e5ebf..d74d209fe8c252acc8ad0cf2e0868ddd328da750 100644 (file)
--- a/Bootloader/main.c
+++ b/Bootloader/main.c
@@ -28,46 +28,62 @@
 /**
  * Unfortunately we can't DMA directly to FlexRAM, so we'll have to stage here.
  */
-static char staging[FLASH_SECTOR_SIZE];
+static char staging[ FLASH_SECTOR_SIZE ];
 
 
 
 // ----- Functions -----
 
-static enum dfu_status setup_write(size_t off, size_t len, void **buf)
+static enum dfu_status setup_write( size_t off, size_t len, void **buf )
 {
-        static int last = 0;
-
-        if (len > sizeof(staging))
-                return (DFU_STATUS_errADDRESS);
-
-        // We only allow the last write to be less than one sector size.
-        if (off == 0)
-                last = 0;
-        if (last && len != 0)
-                return (DFU_STATUS_errADDRESS);
-        if (len != FLASH_SECTOR_SIZE) {
-                last = 1;
-                memset(staging, 0xff, sizeof(staging));
-        }
-
-        *buf = staging;
-        return (DFU_STATUS_OK);
+       GPIOA_PCOR |= (1<<5);
+       static int last = 0;
+
+       if ( len > sizeof(staging) )
+               return (DFU_STATUS_errADDRESS);
+
+       // We only allow the last write to be less than one sector size.
+       if ( off == 0 )
+               last = 0;
+       if ( last && len != 0 )
+               return (DFU_STATUS_errADDRESS);
+       if ( len != FLASH_SECTOR_SIZE )
+       {
+               last = 1;
+               memset( staging, 0xff, sizeof(staging) );
+       }
+
+       *buf = staging;
+       return (DFU_STATUS_OK);
 }
 
 static enum dfu_status finish_write( void *buf, size_t off, size_t len )
 {
-        void *target;
-        if (len == 0)
-                return (DFU_STATUS_OK);
-
-        target = flash_get_staging_area(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE);
-        if (!target)
-                return (DFU_STATUS_errADDRESS);
-        memcpy(target, buf, len);
-        if (flash_program_sector(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE) != 0)
-                return (DFU_STATUS_errADDRESS);
-        return (DFU_STATUS_OK);
+       void *target;
+       if ( len == 0 )
+               return (DFU_STATUS_OK);
+
+       target = flash_get_staging_area(off + (uintptr_t)&_app_rom, FLASH_SECTOR_SIZE);
+       if ( !target )
+               return (DFU_STATUS_errADDRESS);
+       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);
+       case FTFL_FSTAT_MGSTAT0:  // Memory Controller Command Completion Error
+               return (DFU_STATUS_errADDRESS);
+       */
+
+       case 0:
+       default: // No error
+               return (DFU_STATUS_OK);
+       }
 }
 
 
@@ -75,7 +91,7 @@ static struct dfu_ctx dfu_ctx;
 
 void init_usb_bootloader( int config )
 {
-        dfu_init(setup_write, finish_write, &dfu_ctx);
+       dfu_init(setup_write, finish_write, &dfu_ctx);
 }
 
 void main()
@@ -93,17 +109,73 @@ 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
 
-        flash_prepare_flashing();
-
-        usb_init( &dfu_device );
-        for (;;)
+       //for (uint8_t c = 0; c < 20; c++)
+       /*
+       while( 1 )
+       {
+               GPIOA_PTOR |= (1<<5);
+               for (uint32_t d = 0; d < 7200000; d++ );
+       }
+       */
+
+       // 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);
+
+
+
+       flash_prepare_flashing();
+
+       uint32_t *position = &_app_rom;
+       usb_init( &dfu_device );
+       for (;;)
        {
-                usb_poll();
-        }
+               usb_poll();
+
+               /*
+               for ( ; position < &_app_rom + 0x201; position++ )
+               //for ( ; position < &_app_rom + 0x800; position++ )
+               {
+                       if ( *position != 0xFFFFFFFF )
+                       {
+                       while( 1 )
+                       {
+                               GPIOA_PTOR |= (1<<5);
+                               for (uint32_t d = 0; d < 7200000; d++ );
+                       }
+                       }
+               }
+               */
+
+       }
 }