Renamed xm6.h to rascsi.h

src/raspberrypi/controllers/sasidev_ctrl.h

@@ -15,11 +15,11 @@
 //---------------------------------------------------------------------------
 #pragma once
 
+#include "../rascsi.h"
 #include "os.h"
 #include "scsi.h"
 #include "fileio.h"
 #include "log.h"
-#include "xm6.h"
 
 
 //===========================================================================

src/raspberrypi/devices/cfilesystem.cpp

@@ -19,10 +19,10 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "log.h"
 #include "filepath.h"
 #include "cfilesystem.h"
+#include "../rascsi.h"
 
 //---------------------------------------------------------------------------
 //

src/raspberrypi/devices/ctapdriver.cpp

@@ -22,7 +22,7 @@
 #endif
 #include <zlib.h> // For crc32()
 #include "os.h"
-#include "xm6.h"
+#include "../rascsi.h"
 #include "ctapdriver.h"
 #include "log.h"
 #include "exceptions.h"

src/raspberrypi/devices/disk.cpp

@@ -18,12 +18,12 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "controllers/sasidev_ctrl.h"
 #include "device_factory.h"
 #include "exceptions.h"
 #include "disk.h"
 #include <sstream>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/disk.h

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include "xm6.h"
 #include "log.h"
 #include "scsi.h"
 #include "controllers/scsidev_ctrl.h"
@@ -28,6 +27,8 @@
 #include <string>
 #include <vector>
 #include <map>
+
+#include "../rascsi.h"
 #include "scsi_block_commands.h"
 #include "scsi_primary_commands.h"
 

src/raspberrypi/devices/disk_track_cache.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "xm6.h"
+#include "../rascsi.h"
 #include "log.h"
 #include "filepath.h"
 

src/raspberrypi/devices/sasihd.cpp

@@ -14,10 +14,10 @@
 //
 //---------------------------------------------------------------------------
 #include "sasihd.h"
-#include "xm6.h"
 #include "fileio.h"
 #include "exceptions.h"
 #include <sstream>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/scsi_daynaport.h

@@ -28,12 +28,12 @@
 //---------------------------------------------------------------------------
 #pragma once
 
-#include "xm6.h"
 #include "os.h"
 #include "disk.h"
 #include "ctapdriver.h"
 #include <map>
 #include <string>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/scsi_host_bridge.cpp

@@ -17,7 +17,8 @@
 //---------------------------------------------------------------------------
 
 #include "scsi_host_bridge.h"
-#include "xm6.h"
+
+#include "../rascsi.h"
 #include "ctapdriver.h"
 #include "cfilesystem.h"
 

src/raspberrypi/devices/scsi_host_bridge.h

@@ -17,10 +17,10 @@
 //---------------------------------------------------------------------------
 #pragma once
 
-#include "xm6.h"
 #include "os.h"
 #include "disk.h"
 #include <string>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/scsicd.cpp

@@ -14,11 +14,11 @@
 //
 //---------------------------------------------------------------------------
 
-#include "xm6.h"
 #include "scsicd.h"
 #include "fileio.h"
 #include "exceptions.h"
 #include <sstream>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/scsihd.cpp

@@ -14,10 +14,10 @@
 //
 //---------------------------------------------------------------------------
 #include "scsihd.h"
-#include "xm6.h"
 #include "fileio.h"
 #include "exceptions.h"
 #include <sstream>
+#include "../rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/devices/scsimo.cpp

@@ -15,7 +15,8 @@
 //---------------------------------------------------------------------------
 
 #include "scsimo.h"
-#include "xm6.h"
+
+#include "../rascsi.h"
 #include "fileio.h"
 #include "exceptions.h"
 

src/raspberrypi/fileio.cpp

@@ -9,9 +9,9 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "filepath.h"
 #include "fileio.h"
+#include "rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/filepath.cpp

@@ -9,9 +9,9 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "filepath.h"
 #include "fileio.h"
+#include "rascsi.h"
 
 //===========================================================================
 //

src/raspberrypi/gpiobus.cpp

@@ -15,9 +15,9 @@
 #include <sys/mman.h>
 
 #include "os.h"
-#include "xm6.h"
 #include "gpiobus.h"
 #include "log.h"
+#include "rascsi.h"
 
 #ifdef __linux__
 //---------------------------------------------------------------------------

src/raspberrypi/rascsi.cpp

@@ -9,8 +9,9 @@
 //
 //---------------------------------------------------------------------------
 
+#include "rascsi.h"
+
 #include "os.h"
-#include "xm6.h"
 #include "filepath.h"
 #include "fileio.h"
 #include "controllers/scsidev_ctrl.h"

src/raspberrypi/rascsi.h

@@ -10,8 +10,7 @@
 //
 //---------------------------------------------------------------------------
 
-#if !defined(xm6_h)
-#define xm6_h
+#pragma once
 
 //---------------------------------------------------------------------------
 //
@@ -36,6 +35,3 @@ class Fileio;
 class Disk;
 										// SASI/SCSI Disk
 class Filepath;
-										// File Path
-
-#endif	// xm6_h

src/raspberrypi/rasdump.cpp

@@ -10,10 +10,10 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "fileio.h"
 #include "filepath.h"
 #include "gpiobus.h"
+#include "rascsi.h"
 #include "rascsi_version.h"
 
 //---------------------------------------------------------------------------

src/raspberrypi/sasidump.cpp

@@ -19,10 +19,10 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "fileio.h"
 #include "filepath.h"
 #include "gpiobus.h"
+#include "rascsi.h"
 #include "rascsi_version.h"
 
 //---------------------------------------------------------------------------

src/raspberrypi/scsi.cpp

@@ -10,8 +10,8 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "scsi.h"
+#include "rascsi.h"
 
 //---------------------------------------------------------------------------
 //

src/raspberrypi/scsimon.cpp

@@ -10,7 +10,6 @@
 //---------------------------------------------------------------------------
 
 #include "os.h"
-#include "xm6.h"
 #include "filepath.h"
 #include "fileio.h"
 #include "devices/disk.h"
@@ -21,6 +20,7 @@
 #include <sys/time.h>
 #include <climits>
 #include <sstream>
+#include "rascsi.h"
 
 //---------------------------------------------------------------------------
 //