Revised makefiles, added strtok(), command line arguments, SetHeapSize(), moved ISR and callback system to psxetc, moved debug font to psxgpu, fixed CD-ROM library crashing on PSIO, fixed interrupt callback setup to fix crashing on ResetGraph()

1 files changed, 8 insertions, 6 deletions

diff --git a/libpsn00b/include/psxgpu.h b/libpsn00b/include/psxgpu.h
index 01b3280..bcd1835 100644
--- a/libpsn00b/include/psxgpu.h
+++ b/libpsn00b/include/psxgpu.h
@@ -560,12 +560,6 @@ void WaitGPUdma(void);
 void *VSyncCallback(void (*func)(void));
 void *DrawSyncCallback(void (*func)(void));
 
-// Interrupt callback functions
-void *DMACallback(int dma, void (*func)(void));
-void *InterruptCallback(int irq, void (*func)(void));
-void *GetInterruptCallback(int irq);				// Original
-void RestartCallback();
-
 void LoadImage(RECT *rect, unsigned int *data);
 void StoreImage(RECT *rect, unsigned int *data);
 
@@ -582,6 +576,14 @@ int GetTimInfo(unsigned int *tim, TIM_IMAGE *timimg);
 DISPENV *SetDefDispEnv(DISPENV *disp, int x, int y, int w, int h);
 DRAWENV *SetDefDrawEnv(DRAWENV *draw, int x, int y, int w, int h);
 
+// Debug font functions
+
+void FntLoad(int x, int y);
+char *FntSort(unsigned int *ot, char *pri, int x, int y, const char *text);
+int FntOpen(int x, int y, int w, int h, int isbg, int n);
+int FntPrint(int id, const char *fmt, ...);
+char *FntFlush(int id);
+
 #ifdef __cplusplus
 }
 #endif