summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/jaguar.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes/jaguar.h')
-rw-r--r--src/mame/includes/jaguar.h144
1 files changed, 72 insertions, 72 deletions
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 87a77371ddb..bb9738dcb5c 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -192,73 +192,73 @@ private:
static void (jaguar_state::*const bitmap16[8])(uint16_t *, int32_t, int32_t, uint32_t *, int32_t);
static void (jaguar_state::*const bitmap32[8])(uint16_t *, int32_t, int32_t, uint32_t *, int32_t);
- DECLARE_WRITE32_MEMBER(eeprom_w);
- DECLARE_READ32_MEMBER(eeprom_clk);
- DECLARE_READ32_MEMBER(eeprom_cs);
- DECLARE_READ32_MEMBER(misc_control_r);
- DECLARE_WRITE32_MEMBER(misc_control_w);
- DECLARE_READ32_MEMBER(gpuctrl_r);
- DECLARE_WRITE32_MEMBER(gpuctrl_w);
- DECLARE_READ32_MEMBER(dspctrl_r);
- DECLARE_WRITE32_MEMBER(dspctrl_w);
- DECLARE_READ32_MEMBER(joystick_r);
- DECLARE_WRITE32_MEMBER(joystick_w);
- DECLARE_WRITE32_MEMBER(latch_w);
- DECLARE_READ32_MEMBER(eeprom_data_r);
- DECLARE_WRITE32_MEMBER(eeprom_enable_w);
- DECLARE_WRITE32_MEMBER(eeprom_data_w);
- DECLARE_WRITE32_MEMBER(gpu_jump_w);
- DECLARE_READ32_MEMBER(gpu_jump_r);
- DECLARE_READ32_MEMBER(cojagr3k_main_speedup_r);
- DECLARE_READ32_MEMBER(main_gpu_wait_r);
- DECLARE_WRITE32_MEMBER(area51_main_speedup_w);
- DECLARE_WRITE32_MEMBER(area51mx_main_speedup_w);
- DECLARE_READ16_MEMBER(gpuctrl_r16);
- DECLARE_WRITE16_MEMBER(gpuctrl_w16);
- DECLARE_READ16_MEMBER(blitter_r16);
- DECLARE_WRITE16_MEMBER(blitter_w16);
- DECLARE_READ16_MEMBER(serial_r16);
- DECLARE_WRITE16_MEMBER(serial_w16);
- DECLARE_READ16_MEMBER(dspctrl_r16);
- DECLARE_WRITE16_MEMBER(dspctrl_w16);
- DECLARE_READ16_MEMBER(eeprom_cs16);
- DECLARE_READ16_MEMBER(eeprom_clk16);
- DECLARE_WRITE16_MEMBER(eeprom_w16);
- DECLARE_READ16_MEMBER(joystick_r16);
- DECLARE_WRITE16_MEMBER(joystick_w16);
- DECLARE_READ32_MEMBER(shared_ram_r);
- DECLARE_WRITE32_MEMBER(shared_ram_w);
- DECLARE_READ32_MEMBER(rom_base_r);
- DECLARE_READ32_MEMBER(wave_rom_r);
- DECLARE_READ32_MEMBER(dsp_ram_r);
- DECLARE_WRITE32_MEMBER(dsp_ram_w);
- DECLARE_READ32_MEMBER(gpu_clut_r);
- DECLARE_WRITE32_MEMBER(gpu_clut_w);
- DECLARE_READ32_MEMBER(gpu_ram_r);
- DECLARE_WRITE32_MEMBER(gpu_ram_w);
- DECLARE_READ16_MEMBER(shared_ram_r16);
- DECLARE_WRITE16_MEMBER(shared_ram_w16);
- DECLARE_READ16_MEMBER(cart_base_r16);
- DECLARE_READ16_MEMBER(dsp_ram_r16);
- DECLARE_WRITE16_MEMBER(dsp_ram_w16);
- DECLARE_READ16_MEMBER(gpu_clut_r16);
- DECLARE_WRITE16_MEMBER(gpu_clut_w16);
- DECLARE_READ16_MEMBER(gpu_ram_r16);
- DECLARE_WRITE16_MEMBER(gpu_ram_w16);
+ void eeprom_w(uint32_t data);
+ uint32_t eeprom_clk();
+ uint32_t eeprom_cs();
+ uint32_t misc_control_r();
+ void misc_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpuctrl_r(offs_t offset, uint32_t mem_mask = ~0);
+ void gpuctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t dspctrl_r(offs_t offset, uint32_t mem_mask = ~0);
+ void dspctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t joystick_r();
+ void joystick_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void latch_w(uint32_t data);
+ uint32_t eeprom_data_r(offs_t offset);
+ void eeprom_enable_w(uint32_t data);
+ void eeprom_data_w(offs_t offset, uint32_t data);
+ void gpu_jump_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_jump_r();
+ uint32_t cojagr3k_main_speedup_r();
+ uint32_t main_gpu_wait_r();
+ void area51_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ void area51mx_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t gpuctrl_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void gpuctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t blitter_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void blitter_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t serial_r16(offs_t offset);
+ void serial_w16(offs_t offset, uint16_t data);
+ uint16_t dspctrl_r16(offs_t offset, uint16_t mem_mask = ~0);
+ void dspctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t eeprom_cs16(offs_t offset);
+ uint16_t eeprom_clk16(offs_t offset);
+ void eeprom_w16(offs_t offset, uint16_t data);
+ uint16_t joystick_r16(offs_t offset);
+ void joystick_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t shared_ram_r(offs_t offset);
+ void shared_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t rom_base_r(offs_t offset);
+ uint32_t wave_rom_r(offs_t offset);
+ uint32_t dsp_ram_r(offs_t offset);
+ void dsp_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_clut_r(offs_t offset);
+ void gpu_clut_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint32_t gpu_ram_r(offs_t offset);
+ void gpu_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t shared_ram_r16(offs_t offset);
+ void shared_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t cart_base_r16(offs_t offset);
+ uint16_t dsp_ram_r16(offs_t offset);
+ void dsp_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t gpu_clut_r16(offs_t offset);
+ void gpu_clut_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t gpu_ram_r16(offs_t offset);
+ void gpu_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
// from audio/jaguar.cpp
- DECLARE_READ16_MEMBER( jerry_regs_r );
- DECLARE_WRITE16_MEMBER( jerry_regs_w );
- DECLARE_READ32_MEMBER( serial_r );
- DECLARE_WRITE32_MEMBER( serial_w );
+ uint16_t jerry_regs_r(offs_t offset);
+ void jerry_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t serial_r(offs_t offset);
+ void serial_w(offs_t offset, uint32_t data);
void serial_update();
// from video/jaguar.cpp
- DECLARE_READ32_MEMBER( blitter_r );
- DECLARE_WRITE32_MEMBER( blitter_w );
- DECLARE_READ16_MEMBER( tom_regs_r );
- DECLARE_WRITE16_MEMBER( tom_regs_w );
- DECLARE_READ32_MEMBER( cojag_gun_input_r );
+ uint32_t blitter_r(offs_t offset, uint32_t mem_mask = ~0);
+ void blitter_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+ uint16_t tom_regs_r(offs_t offset);
+ void tom_regs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t cojag_gun_input_r(offs_t offset);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void jagpal_ycc(palette_device &palette) const;
@@ -298,11 +298,11 @@ private:
void cojag_common_init(uint16_t gpu_jump_offs, uint16_t spin_pc);
void init_freeze_common(offs_t main_speedup_addr);
- // from audio/jaguar.c
+ // from audio/jaguar.cpp
void update_gpu_irq();
- DECLARE_WRITE32_MEMBER( dsp_flags_w );
+ void dsp_flags_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- // from video/jaguar.c
+ // from video/jaguar.cpp
void get_crosshair_xy(int player, int &x, int &y);
int effective_hvalue(int value);
bool adjust_object_timer(int vc);
@@ -313,7 +313,7 @@ private:
void scanline_update(int param);
void set_palette(uint16_t vmode);
- /* from jagobj.c */
+ /* from jagobj.cpp */
void jagobj_init();
uint32_t *process_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit);
uint32_t *process_scaled_bitmap(uint16_t *scanline, uint32_t *objdata, int vc, bool logit);
@@ -356,7 +356,7 @@ private:
void bitmap_32_6(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos);
void bitmap_32_7(uint16_t *scanline, int32_t firstpix, int32_t iwidth, uint32_t *src, int32_t xpos);
- /* from jagblit.c */
+ /* from jagblit.cpp */
void generic_blitter(uint32_t command, uint32_t a1flags, uint32_t a2flags);
void blitter_09800001_010020_010020(uint32_t command, uint32_t a1flags, uint32_t a2flags);
void blitter_09800009_000020_000020(uint32_t command, uint32_t a1flags, uint32_t a2flags);
@@ -391,12 +391,12 @@ protected:
virtual void machine_reset() override;
private:
- DECLARE_READ16_MEMBER(butch_regs_r16);
- DECLARE_WRITE16_MEMBER(butch_regs_w16);
- DECLARE_READ32_MEMBER(butch_regs_r);
- DECLARE_WRITE32_MEMBER(butch_regs_w);
+ uint16_t butch_regs_r16(offs_t offset);
+ void butch_regs_w16(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint32_t butch_regs_r(offs_t offset);
+ void butch_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ32_MEMBER(cd_bios_r);
+ uint32_t cd_bios_r(offs_t offset);
void jaguarcd_map(address_map &map);
void jagcd_gpu_dsp_map(address_map &map);