aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2018-03-20 06:37:23 +0100
committerXaviDCR92 <xavi.dcr@gmail.com>2018-03-20 06:37:23 +0100
commit34c8910b9ff33d50d642fda24c78d88595a59aa6 (patch)
tree5b25401c451d13dc4700dc361f7ef97bb1915e60
parent977ec481d81b3da6c307f37ff2f9147eac3170c0 (diff)
- .iso files are now ignored.
- Removed deprecated functions from System.c. * Minor changes.
-rw-r--r--.gitignore1
-rw-r--r--Bin/AIRPORT.binbin1707552 -> 1707552 bytes
-rw-r--r--Bin/AIRPORT.cue12
-rwxr-xr-x[-rw-r--r--]Source/Exe/AIRPORT.elfbin449388 -> 449640 bytes
-rw-r--r--Source/PltParser.c2
-rw-r--r--Source/System.c20
-rw-r--r--Source/System.h7
7 files changed, 12 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
index e2dda68..b3da067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
# PSX disk images
*.bin
*.cue
+*.iso
# Shared objects (inc. Windows DLLs)
*.dll
diff --git a/Bin/AIRPORT.bin b/Bin/AIRPORT.bin
index 628d28e..96906d4 100644
--- a/Bin/AIRPORT.bin
+++ b/Bin/AIRPORT.bin
Binary files differ
diff --git a/Bin/AIRPORT.cue b/Bin/AIRPORT.cue
index 7f3ca9c..2e95890 100644
--- a/Bin/AIRPORT.cue
+++ b/Bin/AIRPORT.cue
@@ -3,13 +3,13 @@ TRACK 01 MODE2/2352
INDEX 01 00:00:00
FILE "TRACK01.bin" BINARY
TRACK 02 AUDIO
- INDEX 00 00:00:00
- INDEX 01 00:02:00
+ INDEX 00 00:00:00
+ INDEX 01 00:02:00
FILE "TRACK02.bin" BINARY
TRACK 03 AUDIO
- INDEX 00 00:00:00
- INDEX 01 00:02:00
+ INDEX 00 00:00:00
+ INDEX 01 00:02:00
FILE "TRACK03.bin" BINARY
TRACK 04 AUDIO
- INDEX 00 00:00:00
- INDEX 01 00:02:00
+ INDEX 00 00:00:00
+ INDEX 01 00:02:00
diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf
index e0a79df..f3b7219 100644..100755
--- a/Source/Exe/AIRPORT.elf
+++ b/Source/Exe/AIRPORT.elf
Binary files differ
diff --git a/Source/PltParser.c b/Source/PltParser.c
index 772f715..c5f3a8f 100644
--- a/Source/PltParser.c
+++ b/Source/PltParser.c
@@ -401,7 +401,7 @@ uint8_t* PltParserGenerateFile(TYPE_PLT_CONFIG* ptrPltConfig)
return NULL;
}
- SystemClearBuffer();
+ SystemClearFileBuffer();
// At this point, PltBuffer is filled with zeros. Start generating PLT file.
diff --git a/Source/System.c b/Source/System.c
index 75a1010..864e2fc 100644
--- a/Source/System.c
+++ b/Source/System.c
@@ -600,36 +600,20 @@ uint8_t* SystemGetBufferAddress(void)
/* ******************************************************************
*
- * @name void SystemClearBuffer(void)
+ * @name void SystemClearFileBuffer(void)
*
* @author: Xavier Del Campo
*
* @return: Fills internal buffer with zeros
*
* *****************************************************************/
-void SystemClearBuffer(void)
+void SystemClearFileBuffer(void)
{
memset(file_buffer, 0, sizeof (file_buffer));
}
/* ******************************************************************
*
- * @name void SystemWaitCycles(uint32_t cycles)
- *
- * @author: Xavier Del Campo
- *
- * @return: halts program execution for n-"cycles"
- *
- * *****************************************************************/
-void SystemWaitCycles(uint32_t cycles)
-{
- uint64_t currentTime = global_timer;
-
- while (global_timer < (currentTime + cycles) );
-}
-
-/* ******************************************************************
- *
* @name uint32_t SystemRand(uint32_t min, uint32_t max)
*
* @author: Xavier Del Campo
diff --git a/Source/System.h b/Source/System.h
index 8519a43..29d8d1b 100644
--- a/Source/System.h
+++ b/Source/System.h
@@ -19,7 +19,7 @@
// Calls PSXSDK init routines
void SystemInit(void);
-// Sets default VSync (only sets flag to true and increases global_timer)
+// Sets default VSync (only sets VBlank flag)
void ISR_SystemDefaultVBlank(void);
// Calls srand() using current global_timer value as seed
@@ -43,9 +43,6 @@ uint8_t* SystemGetBufferAddress(void);
// Tells whether srand() has been called using a pseudo-random value
bool SystemIsRandSeedSet(void);
-// Stops program flow during X cycles
-void SystemWaitCycles(uint32_t cycles);
-
// To be called from GfxDrawScene after each cycle
void SystemRunTimers(void);
@@ -109,7 +106,7 @@ void SystemAcknowledgeFrame(void);
void SystemCyclicHandler(void);
-void SystemClearBuffer(void);
+void SystemClearFileBuffer(void);
void SystemEnableVBlankInterrupt(void);