folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UnibusByte -> _unibus_byte

Browse source
This commit is contained in:
folkert van heusden 2024-06-20 07:10:14 +02:00
parent 9a10510c30
commit fcff5f8372
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus.cpp
View file

@ -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); 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); uint8_t v = m->read_byte(a);
TRACE("readUnibusByte[%08o]=%03o", a, v); TRACE("read_unibus_byte[%08o]=%03o", a, v);
return 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); m->write_byte(a, v);
} }

4
bus.h
View file

@ -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, const d_i_space_t s);
uint16_t read_word(const uint16_t a) override { return read_word(a, i_space); } uint16_t read_word(const uint16_t a) override { return read_word(a, i_space); }
uint16_t peek_word(const uint16_t a); 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); 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); 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_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, const d_i_space_t s);
void write_word(const uint16_t a, const uint16_t value) override { write_word(a, value, i_space); } void write_word(const uint16_t a, const uint16_t value) override { write_word(a, value, i_space); }

4
rk05.cpp
View file

@ -173,7 +173,7 @@ void rk05::write_word(const uint16_t addr, const uint16_t v)
work_reclen -= cur; work_reclen -= cur;
for(size_t i=0; i<cur; i++) for(size_t i=0; i<cur; i++)
xfer_buffer[i] = b->readUnibusByte(work_memoff++); xfer_buffer[i] = b->read_unibus_byte(work_memoff++);
if (!fhs.at(device)->write(work_diskoffb, cur, xfer_buffer, 512)) { 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); 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; temp_diskoffb += cur;
for(uint32_t i=0; i<cur; i++) { for(uint32_t i=0; i<cur; i++) {
b->writeUnibusByte(p++, xfer_buffer[i]); b->write_unibus_byte(p++, xfer_buffer[i]);
if ((v & 2048) == 0) if ((v & 2048) == 0)
update_bus_address(2); update_bus_address(2);

8
rl02.cpp
View file

@ -275,8 +275,8 @@ void rl02::write_word(const uint16_t addr, uint16_t v)
for(uint32_t i=0; i<cur;) { for(uint32_t i=0; i<cur;) {
// BA and MPR are increased by 2 // BA and MPR are increased by 2
xfer_buffer[i++] = b->readUnibusByte(memory_address++); xfer_buffer[i++] = b->read_unibus_byte(memory_address++);
xfer_buffer[i++] = b->readUnibusByte(memory_address++); xfer_buffer[i++] = b->read_unibus_byte(memory_address++);
// update_bus_address(memory_address); // update_bus_address(memory_address);
mpr[0]++; mpr[0]++;
@ -343,8 +343,8 @@ void rl02::write_word(const uint16_t addr, uint16_t v)
for(uint32_t i=0; i<cur;) { for(uint32_t i=0; i<cur;) {
// BA and MPR are increased by 2 // BA and MPR are increased by 2
b->writeUnibusByte(memory_address++, xfer_buffer[i++]); b->write_unibus_byte(memory_address++, xfer_buffer[i++]);
b->writeUnibusByte(memory_address++, xfer_buffer[i++]); b->write_unibus_byte(memory_address++, xfer_buffer[i++]);
// update_bus_address(memory_address); // update_bus_address(memory_address);

4
rp06.cpp
View file

@ -201,13 +201,13 @@ void rp06::write_word(const uint16_t addr, uint16_t v)
} }
for(uint32_t i=0; i<cur_n; i++) for(uint32_t i=0; i<cur_n; i++)
b->writeUnibusByte(addr++, xfer_buffer[i]); b->write_unibus_byte(addr++, xfer_buffer[i]);
} }
else { else {
DOLOG(debug, false, "RP06: writing %u bytes to %u (dec) from %06o (oct)", cur_n, offs, addr); DOLOG(debug, false, "RP06: writing %u bytes to %u (dec) from %06o (oct)", cur_n, offs, addr);
for(uint32_t i=0; i<cur_n; i++) for(uint32_t i=0; i<cur_n; i++)
xfer_buffer[i] = b->readUnibusByte(addr++); xfer_buffer[i] = b->read_unibus_byte(addr++);
if (!fhs.at(0)->write(cur_offset, cur_n, xfer_buffer, SECTOR_SIZE)) { 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); DOLOG(ll_error, true, "RP06 write error %s from %u", strerror(errno), cur_offset);