[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1456-g23ffc3ab

[falcovorbis <fal...@us...>]

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  23ffc3ab18812cf77888bd079ad061de6e02c430 (commit)
      from  eb3ed416c8ddf2038376e362a15939b057b37628 (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 23ffc3ab18812cf77888bd079ad061de6e02c430
Author: Andy Barajas <and...@gm...>
Date:   Wed Jul 3 16:48:38 2024 -0700

    Replace redefined regs with dmac.h definitions (#655)

-----------------------------------------------------------------------

Summary of changes:
 kernel/arch/dreamcast/kernel/init.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/kernel/arch/dreamcast/kernel/init.c b/kernel/arch/dreamcast/kernel/init.c
index a19b13f8..1c6bbd4d 100644
--- a/kernel/arch/dreamcast/kernel/init.c
+++ b/kernel/arch/dreamcast/kernel/init.c
@@ -24,6 +24,7 @@
 #include <dc/pvr.h>
 #include <dc/vmufs.h>
 #include <dc/syscalls.h>
+#include <dc/dmac.h>
 
 #include "initall_hdrs.h"
 
@@ -44,10 +45,6 @@ void (*__kos_init_early_fn)(void) __attribute__((weak,section(".data"))) = NULL;
 int main(int argc, char **argv);
 uint32 _fs_dclsocket_get_ip(void);
 
-#define SAR2    ((vuint32 *)0xFFA00020)
-#define CHCR2   ((vuint32 *)0xFFA0002C)
-#define DMAOR   ((vuint32 *)0xFFA00040)
-
 /* We have to put this here so we can include plat-specific devices */
 dbgio_handler_t * dbgio_handlers[] = {
     &dbgio_dcload,
@@ -268,9 +265,9 @@ void arch_main(void) {
     if (KOS_PLATFORM_IS_NAOMI) {
         /* Ugh. I'm really not sure why we have to set up these DMA registers this
            way on boot, but failing to do so breaks maple... */
-        *SAR2 = 0;
-        *CHCR2 = 0x1201;
-        *DMAOR = 0x8201;
+        DMAC_SAR2 = 0;
+        DMAC_CHCR2 = 0x1201;
+        DMAC_DMAOR = 0x8201;
     }
 
     /* Ensure the WDT is not enabled from a previous session */


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.