[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-1471-g97321653

[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  973216532c9cd340ce71aefa28c1233c10ffeff3 (commit)
      from  25a851792351a9818cc5d02762f5f925ee05e69b (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 973216532c9cd340ce71aefa28c1233c10ffeff3
Author: Donald Haase <qu...@ya...>
Date:   Wed Jul 31 13:59:22 2024 -0400

    Replace duplicated define for the size of the PVR RAM (#688)
    
    Co-authored-by: QuzarDC <qu...@co...>

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

Summary of changes:
 kernel/arch/dreamcast/hardware/video.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/video.c b/kernel/arch/dreamcast/hardware/video.c
index 6cae86f9..df945333 100644
--- a/kernel/arch/dreamcast/hardware/video.c
+++ b/kernel/arch/dreamcast/hardware/video.c
@@ -14,9 +14,6 @@
 #include <string.h>
 #include <stdio.h>
 
-/* The size of the vram. TODO: This needs a better home */
-#define PVR_MEM_SIZE 0x800000
-
 /*-----------------------------------------------------------------------------*/
 /* This table is indexed w/ DM_* */
 vid_mode_t vid_builtin[DM_MODE_COUNT] = {
@@ -283,7 +280,7 @@ void vid_set_mode(int dm, vid_pixel_mode_t pm) {
 
     if(mb == DM_MULTIBUFFER) {
         /* Fill vram with framebuffers */
-        mode.fb_count = PVR_MEM_SIZE / mode.fb_size;
+        mode.fb_count = PVR_RAM_SIZE / mode.fb_size;
     }
 
     /* This is also to be generic */
@@ -433,7 +430,7 @@ void vid_set_vram(uint32_t base) {
 
 void vid_set_start(uint32_t base) {
     /* Set vram base of current framebuffer */
-    base &= (PVR_MEM_SIZE - 1);
+    base &= (PVR_RAM_SIZE - 1);
     PVR_SET(PVR_FB_ADDR, base);
 
     vid_set_vram(base);
@@ -531,7 +528,7 @@ void vid_clear(uint8_t r, uint8_t g, uint8_t b) {
 /*-----------------------------------------------------------------------------*/
 /* Clears all of video memory as quickly as possible */
 void vid_empty(void) {
-    sq_clr((uint32_t *)PVR_RAM_BASE, PVR_MEM_SIZE);
+    sq_clr((uint32_t *)PVR_RAM_BASE, PVR_RAM_SIZE);
 }
 
 /*-----------------------------------------------------------------------------*/


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