final src and Makefile adjustments for PSP release

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@298 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Draw_amips.s b/Pico/Draw_amips.s
index ff3d59e..c05391c 100644 (file)
--- a/Pico/Draw_amips.s
+++ b/Pico/Draw_amips.s
@@ -1,5 +1,8 @@
 # vim:filetype=mips
 
+# several drawing related functions for Allegrex MIPS
+# (c) Copyright 2007, Grazvydas "notaz" Ignotas
+# All Rights Reserved
 
 .set noreorder # don't reorder any instructions
 .set noat      # don't use $at

diff --git a/Pico/Misc_amips.s b/Pico/Misc_amips.s
index f6efeb0..283324c 100644 (file)
--- a/Pico/Misc_amips.s
+++ b/Pico/Misc_amips.s
@@ -1,5 +1,9 @@
 # vim:filetype=mips
 
+# Some misc routines for Allegrex MIPS
+# (c) Copyright 2007, Grazvydas "notaz" Ignotas
+# All Rights Reserved
+
 .set noreorder
 .set noat
 

diff --git a/Pico/PicoFrameHints.c b/Pico/PicoFrameHints.c
index b5cef7d..1b35268 100644 (file)
--- a/Pico/PicoFrameHints.c
+++ b/Pico/PicoFrameHints.c
@@ -1,3 +1,6 @@
+// common code for Pico.c and cd/Pico.c
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
+
 #define CYCLES_M68K_LINE     488 // suitable for both PAL/NTSC
 #define CYCLES_M68K_VINT_LAG  68
 #define CYCLES_M68K_ASD      148

