diff options
Diffstat (limited to 'src/mame/drivers/pet.cpp')
-rw-r--r-- | src/mame/drivers/pet.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp index 5363c192e8f..f53a3af6f62 100644 --- a/src/mame/drivers/pet.cpp +++ b/src/mame/drivers/pet.cpp @@ -1777,7 +1777,7 @@ MACHINE_CONFIG_START(pet_state::pet) MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet) // basic machine hardware - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_8MHz/8) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8) MCFG_CPU_PROGRAM_MAP(pet2001_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks @@ -1793,7 +1793,7 @@ MACHINE_CONFIG_START(pet_state::pet) MCFG_PALETTE_ADD_MONOCHROME("palette") // devices - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_8MHz/8) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(8'000'000)/8) MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) @@ -1824,7 +1824,7 @@ MACHINE_CONFIG_START(pet_state::pet) MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_8MHz/8, pet_expansion_cards, nullptr) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, pet_expansion_cards, nullptr) MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr) @@ -2060,7 +2060,7 @@ MACHINE_CONFIG_DERIVED(pet2001b_state::pet4032f, pet4000) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_DEVICE_REMOVE("sync_timer") - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) @@ -2132,7 +2132,7 @@ MACHINE_CONFIG_DERIVED(pet_state::cbm4032f, cbm4000) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) MCFG_DEVICE_REMOVE("sync_timer") - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) @@ -2203,7 +2203,7 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80) // basic machine hardware - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/16) + MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16) MCFG_CPU_PROGRAM_MAP(pet2001_mem) MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks @@ -2215,7 +2215,7 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 250 - 1) MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update) - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(2*8) MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update) @@ -2230,7 +2230,7 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // devices - MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) + MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16) MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) @@ -2261,7 +2261,7 @@ MACHINE_CONFIG_START(pet80_state::pet80) MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w)) MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1)) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, nullptr) + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, nullptr) MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr) @@ -2309,7 +2309,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(superpet_state::superpet, pet8032) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet") + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "superpet") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") @@ -2322,7 +2322,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(cbm8096_state::cbm8096, pet80) MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG) - MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k") + MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "64k") MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write)) MCFG_RAM_ADD(RAM_TAG) @@ -2347,7 +2347,7 @@ MACHINE_CONFIG_DERIVED(cbm8296_state::cbm8296, pet80) MCFG_PLS100_ADD(PLA2_TAG) MCFG_DEVICE_REMOVE(MC6845_TAG) - MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL_16MHz/16) + MCFG_MC6845_ADD(MC6845_TAG, MC6845, SCREEN_TAG, XTAL(16'000'000)/16) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(2*8) MCFG_MC6845_UPDATE_ROW_CB(pet80_state, cbm8296_update_row) |