From 53c8d271aa4273c03525ca56df46ebec9ef3eabf Mon Sep 17 00:00:00 2001 From: Uwe Seimet Date: Thu, 26 Aug 2021 10:40:40 +0200 Subject: [PATCH] Renamed xm6.h to rascsi.h --- src/raspberrypi/controllers/sasidev_ctrl.h | 2 +- src/raspberrypi/devices/cfilesystem.cpp | 2 +- src/raspberrypi/devices/ctapdriver.cpp | 2 +- src/raspberrypi/devices/disk.cpp | 2 +- src/raspberrypi/devices/disk.h | 3 ++- src/raspberrypi/devices/disk_track_cache.h | 2 +- src/raspberrypi/devices/sasihd.cpp | 2 +- src/raspberrypi/devices/scsi_daynaport.h | 2 +- src/raspberrypi/devices/scsi_host_bridge.cpp | 3 ++- src/raspberrypi/devices/scsi_host_bridge.h | 2 +- src/raspberrypi/devices/scsicd.cpp | 2 +- src/raspberrypi/devices/scsihd.cpp | 2 +- src/raspberrypi/devices/scsimo.cpp | 3 ++- src/raspberrypi/fileio.cpp | 2 +- src/raspberrypi/filepath.cpp | 2 +- src/raspberrypi/gpiobus.cpp | 2 +- src/raspberrypi/rascsi.cpp | 3 ++- src/raspberrypi/{xm6.h => rascsi.h} | 6 +----- src/raspberrypi/rasdump.cpp | 2 +- src/raspberrypi/sasidump.cpp | 2 +- src/raspberrypi/scsi.cpp | 2 +- src/raspberrypi/scsimon.cpp | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) rename src/raspberrypi/{xm6.h => rascsi.h} (93%) diff --git a/src/raspberrypi/controllers/sasidev_ctrl.h b/src/raspberrypi/controllers/sasidev_ctrl.h index d3eec3cb..260fdb73 100644 --- a/src/raspberrypi/controllers/sasidev_ctrl.h +++ b/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" //=========================================================================== diff --git a/src/raspberrypi/devices/cfilesystem.cpp b/src/raspberrypi/devices/cfilesystem.cpp index 2ad123c3..e1c81b5d 100644 --- a/src/raspberrypi/devices/cfilesystem.cpp +++ b/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" //--------------------------------------------------------------------------- // diff --git a/src/raspberrypi/devices/ctapdriver.cpp b/src/raspberrypi/devices/ctapdriver.cpp index db95a801..8f6a4d2e 100644 --- a/src/raspberrypi/devices/ctapdriver.cpp +++ b/src/raspberrypi/devices/ctapdriver.cpp @@ -22,7 +22,7 @@ #endif #include // For crc32() #include "os.h" -#include "xm6.h" +#include "../rascsi.h" #include "ctapdriver.h" #include "log.h" #include "exceptions.h" diff --git a/src/raspberrypi/devices/disk.cpp b/src/raspberrypi/devices/disk.cpp index 79b6e91b..a8d44456 100644 --- a/src/raspberrypi/devices/disk.cpp +++ b/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 +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/disk.h b/src/raspberrypi/devices/disk.h index d417900b..13f118c6 100644 --- a/src/raspberrypi/devices/disk.h +++ b/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 #include #include + +#include "../rascsi.h" #include "scsi_block_commands.h" #include "scsi_primary_commands.h" diff --git a/src/raspberrypi/devices/disk_track_cache.h b/src/raspberrypi/devices/disk_track_cache.h index 44e1fb25..f3871018 100644 --- a/src/raspberrypi/devices/disk_track_cache.h +++ b/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" diff --git a/src/raspberrypi/devices/sasihd.cpp b/src/raspberrypi/devices/sasihd.cpp index a7d80133..06eb78ff 100644 --- a/src/raspberrypi/devices/sasihd.cpp +++ b/src/raspberrypi/devices/sasihd.cpp @@ -14,10 +14,10 @@ // //--------------------------------------------------------------------------- #include "sasihd.h" -#include "xm6.h" #include "fileio.h" #include "exceptions.h" #include +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/scsi_daynaport.h b/src/raspberrypi/devices/scsi_daynaport.h index b77cdc7b..4f32718d 100644 --- a/src/raspberrypi/devices/scsi_daynaport.h +++ b/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 #include +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/scsi_host_bridge.cpp b/src/raspberrypi/devices/scsi_host_bridge.cpp index 1cdb85dd..1a268ef4 100644 --- a/src/raspberrypi/devices/scsi_host_bridge.cpp +++ b/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" diff --git a/src/raspberrypi/devices/scsi_host_bridge.h b/src/raspberrypi/devices/scsi_host_bridge.h index e3b0365d..9364ee68 100644 --- a/src/raspberrypi/devices/scsi_host_bridge.h +++ b/src/raspberrypi/devices/scsi_host_bridge.h @@ -17,10 +17,10 @@ //--------------------------------------------------------------------------- #pragma once -#include "xm6.h" #include "os.h" #include "disk.h" #include +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/scsicd.cpp b/src/raspberrypi/devices/scsicd.cpp index cc2ade36..11267d60 100644 --- a/src/raspberrypi/devices/scsicd.cpp +++ b/src/raspberrypi/devices/scsicd.cpp @@ -14,11 +14,11 @@ // //--------------------------------------------------------------------------- -#include "xm6.h" #include "scsicd.h" #include "fileio.h" #include "exceptions.h" #include +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/scsihd.cpp b/src/raspberrypi/devices/scsihd.cpp index f240ee8d..c6eebd1e 100644 --- a/src/raspberrypi/devices/scsihd.cpp +++ b/src/raspberrypi/devices/scsihd.cpp @@ -14,10 +14,10 @@ // //--------------------------------------------------------------------------- #include "scsihd.h" -#include "xm6.h" #include "fileio.h" #include "exceptions.h" #include +#include "../rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/devices/scsimo.cpp b/src/raspberrypi/devices/scsimo.cpp index cbf3a6e2..4aa2c8a9 100644 --- a/src/raspberrypi/devices/scsimo.cpp +++ b/src/raspberrypi/devices/scsimo.cpp @@ -15,7 +15,8 @@ //--------------------------------------------------------------------------- #include "scsimo.h" -#include "xm6.h" + +#include "../rascsi.h" #include "fileio.h" #include "exceptions.h" diff --git a/src/raspberrypi/fileio.cpp b/src/raspberrypi/fileio.cpp index 8cb67ff2..590d9816 100644 --- a/src/raspberrypi/fileio.cpp +++ b/src/raspberrypi/fileio.cpp @@ -9,9 +9,9 @@ //--------------------------------------------------------------------------- #include "os.h" -#include "xm6.h" #include "filepath.h" #include "fileio.h" +#include "rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/filepath.cpp b/src/raspberrypi/filepath.cpp index 18c51b26..788eb3cd 100644 --- a/src/raspberrypi/filepath.cpp +++ b/src/raspberrypi/filepath.cpp @@ -9,9 +9,9 @@ //--------------------------------------------------------------------------- #include "os.h" -#include "xm6.h" #include "filepath.h" #include "fileio.h" +#include "rascsi.h" //=========================================================================== // diff --git a/src/raspberrypi/gpiobus.cpp b/src/raspberrypi/gpiobus.cpp index a1f07c1e..c2d21368 100644 --- a/src/raspberrypi/gpiobus.cpp +++ b/src/raspberrypi/gpiobus.cpp @@ -15,9 +15,9 @@ #include #include "os.h" -#include "xm6.h" #include "gpiobus.h" #include "log.h" +#include "rascsi.h" #ifdef __linux__ //--------------------------------------------------------------------------- diff --git a/src/raspberrypi/rascsi.cpp b/src/raspberrypi/rascsi.cpp index 5a45cbf2..164d8948 100644 --- a/src/raspberrypi/rascsi.cpp +++ b/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" diff --git a/src/raspberrypi/xm6.h b/src/raspberrypi/rascsi.h similarity index 93% rename from src/raspberrypi/xm6.h rename to src/raspberrypi/rascsi.h index 2c21bfc0..b8852cc6 100644 --- a/src/raspberrypi/xm6.h +++ b/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 diff --git a/src/raspberrypi/rasdump.cpp b/src/raspberrypi/rasdump.cpp index 8fbf0bd1..585d6abd 100644 --- a/src/raspberrypi/rasdump.cpp +++ b/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" //--------------------------------------------------------------------------- diff --git a/src/raspberrypi/sasidump.cpp b/src/raspberrypi/sasidump.cpp index a0a8ee9a..4654e2dd 100644 --- a/src/raspberrypi/sasidump.cpp +++ b/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" //--------------------------------------------------------------------------- diff --git a/src/raspberrypi/scsi.cpp b/src/raspberrypi/scsi.cpp index 7e3af2c4..757ee7d3 100644 --- a/src/raspberrypi/scsi.cpp +++ b/src/raspberrypi/scsi.cpp @@ -10,8 +10,8 @@ //--------------------------------------------------------------------------- #include "os.h" -#include "xm6.h" #include "scsi.h" +#include "rascsi.h" //--------------------------------------------------------------------------- // diff --git a/src/raspberrypi/scsimon.cpp b/src/raspberrypi/scsimon.cpp index 1e8655ed..10a32486 100644 --- a/src/raspberrypi/scsimon.cpp +++ b/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 #include #include +#include "rascsi.h" //--------------------------------------------------------------------------- //