diff options
Diffstat (limited to 'src/mame/includes/seta.h')
-rw-r--r-- | src/mame/includes/seta.h | 164 |
1 files changed, 81 insertions, 83 deletions
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h index 22e07968d40..5e63b144804 100644 --- a/src/mame/includes/seta.h +++ b/src/mame/includes/seta.h @@ -30,9 +30,9 @@ public: struct uPD71054_state { emu_timer *timer[3]; // Timer - uint16_t max[3]; // Max counter - uint16_t write_select; // Max counter write select - uint8_t reg[4]; // + u16 max[3]; // Max counter + u16 write_select; // Max counter write select + u8 reg[4]; // }; struct game_offset @@ -120,7 +120,6 @@ public: void init_metafox(); void init_arbalest(); void init_wiggie(); - void init_blandia(); void init_bankx1(); void init_eightfrc(); void init_pairlove(); @@ -129,7 +128,7 @@ public: SETA001_SPRITE_GFXBANK_CB_MEMBER(setac_gfxbank_callback); - uint32_t screen_update_seta_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u32 screen_update_seta_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: required_device<cpu_device> m_maincpu; @@ -146,10 +145,10 @@ protected: optional_ioport m_coins; optional_ioport m_extra_port; - optional_shared_ptr<uint8_t> m_sharedram; - optional_shared_ptr_array<uint16_t, 2> m_vram; - optional_shared_ptr_array<uint16_t, 2> m_vctrl; - optional_shared_ptr_array<uint16_t, 2> m_paletteram; + optional_shared_ptr<u8> m_sharedram; + optional_shared_ptr_array<u16, 2> m_vram; + optional_shared_ptr_array<u16, 2> m_vctrl; + optional_shared_ptr_array<u16, 2> m_paletteram; optional_memory_bank m_subbank; optional_memory_bank m_x1_bank; @@ -159,7 +158,7 @@ protected: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - uint8_t m_vregs; + u8 m_vregs; int m_tiles_offset; tilemap_t *m_tilemap[2]; // Max 2 Layers @@ -178,54 +177,54 @@ protected: int m_keroppi_protection_count; emu_timer *m_keroppi_prize_hop_timer; - uint8_t m_twineagl_xram[8]; + u8 m_twineagl_xram[8]; int m_twineagl_tilebank[4]; - uint16_t m_magspeed_lights[3]; + u16 m_magspeed_lights[3]; - std::unique_ptr<uint16_t[]> m_pairslove_protram; - std::unique_ptr<uint16_t[]> m_pairslove_protram_old; - std::unique_ptr<uint16_t[]> m_downtown_protection; + std::unique_ptr<u16[]> m_pairslove_protram; + std::unique_ptr<u16[]> m_pairslove_protram_old; + std::unique_ptr<u16[]> m_downtown_protection; DECLARE_READ16_MEMBER(metafox_protection_r); void seta_coin_counter_w(u8 data); void seta_coin_lockout_w(u8 data); - DECLARE_WRITE8_MEMBER(seta_vregs_w); - template<int Layer> DECLARE_WRITE16_MEMBER(vram_w); - DECLARE_WRITE16_MEMBER(twineagl_tilebank_w); - DECLARE_WRITE16_MEMBER(timer_regs_w); - DECLARE_READ16_MEMBER(sharedram_68000_r); - DECLARE_WRITE16_MEMBER(sharedram_68000_w); - DECLARE_WRITE16_MEMBER(sub_ctrl_w); - DECLARE_READ16_MEMBER(seta_dsw_r); - - DECLARE_READ16_MEMBER(zingzipbl_unknown_r); - DECLARE_READ16_MEMBER(keroppi_protection_r); - DECLARE_READ16_MEMBER(keroppi_protection_init_r); - DECLARE_READ16_MEMBER(keroppi_coin_r); - DECLARE_WRITE16_MEMBER(keroppi_prize_w); - DECLARE_READ16_MEMBER(thunderl_protection_r); - DECLARE_WRITE16_MEMBER(thunderl_protection_w); - DECLARE_WRITE8_MEMBER(utoukond_sound_control_w); - DECLARE_READ16_MEMBER(pairlove_prot_r); - DECLARE_WRITE16_MEMBER(pairlove_prot_w); + void seta_vregs_w(u8 data); + template<int Layer> void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void twineagl_tilebank_w(offs_t offset, u8 data); + void timer_regs_w(offs_t offset, u16 data); + u8 sharedram_68000_r(offs_t offset); + void sharedram_68000_w(offs_t offset, u8 data); + void sub_ctrl_w(offs_t offset, u8 data); + u16 seta_dsw_r(offs_t offset); + + u16 zingzipbl_unknown_r(); + u16 keroppi_protection_r(); + u16 keroppi_protection_init_r(); + u16 keroppi_coin_r(); + void keroppi_prize_w(u16 data); + u16 thunderl_protection_r(); + void thunderl_protection_w(u16 data); + void utoukond_sound_control_w(u8 data); + u16 pairlove_prot_r(offs_t offset); + void pairlove_prot_w(offs_t offset, u16 data); void sub_bankswitch_w(u8 data); void sub_bankswitch_lockout_w(u8 data); - DECLARE_READ8_MEMBER(ff_r); - DECLARE_READ8_MEMBER(downtown_ip_r); - DECLARE_WRITE8_MEMBER(calibr50_sub_bankswitch_w); - DECLARE_WRITE8_MEMBER(calibr50_soundlatch2_w); - DECLARE_WRITE8_MEMBER(twineagl_ctrl_w); + u8 ff_r(); + u8 downtown_ip_r(offs_t offset); + void calibr50_sub_bankswitch_w(u8 data); + void calibr50_soundlatch2_w(u8 data); + void twineagl_ctrl_w(u8 data); DECLARE_READ16_MEMBER(twineagl_debug_r); DECLARE_READ16_MEMBER(twineagl_200100_r); DECLARE_WRITE16_MEMBER(twineagl_200100_w); DECLARE_READ16_MEMBER(downtown_protection_r); DECLARE_WRITE16_MEMBER(downtown_protection_w); DECLARE_READ16_MEMBER(arbalest_debug_r); - DECLARE_WRITE16_MEMBER(magspeed_lights_w); - DECLARE_READ8_MEMBER(dsw1_r); - DECLARE_READ8_MEMBER(dsw2_r); - DECLARE_READ16_MEMBER(extra_r); + void magspeed_lights_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u8 dsw1_r(); + u8 dsw2_r(); + u16 extra_r(); TILE_GET_INFO_MEMBER(twineagl_get_tile_info); template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info); @@ -244,16 +243,16 @@ protected: DECLARE_MACHINE_START(keroppi); DECLARE_MACHINE_START(magspeed); DECLARE_VIDEO_START(oisipuzl_2_layers); - uint32_t screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u32 screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u32 screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_seta_buffer_sprites); - DECLARE_READ16_MEMBER(ipl0_ack_r); - DECLARE_WRITE16_MEMBER(ipl0_ack_w); - DECLARE_READ16_MEMBER(ipl1_ack_r); - DECLARE_WRITE16_MEMBER(ipl1_ack_w); - DECLARE_READ16_MEMBER(ipl2_ack_r); - DECLARE_WRITE16_MEMBER(ipl2_ack_w); + u16 ipl0_ack_r(); + void ipl0_ack_w(u16 data); + u16 ipl1_ack_r(); + void ipl1_ack_w(u16 data); + u16 ipl2_ack_r(); + void ipl2_ack_w(u16 data); void uPD71054_update_timer(device_t *cpu, int no); INTERRUPT_GEN_MEMBER(wrofaero_interrupt); TIMER_CALLBACK_MEMBER(uPD71054_timer_callback); @@ -268,8 +267,7 @@ protected: void set_pens(); void draw_tilemap_palette_effect(bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tilemap, int scrollx, int scrolly, int gfxnum, int flipscreen); void seta_layers_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_bank_size); - void rearrange_gfx(); - void uPD71054_timer_init( ); + void uPD71054_timer_init(); DECLARE_WRITE_LINE_MEMBER(pit_out0); DECLARE_WRITE_LINE_MEMBER(utoukond_ym3438_interrupt); @@ -340,12 +338,12 @@ protected: virtual void machine_start() override; private: - uint16_t dsw_r(offs_t offset); - void lockout_w(uint8_t data); + u16 dsw_r(offs_t offset); + void lockout_w(u8 data); void usclssic_palette(palette_device &palette) const; - uint32_t screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u32 screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void usclssic_set_pens(); @@ -356,7 +354,7 @@ private: required_ioport_array<2> m_track_x; required_ioport_array<2> m_track_y; - uint8_t m_port_select; + u8 m_port_select; }; class kiwame_state : public seta_state @@ -371,8 +369,8 @@ public: void kiwame(machine_config &config); private: - void row_select_w(uint16_t data); - uint16_t input_r(offs_t offset); + void row_select_w(u16 data); + u16 input_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(kiwame_vblank); void kiwame_map(address_map &map); @@ -380,7 +378,7 @@ private: required_device<tmp68301_device> m_maincpu; required_ioport_array<10> m_key; - uint16_t m_kiwame_row_select; + u16 m_kiwame_row_select; }; class zombraid_state : public seta_state @@ -400,9 +398,9 @@ protected: DECLARE_MACHINE_START(zombraid); private: - double adc_cb(uint8_t input); - uint16_t gun_r(); - void gun_w(uint16_t data); + double adc_cb(u8 input); + u16 gun_r(); + void gun_w(u16 data); void zombraid_map(address_map &map); void zombraid_x1_map(address_map &map); @@ -438,11 +436,11 @@ private: DECLARE_WRITE16_MEMBER(rtc_w); DECLARE_READ16_MEMBER(rtc_r); - DECLARE_READ16_MEMBER(inputs_r); - DECLARE_WRITE16_MEMBER(mux_w); + u16 inputs_r(); + void mux_w(u16 data); - DECLARE_WRITE8_MEMBER(pay_w); - DECLARE_WRITE8_MEMBER(led_w); + void pay_w(u8 data); + void led_w(u8 data); DECLARE_READ16_MEMBER(spritecode_r); DECLARE_WRITE16_MEMBER(spritecode_w); @@ -456,7 +454,7 @@ private: DECLARE_VIDEO_START(setaroul_1_layer); void setaroul_palette(palette_device &palette) const; - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); @@ -466,10 +464,10 @@ private: required_device<ticket_dispenser_device> m_hopper; required_ioport_array<26> m_bet; - uint8_t m_mux; + u8 m_mux; - uint8_t m_pay; - uint8_t m_led; + u8 m_pay; + u8 m_led; uint64_t m_coin_start_cycles; @@ -508,14 +506,14 @@ private: DECLARE_WRITE16_MEMBER(rtc_w); DECLARE_READ16_MEMBER(rtc_r); - DECLARE_READ16_MEMBER(dsw_r); - DECLARE_READ16_MEMBER(comm_r); + u16 dsw_r(offs_t offset); + u16 comm_r(); - DECLARE_READ16_MEMBER(mux_r); - DECLARE_WRITE16_MEMBER(jockeyc_mux_w); - DECLARE_WRITE16_MEMBER(jockeyc_out_w); + u16 mux_r(); + void jockeyc_mux_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void jockeyc_out_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_READ16_MEMBER(trackball_r); + u16 trackball_r(offs_t offset); DECLARE_MACHINE_START(jockeyc); DECLARE_MACHINE_START(inttoote); @@ -523,9 +521,9 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(interrupt); - DECLARE_WRITE16_MEMBER(inttoote_mux_w); - DECLARE_WRITE16_MEMBER(inttoote_out_w); - DECLARE_READ16_MEMBER(inttoote_700000_r); + void inttoote_mux_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void inttoote_out_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 inttoote_700000_r(offs_t offset); void inttoote_map(address_map &map); void jockeyc_map(address_map &map); @@ -533,7 +531,7 @@ private: required_device<upd4992_device> m_rtc; // ! Actually D4911C ! required_device<ticket_dispenser_device> m_hopper1, m_hopper2; // the 2nd hopper is optional - optional_shared_ptr<uint16_t> m_inttoote_700000; + optional_shared_ptr<u16> m_inttoote_700000; required_ioport_array<5> m_key1, m_key2; required_ioport m_dsw1, m_dsw2_3; optional_ioport m_cabinet; @@ -546,8 +544,8 @@ private: output_finder<> m_out_help; output_finder<> m_out_itstart; - uint16_t m_mux; - uint16_t m_out; + u16 m_mux; + u16 m_out; void update_hoppers(); void show_outputs(); |