From 345ec031f5764060ca9de4f1c542755dc285ac34 Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 15 Nov 2022 19:05:45 +0100 Subject: [PATCH] namcos22.h: update prev commit --- src/mame/namco/namcos22.cpp | 6 ++++-- src/mame/namco/namcos22.h | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mame/namco/namcos22.cpp b/src/mame/namco/namcos22.cpp index 383d0834e42..59faa2be7bc 100644 --- a/src/mame/namco/namcos22.cpp +++ b/src/mame/namco/namcos22.cpp @@ -2865,7 +2865,7 @@ void alpine_state::alpine_mcu_port4_w(u8 data) } -// Prop Cycle +// Prop Cycle pedal TIMER_DEVICE_CALLBACK_MEMBER(propcycl_state::pedal_interrupt) { @@ -2901,7 +2901,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(propcycl_state::pedal_update) } -// Armadillo Racing +// Armadillo Racing trackball TIMER_DEVICE_CALLBACK_MEMBER(adillor_state::trackball_interrupt) { @@ -3738,6 +3738,7 @@ void alpine_state::machine_start() } // System22 + void namcos22_state::namcos22(machine_config &config) { /* basic machine hardware */ @@ -3808,6 +3809,7 @@ void namcos22_state::cybrcomm(machine_config &config) } // System Super22 + void namcos22s_state::namcos22s(machine_config &config) { namcos22(config); diff --git a/src/mame/namco/namcos22.h b/src/mame/namco/namcos22.h index 0bf8e45b78d..e82fde3f438 100644 --- a/src/mame/namco/namcos22.h +++ b/src/mame/namco/namcos22.h @@ -161,8 +161,8 @@ private: float m_clipy = 0.0; rectangle m_cliprect; - inline u8 nthbyte(const u32 *src, int n) { return (src[n / 4] << ((n & 3) * 8)) >> 24; } - inline u16 nthword(const u32 *src, int n) { return (src[n / 2] << ((n & 1) * 16)) >> 16; } + static u8 nthbyte(const u32 *src, int n) { return util::big_endian_cast(src)[n]; } + static u16 nthword(const u32 *src, int n) { return util::big_endian_cast(src)[n]; } void render_scene_nodes(screen_device &screen, bitmap_rgb32 &bitmap, struct namcos22_scenenode *node); void render_sprite(screen_device &screen, bitmap_rgb32 &bitmap, struct namcos22_scenenode *node); @@ -329,7 +329,7 @@ protected: void mcu_speedup_w(offs_t offset, u16 data, u16 mem_mask = ~0); static u8 nthbyte(const u32 *src, int n) { return util::big_endian_cast(src)[n]; } - static u16 nthword(const u32 *src, int n) { return util::big_endian_cast(src)[n];; } + static u16 nthword(const u32 *src, int n) { return util::big_endian_cast(src)[n]; } static constexpr s32 signed12(s32 val) { return util::sext(val, 12); } static constexpr s32 signed18(s32 val) { return util::sext(val, 18); }