Only in sirc005-src/arm7: build diff -udr sirc005-src/arm7/Makefile sylphirc-bbraun/arm7/Makefile --- sirc005-src/arm7/Makefile 2006-05-01 20:21:10.000000000 -0700 +++ sylphirc-bbraun/arm7/Makefile 2007-03-24 07:47:59.000000000 -0700 @@ -29,20 +29,20 @@ -ffast-math \ $(ARCH) -CFLAGS += $(INCLUDE) -DARM7 +CFLAGS += $(INCLUDE) -DARM7 CXXFLAGS := $(CFLAGS) ASFLAGS := -g $(ARCH) LDFLAGS = -specs=ds_arm7.specs -g $(ARCH) -mno-fpu -Wl,-Map,$(notdir $*).map -LIBS := -lnds7 -ldswifi7r +LIBS := -lcartreset7 -lnds7 -ldswifi7 #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(LIBNDS) +LIBDIRS := $(LIBNDS) $(DEVKITPRO)/dswifi $(DEVKITPRO)/libfat #--------------------------------------------------------------------------------- @@ -134,4 +134,4 @@ #--------------------------------------------------------------------------------------- endif -#--------------------------------------------------------------------------------------- \ No newline at end of file +#--------------------------------------------------------------------------------------- diff -udr sirc005-src/arm7/source/main.cpp sylphirc-bbraun/arm7/source/main.cpp --- sirc005-src/arm7/source/main.cpp 2006-05-01 20:21:10.000000000 -0700 +++ sylphirc-bbraun/arm7/source/main.cpp 2007-03-24 07:30:12.000000000 -0700 @@ -31,6 +31,8 @@ #include +#include + //--------------------------------------------------------------------------------- void startSound(int sampleRate, const void* data, u32 bytes, u8 channel, u8 vol, u8 pan, u8 format) { //--------------------------------------------------------------------------------- @@ -59,7 +61,7 @@ uint16 but=0, x=0, y=0, xpx=0, ypx=0, z1=0, z2=0, batt=0, aux=0; int t1=0, t2=0; uint32 temp=0; - uint8 ct[sizeof(IPC->curtime)]; + uint8 ct[sizeof(IPC->time.curtime)]; u32 i; // Update the heartbeat @@ -94,7 +96,7 @@ temp = touchReadTemperature(&t1, &t2); // Update the IPC struct - IPC->heartbeat = heartbeat; + //IPC->heartbeat = heartbeat; IPC->buttons = but; IPC->touchX = x; IPC->touchY = y; @@ -106,7 +108,7 @@ IPC->aux = aux; for(i=0; icurtime[i] = ct[i]; + IPC->time.curtime[i] = ct[i]; } IPC->temperature = temp; @@ -180,7 +182,11 @@ // Keep the ARM7 out of main RAM - while (1) swiWaitForVBlank(); + while (1) { + if( passmeloopQuery() ) + cartExecute(); + swiWaitForVBlank(); + } } Only in sirc005-src/arm9: build diff -udr sirc005-src/arm9/Makefile sylphirc-bbraun/arm9/Makefile --- sirc005-src/arm9/Makefile 2006-05-02 18:59:22.000000000 -0700 +++ sylphirc-bbraun/arm9/Makefile 2007-03-24 07:39:23.000000000 -0700 @@ -15,7 +15,7 @@ # all directories are relative to this makefile #--------------------------------------------------------------------------------- BUILD := build -SOURCES := source ../common/source source/gba_nds_fat source/screens +SOURCES := source ../common/source source/screens INCLUDES := include ../common/source sound source source/screens DATA := data STATICLIBS := @@ -41,13 +41,13 @@ #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -lnds9 -ldswifi9r +LIBS := -lcartreset9 -lfat -lnds9 -ldswifi9 #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(LIBNDS) +LIBDIRS := $(DEVKITPRO)/libfat $(LIBNDS) $(DEVKITPRO)/dswifi #--------------------------------------------------------------------------------- # no real need to edit anything past this point unless you need to add additional @@ -164,4 +164,4 @@ #--------------------------------------------------------------------------------------- endif -#--------------------------------------------------------------------------------------- \ No newline at end of file +#--------------------------------------------------------------------------------------- Only in sirc005-src/arm9/source: gba_nds_fat diff -udr sirc005-src/arm9/source/main.cpp sylphirc-bbraun/arm9/source/main.cpp --- sirc005-src/arm9/source/main.cpp 2006-07-16 10:57:24.000000000 -0700 +++ sylphirc-bbraun/arm9/source/main.cpp 2007-03-23 18:52:51.000000000 -0700 @@ -22,8 +22,8 @@ #include #include "dswifi9.h" -#include "sys\socket.h" -#include "netinet\in.h" +#include "sys/socket.h" +#include "netinet/in.h" #include "SylphData.h" #include "SylphDataRaw.h" diff -udr sirc005-src/arm9/source/screens/ScrIRC.cpp sylphirc-bbraun/arm9/source/screens/ScrIRC.cpp --- sirc005-src/arm9/source/screens/ScrIRC.cpp 2006-07-16 14:10:10.000000000 -0700 +++ sylphirc-bbraun/arm9/source/screens/ScrIRC.cpp 2007-03-24 08:01:17.000000000 -0700 @@ -26,6 +26,8 @@ #include "SylphWidgets.h" #include "SylphIRC.h" +#include "cartreset.h" + #include std::string build(""), serverurl(""); @@ -273,11 +275,12 @@ VRAM_F_CR = VRAM_ENABLE | VRAM_F_BG_EXT_PALETTE | VRAM_OFFSET(1); VRAM_H_CR = VRAM_ENABLE | VRAM_H_SUB_BG_EXT_PALETTE; - BG_CR[2] = BG_PRIORITY(2) | BG_256_COLOR | BG_TILE_BASE(1) | BG_MAP_BASE(0); - BG_CR[3] = BG_PRIORITY(3) | BG_256_COLOR | BG_TILE_BASE(0) | BG_MAP_BASE(1); + //BG_CR[2] = BG_PRIORITY(2) | BG_256_COLOR | BG_TILE_BASE(1) | BG_MAP_BASE(0); + BG2_CR = BG_PRIORITY(2) | BG_256_COLOR | BG_TILE_BASE(1) | BG_MAP_BASE(0); + BG3_CR = BG_PRIORITY(3) | BG_256_COLOR | BG_TILE_BASE(0) | BG_MAP_BASE(1); - SUB_BG_CR[2] = BG_PRIORITY(2) | BG_256_COLOR | BG_TILE_BASE(1) | BG_MAP_BASE(0); - SUB_BG_CR[3] = BG_PRIORITY(3) | BG_256_COLOR | BG_TILE_BASE(0) | BG_MAP_BASE(1); + SUB_BG2_CR = BG_PRIORITY(2) | BG_256_COLOR | BG_TILE_BASE(1) | BG_MAP_BASE(0); + SUB_BG3_CR = BG_PRIORITY(3) | BG_256_COLOR | BG_TILE_BASE(0) | BG_MAP_BASE(1); SylphBackground back((u16*)CHAR_BASE_BLOCK(1), (u16*)SCREEN_BASE_BLOCK(0)); SylphBackground backp((u16*)CHAR_BASE_BLOCK(0), (u16*)SCREEN_BASE_BLOCK(1)); @@ -355,6 +358,10 @@ } framer.FrameStep(true); + if ((keysDown() & (KEY_A|KEY_B|KEY_L|KEY_R) == (KEY_A|KEY_B|KEY_L|KEY_R)) ) { + if(cartSetMenuMode(DEVICE_TYPE_AUTO)) + passmeloopEnter(); + } if (keysDown() & KEY_START) irc.Join(config["CHAN"]); if (keysDown() & KEY_B) memo->setTop(memo->getTop() + 1); if (keysDown() & KEY_X) memo->setTop(memo->getTop() - 1); Only in sylphirc-bbraun/arm9/source/screens: .ScrIRC.cpp.swp diff -udr sirc005-src/arm9/source/SylphActions.cpp sylphirc-bbraun/arm9/source/SylphActions.cpp --- sirc005-src/arm9/source/SylphActions.cpp 2006-05-01 20:21:12.000000000 -0700 +++ sylphirc-bbraun/arm9/source/SylphActions.cpp 2007-03-23 18:54:25.000000000 -0700 @@ -16,6 +16,7 @@ #include "SylphActions.h" #include +#include SylphFrameType SylphAction::DefaultType() { return sfDisplayConstant; diff -udr sirc005-src/arm9/source/SylphDataCF.cpp sylphirc-bbraun/arm9/source/SylphDataCF.cpp --- sirc005-src/arm9/source/SylphDataCF.cpp 2006-05-01 20:21:12.000000000 -0700 +++ sylphirc-bbraun/arm9/source/SylphDataCF.cpp 2007-03-24 07:31:18.000000000 -0700 @@ -15,16 +15,20 @@ */ #include "SylphDataCF.h" -#include "gba_nds_fat/gba_nds_fat.h" +#include +#include +#include int SylphCFDataPlugin::GetData(std::string filename, SylphFile** file) { if (!FActive) return 0; - std::string cfilename = "/" + filename; - FAT_FILE* ffile = FAT_fopen(cfilename.c_str(), "r"); - if (ffile == (FAT_FILE*)-1) return 0; + std::string cfilename = "fat:/" + filename; + struct stat sb; + FILE* ffile = fopen(cfilename.c_str(), "r"); + if (ffile == NULL) return 0; + stat(cfilename.c_str(), &sb); SylphCFFile* cff = new SylphCFFile; cff->FFile = ffile; - cff->FileSize = FAT_GetFileSize(); + cff->FileSize = sb.st_size; cff->Flags = ATTR_VALID; cff->Position = 0; *file = cff; @@ -36,11 +40,10 @@ } SylphCFDataPlugin::~SylphCFDataPlugin() { - FAT_FreeFiles(); } SylphCFDataPlugin::SylphCFDataPlugin() { - FActive = FAT_InitFiles(); + FActive = fatInit(8, 0); if (FActive) printf("SylphCF: Init data plugin\n"); } @@ -49,15 +52,15 @@ } int SylphCFFile::Read(void* buffer, int count) { - return FAT_fread(buffer, 1, count, FFile); + return fread(buffer, 1, count, FFile); } int SylphCFFile::Seek(int offset, SylphSeek Where) { int result = SylphFile::Seek(offset, Where); - FAT_fseek(FFile, result, 0); + fseek(FFile, result, 0); return result; } SylphCFFile::~SylphCFFile() { - FAT_fclose(FFile); + fclose(FFile); } diff -udr sirc005-src/arm9/source/SylphDataCF.h sylphirc-bbraun/arm9/source/SylphDataCF.h --- sirc005-src/arm9/source/SylphDataCF.h 2006-05-01 20:21:12.000000000 -0700 +++ sylphirc-bbraun/arm9/source/SylphDataCF.h 2007-03-24 07:29:21.000000000 -0700 @@ -2,9 +2,9 @@ #define __SYLPHDATACF_H #include +#include #include "SylphData.h" -#include "gba_nds_fat/gba_nds_fat.h" class SylphCFDataPlugin: public SylphDataPlugin { protected: @@ -20,7 +20,7 @@ class SylphCFFile: public SylphFile { protected: - FAT_FILE* FFile; + FILE* FFile; public: friend class SylphCFDataPlugin; ~SylphCFFile(); diff -udr sirc005-src/arm9/source/SylphDataRaw.cpp sylphirc-bbraun/arm9/source/SylphDataRaw.cpp --- sirc005-src/arm9/source/SylphDataRaw.cpp 2006-05-02 18:59:44.000000000 -0700 +++ sylphirc-bbraun/arm9/source/SylphDataRaw.cpp 2007-03-23 18:58:09.000000000 -0700 @@ -26,8 +26,8 @@ // #include "aerisb_pds_bin.h" #include "font_bin.h" #include "memo_sly.h" -#include "keybL_sly.h" -#include "keybH_sly.h" +#include "KeybL_sly.h" +#include "KeybH_sly.h" #include "sylphirc_cfg.h" #include "border1_stex.h" diff -udr sirc005-src/arm9/source/SylphUDP.h sylphirc-bbraun/arm9/source/SylphUDP.h --- sirc005-src/arm9/source/SylphUDP.h 2006-05-01 20:21:12.000000000 -0700 +++ sylphirc-bbraun/arm9/source/SylphUDP.h 2007-03-23 18:54:48.000000000 -0700 @@ -2,8 +2,8 @@ #define __SYLPH_UDP #include "dswifi9.h" -#include "sys\socket.h" -#include "netinet\in.h" +#include "sys/socket.h" +#include "netinet/in.h" #include