GBA: Refactor gba directory, dropping gba- prefix and making supervisor directory

CHANGES

@@ -47,6 +47,7 @@ Misc:
  - Debugger: Watchpoints now report address watched (fixes #68)
  - GBA: Add API for getting Configuration structs for overrides and input
  - GBA: Refactor gba-sensors and gba-gpio into gba-hardware
+ - GBA: Refactor gba directory, dropping gba- prefix and making supervisor directory
 
 0.1.1: (2015-01-24)
 Bugfixes:

CMakeLists.txt

@@ -15,6 +15,7 @@ set(BUILD_SDL ON CACHE BOOL "Build SDL frontend")
 set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool")
 file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c)
 file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
+file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c)
 file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs])
 file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c)
 file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c)
@@ -22,9 +23,9 @@ file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c)
 list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c)
 source_group("ARM core" FILES ${ARM_SRC})
 source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC})
+source_group("GBA supervisor" FILES ${GBA_SV_SRC})
 source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}})
 include_directories(${CMAKE_SOURCE_DIR}/src/arm)
-include_directories(${CMAKE_SOURCE_DIR}/src/gba)
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -138,7 +139,7 @@ if(USE_CLI_DEBUGGER)
 	add_definitions(-DUSE_CLI_DEBUGGER)
 	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c)
 	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c)
-	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/gba/gba-cli.c)
+	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/cli.c)
 	include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS})
 	link_directories(${LIBEDIT_LIBRARY_DIRS})
 	set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES})
