Renamed DiskConsts.h to DiskDefs.h + other header refactoring

ApplewinExpress9.00.vcproj

@@ -803,7 +803,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\source\DiskConsts.h"
+					RelativePath=".\source\DiskDefs.h"
 					>
 				</File>
 				<File

source/Applewin.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Structs.h"
+#include "Common.h"
 
 void SetCurrentCLK6502();
 void SetCurrentImageDir(const char* pszImageDir);

source/Common.h

@@ -66,9 +66,6 @@ enum AppMode_e
 #define TITLE_PAUSED       TEXT("* PAUSED *")
 #define TITLE_STEPPING     TEXT("Stepping")
 
-#define  REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
-#define  REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
-
 // Configuration
 #define REG_CONFIG						"Configuration"
 #define  REGVALUE_APPLE2_TYPE        "Apple2 Type"

source/Configuration/Config.h

@@ -1,7 +1,8 @@
 #pragma once
 
 #include "..\AppleWin.h"
-#include "..\HardDisk.h"
+#include "..\Disk.h"		// BOOL enhancedisk
+#include "..\HardDisk.h"	// HD_CardIsEnabled()
 
 class CConfigNeedingRestart
 {

source/Configuration/PageAdvanced.cpp

@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\ParallelPrinter.h"
 #include "..\Registry.h"
 #include "..\SaveState.h"

source/Configuration/PageConfig.cpp

@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\Registry.h"
 #include "..\SerialComms.h"

source/Configuration/PageDisk.cpp

@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\Registry.h"
 #include "..\resource\resource.h"

source/Configuration/PageInput.cpp

@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\Keyboard.h"
 #include "..\Registry.h"
 #include "..\resource\resource.h"

source/Configuration/PageSound.cpp

@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "..\Structs.h"
+#include "..\Common.h"
 
-#include "..\Disk.h"
 #include "..\Mockingboard.h"
 #include "..\Registry.h"
 #include "..\Speaker.h"

source/Configuration/PropertySheet.cpp

@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "..\AppleWin.h"
-#include "..\Disk.h"
 #include "..\Frame.h"
 #include "..\resource\resource.h"
 #include "PropertySheet.h"

source/Debugger/Debug.h

@@ -6,6 +6,7 @@
 using namespace std;
 
 #include "..\Structs.h"
+#include "..\Common.h"
 
 #include "Debugger_Types.h"
 #include "Debugger_DisassemblerData.h"

source/DiskImage.cpp

@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "Structs.h"
+#include "Common.h"
+
 #include "DiskImage.h"
 #include "DiskImageHelper.h"
 

source/DiskImage.h

@@ -23,7 +23,7 @@ along with AppleWin; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "DiskConsts.h"
+#include "DiskDefs.h"
 
 	#define TRACK_DENIBBLIZED_SIZE (16 * 256)	// #Sectors x Sector-size
 

source/DiskImageHelper.cpp

@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "stdafx.h"
 #include "Structs.h"
+#include "Common.h"
 
 #include "zlib.h"
 #include "unzip.h"

source/MouseInterface.cpp

@@ -42,6 +42,7 @@ Etc.
 
 #include "stdafx.h"
 #include "Structs.h"
+#include "Common.h"
 
 #include "CPU.h"
 #include "Frame.h"	// FrameSetCursorPosByMousePos()

source/Registry.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#define  REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
+#define  REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
+
 BOOL    RegLoadString (LPCTSTR,LPCTSTR,BOOL,LPTSTR,DWORD);
 BOOL    RegLoadValue (LPCTSTR,LPCTSTR,BOOL,DWORD *);
 void    RegSaveString (LPCTSTR,LPCTSTR,BOOL,LPCTSTR);

source/Structs.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "Common.h"
-#include "DiskConsts.h"
+#include "DiskDefs.h"
 
 // Structs used by save-state file