X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=d9eb04a40be1070f06700a79daf1293c6de16af8;hp=c3c104af3945193dd1c39391885f1a92dbcb16d7;hb=HEAD;hpb=38b8a211aad8d2c485ccf0c0cbb58d965aac3483

diff --git a/frontend/plugin.c b/frontend/plugin.c
index c3c104af..3263ae31 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -20,42 +20,11 @@
 #undef CALLBACK
 #define CALLBACK
 
-/* CDR */
-struct CdrStat;
-static long CALLBACK CDRinit(void) { return 0; }
-static long CALLBACK CDRshutdown(void) { return 0; }
-static long CALLBACK CDRopen(void) { return 0; }
-static long CALLBACK CDRclose(void) { return 0; }
-static long CALLBACK CDRgetTN(unsigned char *_) { return 0; }
-static long CALLBACK CDRgetTD(unsigned char _, unsigned char *__) { return 0; }
-static boolean CALLBACK CDRreadTrack(unsigned char *_) { return FALSE; }
-static unsigned char * CALLBACK CDRgetBuffer(void) { return NULL; }
-static unsigned char * CALLBACK CDRgetBufferSub(int sector) { return NULL; }
-static long CALLBACK CDRconfigure(void) { return 0; }
-static long CALLBACK CDRtest(void) { return 0; }
-static void CALLBACK CDRabout(void) { return; }
-static long CALLBACK CDRplay(unsigned char *_) { return 0; }
-static long CALLBACK CDRstop(void) { return 0; }
-static long CALLBACK CDRsetfilename(char *_) { return 0; }
-static long CALLBACK CDRgetStatus(struct CdrStat *_) { return 0; }
-static char * CALLBACK CDRgetDriveLetter(void) { return NULL; }
-static long CALLBACK CDRreadCDDA(unsigned char _, unsigned char __, unsigned char ___, unsigned char *____) { return 0; }
-static long CALLBACK CDRgetTE(unsigned char _, unsigned char *__, unsigned char *___, unsigned char *____) { return 0; }
-
-/* GPU */
-static void CALLBACK GPUdisplayText(char *_) { return; }
-
 /* SPU */
 #include "../plugins/dfsound/spu.h"
 
 /* PAD */
-static long CALLBACK PADinit(long _) { return 0; }
-static long CALLBACK PADopen(unsigned long *_) { return 0; }
-static long CALLBACK PADshutdown(void) { return 0; }
-static long CALLBACK PADclose(void) { return 0; }
-static void CALLBACK PADsetSensitive(int _) { return; }
-
-static long CALLBACK PADreadPort1(PadDataS *pad) {
+long PAD1_readPort(PadDataS *pad) {
 	int pad_index = pad->requestPadIndex;
 
 	pad->controllerType = in_type[pad_index];
@@ -83,7 +52,7 @@ static long CALLBACK PADreadPort1(PadDataS *pad) {
 	return 0;
 }
 
-static long CALLBACK PADreadPort2(PadDataS *pad) {
+long PAD2_readPort(PadDataS *pad) {
 	int pad_index = pad->requestPadIndex;
 
 	pad->controllerType = in_type[pad_index];
@@ -122,7 +91,7 @@ extern void GPUwriteDataMem(uint32_t *, int);
 extern uint32_t GPUreadStatus(void);
 extern uint32_t GPUreadData(void);
 extern void GPUreadDataMem(uint32_t *, int);
-extern long GPUdmaChain(uint32_t *, uint32_t, uint32_t *);
+extern long GPUdmaChain(uint32_t *, uint32_t, uint32_t *, int32_t *);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
 extern void GPUvBlank(int, int);
@@ -133,36 +102,14 @@ extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 #define DIRECT(id, name) \
 	{ id, #name, name }
 
-#define DIRECT_CDR(name) DIRECT(PLUGIN_CDR, name)
 #define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name)
 #define DIRECT_GPU(name) DIRECT(PLUGIN_GPU, name)
-#define DIRECT_PAD(name) DIRECT(PLUGIN_PAD, name)
 
 static const struct {
 	int id;
 	const char *name;
 	void *func;
 } plugin_funcs[] = {
-	/* CDR */
-	DIRECT_CDR(CDRinit),
-	DIRECT_CDR(CDRshutdown),
-	DIRECT_CDR(CDRopen),
-	DIRECT_CDR(CDRclose),
-	DIRECT_CDR(CDRtest),
-	DIRECT_CDR(CDRgetTN),
-	DIRECT_CDR(CDRgetTD),
-	DIRECT_CDR(CDRreadTrack),
-	DIRECT_CDR(CDRgetBuffer),
-	DIRECT_CDR(CDRgetBufferSub),
-	DIRECT_CDR(CDRplay),
-	DIRECT_CDR(CDRstop),
-	DIRECT_CDR(CDRgetStatus),
-	DIRECT_CDR(CDRgetDriveLetter),
-	DIRECT_CDR(CDRconfigure),
-	DIRECT_CDR(CDRabout),
-	DIRECT_CDR(CDRsetfilename),
-	DIRECT_CDR(CDRreadCDDA),
-	DIRECT_CDR(CDRgetTE),
 	/* SPU */
 	DIRECT_SPU(SPUinit),
 	DIRECT_SPU(SPUshutdown),
@@ -179,23 +126,6 @@ static const struct {
 	DIRECT_SPU(SPUasync),
 	DIRECT_SPU(SPUplayCDDAchannel),
 	DIRECT_SPU(SPUsetCDvol),
-	/* PAD */
-	DIRECT_PAD(PADinit),
-	DIRECT_PAD(PADshutdown),
-	DIRECT_PAD(PADopen),
-	DIRECT_PAD(PADclose),
-	DIRECT_PAD(PADsetSensitive),
-	DIRECT_PAD(PADreadPort1),
-	DIRECT_PAD(PADreadPort2),
-/*
-	DIRECT_PAD(PADquery),
-	DIRECT_PAD(PADconfigure),
-	DIRECT_PAD(PADtest),
-	DIRECT_PAD(PADabout),
-	DIRECT_PAD(PADkeypressed),
-	DIRECT_PAD(PADstartPoll),
-	DIRECT_PAD(PADpoll),
-*/
 	/* GPU */
 	DIRECT_GPU(GPUupdateLace),
 	DIRECT_GPU(GPUinit),
@@ -213,26 +143,12 @@ static const struct {
 	DIRECT_GPU(GPUvBlank),
 	DIRECT_GPU(GPUgetScreenInfo),
 	DIRECT_GPU(GPUrearmedCallbacks),
-
-	DIRECT_GPU(GPUdisplayText),
-/*
-	DIRECT_GPU(GPUkeypressed),
-	DIRECT_GPU(GPUmakeSnapshot),
-	DIRECT_GPU(GPUconfigure),
-	DIRECT_GPU(GPUtest),
-	DIRECT_GPU(GPUabout),
-	DIRECT_GPU(GPUgetScreenPic),
-	DIRECT_GPU(GPUshowScreenPic),
-*/
 };
 
 void *plugin_link(enum builtint_plugins_e id, const char *sym)
 {
 	int i;
 
-	if (id == PLUGIN_CDRCIMG)
-		return cdrcimg_get_sym(sym);
-
 	for (i = 0; i < ARRAY_SIZE(plugin_funcs); i++) {
 		if (id != plugin_funcs[i].id)
 			continue;