6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-30 22:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Avoid duplicate symbol.

Browse Source
This commit is contained in:
Thomas Harte 2023-12-01 07:36:12 -05:00
parent a96cb1ebd6
commit 5feac8ef14
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Machines/PCCompatible/PCCompatible.cpp
View File

@ -52,7 +52,7 @@ struct Memory;
class DMA {
public:
i8237 i8237;
i8237 controller;
DMAPages pages;
// Memory is set posthoc to resolve a startup time.
@ -134,7 +134,7 @@ class FloppyController {
(pair.second.address.side == target.head) &&
(pair.second.size == target.size)
) {
// printf("");
// `printf("");
}
}
} break;
@ -953,22 +953,22 @@ class IO {
printf("TODO: NMIs %s\n", (value & 0x80) ? "masked" : "unmasked");
break;
case 0x0000: dma_.i8237.write<0>(value); break;
case 0x0001: dma_.i8237.write<1>(value); break;
case 0x0002: dma_.i8237.write<2>(value); break;
case 0x0003: dma_.i8237.write<3>(value); break;
case 0x0004: dma_.i8237.write<4>(value); break;
case 0x0005: dma_.i8237.write<5>(value); break;
case 0x0006: dma_.i8237.write<6>(value); break;
case 0x0007: dma_.i8237.write<7>(value); break;
case 0x0008: dma_.i8237.set_command(uint8_t(value)); break;
case 0x0009: dma_.i8237.set_reset_request(uint8_t(value)); break;
case 0x000a: dma_.i8237.set_reset_mask(uint8_t(value)); break;
case 0x000b: dma_.i8237.set_mode(uint8_t(value)); break;
case 0x000c: dma_.i8237.flip_flop_reset(); break;
case 0x000d: dma_.i8237.master_reset(); break;
case 0x000e: dma_.i8237.mask_reset(); break;
case 0x000f: dma_.i8237.set_mask(uint8_t(value)); break;
case 0x0000: dma_.controller.write<0>(value); break;
case 0x0001: dma_.controller.write<1>(value); break;
case 0x0002: dma_.controller.write<2>(value); break;
case 0x0003: dma_.controller.write<3>(value); break;
case 0x0004: dma_.controller.write<4>(value); break;
case 0x0005: dma_.controller.write<5>(value); break;
case 0x0006: dma_.controller.write<6>(value); break;
case 0x0007: dma_.controller.write<7>(value); break;
case 0x0008: dma_.controller.set_command(uint8_t(value)); break;
case 0x0009: dma_.controller.set_reset_request(uint8_t(value)); break;
case 0x000a: dma_.controller.set_reset_mask(uint8_t(value)); break;
case 0x000b: dma_.controller.set_mode(uint8_t(value)); break;
case 0x000c: dma_.controller.flip_flop_reset(); break;
case 0x000d: dma_.controller.master_reset(); break;
case 0x000e: dma_.controller.mask_reset(); break;
case 0x000f: dma_.controller.set_mask(uint8_t(value)); break;
case 0x0020: pic_.write<0>(value); break;
case 0x0021: pic_.write<1>(value); break;
@ -1057,16 +1057,16 @@ class IO {
printf("Unhandled in: %04x\n", port);
break;
case 0x0000: return dma_.i8237.read<0>();
case 0x0001: return dma_.i8237.read<1>();
case 0x0002: return dma_.i8237.read<2>();
case 0x0003: return dma_.i8237.read<3>();
case 0x0004: return dma_.i8237.read<4>();
case 0x0005: return dma_.i8237.read<5>();
case 0x0006: return dma_.i8237.read<6>();
case 0x0007: return dma_.i8237.read<7>();
case 0x0000: return dma_.controller.read<0>();
case 0x0001: return dma_.controller.read<1>();
case 0x0002: return dma_.controller.read<2>();
case 0x0003: return dma_.controller.read<3>();
case 0x0004: return dma_.controller.read<4>();
case 0x0005: return dma_.controller.read<5>();
case 0x0006: return dma_.controller.read<6>();
case 0x0007: return dma_.controller.read<7>();
case 0x0008: return dma_.i8237.status();
case 0x0008: return dma_.controller.status();
case 0x0009:
case 0x000a: case 0x000b: