[cadcdev-svn-commits] [SCM] branch master updated. 80f6256f705d5365ae19c89d807e2c47e3ccff33

[Christian G. <sa...@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  80f6256f705d5365ae19c89d807e2c47e3ccff33 (commit)
       via  3b63e4a577008ae9ff90a4a2264f0e35269e9ec2 (commit)
      from  2a3e7dbe4623809e8307b20ee170dfde8ca8732f (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 80f6256f705d5365ae19c89d807e2c47e3ccff33
Author: Christian Groessler <ch...@gr...>
Date:   Sat Apr 27 14:51:47 2013 +0200

    vid_border_color() now returns the old color.

commit 3b63e4a577008ae9ff90a4a2264f0e35269e9ec2
Author: Christian Groessler <ch...@gr...>
Date:   Sat Apr 27 14:50:52 2013 +0200

    create a map file

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

Summary of changes:
 kernel/arch/dreamcast/hardware/video.c   |    4 +++-
 kernel/arch/dreamcast/include/dc/video.h |    3 ++-
 kernel/arch/dreamcast/sound/arm/Makefile |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel/arch/dreamcast/hardware/video.c b/kernel/arch/dreamcast/hardware/video.c
index b8f38e7..8b344b0 100644
--- a/kernel/arch/dreamcast/hardware/video.c
+++ b/kernel/arch/dreamcast/hardware/video.c
@@ -676,10 +676,12 @@ void vid_flip(int fb) {
 }
 
 /*-----------------------------------------------------------------------------*/
-void vid_border_color(int r, int g, int b) {
+uint32 vid_border_color(int r, int g, int b) {
+    uint32 obc = regs[0x0040 / 4];
     regs[0x0040 / 4] = ((r & 0xFF) << 16) |
                        ((g & 0xFF) << 8) |
                        (b & 0xFF);
+    return obc;
 }
 
 /*-----------------------------------------------------------------------------*/
diff --git a/kernel/arch/dreamcast/include/dc/video.h b/kernel/arch/dreamcast/include/dc/video.h
index 404f309..2d248e1 100644
--- a/kernel/arch/dreamcast/include/dc/video.h
+++ b/kernel/arch/dreamcast/include/dc/video.h
@@ -212,8 +212,9 @@ void vid_flip(int fb);
     \param  r               The red value of the color (0-255).
     \param  g               The green value of the color (0-255).
     \param  b               The blue value of the color (0-255).
+    \return                 Old border color value (RGB888)
 */
-void vid_border_color(int r, int g, int b);
+uint32 vid_border_color(int r, int g, int b);
 
 /** \brief  Clear the display.
 
diff --git a/kernel/arch/dreamcast/sound/arm/Makefile b/kernel/arch/dreamcast/sound/arm/Makefile
index 54d7097..b77d6da 100644
--- a/kernel/arch/dreamcast/sound/arm/Makefile
+++ b/kernel/arch/dreamcast/sound/arm/Makefile
@@ -11,7 +11,7 @@ stream.drv: prog.elf
 	$(DC_ARM_OBJCOPY) -O binary prog.elf stream.drv
 
 prog.elf: crt0.o main.o aica.o
-	$(DC_ARM_CC) -Wl,-Ttext,0x00000000 -nostartfiles -nostdlib -e reset -o prog.elf crt0.o main.o aica.o -lgcc
+	$(DC_ARM_CC) -Wl,-Ttext,0x00000000,-Map,prog.map -nostartfiles -nostdlib -e reset -o prog.elf crt0.o main.o aica.o -lgcc
 
 %.o: %.c
 	$(DC_ARM_CC) $(DC_ARM_CFLAGS) $(DC_ARM_INCS) -c $< -o $@
@@ -20,6 +20,6 @@ prog.elf: crt0.o main.o aica.o
 	$(DC_ARM_AS) $(DC_ARM_AFLAGS) $< -o $@
 
 clean:
-	-rm -f *.o *.srec *.elf 1ST_READ.BIN prog.bin *.bck
+	-rm -f *.o *.srec *.elf 1ST_READ.BIN prog.bin *.bck prog.map
 
 


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