From 99bd8b49728a0a12d1fdf103f3b1322b5a1799b7 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Mon, 4 Jan 2021 20:58:29 +0100 Subject: [PATCH] get rid of USE_MODEM/ENABLE_MODEM --- CMakeLists.txt | 3 +-- core/core.mk | 14 +++++------- core/hw/holly/sb.cpp | 8 ++----- core/hw/holly/sb_mem.cpp | 22 ++++--------------- core/serialize.cpp | 21 ------------------ .../reicast/src/main/jni/Android.mk | 1 - .../reicast-osx.xcodeproj/project.pbxproj | 2 -- shell/linux/Makefile | 13 +---------- 8 files changed, 14 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f27200524..339082a76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,8 +81,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE $<$:_USE_MATH_DEFINES> $<$:NOMINMAX> $<$:TEST_AUTOMATION> - $<$:DEBUGFAST> - ENABLE_MODEM) + $<$:DEBUGFAST>) target_include_directories(${PROJECT_NAME} PRIVATE core core/deps core/deps/stb core/deps/xbyak core/khronos) diff --git a/core/core.mk b/core/core.mk index 4092c8b95..0dbc1e780 100755 --- a/core/core.mk +++ b/core/core.mk @@ -137,14 +137,12 @@ RZDCY_CFLAGS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/rend/gles -I$(RZDCY_SRC_DI -I$(RZDCY_SRC_DIR)/deps/vixl -I$(RZDCY_SRC_DIR)/khronos -I$(RZDCY_SRC_DIR)/deps/glslang \ -I$(RZDCY_SRC_DIR)/deps/glm -I$(RZDCY_SRC_DIR)/deps/xbyak -ifdef USE_MODEM - RZDCY_CFLAGS += -DENABLE_MODEM -I$(RZDCY_SRC_DIR)/deps/picotcp/include -I$(RZDCY_SRC_DIR)/deps/picotcp/modules - RZDCY_MODULES += hw/modem/ deps/picotcp/modules/ deps/picotcp/stack/ - ifndef FOR_WINDOWS - RZDCY_CFLAGS += -I/usr/include/miniupnpc - else - RZDCY_CFLAGS += -I$(RZDCY_SRC_DIR)/deps/miniupnpc - endif +RZDCY_CFLAGS += -I$(RZDCY_SRC_DIR)/deps/picotcp/include -I$(RZDCY_SRC_DIR)/deps/picotcp/modules +RZDCY_MODULES += hw/modem/ deps/picotcp/modules/ deps/picotcp/stack/ +ifndef FOR_WINDOWS + RZDCY_CFLAGS += -I/usr/include/miniupnpc +else + RZDCY_CFLAGS += -I$(RZDCY_SRC_DIR)/deps/miniupnpc endif ifdef NO_REC diff --git a/core/hw/holly/sb.cpp b/core/hw/holly/sb.cpp index d2aee4e91..6b0e6e4ff 100644 --- a/core/hw/holly/sb.cpp +++ b/core/hw/holly/sb.cpp @@ -581,12 +581,10 @@ void sb_Init() maple_Init(); aica_sb_Init(); -#ifdef ENABLE_MODEM if (settings.network.EmulateBBA) bba_Init(); else ModemInit(); -#endif } void sb_Reset(bool hard) @@ -599,12 +597,12 @@ void sb_Reset(bool hard) SB_ISTNRM = 0; SB_FFST_rc = 0; SB_FFST = 0; -#ifdef ENABLE_MODEM + if (settings.network.EmulateBBA) bba_Reset(hard); else ModemTerm(); -#endif + asic_reg_Reset(hard); if (settings.platform.system == DC_PLATFORM_DREAMCAST) gdrom_reg_Reset(hard); @@ -617,12 +615,10 @@ void sb_Reset(bool hard) void sb_Term() { -#ifdef ENABLE_MODEM if (settings.network.EmulateBBA) bba_Term(); else ModemTerm(); -#endif aica_sb_Term(); maple_Term(); pvr_sb_Term(); diff --git a/core/hw/holly/sb_mem.cpp b/core/hw/holly/sb_mem.cpp index f8642b9a8..11ee1c229 100644 --- a/core/hw/holly/sb_mem.cpp +++ b/core/hw/holly/sb_mem.cpp @@ -313,15 +313,10 @@ T DYNACALL ReadMem_area0(u32 addr) { if (settings.platform.system != DC_PLATFORM_DREAMCAST) return (T)libExtDevice_ReadMem_A0_006(addr, sz); + else if (!settings.network.EmulateBBA) + return (T)ModemReadMem_A0_006(addr, sz); else -#if defined(ENABLE_MODEM) - if (!settings.network.EmulateBBA) - return (T)ModemReadMem_A0_006(addr, sz); - else - return (T)0; -#else return (T)0; -#endif } //map 0x0060 to 0x006F else if ((base >=0x0060) && (base <=0x006F) && (addr>= 0x00600800) && (addr<= 0x006FFFFF)) // :G2 (Reserved) @@ -349,15 +344,10 @@ T DYNACALL ReadMem_area0(u32 addr) { if (settings.platform.system == DC_PLATFORM_NAOMI) return (T)libExtDevice_ReadMem_A0_010(addr, sz); + else if (settings.network.EmulateBBA) + return (T)bba_ReadMem(addr, sz); else -#if defined(ENABLE_MODEM) - if (settings.network.EmulateBBA) - return (T)bba_ReadMem(addr, sz); - else - return (T)0; -#else return (T)0; -#endif } INFO_LOG(MEMORY, "Read from area0<%d> not implemented [Unassigned], addr=%x", sz, addr); return 0; @@ -414,10 +404,8 @@ void DYNACALL WriteMem_area0(u32 addr,T data) { if (settings.platform.system != DC_PLATFORM_DREAMCAST) libExtDevice_WriteMem_A0_006(addr, data, sz); -#if defined(ENABLE_MODEM) else if (!settings.network.EmulateBBA) ModemWriteMem_A0_006(addr, data, sz); -#endif } //map 0x0060 to 0x006F else if ((base >=0x0060) && (base <=0x006F) && (addr>= 0x00600800) && (addr<= 0x006FFFFF)) // G2 (Reserved) @@ -444,10 +432,8 @@ void DYNACALL WriteMem_area0(u32 addr,T data) { if (settings.platform.system == DC_PLATFORM_NAOMI) libExtDevice_WriteMem_A0_010(addr, data, sz); -#if defined(ENABLE_MODEM) else if (settings.network.EmulateBBA) bba_WriteMem(addr, data, sz); -#endif } else INFO_LOG(COMMON, "Write to area0_32 not implemented [Unassigned], addr=%x,data=%x,size=%d", addr, data, sz); diff --git a/core/serialize.cpp b/core/serialize.cpp index b364de6a4..96ad7ed93 100644 --- a/core/serialize.cpp +++ b/core/serialize.cpp @@ -466,7 +466,6 @@ bool dc_serialize(void **data, unsigned int *total_size) REICAST_S(sch_list[vblank_schid].end) ; REICAST_S(settings.network.EmulateBBA); -#ifdef ENABLE_MODEM if (settings.network.EmulateBBA) { bba_Serialize(data, total_size); @@ -477,12 +476,6 @@ bool dc_serialize(void **data, unsigned int *total_size) REICAST_S(sch_list[modem_sched].start); REICAST_S(sch_list[modem_sched].end); } -#else - int modem_dummy = 0; - REICAST_S(modem_dummy); - REICAST_S(modem_dummy); - REICAST_S(modem_dummy); -#endif REICAST_S(SCIF_SCFSR2); REICAST_S(SCIF_SCSCR2); @@ -750,16 +743,9 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size) REICAST_US(sch_list[vblank_schid].start) ; REICAST_US(sch_list[vblank_schid].end) ; -#ifdef ENABLE_MODEM REICAST_US(sch_list[modem_sched].tag) ; REICAST_US(sch_list[modem_sched].start) ; REICAST_US(sch_list[modem_sched].end) ; -#else - int modem_dummy; - REICAST_US(modem_dummy); - REICAST_US(modem_dummy); - REICAST_US(modem_dummy); -#endif REICAST_US(SCIF_SCFSR2); REICAST_US(SCIF_SCSCR2); @@ -1114,7 +1100,6 @@ bool dc_unserialize(void **data, unsigned int *total_size) REICAST_S(settings.network.EmulateBBA); else settings.network.EmulateBBA = false; -#ifdef ENABLE_MODEM if (settings.network.EmulateBBA) { bba_Unserialize(data, total_size); @@ -1125,12 +1110,6 @@ bool dc_unserialize(void **data, unsigned int *total_size) REICAST_US(sch_list[modem_sched].start); REICAST_US(sch_list[modem_sched].end); } -#else - int modem_dummy; - REICAST_US(modem_dummy); - REICAST_US(modem_dummy); - REICAST_US(modem_dummy); -#endif REICAST_US(SCIF_SCFSR2); if (version < V8) diff --git a/shell/android-studio/reicast/src/main/jni/Android.mk b/shell/android-studio/reicast/src/main/jni/Android.mk index 94b92a4af..0ae69f83d 100644 --- a/shell/android-studio/reicast/src/main/jni/Android.mk +++ b/shell/android-studio/reicast/src/main/jni/Android.mk @@ -21,7 +21,6 @@ FOR_ANDROID := 1 USE_GLES := 1 CHD5_LZMA := 1 CHD5_FLAC := 1 -USE_MODEM := 1 USE_VULKAN = 1 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) diff --git a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj index 5199b048e..4bac01a68 100644 --- a/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj +++ b/shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj @@ -2797,7 +2797,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( TARGET_NO_COREIO_HTTP, TARGET_NO_OPENMP, - ENABLE_MODEM, CHD5_LZMA, _7ZIP_ST, CHD5_FLAC, @@ -2851,7 +2850,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( TARGET_NO_COREIO_HTTP, TARGET_NO_OPENMP, - ENABLE_MODEM, CHD5_LZMA, _7ZIP_ST, CHD5_FLAC, diff --git a/shell/linux/Makefile b/shell/linux/Makefile index 2199997c8..ca16f7353 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -12,7 +12,6 @@ ifndef USE_SDL USE_EVDEV := 1 USE_UDEV := 1 endif -USE_MODEM := 1 PLATFORM_EXT := elf CXX ?= ${CC_PREFIX}g++ @@ -309,17 +308,12 @@ INCS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos ifdef FOR_WINDOWS LIBS += -lm -static -lpthread else - LIBS += -lm -lpthread - ifdef USE_MODEM - LIBS += -lminiupnpc - endif + LIBS += -lminiupnpc -lm -lpthread endif ifdef FOR_LINUX LIBS += -lrt endif -ifdef USE_MODEM - $(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a: ifdef FOR_WINDOWS $(MAKE) -C $(RZDCY_SRC_DIR)/deps/miniupnpc -f Makefile.mingw CC=gcc libminiupnpc.a @@ -327,9 +321,6 @@ else $(MAKE) -C $(RZDCY_SRC_DIR)/deps/miniupnpc libminiupnpc.a endif -endif - - PREFIX ?= /usr/local MAN_DIR ?= ${PREFIX}/share/man/man1 MENUENTRY_DIR ?= ${PREFIX}/share/applications @@ -471,11 +462,9 @@ OBJECTS += $(BUILDDIR)/reicastres.build_obj $(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h $(WINDRES) $< $@ -ifdef USE_MODEM OBJECTS += $(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a CFLAGS += -DMINIUPNP_STATICLIB endif -endif DEPDIR := .dep-$(BUILDDIR) DEPFLAGS = -MT $@ -MD -MP -MF $(DEPDIR)/$*.Td