diff --git a/Pico/cd/LC89510.c b/Pico/cd/LC89510.c
index 31c3f64..9abc253 100644 (file)
--- a/Pico/cd/LC89510.c
+++ b/Pico/cd/LC89510.c
@@ -1,6 +1,6 @@
 /***********************************************************\r
  *                                                         *\r
- * This source was taken from the Gens project             *\r
+ * This source file was taken from the Gens project        *\r
  * Written by Stéphane Dallongeville                       *\r
  * Copyright (c) 2002 by Stéphane Dallongeville            *\r
  * Modified/adapted for PicoDrive by notaz, 2007           *\r

diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c
index c0001d2..003c825 100644 (file)
--- a/Pico/cd/cd_sys.c
+++ b/Pico/cd/cd_sys.c
@@ -1,6 +1,6 @@
 /***********************************************************\r
  *                                                         *\r
- * This source was taken from the Gens project             *\r
+ * This source file was taken from the Gens project        *\r
  * Written by Stéphane Dallongeville                       *\r
  * Copyright (c) 2002 by Stéphane Dallongeville            *\r
  * Modified/adapted for PicoDrive by notaz, 2007           *\r

diff --git a/Pico/sound/mix.c b/Pico/sound/mix.c
index e929da7..c344fba 100644 (file)
--- a/Pico/sound/mix.c
+++ b/Pico/sound/mix.c
@@ -1,3 +1,6 @@
+// some code for sample mixing
+// (c) Copyright 2006-2007, Grazvydas "notaz" Ignotas
+
 #define MAXOUT         (+32767)
 #define MINOUT         (-32768)
 

diff --git a/cpu/fame/famec.c b/cpu/fame/famec.c
index 5d96732..0bb0f9b 100644 (file)
--- a/cpu/fame/famec.c
+++ b/cpu/fame/famec.c
@@ -16,11 +16,11 @@
 \r
 // Options //\r
 #define FAMEC_ROLL_INLINE\r
-//#define FAMEC_EMULATE_TRACE\r
-//#define FAMEC_CHECK_BRANCHES\r
-//#define FAMEC_EXTRA_INLINE\r
+#define FAMEC_EMULATE_TRACE\r
+#define FAMEC_CHECK_BRANCHES\r
+#define FAMEC_EXTRA_INLINE\r
 // #define FAMEC_DEBUG\r
-//#define FAMEC_NO_GOTOS\r
+#define FAMEC_NO_GOTOS\r
 #define FAMEC_ADR_BITS  24\r
 // #define FAMEC_FETCHBITS 8\r
 #define FAMEC_DATABITS  8\r

diff --git a/platform/psp/Makefile b/platform/psp/Makefile
index d990ba6..d18c332 100644 (file)
--- a/platform/psp/Makefile
+++ b/platform/psp/Makefile
@@ -11,8 +11,6 @@ amalgamate = 0
 CFLAGS += -I../.. -I. -DNO_SYNC\r
 CFLAGS += -Wall -Winline -G0\r
 #CFLAGS += -DLPRINTF_STDIO\r
-#CFLAGS += -fprofile-generate\r
-#CFLAGS += -fprofile-use\r
 #CFLAGS += -pg\r
 ifeq ($(DEBUG),)\r
 CFLAGS += -O2 -ftracer -fstrength-reduce -ffast-math\r
@@ -109,7 +107,11 @@ AS := psp-as
 \r
 ../../Pico/Memory.o : ../../Pico/Memory.c\r
        @echo ">>>" $<\r
-       $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS\r
+\r
+../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c\r
+       @echo ">>>" $<\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
 \r
 ../../Pico/Draw.o : ../../Pico/Draw.c\r
        @echo ">>>" $<\r
@@ -119,6 +121,10 @@ AS := psp-as
        @echo ">>>" $<\r
        $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS\r
 \r
+../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c\r
+       @echo ">>>" $<\r
+       $(CC) $(CFLAGS) -O2 -c $< -o $@\r
+\r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
        ../../tools/textfilter ../base_readme.txt $@ PSP\r
 \r
@@ -142,6 +148,7 @@ up: EBOOT.PBP
 # cleanup\r
 \r
 myclean:\r
+       $(RM) PicoDrive.map\r
        make -C ../../cpu/musashi clean\r
 \r
 \r
@@ -158,5 +165,9 @@ endif
 \r
 # ?\r
 rel: EBOOT.PBP readme.txt\r
-       zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt\r
+       mkdir -p PicoDrive/skin/\r
+       cp $^ PicoDrive/\r
+       cp skin/* PicoDrive/skin/\r
+       zip -9 -r ../../PicoDrive_$(VER).zip PicoDrive\r
+       rm -rf PicoDrive\r
 \r

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 9fc890c..aaa5a0e 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/syslimits.h> // PATH_MAX

diff --git a/platform/psp/main.c b/platform/psp/main.c
index ffbc761..bad56a9 100644 (file)
--- a/platform/psp/main.c
+++ b/platform/psp/main.c
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <string.h>
 #include "psp.h"
 #include "emu.h"

diff --git a/platform/psp/menu.c b/platform/psp/menu.c
index f8ba4d7..996f687 100644 (file)
--- a/platform/psp/menu.c
+++ b/platform/psp/menu.c
@@ -1,4 +1,4 @@
-// (c) Copyright 2006,2007 notaz, All rights reserved.
+// (c) Copyright 2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.

diff --git a/platform/psp/mp3.c b/platform/psp/mp3.c
index 5991063..ce12788 100644 (file)
--- a/platform/psp/mp3.c
+++ b/platform/psp/mp3.c
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <stdio.h>
 #include <string.h>
 

diff --git a/platform/psp/psp.c b/platform/psp/psp.c
index b7c8693..99b9084 100644 (file)
--- a/platform/psp/psp.c
+++ b/platform/psp/psp.c
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/platform/psp/psp.h b/platform/psp/psp.h
index 7f2d70d..d4a3d0e 100644 (file)
--- a/platform/psp/psp.h
+++ b/platform/psp/psp.h
@@ -1,3 +1,8 @@
+// (c) Copyright 2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
 #include <pspctrl.h>
 
 void psp_init(void);