scsiphysinterface.h: more callbacks.

Author: maximumspatium

devices/common/scsi/scsi.h

@@ -236,8 +236,6 @@ constexpr auto SCSI_MAX_DEVS    = 8;
 
 class ScsiBus;
 
-typedef std::function<void()> action_callback;
-
 class ScsiPhysDevice : public ScsiPhysInterface, public HWComponent {
 public:
     ScsiPhysDevice(std::string name, int my_id) : ScsiPhysInterface(PHY_ID_SCSI) {
@@ -266,10 +264,14 @@ class ScsiPhysDevice : public ScsiPhysInterface, public HWComponent {
         this->buf_ptr = bptr;
     }
 
-    void set_more_data_cb(more_data_cb_t cb) override {
+    void set_read_more_data_cb(more_data_cb_t cb) override {
         this->read_more_data = cb;
     }
 
+    void set_post_xfer_action(action_callback cb) override {
+        this->post_xfer_action = cb;
+    }
+
     void set_status(uint8_t status_code) override {
         this->status = status_code;
     }

devices/common/scsi/scsicdrom.cpp

@@ -49,7 +49,7 @@ ScsiCdrom::ScsiCdrom(std::string name, int my_id) :
         }
     );
 
-    this->set_more_data_cb(
+    this->set_read_more_data_cb(
         [this](int* dsize, uint8_t** dptr) {
             if (this->remain_size) {
                 *dsize = this->read_more();

devices/common/scsi/scsihd.cpp

@@ -48,7 +48,7 @@ ScsiHardDisk::ScsiHardDisk(std::string name, int my_id) : ScsiPhysDevice(name, m
     this->set_buf_ptr(this->data_buf);
     this->set_buffer(this->data_buf);
 
-    phy_impl->set_more_data_cb(
+    phy_impl->set_read_more_data_cb(
         [this](int* dsize, uint8_t** dptr) {
             return false;
         }

devices/common/scsi/scsiphysinterface.h

@@ -35,6 +35,9 @@ enum : int {
 // Prototype for callbacks that request more data from virtual devices.
 using more_data_cb_t = std::function<bool(int* data_size, uint8_t** data_ptr)>;
 
+// Prototype for action callbacks.
+using action_callback = std::function<void()>;
+
 /** Interface for the physical layer of a SCSI/ATAPI device. */
 class ScsiPhysInterface {
 public:
@@ -51,7 +54,8 @@ class ScsiPhysInterface {
     virtual void    set_buffer(uint8_t *buf_ptr) = 0;
     virtual void    set_status(uint8_t status_code) = 0;
     virtual void    switch_phase(const int new_phase) = 0;
-    virtual void    set_more_data_cb(more_data_cb_t cb) = 0;
+    virtual void    set_read_more_data_cb(more_data_cb_t cb) = 0;
+    virtual void    set_post_xfer_action(action_callback cb) = 0;
 
 protected:
     int phy_id = PHY_ID_UNKNOWN;