From 30b4c60b219320c6d9114687b87e699f76abaa12 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 30 Mar 2014 22:29:30 +0200
Subject: [PATCH] Rename files endian.c and memory.c

---
 Fceuwin.dev                                   |  4 +-
 src/boards/mapinc.h                           |  2 +-
 src/cart.c                                    |  2 +-
 src/cheat.c                                   |  2 +-
 .../msvc/msvc-2010-360/msvc-2010-360.vcxproj  |  4 +-
 .../msvc-2010-360.vcxproj.filters             |  6 +-
 .../libretro/msvc/msvc-2010/msvc-2010.vcxproj |  6 +-
 .../msvc/msvc-2010/msvc-2010.vcxproj.filters  |  6 +-
 src/endian.c                                  | 95 -------------------
 src/endian.h                                  |  7 --
 src/fceu-endian.c                             | 10 +-
 src/fceu-endian.h                             | 12 +--
 src/{memory.c => fceu-memory.c}               |  2 +-
 src/{memory.h => fceu-memory.h}               |  0
 src/fceu.c                                    |  2 +-
 src/fds.c                                     |  2 +-
 src/file.c                                    |  2 +-
 src/ines.c                                    |  2 +-
 src/netplay.c                                 |  2 +-
 src/nsf.c                                     |  2 +-
 src/ppu.c                                     |  2 +-
 src/state.c                                   |  4 +-
 src/state.h                                   |  2 +-
 src/unif.c                                    |  2 +-
 src/video.c                                   |  2 +-
 25 files changed, 40 insertions(+), 142 deletions(-)
 delete mode 100644 src/endian.c
 delete mode 100644 src/endian.h
 rename src/{memory.c => fceu-memory.c} (98%)
 rename src/{memory.h => fceu-memory.h} (100%)

diff --git a/Fceuwin.dev b/Fceuwin.dev
index 7a42135..add2902 100644
--- a/Fceuwin.dev
+++ b/Fceuwin.dev
@@ -150,7 +150,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit14]
-FileName=src\memory.c
+FileName=src\fceu-memory.c
 CompileCpp=0
 Folder=
 Compile=1
@@ -460,7 +460,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit65]
-FileName=src\memory.h
+FileName=src\fceu-memory.h
 CompileCpp=0
 Folder=_Headers
 Compile=1
diff --git a/src/boards/mapinc.h b/src/boards/mapinc.h
index 7301928..8376a0c 100644
--- a/src/boards/mapinc.h
+++ b/src/boards/mapinc.h
@@ -2,7 +2,7 @@
 #include "../x6502.h"
 #include "../fceu.h"
 #include "../ppu.h"
-#include "../memory.h"
+#include "../fceu-memory.h"
 #include "../sound.h"
 #include "../state.h"
 #include "../cart.h"
diff --git a/src/cart.c b/src/cart.c
index 104435e..1758821 100644
--- a/src/cart.c
+++ b/src/cart.c
@@ -27,7 +27,7 @@
 #include "ppu.h"
 
 #include "cart.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "x6502.h"
 
 #include "general.h"
diff --git a/src/cheat.c b/src/cheat.c
index 1f41f02..85795bd 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -29,7 +29,7 @@
 #include "fceu.h"
 #include "general.h"
 #include "cart.h"
-#include "memory.h"
+#include "fceu-memory.h"
 
 static uint8 *CheatRPtrs[64];
 
diff --git a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index 50aa5db..7b907e5 100644
--- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -1587,7 +1587,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\..\src\memory.c">
+    <ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
@@ -1711,7 +1711,7 @@
     <ClInclude Include="..\..\..\..\..\srcmappers\mapinc.h" />
     <ClInclude Include="..\..\..\..\..\srcmappers\vrc7tone.h" />
     <ClInclude Include="..\..\..\..\..\srcmd5.h" />
