From 8e48e72bf154a0c9bc8cf9b4e54c6b3a8ad94411 Mon Sep 17 00:00:00 2001 From: RaSCSI User Date: Mon, 14 Mar 2022 02:16:21 +0000 Subject: [PATCH] Comment cleanup --- .../disk_image/disk_image_handle.cpp | 15 ++++++++- .../disk_image/disk_image_handle.h | 16 ++++------ .../disk_image/disk_image_handle_factory.cpp | 31 +++++++++---------- .../disk_image/disk_image_handle_factory.h | 16 ++++------ .../disk_image/mmap_file_handle.cpp | 3 ++ src/raspberrypi/disk_image/mmap_file_handle.h | 2 +- .../disk_image/posix_file_handle.cpp | 2 +- .../disk_image/posix_file_handle.h | 2 +- 8 files changed, 47 insertions(+), 40 deletions(-) diff --git a/src/raspberrypi/disk_image/disk_image_handle.cpp b/src/raspberrypi/disk_image/disk_image_handle.cpp index 5d5933bf..990dfb95 100644 --- a/src/raspberrypi/disk_image/disk_image_handle.cpp +++ b/src/raspberrypi/disk_image/disk_image_handle.cpp @@ -1,4 +1,17 @@ - #include "disk_image/disk_image_handle.h" +//--------------------------------------------------------------------------- +// +// SCSI Target Emulator RaSCSI (*^..^*) +// for Raspberry Pi +// +// Copyright (C) 2022 akuker +// +// Base class for interfacing with disk images. +// +// [ DiskImageHandle ] +// +//--------------------------------------------------------------------------- + +#include "disk_image/disk_image_handle.h" DiskImageHandle::DiskImageHandle(const Filepath& path, int size, uint32_t blocks, off_t imgoff){ diff --git a/src/raspberrypi/disk_image/disk_image_handle.h b/src/raspberrypi/disk_image/disk_image_handle.h index b1e4a6ee..94ba66cd 100644 --- a/src/raspberrypi/disk_image/disk_image_handle.h +++ b/src/raspberrypi/disk_image/disk_image_handle.h @@ -1,19 +1,15 @@ //--------------------------------------------------------------------------- // -// X68000 EMULATOR "XM6" +// SCSI Target Emulator RaSCSI (*^..^*) +// for Raspberry Pi // -// Copyright (C) 2001-2006 ＰＩ．(ytanaka@ipc-tokai.or.jp) -// Copyright (C) 2014-2020 GIMONS +// Copyright (C) 2022 akuker // -// XM6i -// Copyright (C) 2010-2015 isaki@NetBSD.org +// Base class for interfacing with disk images. // -// Imported sava's Anex86/T98Next image and MO format support patch. -// Comments translated to english by akuker. +// [ DiskImageHandle ] // -// [ DiskTrack and DiskCache ] -// -//--------------------------------------------------------------------------- +//--------------------------------------------------------------------------- #pragma once diff --git a/src/raspberrypi/disk_image/disk_image_handle_factory.cpp b/src/raspberrypi/disk_image/disk_image_handle_factory.cpp index a0c2a391..e88e5ba7 100644 --- a/src/raspberrypi/disk_image/disk_image_handle_factory.cpp +++ b/src/raspberrypi/disk_image/disk_image_handle_factory.cpp @@ -1,17 +1,13 @@ //--------------------------------------------------------------------------- // -// X68000 EMULATOR "XM6" +// SCSI Target Emulator RaSCSI (*^..^*) +// for Raspberry Pi // -// Copyright (C) 2001-2006 ＰＩ．(ytanaka@ipc-tokai.or.jp) -// Copyright (C) 2014-2020 GIMONS +// Copyright (C) 2022 akuker // -// XM6i -// Copyright (C) 2010-2015 isaki@NetBSD.org +// Factory class for creating DiskImageHandles // -// Imported sava's Anex86/T98Next image and MO format support patch. -// Comments translated to english by akuker. -// -// [ DiskTrack and DiskCache ] +// [ DiskImageHandleFactory ] // //--------------------------------------------------------------------------- @@ -23,27 +19,30 @@ DiskImageHandleType DiskImageHandleFactory::current_access_type = DiskImageHandleType::ePosixFile; -DiskImageHandle *DiskImageHandleFactory::CreateFileAccess(const Filepath& path, int size, uint32_t blocks, off_t imgoff){ +DiskImageHandle *DiskImageHandleFactory::CreateDiskImageHandle(const Filepath &path, int size, uint32_t blocks, off_t imgoff) +{ DiskImageHandle *result = NULL; - if (current_access_type == DiskImageHandleType::eMmapFile){ + if (current_access_type == DiskImageHandleType::eMmapFile) + { LOGINFO("%s Creating MmapFileAccess %s", __PRETTY_FUNCTION__, path.GetPath()) result = new MmapFileHandle(path, size, blocks, imgoff); } - else if(current_access_type == DiskImageHandleType::eRamCache) { + else if (current_access_type == DiskImageHandleType::eRamCache) + { LOGINFO("%s Creating DiskCache %s", __PRETTY_FUNCTION__, path.GetPath()) result = new DiskCache(path, size, blocks, imgoff); } - else if(current_access_type == DiskImageHandleType::ePosixFile) { + else if (current_access_type == DiskImageHandleType::ePosixFile) + { LOGINFO("%s Creating PosixFileHandle %s", __PRETTY_FUNCTION__, path.GetPath()) result = new PosixFileHandle(path, size, blocks, imgoff); } - if (result == NULL){ + if (result == NULL) + { LOGWARN("%s Unable to create the File Access", __PRETTY_FUNCTION__); } return result; - } - diff --git a/src/raspberrypi/disk_image/disk_image_handle_factory.h b/src/raspberrypi/disk_image/disk_image_handle_factory.h index e1753ccb..96a42f38 100644 --- a/src/raspberrypi/disk_image/disk_image_handle_factory.h +++ b/src/raspberrypi/disk_image/disk_image_handle_factory.h @@ -1,17 +1,13 @@ //--------------------------------------------------------------------------- // -// X68000 EMULATOR "XM6" +// SCSI Target Emulator RaSCSI (*^..^*) +// for Raspberry Pi // -// Copyright (C) 2001-2006 ＰＩ．(ytanaka@ipc-tokai.or.jp) -// Copyright (C) 2014-2020 GIMONS +// Copyright (C) 2022 akuker // -// XM6i -// Copyright (C) 2010-2015 isaki@NetBSD.org +// Factory class for creating DiskImageHandles // -// Imported sava's Anex86/T98Next image and MO format support patch. -// Comments translated to english by akuker. -// -// [ DiskTrack and DiskCache ] +// [ DiskImageHandleFactory ] // //--------------------------------------------------------------------------- @@ -31,7 +27,7 @@ public: static void SetFileAccessMethod(DiskImageHandleType method) { current_access_type = method; }; static DiskImageHandleType GetFileAccessMethod() { return current_access_type; }; - static DiskImageHandle *CreateFileAccess(const Filepath& path, int size, uint32_t blocks, off_t imgoff = 0); + static DiskImageHandle *CreateDiskImageHandle(const Filepath& path, int size, uint32_t blocks, off_t imgoff = 0); private: static DiskImageHandleType current_access_type; diff --git a/src/raspberrypi/disk_image/mmap_file_handle.cpp b/src/raspberrypi/disk_image/mmap_file_handle.cpp index f1efde16..4fa9adf0 100644 --- a/src/raspberrypi/disk_image/mmap_file_handle.cpp +++ b/src/raspberrypi/disk_image/mmap_file_handle.cpp @@ -1,5 +1,8 @@ //--------------------------------------------------------------------------- // +// SCSI Target Emulator RaSCSI (*^..^*) +// for Raspberry Pi +// // Copyright (C) 2022 akuker // // This method of file access will use the mmap() capabilities to 'map' the diff --git a/src/raspberrypi/disk_image/mmap_file_handle.h b/src/raspberrypi/disk_image/mmap_file_handle.h index 83fff3ef..643137aa 100644 --- a/src/raspberrypi/disk_image/mmap_file_handle.h +++ b/src/raspberrypi/disk_image/mmap_file_handle.h @@ -16,7 +16,7 @@ // caching mechanism (like in disk_track_cache.h), we just rely on the // operating system. // -// [ MmapFileAccess ] +// [ MmapFileHandle ] // //--------------------------------------------------------------------------- diff --git a/src/raspberrypi/disk_image/posix_file_handle.cpp b/src/raspberrypi/disk_image/posix_file_handle.cpp index 71e9efc5..b5f59b6d 100644 --- a/src/raspberrypi/disk_image/posix_file_handle.cpp +++ b/src/raspberrypi/disk_image/posix_file_handle.cpp @@ -3,7 +3,7 @@ // SCSI Target Emulator RaSCSI (*^..^*) // for Raspberry Pi // -// Copyright (C) 2021 akuker +// Copyright (C) 2022 akuker // // [ PosixFileHandle ] // diff --git a/src/raspberrypi/disk_image/posix_file_handle.h b/src/raspberrypi/disk_image/posix_file_handle.h index 9ab8482f..ddaaf9ad 100644 --- a/src/raspberrypi/disk_image/posix_file_handle.h +++ b/src/raspberrypi/disk_image/posix_file_handle.h @@ -3,7 +3,7 @@ // SCSI Target Emulator RaSCSI (*^..^*) // for Raspberry Pi // -// Copyright (C) 2021 akuker +// Copyright (C) 2022 akuker // // [ PosixFileHandle ] //