diff --git a/libretro/libretro.c b/libretro/libretro.c
index c53bef5..55131f0 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -124,6 +124,7 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize)
fread(in, CHUNKSIZE, 1, fd);
{
+ int left;
/* Get file size */
fseek(fd, 0, SEEK_END);
size = ftell(fd);
@@ -141,7 +142,7 @@ int load_archive(char *filename, unsigned char *buffer, int maxsize)
fprintf(stderr, "INFORMATION - %s\n", msg);
/* Read into buffer */
- int left = size;
+ left = size;
while (left > CHUNKSIZE)
{
fread(buffer, CHUNKSIZE, 1, fd);
@@ -280,6 +281,7 @@ static void configure_controls(void)
static int slot_load(int slot)
{
+ FILE *fp;
char filename[MAXPATHLEN];
unsigned long filesize, done = 0;
uint8_t *buffer;
@@ -306,7 +308,7 @@ static int slot_load(int slot)
sprintf (filename,"%s/saves/%s.srm", DEFAULT_PATH, rom_filename);
/* Open file */
- FILE *fp = fopen(filename, "rb");
+ fp = fopen(filename, "rb");
if (!fp)
{
fprintf(stderr, "ERROR - Unable to open file.\n");
@@ -319,7 +321,7 @@ static int slot_load(int slot)
fseek(fp, 0, SEEK_SET);
/* allocate buffer */
- buffer = (uint8_t *)memalign(32,filesize);
+ buffer = (uint8_t *)malloc(filesize);
if (!buffer)
{
fprintf(stderr, "ERROR - Unable to allocate memory.\n");
@@ -367,6 +369,7 @@ static int slot_load(int slot)
static int slot_save(int slot)
{
+ FILE *fp;
char filename[MAXPATHLEN];
unsigned long filesize, done = 0;
uint8_t *buffer;
@@ -376,7 +379,7 @@ static int slot_save(int slot)
fprintf(stderr, "INFORMATION - Saving State ...\n");
/* allocate buffer */
- buffer = (uint8_t *)memalign(32,STATE_SIZE);
+ buffer = (uint8_t *)malloc(STATE_SIZE);
if (!buffer)
{
fprintf(stderr, "ERROR - Unable to allocate memory.\n");
@@ -404,7 +407,7 @@ static int slot_save(int slot)
fprintf(stderr, "INFORMATION - Saving SRAM ...\n");
/* allocate buffer */
- buffer = (uint8_t *)memalign(32, 0x10000);
+ buffer = (uint8_t *)malloc(0x10000);
if (!buffer)
{
fprintf(stderr, "ERROR - Unable to allocate memory.\n");
@@ -432,7 +435,7 @@ static int slot_save(int slot)
}
/* Open file */
- FILE *fp = fopen(filename, "wb");
+ fp = fopen(filename, "wb");
if (!fp)
{
fprintf(stderr, "ERROR - Unable to open file.\n");
@@ -463,6 +466,7 @@ static int slot_save(int slot)
static void slot_autoload(int slot)
{
+ FILE *fp;
/* Mega CD backup RAM specific */
if (!slot && (system_hw == SYSTEM_MCD))
{
@@ -485,7 +489,7 @@ static void slot_autoload(int slot)
return;
}
- FILE *fp = fopen(path, "rb");
+ fp = fopen(path, "rb");
if (fp != NULL)
{
fread(scd.bram, 0x2000, 1, fp);
@@ -548,6 +552,7 @@ static void slot_autoload(int slot)
static void slot_autosave(int slot)
{
+ FILE *fp;
/* Mega CD backup RAM specific */
if (!slot && (system_hw == SYSTEM_MCD))
{
@@ -574,7 +579,7 @@ static void slot_autosave(int slot)
default:
return;
}
- FILE *fp = fopen(path, "wb");
+ fp = fopen(path, "wb");
if (fp != NULL)
{
fwrite(scd.bram, 0x2000, 1, fp);
@@ -669,10 +674,11 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
static void extract_directory(char *buf, const char *path, size_t size)
{
+ char *base;
strncpy(buf, path, size - 1);
buf[size - 1] = '\0';
- char *base = strrchr(buf, '/');
+ base = strrchr(buf, '/');
if (!base)
base = strrchr(buf, '\\');
@@ -729,7 +735,6 @@ static void retro_set_viewport_dimensions(void)
bool retro_load_game(const struct retro_game_info *info)
{
- int i;
const char *full_path;
extract_directory(g_rom_dir, info->path, sizeof(g_rom_dir));
@@ -778,6 +783,7 @@ bool retro_load_game_special(unsigned game_type, const struct retro_game_info *i
(void)game_type;
(void)info;
(void)num_info;
+ return FALSE;
}
void retro_unload_game(void)
@@ -821,6 +827,7 @@ size_t retro_get_memory_size(unsigned id)
void retro_init(void)
{
const char *dir = NULL;
+ unsigned level;
#if defined(USE_NTSC)
sms_ntsc = calloc(1, sizeof(sms_ntsc_t));
md_ntsc = calloc(1, sizeof(md_ntsc_t));
@@ -865,7 +872,7 @@ void retro_init(void)
failed_init = true;
}
- unsigned level = 1;
+ level = 1;
environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
}
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index 58e66e9..82a3f46 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -27,383 +27,54 @@
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
- CompileAsC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{00CE82EC-E948-4BB6-B726-23BF1571B05A}
@@ -487,9 +158,9 @@
false
$(OutDir)$(ProjectName).pch
MultiThreadedDebug
- _DEBUG;_XBOX;_LIB;INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
+ _DEBUG;_XBOX;_LIB;INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions)
Callcap
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -510,7 +181,7 @@
MultiThreadedDebug
_DEBUG;_XBOX;_LIB;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
Callcap
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -530,9 +201,9 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;PROFILE;_LIB;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
+ NDEBUG;_XBOX;PROFILE;_LIB;__LIBRETRO__;USE_15BPP_RENDERING;%(PreprocessorDefinitions)
Callcap
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -556,8 +227,8 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ NDEBUG;_XBOX;PROFILE;FASTCAP;_LIB;__LIBRETRO__;USE_15BPP_RENDERING;%(PreprocessorDefinitions)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -579,8 +250,8 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ NDEBUG;_XBOX;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -602,8 +273,8 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_XBOX;LTCG;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions);__LIBRETRO__USE_ZLIB__
- $(SolutionDir)\..\libretro;$(SolutionDir)\..\src;$(SolutionDir)\..\src\m68k;$(SolutionDir)\..\src\sound;$(SolutionDir)\..\src\cart_hw;$(SolutionDir)\..\src\cart_hw\svp;$(SolutionDir)\..\src\input_hw;$(SolutionDir)\..\src\ntsc;$(SolutionDir)\..\src\z80;%(AdditionalIncludeDirectories)
+ NDEBUG;_XBOX;LTCG;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_15BPP_RENDERING;__LIBRETRO__;%(PreprocessorDefinitions)
+ $(SolutionDir)\..\..\libretro;$(SolutionDir)\..\..\source;$(SolutionDir)\..\..\source\m68k;$(SolutionDir)\..\..\source\sound;$(SolutionDir)\..\..\source\cart_hw;$(SolutionDir)\..\..\source\cart_hw\svp;$(SolutionDir)\..\..\source\input_hw;$(SolutionDir)\..\..\source\ntsc;$(SolutionDir)\..\..\source\z80;$(SolutionDir)\..\..\source\cd_hw;%(AdditionalIncludeDirectories)
CompileAsC
@@ -615,4 +286,4 @@
-
+
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
index b91af40..7141b87 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
@@ -30,321 +30,157 @@
{2f0a4c83-ad74-4742-baef-35fafdca0e67}
-
- {c9414edf-4224-4099-8f74-b0e568024aaf}
-
-
- {a4dfea3d-749a-49ef-8da0-83b11b257674}
-
-
- {31cd36b8-e005-4711-b914-e959f77f84c2}
-
-
- {72abffc5-b66c-49dd-85e9-534022a36bc6}
-
-
- {4756672f-68e1-40c7-b78f-2a962c9bbe9e}
-
-
- {48e868f1-3e80-4888-9273-2b6676beb9f7}
-
-
- {7ce7e0de-8fc7-48bd-8fda-8afa919ee775}
-
-
- {53739b7c-d154-46d2-8a8d-28cc67c675aa}
-
{c90aed8d-25e3-439e-acec-f66acc8b4c0d}
+
+ {d8d4356b-c678-422e-aa12-9f52ba60fdbc}
+
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
- Source Files\m68k
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
+
Source Files\z80
-
- Source Files\cart_hw\svp
+
+ Source Files\sound
-
- Source Files\cart_hw\svp
+
+ Source Files\sound
-
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\ntsc
+
+
+ Source Files\ntsc
+
+
+ Source Files\m68k
+
+
+ Source Files\m68k
+
+
Source Files\libretro
-
- Source Files\ntsc
+
+ Source Files\input_hw
-
- Source Files\ntsc
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw
+
+
+ Source Files\cart_hw\svp
+
+
+ Source Files\cart_hw\svp
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
-
-
- Header Files\libretro
-
-
- Header Files\libretro
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\z80
-
-
- Header Files\z80
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\cart_hw\svp
-
-
- Header Files\cart_hw\svp
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
-
+
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index 672fdfc..aef41e8 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -10,6 +10,57 @@
Win32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}
Win32Proj
@@ -53,7 +104,7 @@
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_15BPP_RENDERING;%(PreprocessorDefinitions)
- $(SolutionDir)/../src;$(SolutionDir)/../utils/zlib;$(SolutionDir)/../src/cart_hw/svp;$(SolutionDir)/../libretro;$(SolutionDir)/../src/m68k;$(SolutionDir)/../src/z80;$(SolutionDir)/../src/input_hw;$(SolutionDir)/../src/cart_hw;$(SolutionDir)/../src/sound;$(SolutionDir)/../src/ntsc;%(AdditionalIncludeDirectories)
+ $(SolutionDir)/../../source;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../source/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../source/m68k;$(SolutionDir)/../../source/z80;$(SolutionDir)/../../source/input_hw;$(SolutionDir)/../../source/cart_hw;$(SolutionDir)/../../source/sound;$(SolutionDir)/../../source/ntsc;$(SolutionDir)/../../source/cd_hw;%(AdditionalIncludeDirectories)
Windows
@@ -70,7 +121,7 @@
true
true
WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_15BPP_RENDERING;%(PreprocessorDefinitions)
- $(SolutionDir)/../src;$(SolutionDir)/../utils/zlib;$(SolutionDir)/../src/cart_hw/svp;$(SolutionDir)/../libretro;$(SolutionDir)/../src/m68k;$(SolutionDir)/../src/z80;$(SolutionDir)/../src/input_hw;$(SolutionDir)/../src/cart_hw;$(SolutionDir)/../src/sound;$(SolutionDir)/../src/ntsc;%(AdditionalIncludeDirectories)
+ $(SolutionDir)/../../source;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../source/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../source/m68k;$(SolutionDir)/../../source/z80;$(SolutionDir)/../../source/input_hw;$(SolutionDir)/../../source/cart_hw;$(SolutionDir)/../../source/sound;$(SolutionDir)/../../source/ntsc;$(SolutionDir)/../../source/cd_hw;%(AdditionalIncludeDirectories)
Windows
@@ -80,239 +131,6 @@
libretro.def
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
- CompileAsC
- CompileAsC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index 3b79ab7..24ea0cf 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -37,354 +37,157 @@
{95e90e29-1915-4f70-b6e0-50b9dace48cf}
-
- {2d43f01a-655e-4052-a900-51a34992c5de}
-
-
- {6d10d7fc-8d96-43e1-8e4e-bfdc000e301c}
-
-
- {163bbf21-faa7-4192-b50a-a4767bf9747b}
-
-
- {a142c167-5986-4e2b-9673-6d32158b19c5}
-
-
- {5202f178-780c-4312-bf82-0161b7af4657}
-
-
- {878a07f3-c007-46a9-b695-749cf7a74cee}
-
-
- {7e019ffb-cb39-421f-bc49-bde151103026}
-
-
- {5ff9df4d-6de7-495c-8a2d-155709c2c4a6}
-
-
- {1a79b638-97fd-46c8-b75d-aa93debaed87}
+
+ {eba4b43d-dbd8-4170-9853-e3234db6dfc0}
-
- Source Files
+
+ Source Files\cart_hw\svp
-
- Source Files
+
+ Source Files\cart_hw\svp
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\cart_hw
-
- Source Files
+
+ Source Files\input_hw
-
- Source Files\z80
+
+ Source Files\input_hw
-
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\input_hw
+
+
+ Source Files\libretro
+
+
Source Files\m68k
-
- Source Files\cart_hw
+
+ Source Files\m68k
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw
-
-
- Source Files\cart_hw\svp
-
-
- Source Files\cart_hw\svp
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\sound
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
- Source Files\input_hw
-
-
+
Source Files\ntsc
-
+
Source Files\ntsc
-
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\sound
+
+
+ Source Files\z80
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
+ Source Files\cd_hw
+
+
Source Files\libretro
-
-
- Header Files\libretro
-
-
- Header Files\libretro
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files
-
-
- Header Files\z80
-
-
- Header Files\z80
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\m68k
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\input_hw
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\sound
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\ntsc
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw
-
-
- Header Files\cart_hw\svp
-
-
- Header Files\cart_hw\svp
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
- Header Files\zlib
-
-
\ No newline at end of file
diff --git a/libretro/scrc32.c b/libretro/scrc32.c
new file mode 100644
index 0000000..8ae2f1d
--- /dev/null
+++ b/libretro/scrc32.c
@@ -0,0 +1,79 @@
+#ifndef _S_CRC32_H
+#define _S_CRC32_H
+
+static const unsigned long crc_table[256] = {
+ 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+ 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+ 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+ 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+ 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+ 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+ 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+ 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+ 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+ 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+ 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+ 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+ 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+ 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+ 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+ 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+ 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+ 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+ 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+ 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+ 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+ 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+ 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+ 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+ 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+ 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+ 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+ 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+ 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+ 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+ 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+ 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+ 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+ 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+ 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+ 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+ 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+ 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+ 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+ 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+ 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+ 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+ 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+ 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+ 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+ 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+ 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+ 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+ 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+ 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+ 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+ 0x2d02ef8dL
+};
+
+#define DO1_CRC32(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2_CRC32(buf) DO1_CRC32(buf); DO1_CRC32(buf);
+#define DO4_CRC32(buf) DO2_CRC32(buf); DO2_CRC32(buf);
+#define DO8_CRC32(buf) DO4_CRC32(buf); DO4_CRC32(buf);
+
+unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len)
+{
+ if (buf == 0) return 0L;
+ crc = crc ^ 0xffffffffL;
+ while (len >= 8)
+ {
+ DO8_CRC32(buf);
+ len -= 8;
+ }
+ if (len) do {
+ DO1_CRC32(buf);
+ } while (--len);
+ return crc ^ 0xffffffffL;
+}
+
+#endif
diff --git a/libretro/scrc32.h b/libretro/scrc32.h
index e65ea23..2432c78 100644
--- a/libretro/scrc32.h
+++ b/libretro/scrc32.h
@@ -1,79 +1,6 @@
#ifndef _S_CRC32_H
#define _S_CRC32_H
-static const unsigned long crc_table[256] = {
- 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
- 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
- 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
- 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
- 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
- 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
- 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
- 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
- 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
- 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
- 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
- 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
- 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
- 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
- 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
- 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
- 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
- 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
- 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
- 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
- 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
- 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
- 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
- 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
- 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
- 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
- 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
- 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
- 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
- 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
- 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
- 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
- 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
- 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
- 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
- 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
- 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
- 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
- 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
- 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
- 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
- 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
- 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
- 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
- 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
- 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
- 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
- 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
- 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
- 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
- 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
- 0x2d02ef8dL
-};
+unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len);
-#define DO1_CRC32(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-#define DO2_CRC32(buf) DO1_CRC32(buf); DO1_CRC32(buf);
-#define DO4_CRC32(buf) DO2_CRC32(buf); DO2_CRC32(buf);
-#define DO8_CRC32(buf) DO4_CRC32(buf); DO4_CRC32(buf);
-
-static unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int len)
-{
- if (buf == 0) return 0L;
- crc = crc ^ 0xffffffffL;
- while (len >= 8)
- {
- DO8_CRC32(buf);
- len -= 8;
- }
- if (len) do {
- DO1_CRC32(buf);
- } while (--len);
- return crc ^ 0xffffffffL;
-}
-
-#endif
\ No newline at end of file
+#endif