-    <ClInclude Include="..\..\..\..\..\srcmemory.h" />
+    <ClInclude Include="..\..\..\..\..\srcfceu-memory.h" />
     <ClInclude Include="..\..\..\..\..\srcfceu-endian.h" />
     <ClInclude Include="..\..\..\..\..\srcops.h" />
     <ClInclude Include="..\..\..\..\..\srcpalette.h" />
diff --git a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
index ce3df62..999c0d1 100644
--- a/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
+++ b/src/drivers/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
@@ -629,7 +629,7 @@
     <ClCompile Include="..\..\..\..\..\src\md5.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\..\src\memory.c">
+    <ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\..\src\mycrc32.c">
@@ -739,7 +739,7 @@
     <ClInclude Include="..\..\..\..\..\src\md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\src\memory.h">
+    <ClInclude Include="..\..\..\..\..\src\fceu-memory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\..\src\myendian.h">
@@ -785,4 +785,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index 260dec3..6ca487f 100644
--- a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -845,7 +845,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\..\src\memory.c">
+    <ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
     </ClCompile>
@@ -921,7 +921,7 @@
     <ClInclude Include="..\..\..\..\..\src\mappers\mapinc.h" />
     <ClInclude Include="..\..\..\..\..\src\mappers\vrc7tone.h" />
     <ClInclude Include="..\..\..\..\..\src\md5.h" />
-    <ClInclude Include="..\..\..\..\..\src\memory.h" />
+    <ClInclude Include="..\..\..\..\..\src\fceu-memory.h" />
     <ClInclude Include="..\..\..\..\..\src\fceu-endian.h" />
     <ClInclude Include="..\..\..\..\..\src\ops.h" />
     <ClInclude Include="..\..\..\..\..\src\palette.h" />
@@ -941,4 +941,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index 47a8a08..f47af80 100644
--- a/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/src/drivers/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -75,7 +75,7 @@
     <ClCompile Include="..\..\..\..\..\src\md5.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\..\src\memory.c">
+    <ClCompile Include="..\..\..\..\..\src\fceu-memory.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\..\src\mycrc32.c">
@@ -731,7 +731,7 @@
     <ClInclude Include="..\..\..\..\..\src\md5.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\src\memory.h">
+    <ClInclude Include="..\..\..\..\..\src\fceu-memory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\..\src\ops.h">
@@ -777,4 +777,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/endian.c b/src/endian.c
deleted file mode 100644
index 2479f25..0000000
--- a/src/endian.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/*  Contains file I/O functions that write/read data    */
-/*  LSB first.              */
-
-
-#include <stdio.h>
-#include "types.h"
-#include "endian.h"
-
-void FlipByteOrder(uint8 *src, uint32 count) {
-	uint8 *start = src;
-	uint8 *end = src + count - 1;
-
-	if ((count & 1) || !count) return;	/* This shouldn't happen. */
-
-	while (count--) {
-		uint8 tmp;
-
-		tmp = *end;
-		*end = *start;
-		*start = tmp;
-		end--;
-		start++;
-	}
-}
-
-int write16le(uint16 b, FILE *fp) {
-	uint8 s[2];
-	s[0] = b;
-	s[1] = b >> 8;
-	return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
-}
-
-int write32le(uint32 b, FILE *fp) {
-	uint8 s[4];
-	s[0] = b;
-	s[1] = b >> 8;
-	s[2] = b >> 16;
-	s[3] = b >> 24;
-	return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
-}
-
-int read32le(uint32 *Bufo, FILE *fp) {
-	uint32 buf;
-	if (fread(&buf, 1, 4, fp) < 4)
-		return 0;
- #ifdef LSB_FIRST
-	*(uint32*)Bufo = buf;
- #else
-	*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
- #endif
-	return 1;
-}
-
-int read16le(char *d, FILE *fp) {
- #ifdef LSB_FIRST
-	return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
- #else
-	int ret;
-	ret = fread(d + 1, 1, 1, fp);
-	ret += fread(d, 1, 1, fp);
-	return ret < 2 ? 0 : 2;
- #endif
-}
-
-void FCEU_en32lsb(uint8 *buf, uint32 morp) {
-	buf[0] = morp;
-	buf[1] = morp >> 8;
-	buf[2] = morp >> 16;
-	buf[3] = morp >> 24;
-}
-
-uint32 FCEU_de32lsb(uint8 *morp) {
-	return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
-}
-
diff --git a/src/endian.h b/src/endian.h
deleted file mode 100644
index db3a7b1..0000000
--- a/src/endian.h
+++ /dev/null
@@ -1,7 +0,0 @@
-int write16le(uint16 b, FILE *fp);
-int write32le(uint32 b, FILE *fp);
-int read32le(uint32 *Bufo, FILE *fp);
-void FlipByteOrder(uint8 *src, uint32 count);
-
-void FCEU_en32lsb(uint8 *, uint32);
-uint32 FCEU_de32lsb(uint8 *);
diff --git a/src/fceu-endian.c b/src/fceu-endian.c
index 8e5fbf9..a5997fe 100644
--- a/src/fceu-endian.c
+++ b/src/fceu-endian.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <stdio.h>
-#include "memory.h"
+#include "fceu-memory.h"
 #include "fceu-types.h"
 #include "fceu-endian.h"
 
