Previous 199869 Revisions Next

r44366 Saturday 23rd January, 2016 at 16:30:14 UTC by Ryan Holtz
Time for more this==NULL fixes
[src/devices/sound]aica.cpp aica.h scsp.cpp
[src/emu]diimage.cpp
[src/mame/audio]dcs.cpp
[src/mame/drivers]igs011.cpp pc2000.cpp
[src/mame/includes]playch10.h
[src/mame/machine]playch10.cpp

trunk/src/devices/sound/aica.cpp
r252877r252878
414414   m_MidiOutR=m_MidiOutW=0;
415415
416416   // get AICA RAM
417   if (m_ram_region != NULL)
417418   {
418      m_AICARAM = region()->base();
419      if (m_AICARAM)
420      {
421         m_AICARAM += m_roffset;
422         m_AICARAM_LENGTH = region()->bytes();
423         m_RAM_MASK = m_AICARAM_LENGTH-1;
424         m_RAM_MASK16 = m_RAM_MASK & 0x7ffffe;
425         m_DSP.AICARAM = (UINT16 *)m_AICARAM;
426         m_DSP.AICARAM_LENGTH = m_AICARAM_LENGTH/2;
427      }
419      m_AICARAM = m_ram_region->base();
420      m_AICARAM += m_roffset;
421      m_AICARAM_LENGTH = m_ram_region->bytes();
422      m_RAM_MASK = m_AICARAM_LENGTH-1;
423      m_RAM_MASK16 = m_RAM_MASK & 0x7ffffe;
424      m_DSP.AICARAM = (UINT16 *)m_AICARAM;
425      m_DSP.AICARAM_LENGTH = m_AICARAM_LENGTH/2;
428426   }
429427
430428   m_timerA = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aica_device::timerA_cb), this));
r252877r252878
14731471      m_roffset(0),
14741472      m_irq_cb(*this),
14751473      m_main_irq_cb(*this),
1474      m_ram_region(*this, this->tag()),
14761475      m_IRQL(0),
14771476      m_IRQR(0),
14781477      m_BUFPTR(0),
trunk/src/devices/sound/aica.h
r252877r252878
143143   int m_roffset;                /* offset in the region */
144144   devcb_write_line m_irq_cb;
145145   devcb_write_line m_main_irq_cb;
146   optional_memory_region m_ram_region;
146147
147148   union
148149   {
trunk/src/devices/sound/scsp.cpp
r252877r252878
516516      m_Master = 0;
517517   }
518518
519   if (m_ram_region)
519   if (m_ram_region != NULL)
520520   {
521521      m_SCSPRAM = m_ram_region->base();
522      if (m_SCSPRAM)
523      {
524         m_SCSPRAM_LENGTH = m_ram_region->bytes();
525         m_DSP.SCSPRAM = (UINT16 *)m_SCSPRAM;
526         m_DSP.SCSPRAM_LENGTH = m_SCSPRAM_LENGTH/2;
527         m_SCSPRAM += m_roffset;
528      }
522      m_SCSPRAM_LENGTH = m_ram_region->bytes();
523      m_DSP.SCSPRAM = (UINT16 *)m_SCSPRAM;
524      m_DSP.SCSPRAM_LENGTH = m_SCSPRAM_LENGTH / 2;
525      m_SCSPRAM += m_roffset;
529526   }
530527
531528   m_timerA = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(scsp_device::timerA_cb), this));
trunk/src/emu/diimage.cpp
r252877r252878
393393   char full_tag[256];
394394
395395   sprintf( full_tag, "%s:%s", device().tag(), tag );
396   return device().machine().root_device().memregion( full_tag )->bytes();
396
397   memory_region *region = device().machine().root_device().memregion(full_tag);
398   return region != NULL ? region->bytes() : 0;
397399}
398400
399401
trunk/src/mame/audio/dcs.cpp
r252877r252878
945945   m_dmadac[1] = subdevice<dmadac_sound_device>("dac2");
946946
947947   /* always boot from the base of "dcs" */
948   m_bootrom = (UINT16 *)machine().root_device().memregion("dcs")->base();
949   m_bootrom_words = machine().root_device().memregion("dcs")->bytes() / 2;
948   memory_region *bootrom_region = machine().root_device().memregion("dcs");
949   if (bootrom_region != NULL)
950   {
951      m_bootrom = (UINT16 *)bootrom_region->base();
952      m_bootrom_words = bootrom_region->bytes() / 2;
953   }
950954
951955   /* supports both RAM and ROM variants */
952956   if (m_dram_in_mb != 0)
trunk/src/mame/drivers/igs011.cpp
r252877r252878
8484{
8585public:
8686   igs011_state(const machine_config &mconfig, device_type type, const char *tag)
87      : driver_device(mconfig, type, tag),
88      m_maincpu(*this, "maincpu"),
89      m_oki(*this, "oki"),
90      m_screen(*this, "screen"),
91      m_palette(*this, "palette"),
92      m_priority_ram(*this, "priority_ram"),
93      m_vbowl_trackball(*this, "vbowl_trackball"),
94      m_generic_paletteram_16(*this, "paletteram") { }
87      : driver_device(mconfig, type, tag)
88      , m_maincpu(*this, "maincpu")
89      , m_oki(*this, "oki")
90      , m_screen(*this, "screen")
91      , m_palette(*this, "palette")
92      , m_priority_ram(*this, "priority_ram")
93      , m_vbowl_trackball(*this, "vbowl_trackball")
94      , m_generic_paletteram_16(*this, "paletteram")
95      , m_gfx_region(*this, "blitter")
96      , m_gfx2_region(*this, "blitter_hi")
97   {
98   }
9599
96100   /* devices */
97101   required_device<cpu_device> m_maincpu;
r252877r252878
105109   required_shared_ptr<UINT16> m_generic_paletteram_16;
106110
107111   std::unique_ptr<UINT8[]> m_layer[8];
112   /* memory regions */
113   required_memory_region m_gfx_region;
114   optional_memory_region m_gfx2_region;
115
116   UINT8 *m_layer[8];
108117   UINT16 m_priority;
109118   UINT8 m_lhb2_pen_hi;
110119   UINT16 m_igs_dips_sel;
r252877r252878
484493   UINT8 trans_pen, clear_pen, pen_hi, *dest;
485494   UINT8 pen = 0;
486495
487   UINT8 *gfx      =   memregion("blitter")->base();
488   UINT8 *gfx2     =   memregion("blitter_hi")->base();
489   int gfx_size    =   memregion("blitter")->bytes();
490   int gfx2_size   =   memregion("blitter_hi")->bytes();
496   UINT8 *gfx      =   m_gfx_region->base();
497   int gfx_size    =   m_gfx_region->bytes();
491498
499   UINT8 *gfx2     =   (m_gfx2_region != NULL) ? m_gfx2_region->base() : NULL;
500   int gfx2_size   =   (m_gfx2_region != NULL) ? m_gfx2_region->bytes() : 0;
501
492502   const rectangle &clip = m_screen->visible_area();
493503
494504   COMBINE_DATA(&blitter.flags);
trunk/src/mame/drivers/pc2000.cpp
r252877r252878
747747{
748748   std::string region_tag;
749749   UINT8 *bios = memregion("bios")->base();
750   UINT8 *cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base();
751   if (!cart)
752      cart = memregion("bios")->base();
750   memory_region *cart_region = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
751   UINT8 *cart = (cart_region != NULL) ? cart_region->base() : memregion("bios")->base();
753752
754753   m_bank0->configure_entries(0, 0x10, bios, 0x4000);
755754   m_bank1->configure_entries(0, 0x10, bios, 0x4000);
r252877r252878
761760{
762761   std::string region_tag;
763762   UINT8 *bios = memregion("bios")->base();
764   UINT8 *cart = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str())->base();
765   if (!cart)
766      cart = memregion("bios")->base();
763   memory_region *cart_region = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
764   UINT8 *cart = (cart_region != NULL) ? cart_region->base() : memregion("bios")->base();
767765
768766   m_bank0->configure_entries(0, 0x20, bios, 0x4000);
769767   m_bank1->configure_entries(0, 0x20, bios, 0x4000);
trunk/src/mame/includes/playch10.h
r252877r252878
1313{
1414public:
1515   playch10_state(const machine_config &mconfig, device_type type, const char *tag)
16      : driver_device(mconfig, type, tag),
17      m_maincpu(*this, "maincpu"),
18      m_ppu(*this, "ppu"),
19      m_rp5h01(*this, "rp5h01"),
20      m_ram_8w(*this, "ram_8w"),
21      m_videoram(*this, "videoram"),
22      m_timedata(*this, "timedata"),
23      m_work_ram(*this, "work_ram"),
24      m_gfxdecode(*this, "gfxdecode")
25      { }
16      : driver_device(mconfig, type, tag)
17      , m_maincpu(*this, "maincpu")
18      , m_ppu(*this, "ppu")
19      , m_rp5h01(*this, "rp5h01")
20      , m_ram_8w(*this, "ram_8w")
21      , m_videoram(*this, "videoram")
22      , m_timedata(*this, "timedata")
23      , m_work_ram(*this, "work_ram")
24      , m_gfxdecode(*this, "gfxdecode")
25      , m_vrom_region(*this, "gfx2")
26   {
27   }
2628
2729   required_device<cpu_device> m_maincpu;
2830   required_device<ppu2c0x_device> m_ppu;
r252877r252878
3436   required_shared_ptr<UINT8> m_work_ram;
3537   required_device<gfxdecode_device> m_gfxdecode;
3638
39   optional_memory_region m_vrom_region;
40
3741   int m_up_8w;
3842   int m_pc10_nmi_enable;
3943   int m_pc10_dog_di;
trunk/src/mame/machine/playch10.cpp
r252877r252878
3838
3939void playch10_state::machine_start()
4040{
41   m_vrom = memregion("gfx2")->base();
41   m_vrom = (m_vrom_region != NULL) ? m_vrom_region->base() : NULL;
4242
4343   /* allocate 4K of nametable ram here */
4444   /* move to individual boards as documentation of actual boards allows */
r252877r252878
5858
5959MACHINE_START_MEMBER(playch10_state,playch10_hboard)
6060{
61   m_vrom = memregion("gfx2")->base();
61   m_vrom = (m_vrom_region != NULL) ? m_vrom_region->base() : NULL;
6262
6363   /* allocate 4K of nametable ram here */
6464   /* move to individual boards as documentation of actual boards allows */

https://github.com/mamedev/mame/commit/2820f1c2773011c397db07a5968982ba65073f9e

Previous 199869 Revisions Next

© 1997-2024 The MAME Team