From 1aea114c973f6ec8990fe29bfda40fca3432f636 Mon Sep 17 00:00:00 2001
From: "SND\\edgbla_cp" <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 13 May 2010 15:14:33 +0000
Subject: CDRgetBufferSub for internal cdr plugin. %)

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47981 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 libpcsxcore/plugins.c | 3 ++-
 libpcsxcore/plugins.h | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'libpcsxcore')

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index d5978931..fba84ee1 100644
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -224,6 +224,7 @@ long CALLBACK CDR__getStatus(struct CdrStat *stat) {
 }
 
 char* CALLBACK CDR__getDriveLetter(void) { return NULL; }
+unsigned char* CALLBACK CDR__getBufferSub(void) { return NULL; }
 long CALLBACK CDR__configure(void) { return 0; }
 long CALLBACK CDR__test(void) { return 0; }
 void CALLBACK CDR__about(void) {}
@@ -265,7 +266,7 @@ static int LoadCDRplugin(const char *CDRdll) {
 	LoadCdrSym0(stop, "CDRstop");
 	LoadCdrSym0(getStatus, "CDRgetStatus");
 	LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter");
-	LoadCdrSym1(getBufferSub, "CDRgetBufferSub");
+	LoadCdrSym0(getBufferSub, "CDRgetBufferSub");
 	LoadCdrSym0(configure, "CDRconfigure");
 	LoadCdrSym0(test, "CDRtest");
 	LoadCdrSym0(about, "CDRabout");
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index c5e26a92..6658bf45 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -122,7 +122,8 @@ typedef long (CALLBACK* CDRclose)(void);
 typedef long (CALLBACK* CDRgetTN)(unsigned char *);
 typedef long (CALLBACK* CDRgetTD)(unsigned char , unsigned char *);
 typedef long (CALLBACK* CDRreadTrack)(unsigned char *);
-typedef unsigned char * (CALLBACK* CDRgetBuffer)(void);
+typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);
+typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
 typedef long (CALLBACK* CDRconfigure)(void);
 typedef long (CALLBACK* CDRtest)(void);
 typedef void (CALLBACK* CDRabout)(void);
@@ -146,7 +147,6 @@ struct SubQ {
 	unsigned char AbsoluteAddress[3];
 	char res1[72];
 };
-typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
 
 // CD-ROM function pointers
 extern CDRinit               CDR_init;
@@ -158,11 +158,11 @@ extern CDRgetTN              CDR_getTN;
 extern CDRgetTD              CDR_getTD;
 extern CDRreadTrack          CDR_readTrack;
 extern CDRgetBuffer          CDR_getBuffer;
+extern CDRgetBufferSub       CDR_getBufferSub;
 extern CDRplay               CDR_play;
 extern CDRstop               CDR_stop;
 extern CDRgetStatus          CDR_getStatus;
 extern CDRgetDriveLetter     CDR_getDriveLetter;
-extern CDRgetBufferSub       CDR_getBufferSub;
 extern CDRconfigure          CDR_configure;
 extern CDRabout              CDR_about;
 extern CDRsetfilename        CDR_setfilename;
-- 
cgit v1.2.3