Skip to content

use kernel UART printf syscall instead of vsnprintf #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
israpps wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use kernel UART printf syscall instead of vsnprintf #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }--- #
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions include/debugprintf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
#ifdef EE_SIO_DEBUG
void sio_printf(const char *fmt, ...);
#include <SIOCookie.h>
#define DPRINTF_INIT() ee_sio_start(38400, 0, 0, 0, 0, 1);
#define DPRINTF(x...) sio_printf( x)
#include <kernel.h>
#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
Expand Down
3 changes: 2 additions & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -1143,3 +1143,4 @@ void runOSDNoUpdate(void)
#endif

PS2_DISABLE_AUTOSTART_PTHREAD();
DISABLE_EXTRA_TIMERS_FUNCTIONS(); // Disable the extra functionalities for timers