Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-26 22:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Added support for .hd1 (SCSI-1) image files (#828)

Browse Source 
* Added support for .hd1 (SCSI-1) image files

* Update c-cpp.yml

* Fixed unit test warnings

* Fixed wrong scan default default (must be 1, not -1)

* Updated max length check

* Removed file not present in develop branch

* Added unit test

* Added workflow configurations and README updates (#832)

* automated test try 1

* filter branches

* filter branches

* filter branches

* filter branches

* filter branches

* Configured build and test CI workflows

* enable for all branches

* Update README.md

* Update README.md

Co-authored-by: Tony Kuker <akuker@gmail.com>

* Fix simple SonarCloud issues (#834)

* Fixing SonarCloud issues, first round

* Fixing SonarCLoud issues, next round

* Fixing SonarQube issues, next round

* Fixed warning

* Replaced empty constructors/destructors with = default;

* Fixed warning

* Replaced new

* Use constants instead of macros

* Use structured binding declarations

* Use init statements for if

* Use string views

* Use enum class, use using instead of typedef

* Fixed more SonarCloud warnings

* Replaced redundant/duplicate types with auto

* Devlared methods const

* Memory management update

* Fixed warning

* Added missing const

* Improved RaScsiResponse memory management

* Improved memory management

* Improved memory management

* Replaced macros by constants, removed unused constants

* Made member private

* Fixed warning

* Added comment

* Fixed shadowing warnings

* Cleanup

* Cleanup

* Cleanup

* Fixed shadowing warning

* Removed unused code

* Fixed more warnings

* Removed obsolete casts

* Fixed warnings

* Removed unused field

* Removed library not needed by rasctl

* Include cleanup

* Updated platform check for better compatibility

* Improved check for invalid option. This prevents rasctl to break on macos.

* Updated option check

* Fixed typo

* Added TODO

* Removed macro

* Scope update

* Replaced macro

* Added TODO, update memory management

* Fixed typo

* Replaced NULL by nullptr

* Use more structured bindings

* Added TODO

* Use calloc instead of mallco to not need memset

* Fixed warnings

* Fixed SonarQube initialization issues

* Fixed warning

* Cleaned up override/virtual/final

* Fixed warnings

* Constructor update

* Fixed tests

* Improved memory management

* Added missing const

* Added const

* Fixed two bugs reported by SonarCloud

* Fix SonarCloud hotspot

* Fixed memory management

* Memory management update

* Addressing hotspot by using strncpy

* Fixed SonarCloud issues

* Fixed SonarQube issues

* Added missing const

* Added const

* Added const

* Suppress false positive

* Added SonarQube suppressions for false positives

* Added suppresoin

* Fixed code smells

* Reverted changes that is a SonarQube issue, but caused problems with -O3

* Removed TODO based on review

* Update c-cpp.yml

* Finalized merge

Co-authored-by: akuker <34318535+akuker@users.noreply.github.com>
Co-authored-by: Tony Kuker <akuker@gmail.com>
This commit is contained in:
Uwe Seimet 2022-09-08 04:45:00 +02:00 committed by GitHub
parent e7004e4ea9
commit d80fbec03d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/rascsi.1
View File

@ -25,6 +25,7 @@ The number (n) after the ID or HD identifier specifies the ID number for that de
For SCSI: The ID is limited from 0-7. However, typically SCSI ID 7 is reserved for the "initiator" (the host computer). The LUN is limited from 0-31. For SCSI: The ID is limited from 0-7. However, typically SCSI ID 7 is reserved for the "initiator" (the host computer). The LUN is limited from 0-31.
.PP .PP
RaSCSI will determine the type of device based upon the file extension of the FILE argument. RaSCSI will determine the type of device based upon the file extension of the FILE argument.
hd1: SCSI Hard Disk image (generic, non-removable, SCSI-1)
hds: SCSI Hard Disk image (generic, non-removable) hds: SCSI Hard Disk image (generic, non-removable)
hdr: SCSI Hard Disk image (generic, removable) hdr: SCSI Hard Disk image (generic, removable)
hdn: SCSI Hard Disk image (NEC GENUINE) hdn: SCSI Hard Disk image (NEC GENUINE)

1
doc/rascsi_man_page.txt
View File

@ -23,6 +23,7 @@ DESCRIPTION
RaSCSI will determine the type of device based upon the file extension RaSCSI will determine the type of device based upon the file extension
of the FILE argument. of the FILE argument.
hd1: SCSI Hard Disk image (generic, non-removable, SCSI-1)
hds: SCSI Hard Disk image (generic, non-removable) hds: SCSI Hard Disk image (generic, non-removable)
hdr: SCSI Hard Disk image (generic, removable) hdr: SCSI Hard Disk image (generic, removable)
hdn: SCSI Hard Disk image (NEC GENUINE) hdn: SCSI Hard Disk image (NEC GENUINE)

3
src/raspberrypi/devices/device_factory.cpp
View File

@ -55,6 +55,7 @@ DeviceFactory::DeviceFactory() : sector_sizes({}), geometries({}), default_param
default_params[SCLP]["cmd"] = "lp -oraw %f"; default_params[SCLP]["cmd"] = "lp -oraw %f";
default_params[SCLP]["timeout"] = "30"; default_params[SCLP]["timeout"] = "30";
extension_mapping["hd1"] = SCHD;
extension_mapping["hds"] = SCHD; extension_mapping["hds"] = SCHD;
extension_mapping["hda"] = SCHD; extension_mapping["hda"] = SCHD;
extension_mapping["hdn"] = SCHD; extension_mapping["hdn"] = SCHD;
@ -172,7 +173,7 @@ Device *DeviceFactory::CreateDevice(PbDeviceType type, const string& filename, i
if (string ext = GetExtension(filename); ext == "hdn" || ext == "hdi" || ext == "nhd") { if (string ext = GetExtension(filename); ext == "hdn" || ext == "hdi" || ext == "nhd") {
device = make_unique<SCSIHD_NEC>(); device = make_unique<SCSIHD_NEC>();
} else { } else {
device = make_unique<SCSIHD>(sector_sizes[SCHD], false); device = make_unique<SCSIHD>(sector_sizes[SCHD], false, ext == "hd1" ? scsi_level::SCSI_1_CCS : scsi_level::SCSI_2);
// Some Apple tools require a particular drive identification // Some Apple tools require a particular drive identification
if (ext == "hda") { if (ext == "hda") {

2
src/raspberrypi/devices/mode_page_device.cpp
View File

@ -32,7 +32,7 @@ bool ModePageDevice::Dispatch()
int ModePageDevice::AddModePages(const DWORD *cdb, BYTE *buf, int max_length) const int ModePageDevice::AddModePages(const DWORD *cdb, BYTE *buf, int max_length) const
{ {
if (max_length <= 0) { if (max_length < 0) {
return 0; return 0;
} }

8
src/raspberrypi/devices/scsihd.cpp
View File

@ -13,6 +13,7 @@
// [ SCSI hard disk ] // [ SCSI hard disk ]
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "scsihd.h" #include "scsihd.h"
#include "fileio.h" #include "fileio.h"
#include "rascsi_exceptions.h" #include "rascsi_exceptions.h"
@ -21,8 +22,11 @@
static const char *DEFAULT_PRODUCT = "SCSI HD"; static const char *DEFAULT_PRODUCT = "SCSI HD";
SCSIHD::SCSIHD(const unordered_set<uint32_t>& sector_sizes, bool removable) : Disk(removable ? "SCRM" : "SCHD") SCSIHD::SCSIHD(const unordered_set<uint32_t>& sector_sizes, bool removable, scsi_defs::scsi_level level)
: Disk(removable ? "SCRM" : "SCHD")
{ {
this->scsi_level = level;
SetSectorSizes(sector_sizes); SetSectorSizes(sector_sizes);
} }
@ -95,7 +99,7 @@ void SCSIHD::Open(const Filepath& path)
vector<BYTE> SCSIHD::InquiryInternal() const vector<BYTE> SCSIHD::InquiryInternal() const
{ {
return HandleInquiry(device_type::DIRECT_ACCESS, scsi_level::SCSI_2, IsRemovable()); return HandleInquiry(device_type::DIRECT_ACCESS, scsi_level, IsRemovable());
} }
void SCSIHD::ModeSelect(const DWORD *cdb, const BYTE *buf, int length) void SCSIHD::ModeSelect(const DWORD *cdb, const BYTE *buf, int length)

9
src/raspberrypi/devices/scsihd.h
View File

@ -22,8 +22,9 @@
class SCSIHD : public Disk, public FileSupport class SCSIHD : public Disk, public FileSupport
{ {
public: public:
SCSIHD(const unordered_set<uint32_t>&, bool);
~SCSIHD() override = default; SCSIHD(const unordered_set<uint32_t>&, bool, scsi_defs::scsi_level = scsi_level::SCSI_2);
virtual ~SCSIHD() {}
void FinalizeSetup(const Filepath&, off_t); void FinalizeSetup(const Filepath&, off_t);
@ -36,4 +37,8 @@ public:
void AddFormatPage(map<int, vector<BYTE>>&, bool) const override; void AddFormatPage(map<int, vector<BYTE>>&, bool) const override;
void AddVendorPage(map<int, vector<BYTE>>&, int, bool) const override; void AddVendorPage(map<int, vector<BYTE>>&, int, bool) const override;
private:
scsi_defs::scsi_level scsi_level;
}; };

3
src/raspberrypi/rascsi.cpp
View File

@ -106,7 +106,8 @@ void Banner(int argc, char* argv[])
FPRT(stdout," m is the optional logical unit (LUN) (0-31).\n"); FPRT(stdout," m is the optional logical unit (LUN) (0-31).\n");
FPRT(stdout," FILE is a disk image file, \"daynaport\", \"bridge\", \"printer\" or \"services\".\n\n"); FPRT(stdout," FILE is a disk image file, \"daynaport\", \"bridge\", \"printer\" or \"services\".\n\n");
FPRT(stdout," Image type is detected based on file extension if no explicit type is specified.\n"); FPRT(stdout," Image type is detected based on file extension if no explicit type is specified.\n");
FPRT(stdout," hds : SCSI HD image (Non-removable generic HD image)\n"); FPRT(stdout," hd1 : SCSI-1 HD image (Non-removable generic SCSI-1 HD image)\n");
FPRT(stdout," hds : SCSI HD image (Non-removable generic SCSI HD image)\n");
FPRT(stdout," hdr : SCSI HD image (Removable generic HD image)\n"); FPRT(stdout," hdr : SCSI HD image (Removable generic HD image)\n");
FPRT(stdout," hdn : SCSI HD image (NEC GENUINE)\n"); FPRT(stdout," hdn : SCSI HD image (NEC GENUINE)\n");
FPRT(stdout," hdi : SCSI HD image (Anex86 HD image)\n"); FPRT(stdout," hdi : SCSI HD image (Anex86 HD image)\n");

2
src/raspberrypi/test/device_factory_test.cpp
View File

@ -15,6 +15,7 @@
TEST(DeviceFactoryTest, GetTypeForFile) TEST(DeviceFactoryTest, GetTypeForFile)
{ {
EXPECT_EQ(device_factory.GetTypeForFile("test.hd1"), SCHD);
EXPECT_EQ(device_factory.GetTypeForFile("test.hds"), SCHD); EXPECT_EQ(device_factory.GetTypeForFile("test.hds"), SCHD);
EXPECT_EQ(device_factory.GetTypeForFile("test.HDS"), SCHD); EXPECT_EQ(device_factory.GetTypeForFile("test.HDS"), SCHD);
EXPECT_EQ(device_factory.GetTypeForFile("test.hda"), SCHD); EXPECT_EQ(device_factory.GetTypeForFile("test.hda"), SCHD);
@ -37,6 +38,7 @@ TEST(DeviceFactoryTest, LifeCycle)
{ {
Device *device = device_factory.CreateDevice(UNDEFINED, "services", -1); Device *device = device_factory.CreateDevice(UNDEFINED, "services", -1);
EXPECT_NE(nullptr, device); EXPECT_NE(nullptr, device);
EXPECT_EQ("SCHS", device->GetType());
list<Device *> devices = device_factory.GetAllDevices(); list<Device *> devices = device_factory.GetAllDevices();
EXPECT_EQ(1, devices.size()); EXPECT_EQ(1, devices.size());

1
src/raspberrypi/test/mode_pages_test.cpp
View File

@ -29,6 +29,7 @@ TEST(ModePagesTest, ModePageDevice_AddModePages)
MockModePageDevice device; MockModePageDevice device;
cdb[2] = 0x3f; cdb[2] = 0x3f;
EXPECT_EQ(0, device.AddModePages(cdb, buf, 0)) << "Allocation length was not limited";
EXPECT_EQ(1, device.AddModePages(cdb, buf, 1)) << "Allocation length was not limited"; EXPECT_EQ(1, device.AddModePages(cdb, buf, 1)) << "Allocation length was not limited";
cdb[2] = 0x00; cdb[2] = 0x00;