@@ -47,14 +47,14 @@ void FlipByteOrder(uint8 *src, uint32 count) {
 	}
 }
 
-int write16le(uint16 b, MEM_TYPE *fp) {
+int write16le(uint16 b, FILE *fp) {
 	uint8 s[2];
 	s[0] = b;
 	s[1] = b >> 8;
 	return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
 }
 
-int write32le(uint32 b, MEM_TYPE *fp) {
+int write32le(uint32 b, FILE *fp) {
 	uint8 s[4];
 	s[0] = b;
 	s[1] = b >> 8;
@@ -63,7 +63,7 @@ int write32le(uint32 b, MEM_TYPE *fp) {
 	return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
 }
 
-int read32le(uint32 *Bufo, MEM_TYPE *fp) {
+int read32le(uint32 *Bufo, FILE *fp) {
 	uint32 buf;
 	if (fread(&buf, 1, 4, fp) < 4)
 		return 0;
@@ -75,7 +75,7 @@ int read32le(uint32 *Bufo, MEM_TYPE *fp) {
 	return 1;
 }
 
-int read16le(char *d, MEM_TYPE *fp) {
+int read16le(char *d, FILE *fp) {
  #ifdef LSB_FIRST
 	return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
  #else
diff --git a/src/fceu-endian.h b/src/fceu-endian.h
index dc908a0..00d2a3d 100644
--- a/src/fceu-endian.h
+++ b/src/fceu-endian.h
@@ -1,11 +1,11 @@
-#ifndef FCEU_ENDIAN_H_
-#define FCEU_ENDIAN_H_
+#ifndef _FCEU_ENDIAN_H
+#define _FCEU_ENDIAN_H
 
-#include "memory.h"
+#include "fceu-memory.h"
 
-int write16le(uint16 b, MEM_TYPE *fp);
-int write32le(uint32 b, MEM_TYPE *fp);
-int read32le(uint32 *Bufo, MEM_TYPE *fp);
+int write16le(uint16 b, FILE *fp);
+int write32le(uint32 b, FILE *fp);
+int read32le(uint32 *Bufo, FILE *fp);
 void FlipByteOrder(uint8 *src, uint32 count);
 
 void FCEU_en32lsb(uint8 *, uint32);
diff --git a/src/memory.c b/src/fceu-memory.c
similarity index 98%
rename from src/memory.c
rename to src/fceu-memory.c
index de7a90e..c8e9b98 100644
--- a/src/memory.c
+++ b/src/fceu-memory.c
@@ -22,7 +22,7 @@
 
 #include "fceu-types.h"
 #include "fceu.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "general.h"
 
 void *FCEU_gmalloc(uint32 size) {
diff --git a/src/memory.h b/src/fceu-memory.h
similarity index 100%
rename from src/memory.h
rename to src/fceu-memory.h
diff --git a/src/fceu.c b/src/fceu.c
index 9254c02..6ca5d43 100644
--- a/src/fceu.c
+++ b/src/fceu.c
@@ -31,7 +31,7 @@
 #include  "netplay.h"
 #include  "general.h"
 #include  "fceu-endian.h"
-#include  "memory.h"
+#include  "fceu-memory.h"
 
 #include  "cart.h"
 #include  "nsf.h"
diff --git a/src/fds.c b/src/fds.c
index 9c49a7d..7c054df 100644
--- a/src/fds.c
+++ b/src/fds.c
@@ -30,7 +30,7 @@
 #include "general.h"
 #include "state.h"
 #include "file.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "cart.h"
 #include "md5.h"
 #include "netplay.h"
diff --git a/src/file.c b/src/file.c
index 9794ced..c6f75c9 100644
--- a/src/file.c
+++ b/src/file.c
@@ -29,7 +29,7 @@
 #include "fceu-types.h"
 #include "file.h"
 #include "fceu-endian.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "driver.h"
 #include "general.h"
 
diff --git a/src/ines.c b/src/ines.c
index 15939d5..fbe2691 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -34,7 +34,7 @@
 #include "state.h"
 #include "file.h"
 #include "general.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "crc32.h"
 #include "md5.h"
 #include "cheat.h"
diff --git a/src/netplay.c b/src/netplay.c
index 772f9a5..9542598 100644
--- a/src/netplay.c
+++ b/src/netplay.c
@@ -34,7 +34,7 @@
 #include "state.h"
 #include "cheat.h"
 #include "input.h"
-#include "endian.h"
+#include "fceu-endian.h"
 
 #ifndef __LIBRETRO__
 #define NETPLAY_ENABLED
diff --git a/src/nsf.c b/src/nsf.c
index 39b069f..5c54535 100644
--- a/src/nsf.c
+++ b/src/nsf.c
@@ -30,7 +30,7 @@
 #include "sound.h"
 #include "nsf.h"
 #include "general.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "file.h"
 #include "fds.h"
 #include "cart.h"
diff --git a/src/ppu.c b/src/ppu.c
index 9962ff8..89fc1a6 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -31,7 +31,7 @@
 #include        "sound.h"
 #include        "general.h"
 #include        "fceu-endian.h"
-#include        "memory.h"
+#include        "fceu-memory.h"
 #include        "ppuview.h"
 
 #include        "cart.h"
diff --git a/src/state.c b/src/state.c
index a0dc249..df8acbc 100644
--- a/src/state.c
+++ b/src/state.c
@@ -34,12 +34,12 @@
 #include "x6502.h"
 #include "fceu.h"
 #include "sound.h"
-#include "endian.h"
+#include "fceu-endian.h"
 #include "fds.h"
 #include "general.h"
 #include "state.h"
 #include "movie.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "ppu.h"
 #include "netplay.h"
 #include "video.h"
diff --git a/src/state.h b/src/state.h
index b9a0529..e1c481b 100644
--- a/src/state.h
+++ b/src/state.h
@@ -21,7 +21,7 @@
 #ifndef _FCEU_STATE_H_
 #define _FCEU_STATE_H_
 
-#include "memory.h"
+#include "fceu-memory.h"
 
 void FCEUSS_Save(char *);
 int FCEUSS_Load(char *);
diff --git a/src/unif.c b/src/unif.c
index 142860f..a818f2c 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -36,7 +36,7 @@
 #include  "state.h"
 #include  "fceu-endian.h"
 #include  "file.h"
-#include  "memory.h"
+#include  "fceu-memory.h"
 #include  "input.h"
 #include  "md5.h"
 
diff --git a/src/video.c b/src/video.c
index b68b232..864b683 100644
--- a/src/video.c
+++ b/src/video.c
@@ -28,7 +28,7 @@
 #include "video.h"
 #include "fceu.h"
 #include "general.h"
-#include "memory.h"
+#include "fceu-memory.h"
 #include "crc32.h"
 #include "state.h"
 #include "movie.h"