Leahnaya/gba-link-connection
1
0
Fork 0
mirror of https://github.com/afska/gba-link-connection.git synced 2026-09-08 17:07:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX: Also using the IWRAM directives in LinkUniversal

Browse Source
This commit is contained in:
Rodrigo Alfonso
2023-11-23 06:03:27 -03:00
parent c9b674eebb
commit 8cbde57097
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/compile.sh
View File

@@ -37,20 +37,24 @@ cd ..
cd LinkCable_full/
sed -i -e "s/\/\/ #define USE_LINK_UNIVERSAL/#define USE_LINK_UNIVERSAL/g" src/main.h
sed -i -e "s/\/\/ #define LINK_WIRELESS_PUT_ISR_IN_IWRAM/#define LINK_WIRELESS_PUT_ISR_IN_IWRAM/g" ../../lib/LinkWireless.hpp
mv LinkCable_full.gba backup.gba
make rebuild
cp LinkCable_full.gba ../LinkUniversal_full.gba
mv backup.gba LinkCable_full.gba
sed -i -e "s/#define USE_LINK_UNIVERSAL/\/\/ #define USE_LINK_UNIVERSAL/g" src/main.h
sed -i -e "s/#define LINK_WIRELESS_PUT_ISR_IN_IWRAM/\/\/ #define LINK_WIRELESS_PUT_ISR_IN_IWRAM/g" ../../lib/LinkWireless.hpp
cd ..
cd LinkCable_stress/
sed -i -e "s/\/\/ #define USE_LINK_UNIVERSAL/#define USE_LINK_UNIVERSAL/g" src/main.h
sed -i -e "s/\/\/ #define LINK_WIRELESS_PUT_ISR_IN_IWRAM/#define LINK_WIRELESS_PUT_ISR_IN_IWRAM/g" ../../lib/LinkWireless.hpp
mv LinkCable_stress.gba backup.gba
make rebuild
cp LinkCable_stress.gba ../LinkUniversal_stress.gba
mv backup.gba LinkCable_stress.gba
sed -i -e "s/#define USE_LINK_UNIVERSAL/\/\/ #define USE_LINK_UNIVERSAL/g" src/main.h
sed -i -e "s/#define LINK_WIRELESS_PUT_ISR_IN_IWRAM/\/\/ #define LINK_WIRELESS_PUT_ISR_IN_IWRAM/g" ../../lib/LinkWireless.hpp
cd ..
cd LinkWireless_demo/

12
lib/LinkWireless.cpp
View File

@@ -1,13 +1,13 @@
#include "LinkWireless.hpp"
#ifdef LINK_WIRELESS_PUT_ISR_IN_IWRAM
LINK_WIRELESS_CODE_IWRAM void LINK_WIRELESS_ISR_SERIAL() {
linkWireless->_onSerial();
LINK_WIRELESS_CODE_IWRAM void LinkWireless::_onSerial() {
__onSerial();
}
LINK_WIRELESS_CODE_IWRAM void LINK_WIRELESS_ISR_TIMER() {
linkWireless->_onTimer();
LINK_WIRELESS_CODE_IWRAM void LinkWireless::_onTimer() {
__onTimer();
}
LINK_WIRELESS_CODE_IWRAM void LINK_WIRELESS_ISR_ACK_TIMER() {
linkWireless->_onACKTimer();
LINK_WIRELESS_CODE_IWRAM void LinkWireless::_onACKTimer() {
__onACKTimer();
}
#endif

37
lib/LinkWireless.hpp
View File

@@ -9,11 +9,11 @@
// LinkWireless* linkWireless = new LinkWireless();
// - 2) Add the required interrupt service routines: (*)
// irq_init(NULL);
// irq_add(II_VBLANK, (void (*)())LINK_WIRELESS_ISR_VBLANK);
// irq_add(II_SERIAL, (void (*)())LINK_WIRELESS_ISR_SERIAL);
// irq_add(II_TIMER3, (void (*)())LINK_WIRELESS_ISR_TIMER);
// irq_add(II_TIMER2, (void (*)())LINK_WIRELESS_ISR_ACK_TIMER); // (*)
// // optional, for `LinkWireless::asyncACKTimerId` ----------------^
// irq_add(II_VBLANK, LINK_WIRELESS_ISR_VBLANK);
// irq_add(II_SERIAL, LINK_WIRELESS_ISR_SERIAL);
// irq_add(II_TIMER3, LINK_WIRELESS_ISR_TIMER);
// irq_add(II_TIMER2, LINK_WIRELESS_ISR_ACK_TIMER); // --v
// // optional, for `LinkWireless::asyncACKTimerId` -----^
// - 3) Initialize the library with:
// linkWireless->activate();
// - 4) Start a server:
@@ -129,6 +129,7 @@
#define LINK_WIRELESS_BARRIER asm volatile("" ::: "memory")
#define LINK_WIRELESS_CODE_IWRAM \
__attribute__((section(".iwram"), target("arm"), noinline))
#define LINK_WIRELESS_ALWAYS_INLINE inline __attribute__((always_inline))
#define LINK_WIRELESS_RESET_IF_NEEDED \
if (!isEnabled) \
@@ -563,7 +564,18 @@ class LinkWireless {
#endif
}
void _onSerial() {
#ifdef LINK_WIRELESS_PUT_ISR_IN_IWRAM
void _onSerial();
void _onTimer();
void _onACKTimer();
#endif
#ifndef LINK_WIRELESS_PUT_ISR_IN_IWRAM
void _onSerial() { __onSerial(); }
void _onTimer() { __onTimer(); }
void _onACKTimer() { __onACKTimer(); }
#endif
LINK_WIRELESS_ALWAYS_INLINE void __onSerial() {
if (!isEnabled)
return;
@@ -617,7 +629,7 @@ class LinkWireless {
#endif
}
void _onTimer() {
LINK_WIRELESS_ALWAYS_INLINE void __onTimer() {
if (!isEnabled)
return;
@@ -637,7 +649,7 @@ class LinkWireless {
#endif
}
void _onACKTimer() {
LINK_WIRELESS_ALWAYS_INLINE void __onACKTimer() {
if (!isEnabled || !asyncCommand.isActive ||
asyncCommand.ackStep == AsyncCommand::ACKStep::READY)
return;
@@ -1648,21 +1660,16 @@ inline void LINK_WIRELESS_ISR_VBLANK() {
linkWireless->_onVBlank();
}
#ifndef LINK_WIRELESS_PUT_ISR_IN_IWRAM
inline void LINK_WIRELESS_ISR_SERIAL() {
linkWireless->_onSerial();
}
inline void LINK_WIRELESS_ISR_TIMER() {
linkWireless->_onTimer();
}
inline void LINK_WIRELESS_ISR_ACK_TIMER() {
linkWireless->_onACKTimer();
}
#endif
#ifdef LINK_WIRELESS_PUT_ISR_IN_IWRAM
void LINK_WIRELESS_ISR_SERIAL();
void LINK_WIRELESS_ISR_TIMER();
void LINK_WIRELESS_ISR_ACK_TIMER();
#endif
#endif // LINK_WIRELESS_H