From fcff5f83729576969f6f0530ce585a98e4b75989 Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Thu, 20 Jun 2024 07:10:14 +0200 Subject: [PATCH] UnibusByte -> _unibus_byte --- bus.cpp | 8 ++++---- bus.h | 4 ++-- rk05.cpp | 4 ++-- rl02.cpp | 8 ++++---- rp06.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bus.cpp b/bus.cpp index 02bf6f6..68a5749 100644 --- a/bus.cpp +++ b/bus.cpp @@ -871,15 +871,15 @@ void bus::write_word(const uint16_t a, const uint16_t value, const d_i_space_t s write(a, wm_word, value, rm_cur, s); } -uint8_t bus::readUnibusByte(const uint32_t a) +uint8_t bus::read_unibus_byte(const uint32_t a) { uint8_t v = m->read_byte(a); - TRACE("readUnibusByte[%08o]=%03o", a, v); + TRACE("read_unibus_byte[%08o]=%03o", a, v); return v; } -void bus::writeUnibusByte(const uint32_t a, const uint8_t v) +void bus::write_unibus_byte(const uint32_t a, const uint8_t v) { - TRACE("writeUnibusByte[%08o]=%03o", a, v); + TRACE("write_unibus_byte[%08o]=%03o", a, v); m->write_byte(a, v); } diff --git a/bus.h b/bus.h index b097bf9..43cb2f3 100644 --- a/bus.h +++ b/bus.h @@ -127,11 +127,11 @@ public: uint16_t read_word(const uint16_t a, const d_i_space_t s); uint16_t read_word(const uint16_t a) override { return read_word(a, i_space); } uint16_t peek_word(const uint16_t a); - uint8_t readUnibusByte(const uint32_t a); + uint8_t read_unibus_byte(const uint32_t a); uint16_t read_physical(const uint32_t a); write_rc_t write(const uint16_t a, const word_mode_t word_mode, uint16_t value, const rm_selection_t mode_selection, const d_i_space_t s = i_space); - void writeUnibusByte(const uint32_t a, const uint8_t value); + void write_unibus_byte(const uint32_t a, const uint8_t value); void write_byte(const uint16_t a, const uint8_t value) override { write(a, wm_byte, value, rm_cur); } void write_word(const uint16_t a, const uint16_t value, const d_i_space_t s); void write_word(const uint16_t a, const uint16_t value) override { write_word(a, value, i_space); } diff --git a/rk05.cpp b/rk05.cpp index 2ed0d6b..a858229 100644 --- a/rk05.cpp +++ b/rk05.cpp @@ -173,7 +173,7 @@ void rk05::write_word(const uint16_t addr, const uint16_t v) work_reclen -= cur; for(size_t i=0; ireadUnibusByte(work_memoff++); + xfer_buffer[i] = b->read_unibus_byte(work_memoff++); if (!fhs.at(device)->write(work_diskoffb, cur, xfer_buffer, 512)) { DOLOG(ll_error, true, "RK05(%d) write error %s to %u len %u", device, strerror(errno), work_diskoffb, cur); @@ -230,7 +230,7 @@ void rk05::write_word(const uint16_t addr, const uint16_t v) temp_diskoffb += cur; for(uint32_t i=0; iwriteUnibusByte(p++, xfer_buffer[i]); + b->write_unibus_byte(p++, xfer_buffer[i]); if ((v & 2048) == 0) update_bus_address(2); diff --git a/rl02.cpp b/rl02.cpp index 8c2c0ef..b5057e9 100644 --- a/rl02.cpp +++ b/rl02.cpp @@ -275,8 +275,8 @@ void rl02::write_word(const uint16_t addr, uint16_t v) for(uint32_t i=0; ireadUnibusByte(memory_address++); - xfer_buffer[i++] = b->readUnibusByte(memory_address++); + xfer_buffer[i++] = b->read_unibus_byte(memory_address++); + xfer_buffer[i++] = b->read_unibus_byte(memory_address++); // update_bus_address(memory_address); mpr[0]++; @@ -343,8 +343,8 @@ void rl02::write_word(const uint16_t addr, uint16_t v) for(uint32_t i=0; iwriteUnibusByte(memory_address++, xfer_buffer[i++]); - b->writeUnibusByte(memory_address++, xfer_buffer[i++]); + b->write_unibus_byte(memory_address++, xfer_buffer[i++]); + b->write_unibus_byte(memory_address++, xfer_buffer[i++]); // update_bus_address(memory_address); diff --git a/rp06.cpp b/rp06.cpp index 3fe5b97..25804e6 100644 --- a/rp06.cpp +++ b/rp06.cpp @@ -201,13 +201,13 @@ void rp06::write_word(const uint16_t addr, uint16_t v) } for(uint32_t i=0; iwriteUnibusByte(addr++, xfer_buffer[i]); + b->write_unibus_byte(addr++, xfer_buffer[i]); } else { DOLOG(debug, false, "RP06: writing %u bytes to %u (dec) from %06o (oct)", cur_n, offs, addr); for(uint32_t i=0; ireadUnibusByte(addr++); + xfer_buffer[i] = b->read_unibus_byte(addr++); if (!fhs.at(0)->write(cur_offset, cur_n, xfer_buffer, SECTOR_SIZE)) { DOLOG(ll_error, true, "RP06 write error %s from %u", strerror(errno), cur_offset);