From: kosmirror <kos...@us...> - 2025-05-20 19:17:39
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A pseudo Operating System for the Dreamcast.". The branch, master has been updated via 7cd49f8777ae38a8dc533f751c0fa3b51f7c1c47 (commit) via d1db6cdd7e6abcf86bb0442ee0bc846ca4f906e8 (commit) from 738e494979dc3fff0d7f8e406f5b6a34712038b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7cd49f8777ae38a8dc533f751c0fa3b51f7c1c47 Author: QuzarDC <qu...@co...> Date: Mon May 12 03:17:22 2025 -0400 Remove kos/dbglog.h from sys/stdio.h This was exposing a lot of stuff for no reason. Helps towards #840 to avoid having internal types spill out. Have replaced the inclusion with the two includes dbglog was exposing prior to #995, which should also help with reducing the impact to kos-ports. commit d1db6cdd7e6abcf86bb0442ee0bc846ca4f906e8 Author: QuzarDC <qu...@co...> Date: Mon May 12 02:05:47 2025 -0400 Add explicit includes of <kos/dbglog.h> All of these were adding it implicitly via stdio.h. ----------------------------------------------------------------------- Summary of changes: addons/libkosext2fs/ext2internal.h | 14 ++++++++------ addons/libkosfat/fatinternal.h | 16 +++++++++------- addons/libnavi/navi_flash.c | 1 + addons/libnavi/navi_ide.c | 1 + include/sys/stdio.h | 6 ++++-- kernel/arch/dreamcast/fs/fs_dcload.c | 1 + kernel/arch/dreamcast/fs/fs_iso9660.c | 1 + kernel/arch/dreamcast/fs/fs_vmu.c | 1 + kernel/arch/dreamcast/fs/vmufs.c | 1 + kernel/arch/dreamcast/hardware/flashrom.c | 1 + kernel/arch/dreamcast/hardware/g2dma.c | 1 + .../arch/dreamcast/hardware/maple/maple_init_shutdown.c | 1 + kernel/arch/dreamcast/hardware/maple/maple_utils.c | 1 + kernel/arch/dreamcast/hardware/maple/sip.c | 1 + kernel/arch/dreamcast/hardware/maple/vmu.c | 1 + .../arch/dreamcast/hardware/network/broadband_adapter.c | 1 + kernel/arch/dreamcast/hardware/network/lan_adapter.c | 1 + kernel/arch/dreamcast/hardware/pvr/pvr_dma.c | 1 + kernel/arch/dreamcast/hardware/pvr/pvr_fog.c | 2 ++ kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c | 1 + kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c | 1 + kernel/arch/dreamcast/hardware/pvr/pvr_scene.c | 1 + kernel/arch/dreamcast/hardware/video.c | 1 + kernel/arch/dreamcast/kernel/init.c | 1 + kernel/arch/dreamcast/kernel/irq.c | 1 + kernel/arch/dreamcast/kernel/mm.c | 1 + kernel/arch/dreamcast/sound/snd_iface.c | 1 + kernel/arch/dreamcast/sound/snd_mem.c | 1 + kernel/arch/dreamcast/sound/snd_sfxmgr.c | 1 + kernel/arch/dreamcast/sound/snd_stream.c | 1 + kernel/arch/dreamcast/util/screenshot.c | 1 + kernel/arch/dreamcast/util/vmu_pkg.c | 1 + kernel/fs/elf.c | 1 + kernel/fs/fs.c | 1 + kernel/fs/fs_dev.c | 1 + kernel/fs/fs_random.c | 1 + kernel/fs/fs_romdisk.c | 1 + kernel/libc/koslib/assert.c | 2 ++ kernel/libc/koslib/malloc.c | 1 + kernel/net/net_arp.c | 1 + kernel/net/net_core.c | 1 + kernel/net/net_icmp.c | 1 + kernel/net/net_icmp6.c | 1 + kernel/thread/genwait.c | 1 + kernel/thread/rwsem.c | 1 + kernel/thread/sem.c | 1 + kernel/thread/thread.c | 1 + 47 files changed, 67 insertions(+), 15 deletions(-) diff --git a/addons/libkosext2fs/ext2internal.h b/addons/libkosext2fs/ext2internal.h index 20808cdb..55ffd87f 100644 --- a/addons/libkosext2fs/ext2internal.h +++ b/addons/libkosext2fs/ext2internal.h @@ -45,13 +45,15 @@ struct ext2fs_struct { #define EXT2_FS_FLAG_SB_DIRTY 1 #ifdef EXT2_NOT_IN_KOS -#include <stdio.h> -#define DBG_DEBUG 0 -#define DBG_KDEBUG 0 -#define DBG_WARNING 0 -#define DBG_ERROR 0 + #include <stdio.h> + #define DBG_DEBUG 0 + #define DBG_KDEBUG 0 + #define DBG_WARNING 0 + #define DBG_ERROR 0 -#define dbglog(lvl, ...) printf(__VA_ARGS__) + #define dbglog(lvl, ...) printf(__VA_ARGS__) +#else + #include <kos/dbglog.h> #endif #endif /* !__EXT2_EXT2INTERNAL_H */ diff --git a/addons/libkosfat/fatinternal.h b/addons/libkosfat/fatinternal.h index 9ff7abcf..b35b0c7b 100644 --- a/addons/libkosfat/fatinternal.h +++ b/addons/libkosfat/fatinternal.h @@ -39,13 +39,15 @@ struct fatfs_struct { #define FAT_FS_FLAG_SB_DIRTY 1 #ifdef FAT_NOT_IN_KOS -#include <stdio.h> -#define DBG_DEBUG 0 -#define DBG_KDEBUG 0 -#define DBG_WARNING 0 -#define DBG_ERROR 0 - -#define dbglog(lvl, ...) printf(__VA_ARGS__) + #include <stdio.h> + #define DBG_DEBUG 0 + #define DBG_KDEBUG 0 + #define DBG_WARNING 0 + #define DBG_ERROR 0 + + #define dbglog(lvl, ...) printf(__VA_ARGS__) +#else + #include <kos/dbglog.h> #endif #endif /* !__FAT_FATINTERNAL_H */ diff --git a/addons/libnavi/navi_flash.c b/addons/libnavi/navi_flash.c index dd00a72c..69934137 100644 --- a/addons/libnavi/navi_flash.c +++ b/addons/libnavi/navi_flash.c @@ -9,6 +9,7 @@ #include <assert.h> #include <stdio.h> #include <navi/flash.h> +#include <kos/dbglog.h> #include <kos/thread.h> /* diff --git a/addons/libnavi/navi_ide.c b/addons/libnavi/navi_ide.c index fff802e9..4e1185ca 100644 --- a/addons/libnavi/navi_ide.c +++ b/addons/libnavi/navi_ide.c @@ -10,6 +10,7 @@ #include <stdio.h> #include <navi/ide.h> #include <dc/g2bus.h> +#include <kos/dbglog.h> #include <kos/thread.h> /* diff --git a/include/sys/stdio.h b/include/sys/stdio.h index effd05b8..c186d86c 100644 --- a/include/sys/stdio.h +++ b/include/sys/stdio.h @@ -26,7 +26,9 @@ # define _funlockfile(fp) #endif -// Added for old KOS source compatibility -#include <kos/dbglog.h> +/* Keep compat with old dbglog.h inclusion */ +#include <unistd.h> +#include <stdarg.h> +#include <kos/fs.h> #endif /* _NEWLIB_STDIO_H */ diff --git a/kernel/arch/dreamcast/fs/fs_dcload.c b/kernel/arch/dreamcast/fs/fs_dcload.c index 81a00ac0..93e7ca5e 100644 --- a/kernel/arch/dreamcast/fs/fs_dcload.c +++ b/kernel/arch/dreamcast/fs/fs_dcload.c @@ -22,6 +22,7 @@ printf goes to the dc-tool console #include <dc/fs_dcload.h> #include <arch/spinlock.h> #include <kos/dbgio.h> +#include <kos/dbglog.h> #include <kos/fs.h> #include <kos/init.h> diff --git a/kernel/arch/dreamcast/fs/fs_iso9660.c b/kernel/arch/dreamcast/fs/fs_iso9660.c index 0246c77f..e0f8b435 100644 --- a/kernel/arch/dreamcast/fs/fs_iso9660.c +++ b/kernel/arch/dreamcast/fs/fs_iso9660.c @@ -36,6 +36,7 @@ ISO9660 systems, as these were used as references as well. #include <kos/mutex.h> #include <kos/fs.h> #include <kos/opts.h> +#include <kos/dbglog.h> #include <stdlib.h> #include <stdio.h> diff --git a/kernel/arch/dreamcast/fs/fs_vmu.c b/kernel/arch/dreamcast/fs/fs_vmu.c index 060df026..f79cd7b8 100644 --- a/kernel/arch/dreamcast/fs/fs_vmu.c +++ b/kernel/arch/dreamcast/fs/fs_vmu.c @@ -15,6 +15,7 @@ #include <arch/types.h> #include <kos/mutex.h> +#include <kos/dbglog.h> #include <dc/fs_vmu.h> #include <dc/vmufs.h> #include <dc/maple.h> diff --git a/kernel/arch/dreamcast/fs/vmufs.c b/kernel/arch/dreamcast/fs/vmufs.c index 67e8a27c..726c223f 100644 --- a/kernel/arch/dreamcast/fs/vmufs.c +++ b/kernel/arch/dreamcast/fs/vmufs.c @@ -10,6 +10,7 @@ #include <string.h> #include <time.h> +#include <kos/dbglog.h> #include <kos/mutex.h> #include <dc/vmufs.h> #include <dc/maple.h> diff --git a/kernel/arch/dreamcast/hardware/flashrom.c b/kernel/arch/dreamcast/hardware/flashrom.c index d2c3b9b5..764e4327 100644 --- a/kernel/arch/dreamcast/hardware/flashrom.c +++ b/kernel/arch/dreamcast/hardware/flashrom.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include <dc/flashrom.h> #include <dc/syscalls.h> +#include <kos/dbglog.h> #include <arch/irq.h> static void strcpy_no_term(char *dest, const char *src, size_t destsize) { diff --git a/kernel/arch/dreamcast/hardware/g2dma.c b/kernel/arch/dreamcast/hardware/g2dma.c index d618a4b4..ed37533d 100644 --- a/kernel/arch/dreamcast/hardware/g2dma.c +++ b/kernel/arch/dreamcast/hardware/g2dma.c @@ -11,6 +11,7 @@ #include <errno.h> #include <dc/asic.h> #include <dc/g2bus.h> +#include <kos/dbglog.h> #include <kos/sem.h> #include <kos/thread.h> diff --git a/kernel/arch/dreamcast/hardware/maple/maple_init_shutdown.c b/kernel/arch/dreamcast/hardware/maple/maple_init_shutdown.c index dd1e9e8c..524aca63 100644 --- a/kernel/arch/dreamcast/hardware/maple/maple_init_shutdown.c +++ b/kernel/arch/dreamcast/hardware/maple/maple_init_shutdown.c @@ -14,6 +14,7 @@ #include <dc/vblank.h> #include <kos/thread.h> #include <kos/init.h> +#include <kos/dbglog.h> #include <dc/maple/controller.h> #include <dc/maple/keyboard.h> diff --git a/kernel/arch/dreamcast/hardware/maple/maple_utils.c b/kernel/arch/dreamcast/hardware/maple/maple_utils.c index c12db5c6..b1a58570 100644 --- a/kernel/arch/dreamcast/hardware/maple/maple_utils.c +++ b/kernel/arch/dreamcast/hardware/maple/maple_utils.c @@ -10,6 +10,7 @@ #include <string.h> #include <arch/memory.h> #include <dc/maple.h> +#include <kos/dbglog.h> /* Enable / Disable the bus */ void maple_bus_enable(void) { diff --git a/kernel/arch/dreamcast/hardware/maple/sip.c b/kernel/arch/dreamcast/hardware/maple/sip.c index f51cc9ee..7dfb2189 100644 --- a/kernel/arch/dreamcast/hardware/maple/sip.c +++ b/kernel/arch/dreamcast/hardware/maple/sip.c @@ -9,6 +9,7 @@ #include <string.h> #include <stdlib.h> #include <arch/irq.h> +#include <kos/dbglog.h> #include <kos/genwait.h> #include <dc/maple.h> #include <dc/maple/sip.h> diff --git a/kernel/arch/dreamcast/hardware/maple/vmu.c b/kernel/arch/dreamcast/hardware/maple/vmu.c index 2a4fc304..f41a862d 100644 --- a/kernel/arch/dreamcast/hardware/maple/vmu.c +++ b/kernel/arch/dreamcast/hardware/maple/vmu.c @@ -19,6 +19,7 @@ #include <kos/thread.h> #include <kos/genwait.h> #include <kos/platform.h> +#include <kos/dbglog.h> #include <dc/maple.h> #include <dc/maple/vmu.h> #include <dc/math.h> diff --git a/kernel/arch/dreamcast/hardware/network/broadband_adapter.c b/kernel/arch/dreamcast/hardware/network/broadband_adapter.c index 36df6dad..9201a9d8 100644 --- a/kernel/arch/dreamcast/hardware/network/broadband_adapter.c +++ b/kernel/arch/dreamcast/hardware/network/broadband_adapter.c @@ -19,6 +19,7 @@ #include <arch/irq.h> #include <arch/cache.h> #include <arch/memory.h> +#include <kos/dbglog.h> #include <kos/net.h> #include <kos/thread.h> #include <kos/sem.h> diff --git a/kernel/arch/dreamcast/hardware/network/lan_adapter.c b/kernel/arch/dreamcast/hardware/network/lan_adapter.c index 37243343..1507179e 100644 --- a/kernel/arch/dreamcast/hardware/network/lan_adapter.c +++ b/kernel/arch/dreamcast/hardware/network/lan_adapter.c @@ -15,6 +15,7 @@ #include <dc/flashrom.h> #include <dc/net/lan_adapter.h> #include <arch/irq.h> +#include <kos/dbglog.h> #include <kos/net.h> #include <kos/thread.h> diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_dma.c b/kernel/arch/dreamcast/hardware/pvr/pvr_dma.c index 6f40f895..aeb28b39 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_dma.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_dma.c @@ -17,6 +17,7 @@ #include <dc/sq.h> #include <kos/thread.h> #include <kos/sem.h> +#include <kos/dbglog.h> #include "pvr_internal.h" diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_fog.c b/kernel/arch/dreamcast/hardware/pvr/pvr_fog.c index b7da92d3..a582da49 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_fog.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_fog.c @@ -8,6 +8,8 @@ #include <assert.h> #include <stdio.h> #include <dc/pvr.h> +#include <kos/dbglog.h> + #include "pvr_internal.h" #include "pvr_fog_tables.h" diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c b/kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c index c70758cf..41036b4a 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_init_shutdown.c @@ -12,6 +12,7 @@ #include <dc/video.h> #include <dc/asic.h> #include <dc/vblank.h> +#include <kos/dbglog.h> #include "pvr_internal.h" /* diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c b/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c index 65b573e1..dbed3407 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_mem_core.c @@ -33,6 +33,7 @@ #include "pvr_mem_core.h" +#include <kos/dbglog.h> #include <kos/opts.h> #undef DEBUG diff --git a/kernel/arch/dreamcast/hardware/pvr/pvr_scene.c b/kernel/arch/dreamcast/hardware/pvr/pvr_scene.c index 74d8a3d1..eee57285 100644 --- a/kernel/arch/dreamcast/hardware/pvr/pvr_scene.c +++ b/kernel/arch/dreamcast/hardware/pvr/pvr_scene.c @@ -10,6 +10,7 @@ #include <stdint.h> #include <stdio.h> #include <string.h> +#include <kos/dbglog.h> #include <kos/genwait.h> #include <kos/regfield.h> #include <kos/thread.h> diff --git a/kernel/arch/dreamcast/hardware/video.c b/kernel/arch/dreamcast/hardware/video.c index 62a2fe28..d54e2788 100644 --- a/kernel/arch/dreamcast/hardware/video.c +++ b/kernel/arch/dreamcast/hardware/video.c @@ -10,6 +10,7 @@ #include <dc/video.h> #include <dc/pvr.h> #include <dc/sq.h> +#include <kos/dbglog.h> #include <kos/platform.h> #include <string.h> #include <stdio.h> diff --git a/kernel/arch/dreamcast/kernel/init.c b/kernel/arch/dreamcast/kernel/init.c index c9f6ccfc..765f8850 100644 --- a/kernel/arch/dreamcast/kernel/init.c +++ b/kernel/arch/dreamcast/kernel/init.c @@ -11,6 +11,7 @@ #include <stdbool.h> #include <stdlib.h> #include <kos/dbgio.h> +#include <kos/dbglog.h> #include <kos/init.h> #include <kos/platform.h> #include <arch/arch.h> diff --git a/kernel/arch/dreamcast/kernel/irq.c b/kernel/arch/dreamcast/kernel/irq.c index f9b8a2a1..f74e984a 100644 --- a/kernel/arch/dreamcast/kernel/irq.c +++ b/kernel/arch/dreamcast/kernel/irq.c @@ -18,6 +18,7 @@ #include <arch/timer.h> #include <arch/stack.h> #include <kos/dbgio.h> +#include <kos/dbglog.h> #include <kos/thread.h> #include <kos/library.h> #include <kos/regfield.h> diff --git a/kernel/arch/dreamcast/kernel/mm.c b/kernel/arch/dreamcast/kernel/mm.c index cce8885b..37641fe0 100644 --- a/kernel/arch/dreamcast/kernel/mm.c +++ b/kernel/arch/dreamcast/kernel/mm.c @@ -17,6 +17,7 @@ #include <arch/types.h> #include <arch/arch.h> #include <arch/irq.h> +#include <kos/dbglog.h> #include <errno.h> #include <stdio.h> diff --git a/kernel/arch/dreamcast/sound/snd_iface.c b/kernel/arch/dreamcast/sound/snd_iface.c index ba57e0f8..c32787e6 100644 --- a/kernel/arch/dreamcast/sound/snd_iface.c +++ b/kernel/arch/dreamcast/sound/snd_iface.c @@ -12,6 +12,7 @@ #include <assert.h> #include <stdio.h> +#include <kos/dbglog.h> #include <kos/mutex.h> #include <arch/timer.h> #include <dc/g2bus.h> diff --git a/kernel/arch/dreamcast/sound/snd_mem.c b/kernel/arch/dreamcast/sound/snd_mem.c index a458817a..b477370c 100644 --- a/kernel/arch/dreamcast/sound/snd_mem.c +++ b/kernel/arch/dreamcast/sound/snd_mem.c @@ -14,6 +14,7 @@ #include <sys/queue.h> #include <dc/sound/sound.h> #include <arch/spinlock.h> +#include <kos/dbglog.h> /* diff --git a/kernel/arch/dreamcast/sound/snd_sfxmgr.c b/kernel/arch/dreamcast/sound/snd_sfxmgr.c index e09bfcbb..31f974a9 100644 --- a/kernel/arch/dreamcast/sound/snd_sfxmgr.c +++ b/kernel/arch/dreamcast/sound/snd_sfxmgr.c @@ -17,6 +17,7 @@ #include <sys/queue.h> #include <sys/ioctl.h> +#include <kos/dbglog.h> #include <kos/fs.h> #include <arch/irq.h> #include <dc/spu.h> diff --git a/kernel/arch/dreamcast/sound/snd_stream.c b/kernel/arch/dreamcast/sound/snd_stream.c index 87ebf169..9e11de86 100644 --- a/kernel/arch/dreamcast/sound/snd_stream.c +++ b/kernel/arch/dreamcast/sound/snd_stream.c @@ -17,6 +17,7 @@ #include <errno.h> #include <sys/queue.h> +#include <kos/dbglog.h> #include <kos/mutex.h> #include <arch/cache.h> #include <arch/timer.h> diff --git a/kernel/arch/dreamcast/util/screenshot.c b/kernel/arch/dreamcast/util/screenshot.c index 5e6de6d8..da3cc837 100644 --- a/kernel/arch/dreamcast/util/screenshot.c +++ b/kernel/arch/dreamcast/util/screenshot.c @@ -12,6 +12,7 @@ #include <stdlib.h> #include <string.h> #include <dc/video.h> +#include <kos/dbglog.h> #include <kos/fs.h> #include <arch/irq.h> diff --git a/kernel/arch/dreamcast/util/vmu_pkg.c b/kernel/arch/dreamcast/util/vmu_pkg.c index faba9589..1082146d 100644 --- a/kernel/arch/dreamcast/util/vmu_pkg.c +++ b/kernel/arch/dreamcast/util/vmu_pkg.c @@ -9,6 +9,7 @@ #include <stdio.h> #include <string.h> #include <dc/vmu_pkg.h> +#include <kos/dbglog.h> #include <kos/fs.h> #include <kos/regfield.h> diff --git a/kernel/fs/elf.c b/kernel/fs/elf.c index 1430a4c6..a267826f 100644 --- a/kernel/fs/elf.c +++ b/kernel/fs/elf.c @@ -15,6 +15,7 @@ #include <kos/exports.h> #include <kos/thread.h> #include <kos/library.h> +#include <kos/dbglog.h> /* What's our architecture code we're expecting? */ #if defined(_arch_dreamcast) diff --git a/kernel/fs/fs.c b/kernel/fs/fs.c index ce5ffef6..01f669dc 100644 --- a/kernel/fs/fs.c +++ b/kernel/fs/fs.c @@ -39,6 +39,7 @@ something like this: #include <kos/mutex.h> #include <kos/nmmgr.h> #include <kos/dbgio.h> +#include <kos/dbglog.h> /* File handle structure; this is an entirely internal structure so it does not go in a header file. */ diff --git a/kernel/fs/fs_dev.c b/kernel/fs/fs_dev.c index 919f000a..5ca09161 100644 --- a/kernel/fs/fs_dev.c +++ b/kernel/fs/fs_dev.c @@ -11,6 +11,7 @@ #include <errno.h> #include <arch/types.h> +#include <kos/dbglog.h> #include <kos/fs_dev.h> #include <sys/queue.h> diff --git a/kernel/fs/fs_random.c b/kernel/fs/fs_random.c index e8c3de4e..01f9edda 100644 --- a/kernel/fs/fs_random.c +++ b/kernel/fs/fs_random.c @@ -14,6 +14,7 @@ #include <arch/types.h> #include <kos/mutex.h> #include <kos/fs_random.h> +#include <kos/dbglog.h> ...<truncated>... hooks/post-receive -- A pseudo Operating System for the Dreamcast. |