Skip to content

Commit

Permalink
Update 3DS port
Browse files Browse the repository at this point in the history 
- Add left/right key modifiers to mapper
- Add mouse / joystick axis mapping
- Add reboot(cia only)/shutdown to settings
- Add video scale to screen settings
- Add ipx network support
- Add .conf selection menu
- Fix cia build
- Various fixes / cleanup
  • Loading branch information
@MrHuu
MrHuu committed May 10, 2023
1 parent bd4b30a commit 7fe71de
Show file tree
Hide file tree
Showing 36 changed files with 3,617 additions and 497 deletions.
152 changes: 72 additions & 80 deletions Makefile.ctr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,22 @@ include $(DEVKITARM)/3ds_rules
# If set to $(BUILD), it will statically link in the converted
# files as if they were data 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):
# - <Project name>.png
# - icon.png
# - <libctru folder>/default_icon.png
#---------------------------------------------------------------------------------

TARGET := dosbox-3ds
BUILD := build
SOURCES := src src/cpu src/dos src/fpu src/hardware src/hardware/mame src/hardware/serialport src/ints src/libs src/misc src/gui src/shell src/platform/ctr
SOURCES := src src/cpu src/dos src/fpu src/hardware src/hardware/mame \
src/hardware/serialport src/ints src/libs src/misc src/gui \
src/shell src/platform/ctr src/libs/sdl_net
DATA := data
INCLUDES := include src/platform/ctr
INCLUDES := include src/platform/ctr src/libs/sdl_net
GRAPHICS := gfx
GFXBUILD := $(BUILD)
#ROMFS := res/ctr/romfs
#ROMFS := ctr/romfs
#GFXBUILD := $(ROMFS)/gfx

APP_TITLE := DOSBox
Expand All @@ -57,57 +53,66 @@ APP_VERSION_MINOR := 0
APP_VERSION_MICRO := 2

APP_RSF := $(TOPDIR)/ctr/template.rsf
APP_LOGO := $(TOPDIR)/ctr/hb_logo.bin
APP_ICON := $(TOPDIR)/ctr/icon.png

APP_BANNER_IMAGE := $(TOPDIR)/ctr/banner.png
APP_BANNER_AUDIO := $(TOPDIR)/ctr/audio_silent.wav

GFX_PNG := $(TOPDIR)/src/platform/ctr/include/font.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_low.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_up.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_sym.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_sym_alt.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_num.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_mouse.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_mapper.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_setting.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_idle.png \
$(TOPDIR)/ctr/gfx/btn_save.png \
$(TOPDIR)/ctr/gfx/btn_mapper.png \
$(TOPDIR)/ctr/gfx/kbd/key_key.png \
$(TOPDIR)/ctr/gfx/kbd/key_fkey.png \
$(TOPDIR)/ctr/gfx/kbd/key_alt.png \
$(TOPDIR)/ctr/gfx/kbd/key_ctrl.png \
$(TOPDIR)/ctr/gfx/kbd/key_enter_top.png \
$(TOPDIR)/ctr/gfx/kbd/key_enter_bot.png \
$(TOPDIR)/ctr/gfx/kbd/key_shift.png \
$(TOPDIR)/ctr/gfx/kbd/key_caps.png \
$(TOPDIR)/ctr/gfx/kbd/key_space.png \
GFX_PNG := $(TOPDIR)/src/platform/ctr/include/font.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_low.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_up.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_sym.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_sym_alt.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_kbd_num.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_mouse.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_mapper.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_mapper_joy.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_system.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_idle.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_disable.png \
$(TOPDIR)/ctr/gfx/ctr_bottom_load.png \
$(TOPDIR)/ctr/gfx/btn_save.png \
$(TOPDIR)/ctr/gfx/btn_mapper.png \
$(TOPDIR)/ctr/gfx/kbd/key_key.png \
$(TOPDIR)/ctr/gfx/kbd/key_fkey.png \
$(TOPDIR)/ctr/gfx/kbd/key_alt.png \
$(TOPDIR)/ctr/gfx/kbd/key_lalt.png \
$(TOPDIR)/ctr/gfx/kbd/key_ralt.png \
$(TOPDIR)/ctr/gfx/kbd/key_ctrl.png \
$(TOPDIR)/ctr/gfx/kbd/key_lctrl.png \
$(TOPDIR)/ctr/gfx/kbd/key_rctrl.png \
$(TOPDIR)/ctr/gfx/kbd/key_enter_top.png \
$(TOPDIR)/ctr/gfx/kbd/key_enter_bot.png \
$(TOPDIR)/ctr/gfx/kbd/key_shift.png \
$(TOPDIR)/ctr/gfx/kbd/key_lshift.png \
$(TOPDIR)/ctr/gfx/kbd/key_rshift.png \
$(TOPDIR)/ctr/gfx/kbd/key_caps.png \
$(TOPDIR)/ctr/gfx/kbd/key_space.png \
$(TOPDIR)/ctr/gfx/kbd/key_tab.png

