General: the DS card stuff can perfectly fit in MMU.h (though it'd fit

better in NDSSystem.h, but it would require more work). There's no need 
for tiny extra files.

desmume/src/MMU.h

@@ -26,7 +26,6 @@
 #define MMU_H
 
 #include "FIFO.h"
-#include "dscard.h"
 #include "mem.h"
 
 #include "ARM9.h"
@@ -38,6 +37,25 @@
 
 typedef const u8 TWaitState;
 
+enum ECardMode
+{
+	CardMode_Normal = 0,
+	CardMode_KEY1,
+	CardMode_KEY2,
+};
+
+typedef struct
+{
+	
+	u8 command[8];
+
+	u32 address;
+	u32 transfer_count;
+
+	ECardMode mode;
+	
+} nds_dscard;
+
 struct MMU_struct {
 	//ARM7 mem
 	u8 ARM7_BIOS[0x4000];

desmume/src/dscard.h

@@ -1,45 +0,0 @@
-/*  Copyright (C) 2006 thoduv
-
-    This file is part of DeSmuME
-
-    DeSmuME 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.
-
-    DeSmuME 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 DeSmuME; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __DSCARD_H__
-#define __DSCARD_H__
-
-enum ECardMode
-{
-	CardMode_Normal = 0,
-	CardMode_KEY1,
-	CardMode_KEY2,
-};
-
-typedef struct
-{
-	
-	u8 command[8];
-
-	u32 address;
-	u32 transfer_count;
-
-	ECardMode mode;
-	
-} nds_dscard;
-
-#endif /*__DSCARD_H__*/
-
-
-

desmume/src/windows/DeSmuME_2008.vcproj

@@ -931,10 +931,6 @@
 					RelativePath="..\driver.h"
 					>
 				</File>
-				<File
-					RelativePath="..\dscard.h"
-					>
-				</File>
 				<File
 					RelativePath="..\fat.h"
 					>

desmume/src/windows/DeSmuME_2010.vcxproj

@@ -312,7 +312,6 @@
     <ClInclude Include="..\debug.h" />
     <ClInclude Include="..\Disassembler.h" />
     <ClInclude Include="..\driver.h" />
-    <ClInclude Include="..\dscard.h" />
     <ClInclude Include="..\fat.h" />
     <ClInclude Include="..\FIFO.h" />
     <ClInclude Include="..\fs.h" />