merged ppu code, added input+zapper, FDS/VS insert in menu

[fceu.git] / drivers / gp2x / main.c

diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c
index f700e4f..a399e1e 100644 (file)
--- a/drivers/gp2x/main.c
+++ b/drivers/gp2x/main.c
@@ -400,7 +400,7 @@ int CLImain(int argc, char *argv[])
           // TODO: handlers for other formats then iNES
           {
          int MapperNo;
-         iNES_HEADER *head = iNESGetHead();
+         iNES_HEADER *head = iNESGetHead(); // TODO: ReMake
           MapperNo = (head->ROM_type>>4);
           MapperNo|=(head->ROM_type2&0xF0);
          FCEU_DispMessage("%s, Mapper: %d%s%s", PAL?"PAL":"NTSC", MapperNo, (head->ROM_type&2)?", BB":"", (head->ROM_type&4)?", T":"");
@@ -451,8 +451,6 @@ static int DriverInitialize(void)
 {
    SetSignals((void *)CloseStuff);
 
-   if(InitJoysticks())
-    inited|=2;
    if(!InitVideo()) return 0;
    inited|=4;
    return 1;
@@ -463,8 +461,6 @@ static void DriverKill(void)
  // SaveConfig(NULL); // done explicitly in menu now
  SetSignals(SIG_IGN);
 
- if(inited&2)
-  KillJoysticks();
  if(inited&4)
   KillVideo();
  if(inited&1)