Commit f40cb9c4 authored by Libretro-Admin's avatar Libretro-Admin
Browse files

Cleanups

parent 015e76d9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* Support functions for interfacing with DrZ80 * Support functions for interfacing with DrZ80
*/ */
#include "StdAfx.h" #include "types.h"
#include "main.h" #include "main.h"
#include "memory.h" #include "memory.h"
......
...@@ -9,13 +9,8 @@ ...@@ -9,13 +9,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
/*#ifdef GP2X
#include "gp2x/minimal.h"
#else
#include "sdl/minimal.h"
#endif*/
#include "StdAfx.h" #include "types.h"
#include "main.h" #include "main.h"
#include "memory.h" #include "memory.h"
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
* for emulation of NGPC carts * for emulation of NGPC carts
*/ */
#include "StdAfx.h"
#include "race-memory.h"
#include "flash.h"
#include <string.h> #include <string.h>
#ifdef _WIN32 #ifdef _WIN32
#include <direct.h> #include <direct.h>
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif
#include "race-memory.h"
#include "types.h"
#include "flash.h"
#if 0 #if 0
#define DEBUG_FLASH #define DEBUG_FLASH
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/* graphics.cpp: implementation of the graphics class. */ /* graphics.cpp: implementation of the graphics class. */
#include "StdAfx.h" #include "types.h"
#include "graphics.h" #include "graphics.h"
#include "race-memory.h" #include "race-memory.h"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "log.h" #include "log.h"
#include <string.h> #include <string.h>
#include "../StdAfx.h" #include "../types.h"
#include "../state.h" #include "../state.h"
#include "../neopopsound.h" #include "../neopopsound.h"
#include "../sound.h" #include "../sound.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "unzip.h" #include "unzip.h"
#include "StdAfx.h" #include "types.h"
#include "main.h" #include "main.h"
...@@ -39,11 +39,11 @@ extern int finscan; ...@@ -39,11 +39,11 @@ extern int finscan;
extern int language; extern int language;
extern int tipo_consola; extern int tipo_consola;
BOOL m_bIsActive; int m_bIsActive;
EMUINFO m_emuInfo; EMUINFO m_emuInfo;
SYSTEMINFO m_sysInfo[NR_OF_SYSTEMS]; SYSTEMINFO m_sysInfo[NR_OF_SYSTEMS];
#define numberof(a) (sizeof(a)/sizeof(*(a))) #define ARRAY_SIZE(a) (sizeof(a)/sizeof(*(a)))
void mainemuinit(void) void mainemuinit(void)
{ {
...@@ -245,11 +245,12 @@ int loadFromZipByName(unsigned char *buffer, char *archive, ...@@ -245,11 +245,12 @@ int loadFromZipByName(unsigned char *buffer, char *archive,
//Vérifions que c'est la bonne extension //Vérifions que c'est la bonne extension
char *extension = getFileNameExtension(name); char *extension = getFileNameExtension(name);
for (i=0;i<numberof(recognizedExtensions);i++) { for (i=0;i < ARRAY_SIZE(recognizedExtensions);i++)
{
if (!strcmp(extension, recognizedExtensions[i])) if (!strcmp(extension, recognizedExtensions[i]))
break; break;
} }
if (i < numberof(recognizedExtensions)) if (i < ARRAY_SIZE(recognizedExtensions))
break; break;
zerror = unzGoToNextFile(zhandle); zerror = unzGoToNextFile(zhandle);
......
...@@ -14,10 +14,6 @@ struct SYSTEMINFO { ...@@ -14,10 +14,6 @@ struct SYSTEMINFO {
int vSize; int vSize;
int Ticks; int Ticks;
int InputKeys[12]; int InputKeys[12];
/* Dynamic System Info */
BOOL Back0;
BOOL Back1;
BOOL Sprites;
}; };
struct EMUINFO struct EMUINFO
...@@ -50,7 +46,7 @@ struct EMUINFO ...@@ -50,7 +46,7 @@ struct EMUINFO
#define NR_OF_SYSTEMS 2 #define NR_OF_SYSTEMS 2
extern BOOL m_bIsActive; extern int m_bIsActive;
extern EMUINFO m_emuInfo; extern EMUINFO m_emuInfo;
extern SYSTEMINFO m_sysInfo[NR_OF_SYSTEMS]; extern SYSTEMINFO m_sysInfo[NR_OF_SYSTEMS];
extern int romSize; extern int romSize;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* * * *
************************************************************************/ ************************************************************************/
#include "StdAfx.h" #include "types.h"
#include <string.h> #include <string.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#ifndef __NEOPOPSOUND__ #ifndef __NEOPOPSOUND__
#define __NEOPOPSOUND__ #define __NEOPOPSOUND__
#include "StdAfx.h" #include "types.h"
typedef struct typedef struct
{ {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/* ngpBios.cpp: implementation of the ngpBios class. */ /* ngpBios.cpp: implementation of the ngpBios class. */
#include "StdAfx.h" #include "types.h"
#include "ngpBios.h" #include "ngpBios.h"
unsigned char sysfont[8*256] = unsigned char sysfont[8*256] =
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* TODO: * TODO:
*/ */
#include "StdAfx.h"
#include "race-memory.h" #include "race-memory.h"
#include "types.h"
#include "input.h" /* for Gameboy Input */ #include "input.h" /* for Gameboy Input */
#include "graphics.h" /* for i/o ports of the game gear */ #include "graphics.h" /* for i/o ports of the game gear */
#include "tlcs900h.h" #include "tlcs900h.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef _MEMORYH_ #ifndef _MEMORYH_
#define _MEMORYH_ #define _MEMORYH_
#include "StdAfx.h" #include "types.h"
#include "neopopsound.h" #include "neopopsound.h"
#include "sound.h" #include "sound.h"
#include "input.h" #include "input.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
/* sound.cpp: implementation of the sound class. */ /* sound.cpp: implementation of the sound class. */
#include "StdAfx.h"
#include "main.h" #include "main.h"
#include "types.h"
#include "sound.h" #include "sound.h"
#include "memory.h" #include "memory.h"
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
/* sound.h: interface for the sound class. */ /* sound.h: interface for the sound class. */
#if !defined(AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_) #ifndef AFX_SOUND_H
#define AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_ #define AFX_SOUND_H
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif /* _MSC_VER > 1000 */ #endif /* _MSC_VER > 1000 */
#include "StdAfx.h" #include "types.h"
#include "main.h" #include "main.h"
int initSound(void); int initSound(void);
...@@ -49,4 +49,4 @@ void ngpSoundExecute(void); ...@@ -49,4 +49,4 @@ void ngpSoundExecute(void);
void ngpSoundOff(void); void ngpSoundOff(void);
void ngpSoundInterrupt(void); void ngpSoundInterrupt(void);
#endif /* !defined(AFX_SOUND_H__15E0A182_A0FD_11D4_8645_0050DA4EEEA0__INCLUDED_) */ #endif /* !defined(AFX_SOUND_H) */
...@@ -29,13 +29,12 @@ ...@@ -29,13 +29,12 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#include "StdAfx.h"
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include "tlcs900h.h" #include "tlcs900h.h"
#include "race-memory.h" #include "race-memory.h"
#include "ngpBios.h" #include "ngpBios.h"
#include "types.h"
#ifdef _DEBUG #ifdef _DEBUG
#undef THIS_FILE #undef THIS_FILE
...@@ -117,7 +116,7 @@ gen_regsXHL3, gen_regsXIX, gen_regsXIY, gen_regsXIZ, gen_regsXSP, ...@@ -117,7 +116,7 @@ gen_regsXHL3, gen_regsXIX, gen_regsXIY, gen_regsXIZ, gen_regsXSP,
gen_regsSP, gen_regsXSSP, gen_regsXNSP; gen_regsSP, gen_regsXSSP, gen_regsXNSP;
#ifdef TARGET_GP2X #ifdef TARGET_GP2X
//it's defined in StdAfx.h //it's defined in types.h
#ifndef GENREGSPC_AS_REG #ifndef GENREGSPC_AS_REG
unsigned int gen_regsPC; unsigned int gen_regsPC;
#endif #endif
...@@ -168,7 +167,7 @@ unsigned int gen_regsPC, gen_regsSR; ...@@ -168,7 +167,7 @@ unsigned int gen_regsPC, gen_regsSR;
unsigned char F2; unsigned char F2;
#ifdef TARGET_GP2X #ifdef TARGET_GP2X
//it's defined in StdAfx.h //it's defined in types.h
#else #else
unsigned char *my_pc = NULL; unsigned char *my_pc = NULL;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment