diff options
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/cbm_snqk.h | 19 | ||||
-rw-r--r-- | src/mame/machine/cedar_magnet_board.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/coleco.h | 8 | ||||
-rw-r--r-- | src/mame/machine/cuda.h | 8 | ||||
-rw-r--r-- | src/mame/machine/decioga.cpp | 9 | ||||
-rw-r--r-- | src/mame/machine/decioga.h | 15 | ||||
-rw-r--r-- | src/mame/machine/msx_switched.h | 8 | ||||
-rw-r--r-- | src/mame/machine/namcoic.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/spec_snqk.h | 8 | ||||
-rw-r--r-- | src/mame/machine/subsino.h | 8 | ||||
-rw-r--r-- | src/mame/machine/trs80.cpp | 14 | ||||
-rw-r--r-- | src/mame/machine/x68k_hdc.h | 2 |
12 files changed, 55 insertions, 48 deletions
diff --git a/src/mame/machine/cbm_snqk.h b/src/mame/machine/cbm_snqk.h index 25fbcab989b..5d19d453df2 100644 --- a/src/mame/machine/cbm_snqk.h +++ b/src/mame/machine/cbm_snqk.h @@ -6,16 +6,23 @@ ***********************************************/ -#ifndef __CBM_SNQK_H__ -#define __CBM_SNQK_H__ +#ifndef MAME_MACHINE_CBM_SNQK_H +#define MAME_MACHINE_CBM_SNQK_H + +#pragma once #include "imagedev/snapquik.h" #define CBM_QUICKLOAD_DELAY_SECONDS 3 -image_init_result general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, - address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, uint16_t hiaddress) ); +image_init_result general_cbm_loadsnap( + device_image_interface &image, + const char *file_type, + int snapshot_size, + address_space &space, + offs_t offset, + void (*cbm_sethiaddress)(address_space &space, uint16_t hiaddress)); -void cbm_quick_sethiaddress( address_space &space, uint16_t hiaddress ); +void cbm_quick_sethiaddress(address_space &space, uint16_t hiaddress); -#endif /* __CBM_SNQK_H__ */ +#endif // MAME_MACHINE_CBM_SNQK_H diff --git a/src/mame/machine/cedar_magnet_board.cpp b/src/mame/machine/cedar_magnet_board.cpp index 700dbf8d193..8eeffb690dc 100644 --- a/src/mame/machine/cedar_magnet_board.cpp +++ b/src/mame/machine/cedar_magnet_board.cpp @@ -86,4 +86,4 @@ void cedar_magnet_board_interface::interface_pre_start() m_halt_clear_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::halt_clear_callback), this)); m_reset_assert_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::reset_assert_callback), this)); m_reset_clear_timer = device().machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cedar_magnet_board_interface::reset_clear_callback), this)); -}
\ No newline at end of file +} diff --git a/src/mame/machine/coleco.h b/src/mame/machine/coleco.h index b6022b164c9..41b71564383 100644 --- a/src/mame/machine/coleco.h +++ b/src/mame/machine/coleco.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young -#pragma once +#ifndef MAME_MACHINE_COLECO_H +#define MAME_MACHINE_COLECO_H -#ifndef __COLECO_CONTROLLERS__ -#define __COLECO_CONTROLLERS__ +#pragma once INPUT_PORTS_EXTERN( coleco ); -#endif +#endif // MAME_MACHINE_COLECO_H diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h index 99f786908b2..158784a1198 100644 --- a/src/mame/machine/cuda.h +++ b/src/mame/machine/cuda.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#pragma once +#ifndef MAME_MACHINE_CUDA_H +#define MAME_MACHINE_CUDA_H -#ifndef __CUDA_H__ -#define __CUDA_H__ +#pragma once //************************************************************************** @@ -138,4 +138,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(CUDA, cuda_device) -#endif +#endif // MAME_MACHINE_CUDA_H diff --git a/src/mame/machine/decioga.cpp b/src/mame/machine/decioga.cpp index a65338f7fcd..b870e728bc1 100644 --- a/src/mame/machine/decioga.cpp +++ b/src/mame/machine/decioga.cpp @@ -7,6 +7,7 @@ * a multi-channel DMA engine. */ +#include "emu.h" #include "decioga.h" DEFINE_DEVICE_TYPE(DECSTATION_IOGA, dec_ioga_device, "decioga", "DECstation I/O Gate Array") @@ -56,14 +57,14 @@ WRITE32_MEMBER(dec_ioga_device::csr_w) READ32_MEMBER(dec_ioga_device::intr_r) { uint32_t rv = m_intr; - m_intr &= ~0x20; // 5000/133 boot ROM tests that reading clears this bit + m_intr &= ~0x20; // 5000/133 boot ROM tests that reading clears this bit //printf("m_intr = %08x\n", m_intr); return rv; } WRITE32_MEMBER(dec_ioga_device::intr_w) { - m_intr &= ~data; // clear bits on write + m_intr &= ~data; // clear bits on write } READ32_MEMBER(dec_ioga_device::imsk_r) @@ -80,6 +81,6 @@ WRITE_LINE_MEMBER(dec_ioga_device::rtc_irq_w) { if (state == ASSERT_LINE) { - m_intr |= 0x20; // tested by 5000/133 boot ROM circa BFC027C8 + m_intr |= 0x20; // tested by 5000/133 boot ROM circa BFC027C8 } -}
\ No newline at end of file +} diff --git a/src/mame/machine/decioga.h b/src/mame/machine/decioga.h index c014f5dd440..5e446f9ba2a 100644 --- a/src/mame/machine/decioga.h +++ b/src/mame/machine/decioga.h @@ -6,23 +6,16 @@ * * */ - #ifndef MAME_MACHINE_DECIOGA_H #define MAME_MACHINE_DECIOGA_H #pragma once -#include "emu.h" class dec_ioga_device : public device_t { public: - dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner) - : dec_ioga_device(mconfig, tag, owner, (uint32_t)0) - { - } - - dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + dec_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); void map(address_map &map); @@ -30,8 +23,8 @@ public: DECLARE_WRITE_LINE_MEMBER(rtc_irq_w); protected: - virtual void device_start() override; - virtual void device_reset() override; + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(csr_r); DECLARE_WRITE32_MEMBER(csr_w); @@ -45,4 +38,4 @@ private: DECLARE_DEVICE_TYPE(DECSTATION_IOGA, dec_ioga_device) -#endif // MAME_MACHINE_DECIOGA_H
\ No newline at end of file +#endif // MAME_MACHINE_DECIOGA_H diff --git a/src/mame/machine/msx_switched.h b/src/mame/machine/msx_switched.h index 9db37baec61..7db1874d1af 100644 --- a/src/mame/machine/msx_switched.h +++ b/src/mame/machine/msx_switched.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#ifndef __MSX_SWITCHED_H -#define __MSX_SWITCHED_H +#ifndef MAME_MACHINE_MSX_SWITCHED_H +#define MAME_MACHINE_MSX_SWITCHED_H + +#pragma once class msx_switched_interface @@ -11,4 +13,4 @@ public: virtual DECLARE_WRITE8_MEMBER(switched_write) = 0; }; -#endif +#endif // MAME_MACHINE_MSX_SWITCHED_H diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index 038b34d7d7d..bfb3ea1e192 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -885,7 +885,7 @@ void namcos2_shared_state::c169_roz_unpack_params(const uint16_t *source, roz_pa void namcos2_shared_state::c169_roz_draw_helper(screen_device &screen, bitmap_ind16 &bitmap, tilemap_t &tmap, const rectangle &clip, const roz_parameters ¶ms) { if (m_gametype != NAMCOFL_SPEED_RACER && m_gametype != NAMCOFL_FINAL_LAP_R) -// if (m_gametype != NAMCOFL_FINAL_LAP_R) // Fix speedrcr some title animations, but broke at road scene +// if (m_gametype != NAMCOFL_FINAL_LAP_R) // Fix speedrcr some title animations, but broke at road scene { uint32_t size_mask = params.size - 1; bitmap_ind16 &srcbitmap = tmap.pixmap(); diff --git a/src/mame/machine/spec_snqk.h b/src/mame/machine/spec_snqk.h index ebf829e4f91..be6bb6e080d 100644 --- a/src/mame/machine/spec_snqk.h +++ b/src/mame/machine/spec_snqk.h @@ -6,8 +6,10 @@ * ****************************************************************************/ -#ifndef __SPEC_SNQK_H__ -#define __SPEC_SNQK_H__ +#ifndef MAME_MACHINE_SPEC_SNQK_H +#define MAME_MACHINE_SPEC_SNQK_H + +#pragma once #include "imagedev/snapquik.h" @@ -162,4 +164,4 @@ enum SPECTRUM_Z80_SNAPSHOT_TYPE { #define RAW_HDR 9 #define RAW_SIZE (RAW_HDR + 3*SPECTRUM_BANK) -#endif /* __SPEC_SNQK_H__ */ +#endif // MAME_MACHINE_SPEC_SNQK_H diff --git a/src/mame/machine/subsino.h b/src/mame/machine/subsino.h index 8b68bd1902a..2f4b227c4ef 100644 --- a/src/mame/machine/subsino.h +++ b/src/mame/machine/subsino.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood, Angelo Salese, Roberto Fresca -#ifndef __MACHINE_SUBSINO__ -#define __MACHINE_SUBSINO__ +#ifndef MAME_MACHINE_SUBSINO_H +#define MAME_MACHINE_SUBSINO_H + +#pragma once extern const uint8_t crsbingo_xors[8]; @@ -16,4 +18,4 @@ void victor21_bitswaps(uint8_t *decrypt, int i); void subsino_decrypt(running_machine& machine, void (*bitswaps)(uint8_t *decrypt, int i), const uint8_t *xors, int size); -#endif +#endif // MAME_MACHINE_SUBSINO_H diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp index 7e591af3052..50134a236e7 100644 --- a/src/mame/machine/trs80.cpp +++ b/src/mame/machine/trs80.cpp @@ -224,13 +224,13 @@ INTERRUPT_GEN_MEMBER(trs80_state::rtc_interrupt) // While we're here, let's countdown the motor timeout too. // Let's not... LDOS often freezes -// if (m_timeout) -// { -// m_timeout--; -// if (m_timeout == 0) -// if (m_floppy) -// m_floppy->mon_w(1); // motor off -// } +// if (m_timeout) +// { +// m_timeout--; +// if (m_timeout == 0) +// if (m_floppy) +// m_floppy->mon_w(1); // motor off +// } } diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h index 051942566f5..2c499d7e4c8 100644 --- a/src/mame/machine/x68k_hdc.h +++ b/src/mame/machine/x68k_hdc.h @@ -84,7 +84,7 @@ class x68k_hdc_image_device : public device_t, }; enum sasi_status : u8 - { + { SASI_STATUS_MSG = 1 << 4, // MSG SASI_STATUS_CD = 1 << 3, // C/D (Command/Data) SASI_STATUS_IO = 1 << 2, // I/O |