Previous 199869 Revisions Next

r24077 Thursday 4th July, 2013 at 21:11:58 UTC by hap
fix priority ram memory test
[src/mame/drivers]tetrisp2.c
[src/mame/includes]tetrisp2.h
[src/mame/video]tetrisp2.c

trunk/src/mame/includes/tetrisp2.h
r24076r24077
33public:
44   tetrisp2_state(const machine_config &mconfig, device_type type, const char *tag)
55      : driver_device(mconfig, type, tag),
6         m_spriteram(*this, "spriteram"),
7         m_spriteram2(*this, "spriteram2") ,
6      m_maincpu(*this, "maincpu"),
7      m_subcpu(*this, "sub"),
8      m_spriteram(*this, "spriteram"),
9      m_spriteram2(*this, "spriteram2"),
810      m_vram_fg(*this, "vram_fg"),
911      m_vram_bg(*this, "vram_bg"),
1012      m_vram_rot(*this, "vram_rot"),
r24076r24077
1820      m_rocknms_sub_vram_bg(*this, "sub_vram_bg"),
1921      m_rocknms_sub_scroll_fg(*this, "sub_scroll_fg"),
2022      m_rocknms_sub_scroll_bg(*this, "sub_scroll_bg"),
21      m_rocknms_sub_rotregs(*this, "sub_rotregs"),
22      m_maincpu(*this, "maincpu"),
23      m_subcpu(*this, "sub") { }
23      m_rocknms_sub_rotregs(*this, "sub_rotregs")
24   { }
2425
26   required_device<cpu_device> m_maincpu;
27   optional_device<cpu_device> m_subcpu;
28
2529   required_shared_ptr<UINT16> m_spriteram;
2630   optional_shared_ptr<UINT16> m_spriteram2;
2731
r24076r24077
8084   DECLARE_WRITE16_MEMBER(tetrisp2_nvram_w);
8185   DECLARE_WRITE16_MEMBER(tetrisp2_palette_w);
8286   DECLARE_WRITE16_MEMBER(rocknms_sub_palette_w);
83   DECLARE_WRITE8_MEMBER(tetrisp2_priority_w);
84   DECLARE_WRITE8_MEMBER(rockn_priority_w);
87   DECLARE_WRITE16_MEMBER(tetrisp2_priority_w);
8588   DECLARE_WRITE16_MEMBER(rocknms_sub_priority_w);
86   DECLARE_READ16_MEMBER(nndmseal_priority_r);
87   DECLARE_READ8_MEMBER(tetrisp2_priority_r);
89   DECLARE_READ16_MEMBER(tetrisp2_priority_r);
8890   DECLARE_WRITE16_MEMBER(tetrisp2_vram_bg_w);
8991   DECLARE_WRITE16_MEMBER(tetrisp2_vram_fg_w);
9092   DECLARE_WRITE16_MEMBER(tetrisp2_vram_rot_w);
r24076r24077
117119   TIMER_CALLBACK_MEMBER(rockn_timer_level1_callback);
118120   TIMER_CALLBACK_MEMBER(rockn_timer_sub_level1_callback);
119121   void init_rockn_timer();
120   required_device<cpu_device> m_maincpu;
121   optional_device<cpu_device> m_subcpu;
122122};
123123
124124class stepstag_state : public tetrisp2_state
trunk/src/mame/video/tetrisp2.c
r24076r24077
6868
6969***************************************************************************/
7070
71WRITE8_MEMBER(tetrisp2_state::tetrisp2_priority_w)
71WRITE16_MEMBER(tetrisp2_state::tetrisp2_priority_w)
7272{
73   //if (ACCESSING_BITS_8_15)
74   {
75      data |= ((data & 0xff00) >> 8);
73   if (ACCESSING_BITS_0_7)
7674      m_priority[offset] = data;
77   }
75   else
76      m_priority[offset] = data >> 8;
7877}
7978
80
81WRITE8_MEMBER(tetrisp2_state::rockn_priority_w)
79READ16_MEMBER(tetrisp2_state::tetrisp2_priority_r)
8280{
83   //if (ACCESSING_BITS_8_15)
84   {
85      m_priority[offset] = data;
86   }
81   return m_priority[offset] | 0xff00;
8782}
8883
8984WRITE16_MEMBER(tetrisp2_state::rocknms_sub_priority_w)
9085{
91   if (ACCESSING_BITS_8_15)
92   {
86   if (ACCESSING_BITS_0_7)
9387      m_rocknms_sub_priority[offset] = data;
94   }
88   else
89      m_rocknms_sub_priority[offset] = data >> 8;
9590}
9691
97READ16_MEMBER(tetrisp2_state::nndmseal_priority_r)
98{
99   return m_priority[offset] | 0xff00;
100}
10192
102READ8_MEMBER(tetrisp2_state::tetrisp2_priority_r)
103{
104   return m_priority[offset];
105}
106
10793/***************************************************************************
10894
10995
trunk/src/mame/drivers/tetrisp2.c
r24076r24077
297297   AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram")           // Object RAM
298298   AM_RANGE(0x104000, 0x107fff) AM_RAM                                                         // Spare Object RAM
299299   AM_RANGE(0x108000, 0x10ffff) AM_RAM                                                         // Work RAM
300   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, tetrisp2_priority_w, 0x00ff)
300   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
301301   AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram")        // Palette
302302   AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_SHARE("vram_fg")   // Foreground
303303   AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_SHARE("vram_bg")   // Background
r24076r24077
354354   AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram")   // Object RAM
355355   AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
356356   AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM
357   AM_RANGE(0x200000, 0x23ffff) AM_WRITE8(tetrisp2_priority_w, 0x00ff) // Priority
358   AM_RANGE(0x200000, 0x23ffff) AM_READ(nndmseal_priority_r)
357   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
359358   AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram")    // Palette
360359   AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_SHARE("vram_fg")   // Foreground
361360   AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_SHARE("vram_bg")   // Background
r24076r24077
400399   AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram")           // Object RAM
401400   AM_RANGE(0x104000, 0x107fff) AM_RAM                                                         // Spare Object RAM
402401   AM_RANGE(0x108000, 0x10ffff) AM_RAM                                                         // Work RAM
403   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff)       // Priority
402   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
404403   AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram")        // Palette
405404   AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_SHARE("vram_fg")   // Foreground
406405   AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_SHARE("vram_bg")   // Background
r24076r24077
434433   AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram")           // Object RAM
435434   AM_RANGE(0x104000, 0x107fff) AM_RAM                                                         // Spare Object RAM
436435   AM_RANGE(0x108000, 0x10ffff) AM_RAM                                                         // Work RAM
437   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff)   // Priority
436   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
438437   AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram")        // Palette
439438   AM_RANGE(0x500000, 0x50ffff) AM_RAM                                                         // Line
440439   AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_SHARE("vram_rot") // Rotation
r24076r24077
468467   AM_RANGE(0x100000, 0x103fff) AM_RAM AM_SHARE("spriteram")           // Object RAM
469468   AM_RANGE(0x104000, 0x107fff) AM_RAM                                                         // Spare Object RAM
470469   AM_RANGE(0x108000, 0x10ffff) AM_RAM                                                         // Work RAM
471   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff)       // Priority
470   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
472471   AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_SHARE("paletteram")        // Palette
473472//  AM_RANGE(0x500000, 0x50ffff) AM_RAM                                                         // Line
474473   AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_SHARE("vram_rot") // Rotation
r24076r24077
601600   AM_RANGE(0x000000, 0x0fffff) AM_ROM
602601   AM_RANGE(0x100000, 0x103fff) AM_RAM                                                         // Object RAM
603602   AM_RANGE(0x108000, 0x10ffff) AM_RAM                                                         // Work RAM
604   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE8(tetrisp2_priority_r, rockn_priority_w, 0x00ff)   // Priority
603   AM_RANGE(0x200000, 0x23ffff) AM_READWRITE(tetrisp2_priority_r, tetrisp2_priority_w)
605604   AM_RANGE(0x300000, 0x31ffff) AM_RAM                                                         // Palette
606605   AM_RANGE(0x400000, 0x403fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_SHARE("vram_fg")           // Foreground
607606   AM_RANGE(0x404000, 0x407fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_SHARE("vram_bg")           // Background

Previous 199869 Revisions Next


© 1997-2024 The MAME Team