convert some defines to typed consts

This commit is contained in:
Stanislav Shwartsman 2021-01-30 17:06:34 +00:00
parent 22fabb599a
commit 9314902a85
2 changed files with 6 additions and 6 deletions

View File

@ -34,7 +34,7 @@ extern int apic_bus_broadcast_interrupt(Bit8u vector, Bit8u delivery_mode, bx_bo
#define BX_IOAPIC_NUM_PINS (0x18)
// use the same version as 82093 IOAPIC (0x00170011)
#define BX_IOAPIC_VERSION_ID (((BX_IOAPIC_NUM_PINS - 1) << 16) | 0x11)
const Bit32u BX_IOAPIC_VERSION_ID = (((BX_IOAPIC_NUM_PINS - 1) << 16) | 0x11);
class bx_io_redirect_entry_t {
Bit32u hi, lo;

View File

@ -35,12 +35,12 @@
#endif
class BX_CPU_C;
// 512K BIOS ROM @0xfff80000
#define BIOSROMSZ ((Bit32u)(1 << 21)) // 2M BIOS ROM @0xffe00000, must be a power of 2
#define EXROMSIZE (0x20000) // ROMs 0xc0000-0xdffff (area 0xe0000-0xfffff=bios mapped)
#define BIOS_MASK (BIOSROMSZ-1)
#define EXROM_MASK (EXROMSIZE-1)
const Bit32u BIOSROMSZ = (1 << 21); // 2M BIOS ROM @0xffe00000, must be a power of 2
const Bit32u EXROMSIZE = (0x20000); // ROMs 0xc0000-0xdffff (area 0xe0000-0xfffff=bios mapped)
const Bit32u BIOS_MASK = BIOSROMSZ-1;
const Bit32u EXROM_MASK = EXROMSIZE-1;
#define BIOS_MAP_LAST128K(addr) (((addr) | 0xfff00000) & BIOS_MASK)