@@ -239,6 +240,7 @@ endif()
 add_library(${BINARY_NAME} SHARED
 	${ARM_SRC}
 	${GBA_SRC}
+	${GBA_SV_SRC}
 	${DEBUGGER_SRC}
 	${RENDERER_SRC}
 	${UTIL_SRC}

src/gba/audio.c

@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-audio.h"
+#include "audio.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
-#include "gba-video.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 
 const unsigned GBA_AUDIO_SAMPLES = 2048;
 const unsigned BLIP_BUFFER_SIZE = 0x4000;

src/gba/audio.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/bios.c

@@ -1,13 +1,13 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-bios.h"
+#include "bios.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-memory.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/memory.h"
 #include "isa-inlines.h"
 
 const uint32_t GBA_BIOS_CHECKSUM = 0xBAAE187F;

src/gba/bios.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/gba.c

@@ -1,16 +1,16 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "gba.h"
 
-#include "gba-bios.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-sio.h"
-#include "gba-thread.h"
+#include "gba/bios.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
+#include "gba/serialize.h"
+#include "gba/sio.h"
 
 #include "isa-inlines.h"
 

src/gba/gba.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,10 +11,10 @@
 #include "arm.h"
 #include "debugger/debugger.h"
 
-#include "gba-memory.h"
-#include "gba-video.h"
-#include "gba-audio.h"
-#include "gba-sio.h"
+#include "gba/memory.h"
+#include "gba/video.h"
+#include "gba/audio.h"
+#include "gba/sio.h"
 
 extern const uint32_t GBA_ARM7TDMI_FREQUENCY;
 

src/gba/hardware.c

@@ -3,10 +3,9 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba.h"
+#include "hardware.h"
 
-#include "gba-hardware.h"
-#include "gba-serialize.h"
+#include "gba/serialize.h"
 
 #include <time.h>
 

src/gba/hle-bios.c

@@ -1,6 +1,6 @@
 #include "hle-bios.h"
 
-#include "gba-memory.h"
+#include "gba/memory.h"
 
 const uint8_t hleBios[SIZE_BIOS] = {
   0x06, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x07, 0x00, 0x00, 0xea,

src/gba/hle-bios.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/hle-bios.make

@@ -13,6 +13,6 @@ hle-bios.bin: hle-bios.o
 hle-bios.c: hle-bios.bin
 	echo '#include "hle-bios.h"' > $@
 	echo >> $@
-	echo '#include "gba-memory.h"' >> $@
+	echo '#include "gba/memory.h"' >> $@
 	echo >> $@
 	xxd -i $< | sed -e 's/unsigned char hle_bios_bin\[\]/const uint8_t hleBios[SIZE_BIOS]/' | grep -v hle_bios_bin_len >> $@

src/gba/input.c

@@ -1,9 +1,9 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-input.h"
+#include "input.h"
 
 #include "util/configuration.h"
 #include "util/table.h"

src/gba/input.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef GBA_INPUT_H
 #define GBA_INPUT_H
 
-#include "gba.h"
+#include "gba/gba.h"
 
 struct Configuration;
 

src/gba/io.c

@@ -1,14 +1,14 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-io.h"
+#include "io.h"
 
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-sio.h"
-#include "gba-video.h"
+#include "gba/supervisor/rr.h"
+#include "gba/serialize.h"
+#include "gba/sio.h"
+#include "gba/video.h"
 
 const char* GBAIORegisterNames[] = {
 	// Video

src/gba/io.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 enum GBAIORegisters {
 	// Video

src/gba/memory.c

@@ -1,17 +1,17 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-memory.h"
+#include "memory.h"
 
 #include "macros.h"
 
 #include "decoder.h"
-#include "gba-hardware.h"
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "hle-bios.h"
+#include "gba/hardware.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/hle-bios.h"
 #include "util/memory.h"
 
 #define IDLE_LOOP_THRESHOLD 10000

src/gba/memory.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,8 +11,8 @@
 #include "arm.h"
 #include "macros.h"
 
-#include "gba-hardware.h"
-#include "gba-savedata.h"
+#include "gba/hardware.h"
+#include "gba/savedata.h"
 
 enum GBAMemoryRegion {
 	REGION_BIOS = 0x0,

src/gba/renderers/video-software.c

@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "video-software.h"
 
-#include "gba.h"
-#include "gba-io.h"
+#include "gba/gba.h"
+#include "gba/io.h"
 
 #ifdef NDEBUG
 #define VIDEO_CHECKS false

src/gba/renderers/video-software.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 #ifdef COLOR_16_BIT
 typedef uint16_t color_t;

src/gba/savedata.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-savedata.h"
+#include "savedata.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 #include "util/memory.h"
 #include "util/vfs.h"

src/gba/savedata.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/serialize.c

@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-serialize.h"
+#include "serialize.h"
 
-#include "gba-audio.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-thread.h"
-#include "gba-video.h"
+#include "gba/audio.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 
 #include "util/memory.h"
 #include "util/vfs.h"

src/gba/serialize.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 extern const uint32_t GBA_SAVESTATE_MAGIC;
 

src/gba/sio.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-sio.h"
+#include "sio.h"
 
-#include "gba-io.h"
+#include "gba/io.h"
 
 const int GBASIOCyclesPerTransfer[4][MAX_GBAS] = {
 	{ 31457, 62914, 94371, 125829 },

src/gba/sio.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/supervisor/cli.c

@@ -1,13 +1,13 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-cli.h"
+#include "cli.h"
 
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/thread.h"
 
 #ifdef USE_CLI_DEBUGGER
 

src/gba/supervisor/cli.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/supervisor/config.c

@@ -1,11 +1,9 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-config.h"
-
-#include "platform/commandline.h"
+#include "config.h"
 
 #include <sys/stat.h>
 

src/gba/supervisor/config.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 #include "util/configuration.h"
 

src/gba/supervisor/overrides.c

@@ -3,10 +3,10 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-overrides.h"
+#include "overrides.h"
 
-#include "gba.h"
-#include "gba-hardware.h"
+#include "gba/gba.h"
+#include "gba/hardware.h"
 
  #include "util/configuration.h"
 

src/gba/supervisor/overrides.h

@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-savedata.h"
+#include "gba/savedata.h"
 
 #define IDLE_LOOP_NONE 0xFFFFFFFF
 

src/gba/supervisor/rr.c

@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-rr.h"
+#include "rr.h"
 
-#include "gba.h"
-#include "gba-serialize.h"
+#include "gba/gba.h"
+#include "gba/serialize.h"
 #include "util/vfs.h"
 
 #define BINARY_EXT ".dat"

src/gba/supervisor/rr.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

src/gba/supervisor/thread.c

@@ -1,14 +1,14 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-thread.h"
+#include "thread.h"
 
 #include "arm.h"
-#include "gba.h"
-#include "gba-config.h"
-#include "gba-serialize.h"
+#include "gba/gba.h"
+#include "gba/supervisor/config.h"
+#include "gba/serialize.h"
 
 #include "debugger/debugger.h"
 

src/gba/supervisor/thread.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,9 +8,9 @@
 
 #include "util/common.h"
 
-#include "gba.h"
-#include "gba-input.h"
-#include "gba-overrides.h"
+#include "gba/gba.h"
+#include "gba/input.h"
+#include "gba/supervisor/overrides.h"
 
 #include "util/threading.h"
 

src/gba/video.c

@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-video.h"
+#include "video.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
 
 #include "util/memory.h"
 

src/gba/video.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-memory.h"
+#include "gba/memory.h"
 #include "macros.h"
 
 #ifdef COLOR_16_BIT

src/platform/commandline.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,14 +9,14 @@
 
 #ifdef USE_CLI_DEBUGGER
 #include "debugger/cli-debugger.h"
-#include "gba/gba-cli.h"
+#include "gba/supervisor/cli.h"
 #endif
 
 #ifdef USE_GDB_STUB
 #include "debugger/gdb-stub.h"
 #endif
 
-#include "gba/gba-video.h"
+#include "gba/video.h"
 
 #include <fcntl.h>
 #include <getopt.h>

src/platform/commandline.h

@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-config.h"
+#include "gba/supervisor/config.h"
 
 enum DebuggerType {
 	DEBUGGER_NONE = 0,

src/platform/ffmpeg/ffmpeg-encoder.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "ffmpeg-encoder.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 #include <libavcodec/version.h>
 #include <libavcodec/avcodec.h>

src/platform/ffmpeg/ffmpeg-encoder.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef FFMPEG_ENCODER
 #define FFMPEG_ENCODER
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #include <libavformat/avformat.h>
 

src/platform/imagemagick/imagemagick-gif-encoder.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "imagemagick-gif-encoder.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 static void _magickPostVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer);
 static void _magickPostAudioFrame(struct GBAAVStream*, int32_t left, int32_t right);

src/platform/imagemagick/imagemagick-gif-encoder.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef IMAGEMAGICK_GIF_ENCODER
 #define IMAGEMAGICK_GIF_ENCODER
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #define MAGICKCORE_HDRI_ENABLE 0
 #define MAGICKCORE_QUANTUM_DEPTH 8

src/platform/perf-main.c

@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-thread.h"
-#include "gba-config.h"
-#include "gba.h"
-#include "renderers/video-software.h"
+#include "gba/supervisor/thread.h"
+#include "gba/supervisor/config.h"
+#include "gba/gba.h"
+#include "gba/renderers/video-software.h"
 
 #include "platform/commandline.h"
 

src/platform/qt/AudioDevice.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,9 +6,9 @@
 #include "AudioDevice.h"
 
 extern "C" {
-#include "gba.h"
-#include "gba-audio.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/audio.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/AudioProcessor.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #endif
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/AudioProcessorQt.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 #include <QAudioOutput>
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/AudioProcessorSDL.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #include "AudioProcessorSDL.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/ConfigController.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <QMenu>
 
 extern "C" {
-#include "gba-overrides.h"
+#include "gba/supervisor/overrides.h"
 #include "platform/commandline.h"
 }
 

src/platform/qt/ConfigController.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 #include <functional>
 
 extern "C" {
-#include "gba-config.h"
+#include "gba/supervisor/config.h"
 #include "util/configuration.h"
 }
 

src/platform/qt/Display.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 #include <QResizeEvent>
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/GBAKeyEditor.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <QWidget>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 class QTimer;

src/platform/qt/GameController.cpp

@@ -14,11 +14,11 @@
 #include <ctime>
 
 extern "C" {
-#include "gba.h"
-#include "gba-audio.h"
-#include "gba-config.h"
-#include "gba-serialize.h"
-#include "renderers/video-software.h"
+#include "gba/audio.h"
+#include "gba/gba.h"
+#include "gba/serialize.h"
+#include "gba/renderers/video-software.h"
+#include "gba/supervisor/config.h"
 #include "util/vfs.h"
 }
 

src/platform/qt/GameController.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,8 +13,8 @@
 #include <QString>
 
 extern "C" {
-#include "gba-hardware.h"
-#include "gba-thread.h"
+#include "gba/hardware.h"
+#include "gba/supervisor/thread.h"
 #ifdef BUILD_SDL
 #include "sdl-events.h"
 #endif

src/platform/qt/GamepadAxisEvent.h

@@ -9,7 +9,7 @@
 #include <QEvent>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 namespace QGBA {

src/platform/qt/GamepadButtonEvent.h

@@ -9,7 +9,7 @@
 #include <QEvent>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 namespace QGBA {

src/platform/qt/InputController.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 class QTimer;
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 
 #ifdef BUILD_SDL
 #include "platform/sdl/sdl-events.h"

src/platform/qt/LoadSaveState.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,8 +14,8 @@
 #include <QPainter>
 
 extern "C" {
-#include "gba-serialize.h"
-#include "gba-video.h"
+#include "gba/serialize.h"
+#include "gba/video.h"
 }
 
 using namespace QGBA;

src/platform/qt/LogView.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include "ui_LogView.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 namespace QGBA {

src/platform/qt/OverrideView.cpp

@@ -9,7 +9,7 @@
 #include "GameController.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;

src/platform/qt/OverrideView.h

@@ -11,7 +11,7 @@
 #include "ui_OverrideView.h"
 
 extern "C" {
-#include "gba-overrides.h"
+#include "gba/supervisor/overrides.h"
 }
 
 struct GBAThread;

src/platform/qt/Window.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 #include <functional>
 
 extern "C" {
-#include "gba.h"
+#include "gba/gba.h"
 }
 
 #include "GDBController.h"

src/platform/sdl/gl-sdl.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>

src/platform/sdl/main.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,10 +13,10 @@
 #include "debugger/gdb-stub.h"
 #endif
 
-#include "gba-thread.h"
-#include "gba.h"
-#include "gba-config.h"
-#include "gba-video.h"
+#include "gba/gba.h"
+#include "gba/supervisor/config.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 #include "platform/commandline.h"
 #include "util/configuration.h"
 

src/platform/sdl/main.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef SDL_MAIN_H
 #define SDL_MAIN_H
 
-#include "renderers/video-software.h"
+#include "gba/renderers/video-software.h"
 
 #include "sdl-audio.h"
 #include "sdl-events.h"

src/platform/sdl/sdl-audio.c

@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "sdl-audio.h"
 
-#include "gba.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/supervisor/thread.h"
 
 #if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF
 #include "third-party/blip_buf/blip_buf.h"

src/platform/sdl/sdl-audio.h

@@ -10,7 +10,7 @@
 
 #include <SDL.h>
 
-#include "gba-audio.h"
+#include "gba/audio.h"
 
 struct GBASDLAudio {
 	// Input

src/platform/sdl/sdl-events.c

@@ -6,11 +6,11 @@
 #include "sdl-events.h"
 
 #include "debugger/debugger.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-video.h"
-#include "renderers/video-software.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/serialize.h"
+#include "gba/video.h"
+#include "gba/renderers/video-software.h"
 #include "util/vfs.h"
 
 #if SDL_VERSION_ATLEAST(2, 0, 0) && defined(__APPLE__)

src/platform/sdl/sdl-events.h

@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #include <SDL.h>
 

src/platform/sdl/sw-sdl.c

@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #if defined(__ARM_NEON)
 void _neon2x(void* dest, void* src, int width, int height);