X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=95ed4bd5cd41108498ee9007759181765e036d7d;hp=d2be777d7aeb620b0ff8f1408af209d56c478451;hb=d97315ac0bca825d2d50a44453bc5652946e2c67;hpb=35868d35201adb0e4066584d1145c920f5be9b03

diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c
index d2be777..95ed4bd 100644
--- a/drivers/gp2x/main.c
+++ b/drivers/gp2x/main.c
@@ -193,7 +193,7 @@ static void DoArgs(int argc, char *argv[])
 {
         static char *cortab[5]={"none","gamepad","zapper","powerpad","arkanoid"};
         static int cortabi[5]={SI_NONE,SI_GAMEPAD,
-                               SI_ZAPPER,SI_POWERPAD,SI_ARKANOID};
+                               SI_ZAPPER,SI_POWERPADA,SI_ARKANOID};
 	static char *fccortab[5]={"none","arkanoid","shadow","4player","fkb"};
 	static int fccortabi[5]={SIFC_NONE,SIFC_ARKANOID,SIFC_SHADOW,
 			         SIFC_4PLAYER,SIFC_FKB};
@@ -304,17 +304,23 @@ int CLImain(int argc, char *argv[])
 	FCEUGI *tmp;
 	int ret;
 
+        if(argc<=1)
+        {
+         ShowUsage(argv[0]);
+         return 1;
+        }
+
+        if(!DriverInitialize())
+        {
+	 return 1;
+        }
+
 	if(!(ret=FCEUI_Initialize()))
          return(1);
         GetBaseDirectory(BaseDirectory);
 	FCEUI_SetBaseDirectory(BaseDirectory);
 
 	CreateDirs();
-        if(argc<=1)
-        {
-         ShowUsage(argv[0]);
-         return 1;
-        }
         LoadConfig();
         DoArgs(argc-2,&argv[1]);
 	if(cpalette)
@@ -329,11 +335,6 @@ int CLImain(int argc, char *argv[])
         }
 	ParseGI(tmp);
 	//RefreshThrottleFPS();
-        if(!DriverInitialize())
-        {
-         ret=0;
-         goto dk;
-        }
 	InitOtherInput();
 	FCEUI_Emulate();
 
@@ -373,13 +374,13 @@ static void DriverKill(void)
  inited=0;
 }
 
-void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count)
+void FCEUD_Update(uint8 *xbuf, int16 *Buffer, int Count)
 {
  if(!Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE))
   SpeedThrottle();
- BlitScreen(XBuf);
- if(Count)
-  WriteSound(Buffer,Count,NoWaiting);
+ BlitScreen(xbuf);
+ if(Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE))
+  WriteSound(Buffer,Count);
  FCEUD_UpdateInput();
 }