GFX_HDR := $(GFX_PNG:.png=_bgr.h)
GFX_BIN := $(GFX_PNG:.png=.bgr.o)

FILTERLIST := sdlmain.cpp

#---------------------------------------------------------------------------------
# options for code generation
#---------------------------------------------------------------------------------
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft

CFLAGS := -g -Wall -O3 -mword-relocations \
-fomit-frame-pointer -ffunction-sections \
$(ARCH)
CFLAGS := -g -Wall -O3 -mword-relocations \
-fomit-frame-pointer -ffunction-sections \
$(ARCH)

CFLAGS += $(INCLUDE) -D__3DS__
CFLAGS += $(INCLUDE) -D__3DS__

CXXFLAGS := $(CFLAGS) -std=gnu++11 -fpermissive -fomit-frame-pointer \
-Wno-unused-parameter -Wno-strict-aliasing
#-fno-rtti -fno-exceptions
CXXFLAGS := $(CFLAGS) -std=gnu++11 -fpermissive \
-Wno-unused-parameter -Wno-strict-aliasing

ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

LIBS := -lSDL_mixer -lSDL_gfx -lSDL_image -lSDL -lpng -ljpeg -lz -lcitro3d -lctru -lm -lmikmod
LIBS := -lSDL -lcitro3d -lctru -lm

#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing
Expand All @@ -122,21 +127,22 @@ LIBDIRS := $(CTRULIB) $(PORTLIBS)
ifneq ($(BUILD),$(notdir $(CURDIR)))
#---------------------------------------------------------------------------------

export OUTPUT := $(CURDIR)/$(TARGET)
export TOPDIR := $(CURDIR)
export OUTPUT := $(CURDIR)/$(TARGET)
export TOPDIR := $(CURDIR)

export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \
$(foreach dir,$(DATA),$(CURDIR)/$(dir))
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \
$(foreach dir,$(DATA),$(CURDIR)/$(dir))

export DEPSDIR := $(CURDIR)/$(BUILD)
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)))
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)))

CPPFILES := $(filter-out $(FILTERLIST), $(CPPFILES))
#---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C
#---------------------------------------------------------------------------------
Expand Down Expand Up @@ -182,24 +188,7 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \

export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(DEVKITPRO)/libctru/include -L$(PORTLIBS)/lib

#export _3DSXDEPS := $(if $(NO_SMDH),,$(OUTPUT).smdh)

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=$(TARGET).smdh
endif
export _3DSXFLAGS += --smdh=$(TARGET).smdh

ifneq ($(ROMFS),)
export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
Expand Down Expand Up @@ -228,6 +217,9 @@ clean:
@echo clean ...
@rm -fr $(BUILD) $(TARGET).3dsx $(TARGET).cia $(TARGET).elf $(GFXBUILD) $(GFX_BIN) $(GFX_HDR)

3dslink: all
@3dslink -r 10 -a 192.168.1.96 $(OUTPUT).3dsx

#---------------------------------------------------------------------------------
$(GFXBUILD)/%.t3x $(BUILD)/%.h : %.t3s
#---------------------------------------------------------------------------------
Expand All @@ -236,10 +228,10 @@ $(GFXBUILD)/%.t3x $(BUILD)/%.h : %.t3s
#---------------------------------------------------------------------------------
else

