From 0e7c9b679f27348598962770af42d67b90820844 Mon Sep 17 00:00:00 2001 From: thoduv Date: Tue, 4 Jul 2006 18:51:39 +0000 Subject: [PATCH] Reordering directories (arm9 and arm7 folder added). Moved GPU and ARM9 to arm9/ Moved spi and fw (added write support, not tested) to arm7/ Compilation may be broken for gtk version (i'll fix it soon) and windows version (includes have to be changed) --- trunk/desmume/src/Makefile.am | 7 +++++-- trunk/desmume/src/armcpu.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/trunk/desmume/src/Makefile.am b/trunk/desmume/src/Makefile.am index 42de238d5..566624534 100644 --- a/trunk/desmume/src/Makefile.am +++ b/trunk/desmume/src/Makefile.am @@ -1,14 +1,17 @@ SUBDIRS = . $(UI_DIR) noinst_LIBRARIES = libdesmume.a libdesmume_a_SOURCES = \ - ARM9.c ARM9.h \ armcpu.cpp armcpu.hpp \ arm_instructions.cpp arm_instructions.hpp \ bios.cpp bios.hpp cp15.cpp cp15.hpp \ Disassembler.c Disassembler.h \ FIFO.c FIFO.h \ - GPU.c GPU.h debug.c debug.h \ + debug.c debug.h \ MMU.cpp MMU.hpp NDSSystem.cpp NDSSystem.hpp \ thumb_instructions.cpp thumb_instructions.hpp \ + arm7/fw.c arm7/fw.h \ + arm7/spi.c arm7/spi.h \ + arm9/GPU.c arm9/GPU.h \ + arm9/ARM9.c arm9/ARM9.h \ windows/cflash.cpp windows/cflash.h fs.h libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT) diff --git a/trunk/desmume/src/armcpu.h b/trunk/desmume/src/armcpu.h index 38a115557..0f81c9ede 100644 --- a/trunk/desmume/src/armcpu.h +++ b/trunk/desmume/src/armcpu.h @@ -92,7 +92,7 @@ enum Mode SYS = 0x1F }; -union Status_Reg +typedef union { struct { @@ -108,7 +108,7 @@ union Status_Reg N : 1; } bits; u32 val; -}; +} Status_Reg; typedef void* armcp_t;