diff --git a/localTester/3dsIrForwarder/Makefile b/localTester/3dsIrForwarder/Makefile new file mode 100644 index 0000000..4f5cda2 --- /dev/null +++ b/localTester/3dsIrForwarder/Makefile @@ -0,0 +1,196 @@ +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- + +ifeq ($(strip $(DEVKITARM)),) +$(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") +endif + +TOPDIR ?= $(CURDIR) +include $(DEVKITARM)/3ds_rules + +#--------------------------------------------------------------------------------- +# TARGET is the name of the output +# BUILD is the directory where object files & intermediate files will be placed +# SOURCES is a list of directories containing source code +# DATA is a list of directories containing data files +# INCLUDES is a list of directories containing header files +# +# NO_SMDH: if set to anything, no SMDH file is generated. +# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional) +# APP_TITLE is the name of the app stored in the SMDH file (Optional) +# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional) +# APP_AUTHOR is the author of the app stored in the SMDH file (Optional) +# ICON is the filename of the icon (.png), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .png +# - icon.png +# - /default_icon.png +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source +DATA := data +INCLUDES := include +#ROMFS := romfs + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft + +CFLAGS := -g -Wall -O2 -mword-relocations \ + -fomit-frame-pointer -ffunction-sections \ + $(ARCH) + +CFLAGS += $(INCLUDE) -DARM11 -D_3DS + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) + +LIBS := -lctru -lm + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(CTRULIB) + + +#--------------------------------------------------------------------------------- +# no real need to edit anything past this point unless you need to add additional +# rules for different file extensions +#--------------------------------------------------------------------------------- +ifneq ($(BUILD),$(notdir $(CURDIR))) +#--------------------------------------------------------------------------------- + +export OUTPUT := $(CURDIR)/$(TARGET) +export TOPDIR := $(CURDIR) + +export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(DATA),$(CURDIR)/$(dir)) + +export DEPSDIR := $(CURDIR)/$(BUILD) + +CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) +CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) +SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +PICAFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica))) +SHLISTFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist))) +BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) + +#--------------------------------------------------------------------------------- +# use CXX for linking C++ projects, CC for standard C +#--------------------------------------------------------------------------------- +ifeq ($(strip $(CPPFILES)),) +#--------------------------------------------------------------------------------- + export LD := $(CC) +#--------------------------------------------------------------------------------- +else +#--------------------------------------------------------------------------------- + export LD := $(CXX) +#--------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------- + +export OFILES := $(addsuffix .o,$(BINFILES)) \ + $(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \ + $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) + +export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ + $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ + -I$(CURDIR)/$(BUILD) + +export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.png) + ifneq (,$(findstring $(TARGET).png,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).png + else + ifneq (,$(findstring icon.png,$(icons))) + export APP_ICON := $(TOPDIR)/icon.png + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +ifeq ($(strip $(NO_SMDH)),) + export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh +endif + +ifneq ($(ROMFS),) + export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS) +endif + +.PHONY: $(BUILD) clean all + +#--------------------------------------------------------------------------------- +all: $(BUILD) + +$(BUILD): + @[ -d $@ ] || mkdir -p $@ + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + +#--------------------------------------------------------------------------------- +clean: + @echo clean ... + @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +ifeq ($(strip $(NO_SMDH)),) +$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh +else +$(OUTPUT).3dsx : $(OUTPUT).elf +endif + +$(OUTPUT).elf : $(OFILES) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +#--------------------------------------------------------------------------------- +# rules for assembling GPU shaders +#--------------------------------------------------------------------------------- +define shader-as + $(eval CURBIN := $(patsubst %.shbin.o,%.shbin,$(notdir $@))) + picasso -o $(CURBIN) $1 + bin2s $(CURBIN) | $(AS) -o $@ + echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h + echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h + echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h +endef + +%.shbin.o : %.v.pica %.g.pica + @echo $(notdir $^) + @$(call shader-as,$^) + +%.shbin.o : %.v.pica + @echo $(notdir $<) + @$(call shader-as,$<) + +%.shbin.o : %.shlist + @echo $(notdir $<) + @$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)/$(file))) + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/localTester/3dsIrForwarder/README.md b/localTester/3dsIrForwarder/README.md new file mode 100644 index 0000000..a2147e7 --- /dev/null +++ b/localTester/3dsIrForwarder/README.md @@ -0,0 +1,3 @@ +# 3dsIrForwarder + +Sends raw data received over an encrypted WIFI connection over IR and sends the results back. diff --git a/localTester/3dsIrForwarder/icon.png b/localTester/3dsIrForwarder/icon.png new file mode 100644 index 0000000..8ebec57 Binary files /dev/null and b/localTester/3dsIrForwarder/icon.png differ diff --git a/localTester/3dsIrForwarder/source/main.c b/localTester/3dsIrForwarder/source/main.c new file mode 100644 index 0000000..569e464 --- /dev/null +++ b/localTester/3dsIrForwarder/source/main.c @@ -0,0 +1,36 @@ +#include +#include +#include <3ds.h> + + +int main(int argc, char* argv[]){ + gfxInitDefault(); + consoleInit(GFX_TOP, NULL); + + /* + printf("3dsIrForwarder Starting..."); + printf("Getting Encryption Certificates..."); + printf("Opening WIFI Connection..."); + printf("WIFI Connection Opened..."); + printf("Opening IR Connection..."); + printf("IR Connection Opened..."); + printf("Init Success!"); + */ + + //Loop as long as the status is not exit + while(aptMainLoop()){ + //Scan hid shared memory for input events + hidScanInput(); + + + + //Flush + swap framebuffers and wait for VBlank + gfxFlushBuffers(); + gfxSwapBuffers(); + gspWaitForVBlank(); + } + + + gfxExit(); + return 0; +} diff --git a/localTester/3dsIrForwarder/source/relay.c b/localTester/3dsIrForwarder/source/relay.c new file mode 100644 index 0000000..3a82442 --- /dev/null +++ b/localTester/3dsIrForwarder/source/relay.c @@ -0,0 +1,72 @@ +#include <3ds.h> +#include +#include +#include +#include +#include +#include + + +#define SOC_ALIGN 0x1000 +#define SOC_BUFFERSIZE 0x100000 + + +bool relayInited = false; +static u32* irBuffer = NULL; +static u32* socketBuffer = NULL; +static s32 sock = -1; +static struct sockaddr_in client; +static struct sockaddr_in server; + + +static void failCleanup(){ + if(irBuffer) + free(irBuffer); + if(socketBuffer) + free(socketBuffer); +} + +bool relayInit(){ + if(!relayInited){ + int ret; + + socketBuffer = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE); + irBuffer = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE); + if(!irBuffer || !socketBuffer){ + failCleanup(); + return false; + } + + ret = iruInit(irBuffer, SOC_BUFFERSIZE); + if(ret != RL_SUCCESS){ + failCleanup(); + return false; + } + + ret = socInit(socketBuffer, SOC_BUFFERSIZE) + if(ret != RL_SUCCESS){ + failCleanup(); + return false; + } + + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); + csock = accept(sock, (struct sockaddr *) &client, &clientlen); + + relayInited = true; + } + + return true;//already inited return success +} + +void relayExit(){ + if(relayInited){ + iruExit(); + socExit(); + free(irBuffer); + free(socketBuffer); + + relayInited = false; + } +} + +void relayRun diff --git a/localTester/LocalTester/LocalTester.pro.user b/localTester/LocalTester/LocalTester.pro.user index a31d757..876032b 100644 --- a/localTester/LocalTester/LocalTester.pro.user +++ b/localTester/LocalTester/LocalTester.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/qtBuildSystem/Mu/Mu.pro.user b/qtBuildSystem/Mu/Mu.pro.user index 89c5bb5..5feda09 100644 --- a/qtBuildSystem/Mu/Mu.pro.user +++ b/qtBuildSystem/Mu/Mu.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/readme.md b/readme.md index 7a29300..fd2f913 100644 --- a/readme.md +++ b/readme.md @@ -51,6 +51,7 @@ Musashi v3.4(last version that builds outside of mame) (68k core) http://www.iconarchive.com/show/clean-3d-icons-by-mysitemyway.html (Palm Action Buttons , clean3d-blue.zip) http://www.iconarchive.com/show/crystal-clear-icons-by-everaldo/App-palm-icon.html (Desktop Icon) http://tango.freedesktop.org/Tango_Icon_Library (All UI buttons) +https://www.iconexperience.com/v_collection/icons/?icon=led_red (3dsIrForwarder icon) Some main board photos by Reddit /u/KHRoN ## Building