COMMON_MAKEROM_PARAMS := -rsf $(APP_RSF) -target t -exefslogo -elf $(OUTPUT).elf -icon $(TARGET).smdh \
-banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" \
-DAPP_UNIQUE_ID="$(APP_UNIQUE_ID)" -DAPP_SYSTEM_MODE="64MB" -DAPP_SYSTEM_MODE_EXT="Legacy" \
-major "$(APP_VERSION_MAJOR)" -minor "$(APP_VERSION_MINOR)" -micro "$(APP_VERSION_MICRO)"
COMMON_MAKEROM_PARAMS := -rsf $(APP_RSF) -target t -exefslogo -elf $(OUTPUT).elf -icon $(TARGET).smdh \
-banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" \
-DAPP_UNIQUE_ID="$(APP_UNIQUE_ID)" -DAPP_SYSTEM_MODE="80MB" -DAPP_SYSTEM_MODE_EXT="124MB" \
-major "$(APP_VERSION_MAJOR)" -minor "$(APP_VERSION_MINOR)" -micro "$(APP_VERSION_MICRO)"

ifneq ($(APP_LOGO),)
APP_LOGO_ID := Homebrew
Expand All @@ -256,19 +248,19 @@ ifneq ($(ROMFS),)
endif

ifeq ($(OS),Windows_NT)
MAKEROM = makerom.exe
BANNERTOOL = bannertool.exe
MAKEROM = makerom.exe
BANNERTOOL = bannertool.exe
else
MAKEROM = $(TOOLDIR)/makerom
BANNERTOOL = $(TOOLDIR)/bannertool
MAKEROM = $(TOOLDIR)/makerom
BANNERTOOL = $(TOOLDIR)/bannertool
endif

#---------------------------------------------------------------------------------
# main targets
#---------------------------------------------------------------------------------
.PHONY : all

all : $(OUTPUT).3dsx
all : $(OUTPUT).3dsx $(OUTPUT).cia

$(OUTPUT).3dsx : $(OUTPUT).elf $(TARGET).smdh

Expand Down
Binary file modified ctr/gfx/btn_mapper.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/ctr_bottom_disable.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ctr/gfx/ctr_bottom_idle.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/ctr_bottom_load.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ctr/gfx/ctr_bottom_mapper.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/ctr_bottom_mapper_joy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ctr/gfx/ctr_bottom_setting.png
View file
Binary file not shown.
Binary file added ctr/gfx/ctr_bottom_system.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_lalt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_lctrl.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_lshift.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_ralt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_rctrl.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ctr/gfx/kbd/key_rshift.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ctr/hb_logo.bin
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ctr/template.rsf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Option:
UseOnSD : true # true if App is to be installed to SD
FreeProductCode : true # Removes limitations on ProductCode
MediaFootPadding : false # If true CCI files are created with padding
EnableCrypt : $(APP_ENCRYPTED) # Enables encryption for NCCH and CIA
EnableCrypt : false # Enables encryption for NCCH and CIA
EnableCompress : false # Compresses where applicable (currently only exefs:/.code)

AccessControlInfo:
Expand Down Expand Up @@ -79,7 +79,7 @@ AccessControlInfo:
SystemModeExt : $(APP_SYSTEM_MODE_EXT) # Legacy(Default)/124MB/178MB Legacy:Use Old3DS SystemMode
CpuSpeed : 804MHz # 256MHz(Default)/804MHz
EnableL2Cache : true # false(default)/true
CanAccessCore2 : true
CanAccessCore2 : true

# Virtual Address Mappings
IORegisterMapping:
Expand Down
4 changes: 4 additions & 0 deletions include/render.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
// 1: complex scalers off, scaler cache off, all simple scalers on
// 2: complex scalers off, scaler cache on
// 3: complex scalers on
#if defined(__3DS__)
#define RENDER_USE_ADVANCED_SCALERS 2
#else
#define RENDER_USE_ADVANCED_SCALERS 3
#endif

#include "../src/gui/render_scalers.h"

Expand Down
1 change: 0 additions & 1 deletion src/cpu/dyn_cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ static void cache_init(bool enable) {
#elif defined(__3DS__)
cache_code_start_ptr = (Bit8u*)memalign(4096, CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP-1+PAGESIZE_TEMP);
_SetMemoryPermission(cache_code_start_ptr, CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP-1+PAGESIZE_TEMP / 4096, 7);
// svcSleepThread(1000000000);
#else
cache_code_start_ptr=(Bit8u*)malloc(CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP-1+PAGESIZE_TEMP);
#endif
Expand Down
Loading

0 comments on commit 7fe71de

Please sign in to comment.