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 c1ce9c5375725836c9a9390878c90d0f01634f43 (commit)
from d1f4403d1e2231afa619e503ebe77fd42fde50ef (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 c1ce9c5375725836c9a9390878c90d0f01634f43
Author: Lawrence Sebald <ljs...@us...>
Date: Thu Feb 20 23:24:14 2020 -0500
Init a few more things normally for NAOMI.
-----------------------------------------------------------------------
Summary of changes:
kernel/arch/dreamcast/hardware/hardware.c | 4 +++-
kernel/arch/dreamcast/kernel/init.c | 12 ++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/kernel/arch/dreamcast/hardware/hardware.c b/kernel/arch/dreamcast/hardware/hardware.c
index fddfee3..2802150 100644
--- a/kernel/arch/dreamcast/hardware/hardware.c
+++ b/kernel/arch/dreamcast/hardware/hardware.c
@@ -48,10 +48,10 @@ int hardware_periph_init() {
#ifndef _arch_sub_naomi
/* Init CD-ROM.. NOTE: NO GD-ROM SUPPORT. ONLY CDs/CDRs. */
cdrom_init();
+#endif
/* Setup maple bus */
maple_init();
-#endif
/* Init video */
vid_init(DEFAULT_VID_MODE, DEFAULT_PIXEL_MODE);
@@ -73,7 +73,9 @@ void hardware_shutdown() {
#ifndef _arch_sub_naomi
la_shutdown();
bba_shutdown();
+#endif
maple_shutdown();
+#if 0
cdrom_shutdown();
#endif
spu_dma_shutdown();
diff --git a/kernel/arch/dreamcast/kernel/init.c b/kernel/arch/dreamcast/kernel/init.c
index fe0eda9..da6c03a 100644
--- a/kernel/arch/dreamcast/kernel/init.c
+++ b/kernel/arch/dreamcast/kernel/init.c
@@ -44,8 +44,8 @@ dbgio_handler_t * dbgio_handlers[] = {
&dbgio_dcload,
&dbgio_dcls,
&dbgio_scif,
-#endif
&dbgio_fb,
+#endif
&dbgio_null
};
int dbgio_handler_cnt = sizeof(dbgio_handlers) / sizeof(dbgio_handler_t *);
@@ -78,7 +78,6 @@ int __attribute__((weak)) arch_auto_init() {
/* Init debug IO */
dbgio_init();
-#ifndef _arch_sub_naomi
/* Print a banner */
if(__kos_init_flags & INIT_QUIET)
dbgio_disable();
@@ -87,9 +86,6 @@ int __attribute__((weak)) arch_auto_init() {
dbgio_write_str("\n--\n");
dbgio_write_str(kos_get_banner());
}
-#else
- dbgio_disable();
-#endif
timer_init(); /* Timers */
hardware_sys_init(); /* DC low-level hardware init */
@@ -124,9 +120,9 @@ int __attribute__((weak)) arch_auto_init() {
}
fs_iso9660_init();
+#endif
vmufs_init();
fs_vmu_init();
-#endif
/* Initialize library handling */
library_init();
@@ -134,9 +130,7 @@ int __attribute__((weak)) arch_auto_init() {
/* Now comes the optional stuff */
if(__kos_init_flags & INIT_IRQ) {
irq_enable(); /* Turn on IRQs */
-#ifndef _arch_sub_naomi
maple_wait_scan(); /* Wait for the maple scan to complete */
-#endif
}
#ifndef _arch_sub_naomi
@@ -184,8 +178,10 @@ void __attribute__((weak)) arch_auto_shutdown() {
library_shutdown();
#ifndef _arch_sub_naomi
fs_dcload_shutdown();
+#endif
fs_vmu_shutdown();
vmufs_shutdown();
+#ifndef _arch_sub_naomi
fs_iso9660_shutdown();
#endif
fs_ramdisk_shutdown();
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
