integrate M-HT's neon scalers

[fceu.git] / input.c

diff --git a/input.c b/input.c
index 44432ae..b625583 100644 (file)
--- 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);
@@ -46,8 +46,6 @@ static uint8 joy_readbit[2];
 static uint8 joy[4]={0,0,0,0};
 static uint8 LastStrobe;
 
-extern int coinon;
-
 static int FSDisable=0;        /* Set to 1 if NES-style four-player adapter is disabled. */
 static int JPAttrib[2]={0,0};
 static int JPType[2]={0,0};
@@ -57,7 +55,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};
@@ -119,7 +117,7 @@ static DECLFR(JPRead)
          ret=FCExp->Read(A&1,ret);
 
        ret|=X.DB&0xC0;
-       dprintf("JPRead %02x", ret);
+       dprintf("JPRead %i %02x", A&1, ret);
        return(ret);
 }
 
@@ -232,16 +230,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 +264,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;
          }
 
@@ -348,18 +346,9 @@ void FCEUI_SetInputFC(int type, void *ptr, int attrib)
  SetInputStuffFC();
 }
 
-// quick paste
-#define FCEUNPCMD_RESET   0x01
-#define FCEUNPCMD_POWER   0x02
-
-#define FCEUNPCMD_VSUNICOIN     0x07
-#define FCEUNPCMD_VSUNIDIP0     0x08
-#define FCEUNPCMD_FDSINSERT     0x18
-#define FCEUNPCMD_FDSSELECT     0x1A
-
-
 void FCEU_DoSimpleCommand(int cmd)
 {
+   printf("FCEU_DoSimpleCommand: %i\n", cmd);
  switch(cmd)
  {
    case FCEUNPCMD_FDSINSERT: FCEU_FDSInsert();break;