From 8b99ab90aa519639a87c302c9a26fef526febde9 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 17 Nov 2007 22:13:35 +0000 Subject: [PATCH] final src and Makefile adjustments for PSP release git-svn-id: file:///home/notaz/opt/svn/PicoDrive@298 be3aeb3a-fb24-0410-a615-afba39da0efa --- Pico/Draw_amips.s | 3 +++ Pico/Misc_amips.s | 4 ++++ Pico/PicoFrameHints.c | 3 +++ Pico/cd/LC89510.c | 2 +- Pico/cd/cd_sys.c | 2 +- Pico/sound/mix.c | 3 +++ cpu/fame/famec.c | 8 ++++---- platform/psp/Makefile | 19 +++++++++++++++---- platform/psp/emu.c | 5 +++++ platform/psp/main.c | 5 +++++ platform/psp/menu.c | 2 +- platform/psp/mp3.c | 5 +++++ platform/psp/psp.c | 5 +++++ platform/psp/psp.h | 5 +++++ 14 files changed, 60 insertions(+), 11 deletions(-) diff --git a/Pico/Draw_amips.s b/Pico/Draw_amips.s index ff3d59e7..c05391ce 100644 --- 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 f6efeb02..283324c9 100644 --- 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 b5cef7d1..1b352683 100644 --- 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 31c3f64c..9abc253b 100644 --- a/Pico/cd/LC89510.c +++ b/Pico/cd/LC89510.c @@ -1,6 +1,6 @@ /*********************************************************** * * - * This source was taken from the Gens project * + * This source file was taken from the Gens project * * Written by Stéphane Dallongeville * * Copyright (c) 2002 by Stéphane Dallongeville * * Modified/adapted for PicoDrive by notaz, 2007 * diff --git a/Pico/cd/cd_sys.c b/Pico/cd/cd_sys.c index c0001d2d..003c825b 100644 --- a/Pico/cd/cd_sys.c +++ b/Pico/cd/cd_sys.c @@ -1,6 +1,6 @@ /*********************************************************** * * - * This source was taken from the Gens project * + * This source file was taken from the Gens project * * Written by Stéphane Dallongeville * * Copyright (c) 2002 by Stéphane Dallongeville * * Modified/adapted for PicoDrive by notaz, 2007 * diff --git a/Pico/sound/mix.c b/Pico/sound/mix.c index e929da7f..c344fba0 100644 --- 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 5d967324..0bb0f9ba 100644 --- a/cpu/fame/famec.c +++ b/cpu/fame/famec.c @@ -16,11 +16,11 @@ // Options // #define FAMEC_ROLL_INLINE -//#define FAMEC_EMULATE_TRACE -//#define FAMEC_CHECK_BRANCHES -//#define FAMEC_EXTRA_INLINE +#define FAMEC_EMULATE_TRACE +#define FAMEC_CHECK_BRANCHES +#define FAMEC_EXTRA_INLINE // #define FAMEC_DEBUG -//#define FAMEC_NO_GOTOS +#define FAMEC_NO_GOTOS #define FAMEC_ADR_BITS 24 // #define FAMEC_FETCHBITS 8 #define FAMEC_DATABITS 8 diff --git a/platform/psp/Makefile b/platform/psp/Makefile index d990ba67..d18c3320 100644 --- a/platform/psp/Makefile +++ b/platform/psp/Makefile @@ -11,8 +11,6 @@ amalgamate = 0 CFLAGS += -I../.. -I. -DNO_SYNC CFLAGS += -Wall -Winline -G0 #CFLAGS += -DLPRINTF_STDIO -#CFLAGS += -fprofile-generate -#CFLAGS += -fprofile-use #CFLAGS += -pg ifeq ($(DEBUG),) CFLAGS += -O2 -ftracer -fstrength-reduce -ffast-math @@ -109,7 +107,11 @@ AS := psp-as ../../Pico/Memory.o : ../../Pico/Memory.c @echo ">>>" $< - $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS + $(CC) $(CFLAGS) -O2 -c $< -o $@ -D_ASM_MEMORY_C -D_ASM_MEMORY_C_AMIPS + +../../Pico/cd/Memory.o : ../../Pico/cd/Memory.c + @echo ">>>" $< + $(CC) $(CFLAGS) -O2 -c $< -o $@ ../../Pico/Draw.o : ../../Pico/Draw.c @echo ">>>" $< @@ -119,6 +121,10 @@ AS := psp-as @echo ">>>" $< $(CC) $(CFLAGS) -c $< -o $@ -D_ASM_MISC_C_AMIPS +../../Pico/cd/gfx_cd.o : ../../Pico/cd/gfx_cd.c + @echo ">>>" $< + $(CC) $(CFLAGS) -O2 -c $< -o $@ + readme.txt: ../../tools/textfilter ../base_readme.txt ../../tools/textfilter ../base_readme.txt $@ PSP @@ -142,6 +148,7 @@ up: EBOOT.PBP # cleanup myclean: + $(RM) PicoDrive.map make -C ../../cpu/musashi clean @@ -158,5 +165,9 @@ endif # ? rel: EBOOT.PBP readme.txt - zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt + mkdir -p PicoDrive/skin/ + cp $^ PicoDrive/ + cp skin/* PicoDrive/skin/ + zip -9 -r ../../PicoDrive_$(VER).zip PicoDrive + rm -rf PicoDrive diff --git a/platform/psp/emu.c b/platform/psp/emu.c index 9fc890ca..aaa5a0e0 100644 --- 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 #include #include // PATH_MAX diff --git a/platform/psp/main.c b/platform/psp/main.c index ffbc761f..bad56a9a 100644 --- 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 #include "psp.h" #include "emu.h" diff --git a/platform/psp/menu.c b/platform/psp/menu.c index f8ba4d7f..996f6879 100644 --- 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 5991063a..ce127889 100644 --- 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 #include diff --git a/platform/psp/psp.c b/platform/psp/psp.c index b7c86934..99b9084c 100644 --- 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 #include #include diff --git a/platform/psp/psp.h b/platform/psp/psp.h index 7f2d70d0..d4a3d0e7 100644 --- 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 void psp_init(void); -- 2.39.5