diff --git a/devices/common/scsi/scsiblockcmds.cpp b/devices/common/scsi/scsiblockcmds.cpp index 50caa76c..adda7c62 100644 --- a/devices/common/scsi/scsiblockcmds.cpp +++ b/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 diff --git a/devices/common/scsi/scsiblockcmds.h b/devices/common/scsi/scsiblockcmds.h index 4a0bc5bd..464b945e 100644 --- a/devices/common/scsi/scsiblockcmds.h +++ b/devices/common/scsi/scsiblockcmds.h @@ -41,8 +41,8 @@ public: 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(); diff --git a/devices/common/scsi/scsicdromcmds.cpp b/devices/common/scsi/scsicdromcmds.cpp index 9902e6a0..81472085 100644 --- a/devices/common/scsi/scsicdromcmds.cpp +++ b/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; diff --git a/devices/common/scsi/scsicdromcmds.h b/devices/common/scsi/scsicdromcmds.h index d53eb885..49cc7fa1 100644 --- a/devices/common/scsi/scsicdromcmds.h +++ b/devices/common/scsi/scsicdromcmds.h @@ -36,7 +36,7 @@ public: 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); diff --git a/devices/common/scsi/scsicommoncmds.cpp b/devices/common/scsi/scsicommoncmds.cpp index 582f1efb..1795e0cf 100644 --- a/devices/common/scsi/scsicommoncmds.cpp +++ b/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 diff --git a/devices/common/scsi/scsicommoncmds.h b/devices/common/scsi/scsicommoncmds.h index 4699c63c..9c02cff1 100644 --- a/devices/common/scsi/scsicommoncmds.h +++ b/devices/common/scsi/scsicommoncmds.h @@ -87,8 +87,8 @@ public: 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();