Correct the bootloader entry address
This commit is contained in:
parent
90779c014b
commit
ee3adafd26
24
bootloader.c
24
bootloader.c
|
@ -1,5 +1,5 @@
|
||||||
/* gc_n64_usb : Gamecube or N64 controller to USB adapter firmware
|
/* 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
|
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
|
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/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <avr/wdt.h>
|
||||||
|
#include <util/delay.h>
|
||||||
#include "usb.h"
|
#include "usb.h"
|
||||||
#include "bootloader.h"
|
|
||||||
|
|
||||||
void enterBootLoader(void)
|
void enterBootLoader(void)
|
||||||
{
|
{
|
||||||
|
cli();
|
||||||
usb_shutdown();
|
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)
|
// AT90USB1287/1286 : 0xF000 (word address)
|
||||||
// ATmega32u2 : ???
|
|
||||||
asm volatile(
|
asm volatile(
|
||||||
"cli \n"
|
"cli \n"
|
||||||
"ldi r30, 0x00 \n" // ZL
|
"ldi r30, 0x00 \n" // ZL
|
||||||
"ldi r31, 0xF0 \n" // ZH
|
"ldi r31, 0xF0 \n" // ZH
|
||||||
"ijmp");
|
"ijmp");
|
||||||
|
#else
|
||||||
|
#error Bootloader address unknown for this CPU
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void resetFirmware(void)
|
void resetFirmware(void)
|
||||||
|
@ -38,7 +52,7 @@ void resetFirmware(void)
|
||||||
// jump to the application reset vector
|
// jump to the application reset vector
|
||||||
asm volatile(
|
asm volatile(
|
||||||
"cli \n"
|
"cli \n"
|
||||||
"ldi r30, 0x00 \n"
|
"ldi r30, 0x00 \n" // ZL
|
||||||
"ldi r31, 0x00 \n"
|
"ldi r31, 0x00 \n" // ZH
|
||||||
"ijmp");
|
"ijmp");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue