diff --git a/Makefile b/Makefile index 1c68bed..9a03766 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ export HEADER # ---{BUILD CFG}--- # -HAS_EMBED_IRX = 1 # whether to embed or not non vital IRX (wich will be loaded from memcard files) DEBUG ?= 0 PSX ?= 0 # PSX DESR support HDD ?= 0 #wether to add internal HDD support @@ -23,11 +22,12 @@ PRINTF ?= NONE HOMEBREW_IRX ?= 0 FILEXIO_NEED ?= 0 #if we need filexio and imanx loaded for other features (HDD, mx4sio, etc) +HAS_LOCAL_IRX ?= 0 # whether to embed or not non vital IRX (wich will be loaded from memcard files) # Related to binary size reduction KERNEL_NOPATCH = 1 NEWLIB_NANO = 1 -DUMMY_TIMEZONE = 0 +DUMMY_TIMEZONE = 1 DUMMY_LIBC_INIT = 1 # ---{ VERSIONING }--- # @@ -135,10 +135,12 @@ else EE_OBJS += sio2man_irx.o endif -ifneq ($(HAS_EMBED_IRX), 1) +ifneq ($(HAS_LOCAL_IRX), 1) $(info --- USB drivers will be embedded) EE_OBJS += usbd_irx.o bdm_irx.o bdmfs_fatfs_irx.o usbmass_bd_irx.o EE_CFLAGS += -DHAS_EMBEDDED_IRX +else + $(info --- USB drivers will be loaded of memory card) endif ifeq ($(HDD), 1) diff --git a/include/debugprintf.h b/include/debugprintf.h index 10b5abe..465818f 100644 --- a/include/debugprintf.h +++ b/include/debugprintf.h @@ -4,8 +4,9 @@ #ifdef EE_SIO_DEBUG void sio_printf(const char *fmt, ...); #include - #define DPRINTF_INIT() ee_sio_start(38400, 0, 0, 0, 0, 1); - #define DPRINTF(x...) sio_printf( x) + #include + #define DPRINTF_INIT() ee_sio_start(38400, 0, 0, 0, 0, 1), InitDebug() + #define DPRINTF(x...) _print(x) #elif COMMON_PRINTF #define DPRINTF(x...) printf(x) #elif SCR_PRINT diff --git a/src/main.c b/src/main.c index 97a2576..85b4441 100644 --- a/src/main.c +++ b/src/main.c @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) fioInit(); // NO scr_printf BEFORE here init_scr(); scr_setCursor(0); // get rid of annoying that cursor. - DPRINTF_INIT() + DPRINTF_INIT(); #ifndef NO_DPRINTF DPRINTF("PS2BBL: starting with %d argumments:\n", argc); for (x = 0; x < argc; x++) @@ -1143,3 +1143,4 @@ void runOSDNoUpdate(void) #endif PS2_DISABLE_AUTOSTART_PTHREAD(); +DISABLE_EXTRA_TIMERS_FUNCTIONS(); // Disable the extra functionalities for timers