From 6a6c6645555bb327ecb2fe0394a154f1ee23835a Mon Sep 17 00:00:00 2001 From: Rodrigo Alfonso Date: Fri, 20 May 2022 05:36:34 -0300 Subject: [PATCH] Removing duplicated files --- examples/{basic/src => _lib}/interrupt.cpp | 0 examples/{basic/src => _lib}/interrupt.h | 0 examples/basic/Makefile | 2 +- examples/basic/src/main.cpp | 2 +- examples/full/Makefile | 2 +- examples/full/src/interrupt.cpp | 22 ---------------- examples/full/src/interrupt.h | 30 ---------------------- examples/full/src/main.cpp | 2 +- examples/stress/Makefile | 2 +- examples/stress/src/interrupt.cpp | 22 ---------------- examples/stress/src/interrupt.h | 30 ---------------------- examples/stress/src/main.cpp | 11 ++++---- 12 files changed, 10 insertions(+), 115 deletions(-) rename examples/{basic/src => _lib}/interrupt.cpp (100%) rename examples/{basic/src => _lib}/interrupt.h (100%) delete mode 100644 examples/full/src/interrupt.cpp delete mode 100644 examples/full/src/interrupt.h delete mode 100644 examples/stress/src/interrupt.cpp delete mode 100644 examples/stress/src/interrupt.h diff --git a/examples/basic/src/interrupt.cpp b/examples/_lib/interrupt.cpp similarity index 100% rename from examples/basic/src/interrupt.cpp rename to examples/_lib/interrupt.cpp diff --git a/examples/basic/src/interrupt.h b/examples/_lib/interrupt.h similarity index 100% rename from examples/basic/src/interrupt.h rename to examples/_lib/interrupt.h diff --git a/examples/basic/Makefile b/examples/basic/Makefile index a47c3ba..631e97d 100644 --- a/examples/basic/Makefile +++ b/examples/basic/Makefile @@ -134,7 +134,7 @@ TITLE := $(PROJ) LIBS := -ltonc -lugba BUILD := build -SRCDIRS := src +SRCDIRS := src ../_lib DATADIRS := data INCDIRS := src LIBDIRS := $(TONCLIB) $(PWD)/../_lib/libugba diff --git a/examples/basic/src/main.cpp b/examples/basic/src/main.cpp index ba49214..fb7f50d 100644 --- a/examples/basic/src/main.cpp +++ b/examples/basic/src/main.cpp @@ -1,6 +1,6 @@ #include #include -#include "interrupt.h" +#include "../../_lib/interrupt.h" // (0) Include the header #include "../../_lib/LinkConnection.h" diff --git a/examples/full/Makefile b/examples/full/Makefile index fc17b22..9e6d714 100644 --- a/examples/full/Makefile +++ b/examples/full/Makefile @@ -123,7 +123,7 @@ TITLE := $(PROJ) LIBS := -ltonc -lugba -lgba-sprite-engine BUILD := build -SRCDIRS := src \ +SRCDIRS := src ../_lib \ src/scenes \ src/utils diff --git a/examples/full/src/interrupt.cpp b/examples/full/src/interrupt.cpp deleted file mode 100644 index ab575d9..0000000 --- a/examples/full/src/interrupt.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "interrupt.h" -#include - -void interrupt_init(void) { - IRQ_Init(); -} - -void interrupt_set_handler(interrupt_index index, interrupt_vector function) { - IRQ_SetHandler((irq_index)index, function); -} - -void interrupt_enable(interrupt_index index) { - IRQ_Enable((irq_index)index); -} - -void interrupt_disable(interrupt_index index) { - IRQ_Disable((irq_index)index); -} - -void interrupt_set_reference_vcount(unsigned long y) { - IRQ_SetReferenceVCOUNT(y); -} \ No newline at end of file diff --git a/examples/full/src/interrupt.h b/examples/full/src/interrupt.h deleted file mode 100644 index 47c5b27..0000000 --- a/examples/full/src/interrupt.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H - -typedef enum { - INTR_VBLANK = 0, - INTR_HBLANK = 1, - INTR_VCOUNT = 2, - INTR_TIMER0 = 3, - INTR_TIMER1 = 4, - INTR_TIMER2 = 5, - INTR_TIMER3 = 6, - INTR_SERIAL = 7, - INTR_DMA0 = 8, - INTR_DMA1 = 9, - INTR_DMA2 = 10, - INTR_DMA3 = 11, - INTR_KEYPAD = 12, - INTR_GAMEPAK = 13, - INTR_NUMBER -} interrupt_index; - -typedef void (*interrupt_vector)(void); - -void interrupt_init(void); -void interrupt_set_handler(interrupt_index index, interrupt_vector function); -void interrupt_enable(interrupt_index index); -void interrupt_disable(interrupt_index index); -void interrupt_set_reference_vcount(unsigned long y); - -#endif // INTERRUPT_H \ No newline at end of file diff --git a/examples/full/src/main.cpp b/examples/full/src/main.cpp index 3147f64..d076211 100644 --- a/examples/full/src/main.cpp +++ b/examples/full/src/main.cpp @@ -1,7 +1,7 @@ #include #include #include "../../_lib/LinkConnection.h" -#include "interrupt.h" +#include "../../_lib/interrupt.h" #include "scenes/TestScene.h" #include "utils/SceneUtils.h" diff --git a/examples/stress/Makefile b/examples/stress/Makefile index 5e08d30..e8c0348 100644 --- a/examples/stress/Makefile +++ b/examples/stress/Makefile @@ -134,7 +134,7 @@ TITLE := $(PROJ) LIBS := -ltonc -lugba BUILD := build -SRCDIRS := src +SRCDIRS := src ../_lib DATADIRS := data INCDIRS := src lib LIBDIRS := $(TONCLIB) $(PWD)/../_lib/libugba diff --git a/examples/stress/src/interrupt.cpp b/examples/stress/src/interrupt.cpp deleted file mode 100644 index ab575d9..0000000 --- a/examples/stress/src/interrupt.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "interrupt.h" -#include - -void interrupt_init(void) { - IRQ_Init(); -} - -void interrupt_set_handler(interrupt_index index, interrupt_vector function) { - IRQ_SetHandler((irq_index)index, function); -} - -void interrupt_enable(interrupt_index index) { - IRQ_Enable((irq_index)index); -} - -void interrupt_disable(interrupt_index index) { - IRQ_Disable((irq_index)index); -} - -void interrupt_set_reference_vcount(unsigned long y) { - IRQ_SetReferenceVCOUNT(y); -} \ No newline at end of file diff --git a/examples/stress/src/interrupt.h b/examples/stress/src/interrupt.h deleted file mode 100644 index 47c5b27..0000000 --- a/examples/stress/src/interrupt.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef INTERRUPT_H -#define INTERRUPT_H - -typedef enum { - INTR_VBLANK = 0, - INTR_HBLANK = 1, - INTR_VCOUNT = 2, - INTR_TIMER0 = 3, - INTR_TIMER1 = 4, - INTR_TIMER2 = 5, - INTR_TIMER3 = 6, - INTR_SERIAL = 7, - INTR_DMA0 = 8, - INTR_DMA1 = 9, - INTR_DMA2 = 10, - INTR_DMA3 = 11, - INTR_KEYPAD = 12, - INTR_GAMEPAK = 13, - INTR_NUMBER -} interrupt_index; - -typedef void (*interrupt_vector)(void); - -void interrupt_init(void); -void interrupt_set_handler(interrupt_index index, interrupt_vector function); -void interrupt_enable(interrupt_index index); -void interrupt_disable(interrupt_index index); -void interrupt_set_reference_vcount(unsigned long y); - -#endif // INTERRUPT_H \ No newline at end of file diff --git a/examples/stress/src/main.cpp b/examples/stress/src/main.cpp index e6d43a0..e312f2f 100644 --- a/examples/stress/src/main.cpp +++ b/examples/stress/src/main.cpp @@ -1,8 +1,7 @@ #include #include -#include "interrupt.h" - #include "../../_lib/LinkConnection.h" +#include "../../_lib/interrupt.h" // STRESS: // This test sends consecutive values in a two-player setup. @@ -31,7 +30,7 @@ void init() { int main() { init(); - u16 counter = 0; + u16 localCounter = 0; u16 remoteCounter = 0; bool error = false; @@ -43,8 +42,8 @@ int main() { output += "Players: " + std::to_string(linkState->playerCount) + "\n"; if (linkState->playerCount == 2) { - linkConnection->send(counter + 1); - counter++; + linkConnection->send(localCounter + 1); + localCounter++; } while (linkState->hasMessage(!linkState->currentPlayerId)) { @@ -58,7 +57,7 @@ int main() { } } - output += "(" + std::to_string(counter) + ", " + + output += "(" + std::to_string(localCounter) + ", " + std::to_string(remoteCounter) + ")\n"; } else { output += std::string("Waiting...");