Browse Source

Correct the bootloader entry address

master
Raphael Assenat 4 months ago
parent
commit
ee3adafd26
1 changed files with 19 additions and 5 deletions
  1. +19
    -5
      bootloader.c

+ 19
- 5
bootloader.c View File

@ -1,5 +1,5 @@
/* gc_n64_usb : Gamecube or N64 controller to USB adapter firmware
Copyright (C) 2007-2018 Raphael Assenat <raph@raphnet.net>
Copyright (C) 2007-2021 Raphael Assenat <raph@raphnet.net>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -15,20 +15,34 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <util/delay.h>
#include "usb.h"
#include "bootloader.h"
void enterBootLoader(void)
{
cli();
usb_shutdown();
_delay_ms(10);
#if defined(__AVR_ATmega32U2__)
// ATmega32u2 : 0x3800
asm volatile(
"cli \n"
"ldi r30, 0x00 \n" // ZL
"ldi r31, 0x38 \n" // ZH
"ijmp");
#elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
// AT90USB1287/1286 : 0xF000 (word address)
// ATmega32u2 : ???
asm volatile(
"cli \n"
"ldi r30, 0x00 \n" // ZL
"ldi r31, 0xF0 \n" // ZH
"ijmp");
#else
#error Bootloader address unknown for this CPU
#endif
}
void resetFirmware(void)
@ -38,7 +52,7 @@ void resetFirmware(void)
// jump to the application reset vector
asm volatile(
"cli \n"
"ldi r30, 0x00 \n"
"ldi r31, 0x00 \n"
"ldi r30, 0x00 \n" // ZL
"ldi r31, 0x00 \n" // ZH
"ijmp");
}

Loading…
Cancel
Save