some readme and general cleanups

[picodrive.git] / pico / carthw / svp / svp.c

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index a3ed89e..1bccb3f 100644 (file)
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -1,13 +1,33 @@
-// The SVP chip emulator
-
-// (c) Copyright 2008, Grazvydas "notaz" Ignotas
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
-
-#include "../../pico_int.h"
-#include "../../cpu/drc/cmn.h"
+/*
+ * The SVP chip emulator
+ *
+ * Copyright (c) Gražvydas "notaz" Ignotas, 2008
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the organization nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <pico/pico_int.h>
+#include <cpu/drc/cmn.h>
 #include "compiler.h"
 
 svp_t *svp = NULL;
@@ -36,8 +56,8 @@ static void PicoSVPReset(void)
 
        memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
        ssp1601_reset(&svp->ssp1601);
-#ifndef PSP
-       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+#ifdef _SVP_DRC
+       if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
                ssp1601_dyn_reset(&svp->ssp1601);
 #endif
 }
@@ -46,7 +66,7 @@ static void PicoSVPReset(void)
 static void PicoSVPLine(void)
 {
        int count = 1;
-#if defined(ARM) || defined(PSP)
+#if defined(__arm__) || defined(PSP)
        // performance hack
        static int delay_lines = 0;
        delay_lines++;
@@ -56,8 +76,8 @@ static void PicoSVPLine(void)
        delay_lines = 0;
 #endif
 
-#ifndef PSP
-       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+#ifdef _SVP_DRC
+       if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
                ssp1601_dyn_run(PicoSVPCycles * count);
        else
 #endif
@@ -98,7 +118,7 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#ifndef PSP
+#ifdef _SVP_DRC
        // this is to unmap tcache and make
        // mem available for large ROMs, MCD, etc.
        drc_cmn_cleanup();
@@ -107,7 +127,7 @@ void PicoSVPInit(void)
 
 static void PicoSVPExit(void)
 {
-#ifndef PSP
+#ifdef _SVP_DRC
        ssp1601_dyn_exit();
 #endif
 }
@@ -130,8 +150,8 @@ void PicoSVPStartup(void)
 
        // init SVP compiler
        svp_dyn_ready = 0;
-#ifndef PSP
-       if (PicoOpt & POPT_EN_SVP_DRC) {
+#ifdef _SVP_DRC
+       if (PicoOpt & POPT_EN_DRC) {
                if (ssp1601_dyn_startup())
                        return;
                svp_dyn_ready = 1;