ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated bootloaders to use the new main() function layout and remove any references to the scheduler to keep them in line with the rest of the library.

Browse source
This commit is contained in:
Dean Camera 2009-06-09 06:05:01 +00:00
parent 0323e13b39
commit 28343b1475
6 changed files with 87 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Bootloaders/DFU/BootloaderDFU.c
View file

@ -97,6 +97,23 @@ uint16_t EndAddr = 0x0000;
* the loaded application code.
*/
int main (void)
{
/* Configure hardware required by the bootloader */
SetupHardware();
/* Run the USB management task while the bootloader is supposed to be running */
while (RunBootloader || WaitForExit)
USB_USBTask();
/* Reset configured hardware back to their original states for the user application */
ResetHardware();
/* Start the user application */
AppStartPtr();
}
/** Configures all hardware required for the bootloader. */
void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
@ -111,29 +128,17 @@ int main (void)
/* Initialize the USB subsystem */
USB_Init();
}
/* Run the USB management task while the bootloader is supposed to be running */
while (RunBootloader || WaitForExit)
USB_USBTask();
/** Resets all configured hardware required for the bootloader back to their original states. */
void ResetHardware(void)
{
/* Shut down the USB subsystem */
USB_ShutDown();
/* Relocate the interrupt vector table back to the application section */
MCUCR = (1 << IVCE);
MCUCR = 0;
/* Reset any used hardware ports back to their defaults */
PORTD = 0;
DDRD = 0;
#if defined(PORTE)
PORTE = 0;
DDRE = 0;
#endif
/* Start the user application */
AppStartPtr();
}
/** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user