Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-06-13 02:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix NVRAM->Heathrow connection.

Browse Source
This commit is contained in:
Maxim Poliakovski 2020-01-08 19:33:38 +01:00
parent e1793b6305
commit a3601f224c
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devices/heathrow.cpp
View File

@ -67,9 +67,9 @@ uint32_t HeathrowIC::read(uint32_t offset, int size)
cout << this->name << ": reading from offset " << hex << offset << endl;
unsigned sub_dev = (offset >> 12) & 0x3F;
unsigned sub_addr = (offset >> 12) & 0x7F;
switch(sub_dev) {
switch(sub_addr) {
case 0:
res = mio_ctrl_read(offset, size);
break;
@ -83,11 +83,12 @@ uint32_t HeathrowIC::read(uint32_t offset, int size)
case 0x17:
res = this->viacuda->read((offset - 0x16000) >> 9);
break;
case 0x60:
case 0x70:
res = this->nvram->read_byte((offset - 0x60000) >> 4);
default:
cout << "unmapped I/O space: " << sub_dev << endl;
if (sub_addr >= 0x60) {
res = this->nvram->read_byte((offset - 0x60000) >> 4);
} else {
cout << "unmapped I/O space: " << hex << offset << endl;
}
}
return res;
@ -97,9 +98,9 @@ void HeathrowIC::write(uint32_t offset, uint32_t value, int size)
{
cout << this->name << ": writing to offset " << hex << offset << endl;
unsigned sub_dev = (offset >> 12) & 0x3F;
unsigned sub_addr = (offset >> 12) & 0x7F;
switch(sub_dev) {
switch(sub_addr) {
case 0:
mio_ctrl_write(offset, value, size);
break;
@ -114,7 +115,11 @@ void HeathrowIC::write(uint32_t offset, uint32_t value, int size)
this->viacuda->write((offset - 0x16000) >> 9, value);
break;
default:
cout << "unmapped I/O space: " << sub_dev << endl;
if (sub_addr >= 0x60) {
this->nvram->write_byte((offset - 0x60000) >> 4, value);
} else {
cout << "unmapped I/O space: " << hex << offset << endl;
}
}
}