X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=input.c;h=ba07072a04766d031ab1e3ead213a8c344687fc1;hb=e328100eecae3adfce1c3b57364bee5d166217ef;hp=b540f552ff2f53f281ee203f6a4066ea033dcd8f;hpb=f12b1f316ca070bda860108b4e3901628d1a8398;p=fceu.git diff --git a/input.c b/input.c index b540f55..ba07072 100644 --- a/input.c +++ b/input.c @@ -36,7 +36,7 @@ #include "dprintf.h" extern INPUTC *FCEU_InitZapper(int w); -extern INPUTC *FCEU_InitPowerpad(int w); +extern INPUTC *FCEU_InitPowerpadA(int w); extern INPUTC *FCEU_InitArkanoid(int w); extern INPUTCFC *FCEU_InitArkanoidFC(void); @@ -57,7 +57,7 @@ static int JPAttribFC=0; static int JPTypeFC=0; static void *InputDataPtrFC; -void (*InputScanlineHook)(uint8 *buf, int line); +void (*InputScanlineHook)(uint8 *bg, uint8 *spr, uint32 linets, int final); static INPUTC DummyJPort={0,0,0,0,0}; static INPUTC *JPorts[2]={&DummyJPort,&DummyJPort}; @@ -232,16 +232,16 @@ static DECLFR(VSUNIRead1) return ret; } -static void SLHLHook(uint8 *buf, int line) +static void SLHLHook(uint8 *bg, uint8 *spr, uint32 linets, int final) { int x; for(x=0;x<2;x++) if(JPorts[x]->SLHook) - JPorts[x]->SLHook(x,buf,line); + JPorts[x]->SLHook(x,bg,spr,linets,final); if(FCExp) if(FCExp->SLHook) - FCExp->SLHook(buf,line); + FCExp->SLHook(bg,spr,linets,final); } static void CheckSLHook(void) @@ -266,7 +266,7 @@ static void FASTAPASS(1) SetInputStuff(int x) break; case SI_ARKANOID:JPorts[x]=FCEU_InitArkanoid(x);break; case SI_ZAPPER:JPorts[x]=FCEU_InitZapper(x);break; - case SI_POWERPADA:JPorts[x]=FCEU_InitPowerpad(x);break; + case SI_POWERPADA:JPorts[x]=FCEU_InitPowerpadA(x);break; case SI_NONE:JPorts[x]=&DummyJPort;break; }