scsi*cmds: undo temporary renames.

Author: maximumspatium

devices/common/scsi/scsiblockcmds.cpp

@@ -88,12 +88,12 @@ void ScsiBlockCmds::process_command() {
     case ScsiCommand::READ_6:
     case ScsiCommand::READ_10:
     case ScsiCommand::READ_12:
-        next_phase = this->read_new();
+        next_phase = this->read();
         break;
     case ScsiCommand::WRITE_6:
     case ScsiCommand::WRITE_10:
     case ScsiCommand::WRITE_12:
-        next_phase = this->write_new();
+        next_phase = this->write();
         break;
     case ScsiCommand::START_STOP_UNIT:
         next_phase = this->start_stop_unit();
@@ -113,7 +113,7 @@ void ScsiBlockCmds::process_command() {
     phy_impl->switch_phase(next_phase);
 }
 
-int ScsiBlockCmds::read_new() {
+int ScsiBlockCmds::read() {
     int nblocks = this->get_xfer_len();
 
     // special case: zero transfer length means 256 blocks for READ_6
@@ -143,7 +143,7 @@ int ScsiBlockCmds::read_new() {
     return ScsiPhase::DATA_IN;
 }
 
-int ScsiBlockCmds::write_new() {
+int ScsiBlockCmds::write() {
     int nblocks = this->get_xfer_len();
 
     // special case: zero transfer length means 256 blocks for WRITE_6

devices/common/scsi/scsiblockcmds.h

@@ -41,8 +41,8 @@ class ScsiBlockCmds : public ScsiCommonCmds {
     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();
+    virtual int read();
+    virtual int write();
     virtual int start_stop_unit();
     virtual int read_capacity();
 

devices/common/scsi/scsicdromcmds.cpp

@@ -45,7 +45,7 @@ void ScsiCdromCmds::process_command() {
 
     switch(this->cdb_ptr[0]) {
     case ScsiCommand::READ_TOC:
-        next_phase = this->read_toc_new();
+        next_phase = this->read_toc();
         break;
     default:
         ScsiBlockCmds::process_command();
@@ -55,7 +55,7 @@ void ScsiCdromCmds::process_command() {
     phy_impl->switch_phase(next_phase);
 }
 
-int ScsiCdromCmds:: read_toc_new() {
+int ScsiCdromCmds:: read_toc() {
     uint8_t start_track, session_num;
     int     tot_tracks, resp_len = 0;
 

devices/common/scsi/scsicdromcmds.h

@@ -36,7 +36,7 @@ class ScsiCdromCmds : public ScsiBlockCmds, public CdromDrive {
 protected:
     virtual void process_command() override;
 
-    int read_toc_new();
+    int read_toc();
 
     int get_cd_capabilities_page(uint8_t subpage, uint8_t ctrl,
                                  uint8_t *out_ptr, int avail_len);

devices/common/scsi/scsicommoncmds.cpp

@@ -39,10 +39,10 @@ void ScsiCommonCmds::process_command() {
         next_phase = this->test_unit_ready();
         break;
     case ScsiCommand::REQ_SENSE:
-        next_phase = this->request_sense_new();
+        next_phase = this->request_sense();
         break;
     case ScsiCommand::INQUIRY:
-        next_phase = this->inquiry_new();
+        next_phase = this->inquiry();
         break;
     case ScsiCommand::MODE_SENSE_6:
     case ScsiCommand::MODE_SENSE_10:
@@ -121,7 +121,7 @@ int ScsiCommonCmds::test_unit_ready() {
     return ScsiPhase::STATUS;
 }
 
-int ScsiCommonCmds::inquiry_new() {
+int ScsiCommonCmds::inquiry() {
     int alloc_len = this->get_xfer_len();
     int resp_len  = 36; // standard response length
 
@@ -178,7 +178,7 @@ int ScsiCommonCmds::inquiry_new() {
     return ScsiPhase::DATA_IN;
 }
 
-int ScsiCommonCmds::request_sense_new() {
+int ScsiCommonCmds::request_sense() {
     int alloc_len = this->get_xfer_len();
     int resp_len  = 18; // standard response length
 

devices/common/scsi/scsicommoncmds.h

@@ -87,8 +87,8 @@ class ScsiCommonCmds {
 protected:
     virtual void     process_command();
     virtual int      test_unit_ready();
-    virtual int      inquiry_new();
-    virtual int      request_sense_new();
+    virtual int      inquiry();
+    virtual int      request_sense();
     virtual int      mode_sense();
     virtual uint8_t  get_lun();
     virtual uint32_t get_xfer_len();