diff options
Diffstat (limited to 'src/mame/includes')
-rw-r--r-- | src/mame/includes/bbusters.h | 2 | ||||
-rw-r--r-- | src/mame/includes/bzone.h | 18 | ||||
-rw-r--r-- | src/mame/includes/cps1.h | 6 | ||||
-rw-r--r-- | src/mame/includes/decocass.h | 2 | ||||
-rw-r--r-- | src/mame/includes/namcos22.h | 4 | ||||
-rw-r--r-- | src/mame/includes/nemesis.h | 2 | ||||
-rw-r--r-- | src/mame/includes/pk8020.h | 34 | ||||
-rw-r--r-- | src/mame/includes/seta2.h | 2 | ||||
-rw-r--r-- | src/mame/includes/snk.h | 2 | ||||
-rw-r--r-- | src/mame/includes/thepit.h | 2 |
10 files changed, 38 insertions, 36 deletions
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index bfd451853c9..d078fe982d0 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -58,7 +58,7 @@ protected: template<int Layer> DECLARE_WRITE16_MEMBER(pf_w); DECLARE_WRITE8_MEMBER(coin_counter_w); - const uint16_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block); + const uint8_t *get_source_ptr(gfx_element *gfx, uint32_t sprite, int dx, int dy, int block); void draw_block(screen_device &screen, bitmap_ind16 &dest,int x,int y,int size,int flipx,int flipy,uint32_t sprite,int color,int bank,int block,int priority); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const uint16_t *source, int bank); diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index e59b94dd50e..b72ce44ca3a 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -36,12 +36,12 @@ public: void bzone(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(bzone_coin_counter_w); - DECLARE_READ8_MEMBER(analog_data_r); - DECLARE_WRITE8_MEMBER(analog_select_w); + void bzone_coin_counter_w(offs_t offset, uint8_t data); + uint8_t analog_data_r(); + void analog_select_w(offs_t offset, uint8_t data); virtual void machine_start() override; INTERRUPT_GEN_MEMBER(bzone_interrupt); - DECLARE_WRITE8_MEMBER(bzone_sounds_w); + void bzone_sounds_w(uint8_t data); void bzone_base(machine_config &config); void bzone_audio(machine_config &config); @@ -71,11 +71,11 @@ public: void redbaron(machine_config &config); protected: - DECLARE_READ8_MEMBER(redbaron_joy_r); - DECLARE_WRITE8_MEMBER(redbaron_joysound_w); - DECLARE_READ8_MEMBER(earom_read); - DECLARE_WRITE8_MEMBER(earom_write); - DECLARE_WRITE8_MEMBER(earom_control_w); + uint8_t redbaron_joy_r(); + void redbaron_joysound_w(uint8_t data); + uint8_t earom_read(); + void earom_write(offs_t offset, uint8_t data); + void earom_control_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 83073b7611b..21aa62441d0 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -376,12 +376,12 @@ protected: int m_palette_align; int m_palette_size; int m_stars_rom_size; - uint16_t m_empty_tile[32*32]; + uint8_t m_empty_tile[32*32]; int m_cps_version; /* fcrash video config */ - uint8_t m_layer_enable_reg; - uint8_t m_layer_mask_reg[4]; + uint8_t m_layer_enable_reg; + uint8_t m_layer_mask_reg[4]; int m_layer_scroll1x_offset; int m_layer_scroll2x_offset; int m_layer_scroll3x_offset; diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h index 4f503c52bdc..4db894b4a30 100644 --- a/src/mame/includes/decocass.h +++ b/src/mame/includes/decocass.h @@ -98,7 +98,7 @@ private: tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap_l; tilemap_t *m_bg_tilemap_r; - uint16_t m_empty_tile[16*16]; + uint8_t m_empty_tile[16*16]; int32_t m_watchdog_count; int32_t m_watchdog_flip; int32_t m_color_missiles; diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h index c5f79889b25..f61174d4457 100644 --- a/src/mame/includes/namcos22.h +++ b/src/mame/includes/namcos22.h @@ -126,7 +126,7 @@ struct namcos22_object_data const u8 *czram; /* sprites */ - const u16 *source; + const u8 *source; int alpha; int line_modulo; int flipx; @@ -234,7 +234,7 @@ public: int m_poly_translucency; u16 *m_texture_tilemap; std::unique_ptr<u8[]> m_texture_tileattr; - u16 *m_texture_tiledata; + u8 *m_texture_tiledata; std::unique_ptr<u8[]> m_texture_ayx_to_pixel; int m_is_ss22; int m_mixer_flags; diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index b0a5089d34a..c9a43a26617 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -85,7 +85,7 @@ private: int m_tilemap_flip; int m_flipscreen; uint8_t m_irq_port_last; - uint16_t m_blank_tile[8*8]; + uint8_t m_blank_tile[8*8]; uint8_t m_palette_lookup[32]; /* misc */ diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index e6f2c2eb6f4..67c6299c292 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -26,22 +26,23 @@ class pk8020_state : public driver_device { public: - pk8020_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_decplm(*this, "decplm"), - m_devbank(*this, "devbank"), - m_ram(*this, RAM_TAG), - m_ios(*this, "ios%u", 1U), - m_fdc(*this, "fdc"), - m_floppy(*this, "fdc:%u", 0U), - m_inr(*this, "inr"), - m_speaker(*this, "speaker"), - m_printer(*this, "printer"), - m_region_maincpu(*this, "maincpu"), - m_region_gfx1(*this, "gfx1"), - m_io_port(*this, "LINE%u", 0U), - m_palette(*this, "palette") + pk8020_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_decplm(*this, "decplm") + , m_devbank(*this, "devbank") + , m_ram(*this, RAM_TAG) + , m_ios(*this, "ios%u", 1U) + , m_fdc(*this, "fdc") + , m_floppy(*this, "fdc:%u", 0U) + , m_cass(*this, "cassette") + , m_inr(*this, "inr") + , m_speaker(*this, "speaker") + , m_printer(*this, "printer") + , m_region_maincpu(*this, "maincpu") + , m_region_gfx1(*this, "gfx1") + , m_io_port(*this, "LINE%u", 0U) + , m_palette(*this, "palette") { } void pk8020(machine_config &config); @@ -101,6 +102,7 @@ private: required_device_array<i8251_device, 2> m_ios; required_device<kr1818vg93_device> m_fdc; required_device_array<floppy_connector, 4> m_floppy; + required_device<cassette_image_device> m_cass; required_device<pic8259_device> m_inr; required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_printer; diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h index 4588466f134..61fc336788e 100644 --- a/src/mame/includes/seta2.h +++ b/src/mame/includes/seta2.h @@ -135,7 +135,7 @@ protected: std::unique_ptr<uint16_t[]> m_private_spriteram; private: - void drawgfx_line(bitmap_ind16 &bitmap, const rectangle &cliprect, int gfx, const uint16_t* const addr, const uint32_t realcolor, int flipx, int flipy, int base_sx, int shadow, int realline, int line, int opaque); + void drawgfx_line(bitmap_ind16 &bitmap, const rectangle &cliprect, int gfx, const uint8_t* const addr, const uint32_t realcolor, int flipx, int flipy, int base_sx, int shadow, int realline, int line, int opaque); inline void get_tile(uint16_t* spriteram, int is_16x16, int x, int y, int page, int& code, int& attr, int& flipx, int& flipy, int& color); std::unique_ptr<uint32_t[]> m_realtilenumber; diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 18dd549342d..0f5fd5727e3 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -116,7 +116,7 @@ private: int m_is_psychos; uint8_t m_drawmode_table[16]; - uint16_t m_empty_tile[16*16]; + uint8_t m_empty_tile[16*16]; int m_hf_posy; int m_hf_posx; int m_tc16_posy; diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index e0cf26f11ad..b3220c936c1 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -52,7 +52,7 @@ private: uint8_t m_flip_y; tilemap_t *m_solid_tilemap; tilemap_t *m_tilemap; - std::unique_ptr<uint16_t[]> m_dummy_tile; + std::unique_ptr<uint8_t[]> m_dummy_tile; uint8_t m_nmi_mask; int m_question_address; |