Move Apple copyright page to ScsiBlockcmds class.

Author: maximumspatium

devices/common/scsi/scsiblockcmds.cpp

@@ -39,7 +39,7 @@ ScsiBlockCmds::ScsiBlockCmds() {
 }
 
 void ScsiBlockCmds::init_block_device(uint8_t medium_type, uint8_t dev_flags,
-                                      uint8_t density_code)
+                                      uint8_t density_code, bool is_apple_compliant)
 {
     this->medium_type  = medium_type;
     this->device_flags = dev_flags;
@@ -73,6 +73,9 @@ void ScsiBlockCmds::init_block_device(uint8_t medium_type, uint8_t dev_flags,
             }
         );
     }
+
+    if (is_apple_compliant)
+        this->add_page_getter(this, 0x30, &ScsiBlockCmds::get_apple_copyright_page);
 }
 
 void ScsiBlockCmds::process_command() {
@@ -259,3 +262,24 @@ uint32_t ScsiBlockCmds::get_lba() {
         ABORT_F("unsupported command length %d in get_lba", cmd_len);
     }
 }
+
+static char Apple_Copyright_Page_Data[] = "APPLE COMPUTER, INC   ";
+
+int ScsiBlockCmds::get_apple_copyright_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
+                                            int avail_len)
+{
+    if (subpage && subpage != 0xFFU)
+        return FORMAT_ERR_BAD_SUBPAGE;
+
+    if (ctrl == 3)
+        return FORMAT_ERR_BAD_CONTROL;
+
+    int page_size = 22;
+
+    if (page_size > avail_len)
+        return FORMAT_ERR_DATA_TOO_BIG;
+
+    std::memcpy(out_ptr, Apple_Copyright_Page_Data, page_size);
+
+    return page_size;
+}

devices/common/scsi/scsiblockcmds.h

@@ -38,7 +38,8 @@ class ScsiBlockCmds : public ScsiCommonCmds {
         this->blk_dev = blk_dev_obj;
     }
 
-    void init_block_device(uint8_t medium_type, uint8_t dev_flags, uint8_t density_code);
+    void init_block_device(uint8_t medium_type, uint8_t dev_flags,
+                           uint8_t density_code, bool is_apple_compliant);
 
     virtual int read_new();
     virtual int write_new();
@@ -55,6 +56,11 @@ class ScsiBlockCmds : public ScsiCommonCmds {
     int get_error_recovery_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
                                 int avail_len);
 
+    // this page is supported by a bunch of Apple-certified HD and CD-ROM devices
+    // so implement it here for reusability
+    int get_apple_copyright_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
+                                 int avail_len);
+
 protected:
     virtual void    process_command() override;
 

devices/common/scsi/scsihd.cpp

@@ -53,7 +53,6 @@ ScsiHardDisk::ScsiHardDisk(std::string name, int my_id) : ScsiPhysDevice(name, m
 
     this->add_page_getter(this, ModePage::DEV_FORMAT_PARAMS, &ScsiHardDisk::get_dev_format_page);
     this->add_page_getter(this, ModePage::RIGID_DISK_GEOMETRY, &ScsiHardDisk::get_rigid_geometry_page);
-    this->add_page_getter(this, 0x30, &ScsiHardDisk::get_apple_copyright_page);
 }
 
 void ScsiHardDisk::insert_image(std::string filename) {
@@ -65,7 +64,7 @@ void ScsiHardDisk::insert_image(std::string filename) {
 
     this->is_writeable = true;
 
-    this->init_block_device(0, 0, 0);
+    this->init_block_device(0, 0, 0, true);
 }
 
 void ScsiHardDisk::process_command() {
@@ -175,27 +174,6 @@ int ScsiHardDisk::get_rigid_geometry_page(uint8_t ctrl, uint8_t subpage, uint8_t
     return page_size;
 }
 
-static char Apple_Copyright_Page_Data[] = "APPLE COMPUTER, INC   ";
-
-int ScsiHardDisk::get_apple_copyright_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
-                                           int avail_len)
-{
-    if (subpage && subpage != 0xFFU)
-        return FORMAT_ERR_BAD_SUBPAGE;
-
-    if (ctrl == 3)
-        return FORMAT_ERR_BAD_CONTROL;
-
-    int page_size = 22;
-
-    if (page_size > avail_len)
-        return FORMAT_ERR_DATA_TOO_BIG;
-
-    std::memcpy(out_ptr, Apple_Copyright_Page_Data, page_size);
-
-    return page_size;
-}
-
 void ScsiHardDisk::format() {
     LOG_F(WARNING, "%s: attempt to format the disk!", this->name.c_str());
 

devices/common/scsi/scsihd.h

@@ -40,7 +40,7 @@ class ScsiHardDisk : public ScsiPhysDevice, public BlockStorageDevice, public Sc
     void process_command() override;
 
 protected:
-    bool is_device_ready() override { return true; }
+    bool is_device_ready() override { return this->is_ready; }
 
     void mode_select_6(uint8_t param_len);
 
@@ -50,9 +50,6 @@ class ScsiHardDisk : public ScsiPhysDevice, public BlockStorageDevice, public Sc
     int  get_rigid_geometry_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
                                  int avail_len);
 
-    int  get_apple_copyright_page(uint8_t ctrl, uint8_t subpage, uint8_t *out_ptr,
-                                  int avail_len);
-
     void format();
     void read_buffer();