Previous 199869 Revisions Next

r44562 Friday 29th January, 2016 at 06:54:30 UTC by Miodrag Milanović
Merge pull request #589 from dankan1890/master

Small code cleanup
[src/emu/ui]ui.cpp
[src/mame/drivers]overdriv.cpp pulsar.cpp
[src/mame/includes]overdriv.h

trunk/src/emu/ui/ui.cpp
r253073r253074
183183    CORE IMPLEMENTATION
184184***************************************************************************/
185185
186static const UINT32 mouse_bitmap[] = {
186static const UINT32 mouse_bitmap[32*32] =
187{
187188   0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,
188189   0x09a46f30,0x81ac7c43,0x24af8049,0x00ad7d45,0x00a8753a,0x00a46f30,0x009f6725,0x009b611c,0x00985b14,0x0095560d,0x00935308,0x00915004,0x00904e02,0x008f4e01,0x008f4d00,0x008f4d00,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,
189190   0x00a16a29,0xa2aa783d,0xffbb864a,0xc0b0824c,0x5aaf7f48,0x09ac7b42,0x00a9773c,0x00a67134,0x00a26b2b,0x009e6522,0x009a5e19,0x00965911,0x0094550b,0x00925207,0x00915004,0x008f4e01,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,0x00ffffff,
r253073r253074
457458      {
458459         float mouse_y=-1,mouse_x=-1;
459460         if (mouse_target->map_point_container(mouse_target_x, mouse_target_y, *container, mouse_x, mouse_y)) {
460            container->add_quad(mouse_x,mouse_y,mouse_x + 0.05f*container->manager().ui_aspect(container),mouse_y + 0.05f,UI_TEXT_COLOR,m_mouse_arrow_texture,PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
461            container->add_quad(mouse_x,mouse_y,mouse_x + 0.02f*container->manager().ui_aspect(container),mouse_y + 0.02f,UI_TEXT_COLOR,m_mouse_arrow_texture,PRIMFLAG_ANTIALIAS(1)|PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA));
461462         }
462463      }
463464   }
trunk/src/mame/drivers/overdriv.cpp
r253073r253074
7070
7171TIMER_DEVICE_CALLBACK_MEMBER(overdriv_state::overdriv_cpuA_scanline)
7272{
73   const int timer_threshold = 168; // fwiw matches 0 on mask ROM check, so IF it's a timer irq then should be close ...
7374   int scanline = param;
74
75   /* TODO: irqs routines are TOO slow right now, it ends up firing spurious irqs for whatever reason (shared ram fighting?) */
76   /*       this is a temporary solution to get rid of deprecat lib and the crashes, but also makes the game timer to be too slow */
77   if(scanline == 256 && m_screen->frame_number() & 1) // vblank-out irq
75   
76   m_fake_timer ++;
77   
78   // TODO: irqs routines are TOO slow right now, it ends up firing spurious irqs for whatever reason (shared ram fighting?)
79   //       this is a temporary solution to get rid of deprecat lib and the crashes, but also makes the game timer to be too slow.
80    //       Update: gameplay is actually too fast compared to timer, first attract mode shouldn't even surpass first blue car on right.
81   if(scanline == 256) // vblank-out irq
82   {
83      // m_screen->frame_number() & 1
7884      m_maincpu->set_input_line(4, HOLD_LINE);
79   else if((scanline % 128) == 0) // timer irq
85      m_subcpu->set_input_line(4, HOLD_LINE); // likely wrong
86   }
87   else if(m_fake_timer >= timer_threshold) // timer irq
88   {
89      m_fake_timer -= timer_threshold;
8090      m_maincpu->set_input_line(5, HOLD_LINE);
91   }
8192}
8293
8394INTERRUPT_GEN_MEMBER(overdriv_state::cpuB_interrupt)
8495{
8596   // this doesn't get turned on until the irq has happened? wrong irq?
86//  if (m_k053246->k053246_is_irq_enabled())
87   m_subcpu->set_input_line(4, HOLD_LINE); // likely wrong
97   if (m_k053246->k053246_is_irq_enabled())
98      m_subcpu->set_input_line(6, HOLD_LINE); // likely wrong
8899}
89100
90101
r253073r253074
127138
128139WRITE16_MEMBER(overdriv_state::overdriv_soundirq_w)
129140{
130   m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE);
141   m_audiocpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
131142}
132143
144
133145WRITE16_MEMBER(overdriv_state::overdriv_cpuB_irq_x_w)
134146{
135147   m_subcpu->set_input_line(5, HOLD_LINE); // likely wrong
r253073r253074
137149
138150WRITE16_MEMBER(overdriv_state::overdriv_cpuB_irq_y_w)
139151{
140   m_subcpu->set_input_line(6, HOLD_LINE); // likely wrong
141152}
142153
143154static ADDRESS_MAP_START( overdriv_master_map, AS_PROGRAM, 16, overdriv_state )
r253073r253074
167178   AM_RANGE(0x238000, 0x238001) AM_WRITE(overdriv_cpuB_irq_x_w)
168179ADDRESS_MAP_END
169180
170// HACK ALERT
181#ifdef UNUSED_FUNCTION
171182WRITE16_MEMBER( overdriv_state::overdriv_k053246_word_w )
172183{
173184   m_k053246->k053246_word_w(space,offset,data,mem_mask);
r253073r253074
190201   //printf("%02x %04x %04x\n", offset, data, mem_mask);
191202
192203}
204#endif
193205
194206static ADDRESS_MAP_START( overdriv_slave_map, AS_PROGRAM, 16, overdriv_state )
195207   AM_RANGE(0x000000, 0x03ffff) AM_ROM
r253073r253074
197209   AM_RANGE(0x0c0000, 0x0c1fff) AM_RAM //AM_DEVREADWRITE("k053250_1", k053250_device, ram_r, ram_w)
198210   AM_RANGE(0x100000, 0x10000f) AM_DEVREADWRITE("k053250_1", k053250_device, reg_r, reg_w)
199211   AM_RANGE(0x108000, 0x10800f) AM_DEVREADWRITE("k053250_2", k053250_device, reg_r, reg_w)
200   AM_RANGE(0x118000, 0x118fff) AM_RAM AM_SHARE("sprram") //AM_DEVREADWRITE("k053246", k053247_device, k053247_word_r, k053247_word_w) // data gets copied to sprite chip with DMA..
212   AM_RANGE(0x118000, 0x118fff) AM_DEVREADWRITE("k053246", k053247_device, k053247_word_r, k053247_word_w) // data gets copied to sprite chip with DMA..
201213   AM_RANGE(0x120000, 0x120001) AM_DEVREAD("k053246", k053247_device, k053246_word_r)
202214   AM_RANGE(0x128000, 0x128001) AM_READWRITE(cpuB_ctrl_r, cpuB_ctrl_w) /* enable K053247 ROM reading, plus something else */
203   AM_RANGE(0x130000, 0x130007) AM_WRITE(overdriv_k053246_word_w) // AM_DEVWRITE("k053246", k053247_device, k053246_word_w)
215   AM_RANGE(0x130000, 0x130007) AM_DEVREADWRITE8("k053246", k053247_device, k053246_r,k053246_w,0xffff)
216   //AM_RANGE(0x140000, 0x140001) used in later stages
204217   AM_RANGE(0x200000, 0x203fff) AM_RAM AM_SHARE("share1")
205218   AM_RANGE(0x208000, 0x20bfff) AM_RAM
206219   AM_RANGE(0x218000, 0x219fff) AM_DEVREAD("k053250_1", k053250_device, rom_r)
207220   AM_RANGE(0x220000, 0x221fff) AM_DEVREAD("k053250_2", k053250_device, rom_r)
208221ADDRESS_MAP_END
209222
223WRITE8_MEMBER(overdriv_state::sound_ack_w)
224{
225   m_audiocpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
226}
227
210228static ADDRESS_MAP_START( overdriv_sound_map, AS_PROGRAM, 8, overdriv_state )
229   AM_RANGE(0x0000, 0x0000) AM_WRITE(sound_ack_w)
230   // 0x012 read during explosions
231   // 0x180
211232   AM_RANGE(0x0200, 0x0201) AM_DEVREADWRITE("ymsnd", ym2151_device,read,write)
212233   AM_RANGE(0x0400, 0x042f) AM_DEVREADWRITE("k053260_1", k053260_device, read, write)
213234   AM_RANGE(0x0600, 0x062f) AM_DEVREADWRITE("k053260_2", k053260_device, read, write)
r253073r253074
222243
223244static INPUT_PORTS_START( overdriv )
224245   PORT_START("INPUTS")
225   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_TOGGLE
246   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_TOGGLE
226247   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 )
227248   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 )
228249   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
r253073r253074
297318
298319   /* video hardware */
299320   MCFG_SCREEN_ADD("screen", RASTER)
300   MCFG_SCREEN_REFRESH_RATE(59)
301   MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
302   MCFG_SCREEN_SIZE(64*8, 40*8)
303   MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 0*8, 32*8-1 )
321   MCFG_SCREEN_RAW_PARAMS(XTAL_24MHz/4,384,0,305,264,0,224)
304322   MCFG_SCREEN_UPDATE_DRIVER(overdriv_state, screen_update_overdriv)
305323   MCFG_SCREEN_PALETTE("palette")
306324
r253073r253074
475493   ROM_LOAD( "789e02.f1", 0x100000, 0x100000, CRC(bdd3b5c6) SHA1(412332d64052c0a3714f4002c944b0e7d32980a4) )
476494ROM_END
477495
478GAMEL( 1990, overdriv,         0, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv )
479GAMEL( 1990, overdriva, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv )
480GAMEL( 1990, overdrivb, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv )
496GAMEL( 1990, overdriv,         0, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // US version
497GAMEL( 1990, overdriva, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
498GAMEL( 1990, overdrivb, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
trunk/src/mame/drivers/pulsar.cpp
r253073r253074
254254/* ROM definition */
255255ROM_START( pulsarlb )
256256   ROM_REGION( 0x10800, "maincpu", ROMREGION_ERASEFF )
257   ROM_LOAD( "mp7a.bin", 0x10000, 0x800, CRC(726b8a19) SHA1(43b2af84d5622c1f67584c501b730acf002a6113) )
257   ROM_SYSTEM_BIOS(0, "mon7", "MP7A")
258   ROMX_LOAD( "mp7a.bin", 0x10000, 0x800, CRC(726b8a19) SHA1(43b2af84d5622c1f67584c501b730acf002a6113), ROM_BIOS(1))
259   ROM_SYSTEM_BIOS(1, "mon6", "LBOOT6") // Blank screen until floppy boots
260   ROMX_LOAD( "lboot6.rom", 0x10000, 0x800, CRC(3bca9096) SHA1(ff99288e51a9e832785ce8e3ab5a9452b1064231), ROM_BIOS(2))
258261ROM_END
259262
260263/* Driver */
trunk/src/mame/includes/overdriv.h
r253073r253074
2424      m_k053246(*this, "k053246"),
2525      m_k053251(*this, "k053251"),
2626      m_k053252(*this, "k053252"),
27      m_sprram(*this, "sprram"),
2827      m_screen(*this, "screen")
2928   { }
3029
r253073r253074
4544   required_device<k053247_device> m_k053246;
4645   required_device<k053251_device> m_k053251;
4746   required_device<k053252_device> m_k053252;
48   required_shared_ptr<UINT16> m_sprram;
4947   required_device<screen_device> m_screen;
5048   DECLARE_WRITE16_MEMBER(eeprom_w);
5149   DECLARE_WRITE16_MEMBER(cpuA_ctrl_w);
5250   DECLARE_READ16_MEMBER(cpuB_ctrl_r);
5351   DECLARE_WRITE16_MEMBER(cpuB_ctrl_w);
5452   DECLARE_WRITE16_MEMBER(overdriv_soundirq_w);
53   DECLARE_WRITE8_MEMBER(sound_ack_w);
5554   DECLARE_WRITE16_MEMBER(overdriv_cpuB_irq_x_w);
5655   DECLARE_WRITE16_MEMBER(overdriv_cpuB_irq_y_w);
5756   virtual void machine_start() override;
r253073r253074
5958   UINT32 screen_update_overdriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
6059   INTERRUPT_GEN_MEMBER(cpuB_interrupt);
6160   TIMER_DEVICE_CALLBACK_MEMBER(overdriv_cpuA_scanline);
62
63   DECLARE_WRITE16_MEMBER( overdriv_k053246_word_w );
61   int m_fake_timer;
62   
6463   K051316_CB_MEMBER(zoom_callback_1);
6564   K051316_CB_MEMBER(zoom_callback_2);
6665   K053246_CB_MEMBER(sprite_callback);

https://github.com/mamedev/mame/commit/c38e2ab229b37238a7dc226a5e2a1ecf29eaa99b

Previous 199869 Revisions Next

© 1997-2024 The MAME Team