Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Build fixes, yet again (nw)

Browse Source
This commit is contained in:
AJR 2018-01-25 13:40:08 -05:00
parent 11cafea0c6
commit 11cf1a3788
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mame/drivers/segas32.cpp
View File

@ -5179,7 +5179,7 @@ void segas32_state::segas32_common_init()
{
uint8_t *Z80 = memregion("soundcpu")->base();
uint32_t size = memregion("soundcpu")->bytes();
membank("bank1")->configure_entries(0, size / 0x2000, &Z80[0]);
membank("bank1")->configure_entries(0, size / 0x2000, &Z80[0], 0x2000);
/* reset the custom handlers and other pointers */
m_system32_prot_vblank = nullptr;
m_sw1_output = nullptr;
@ -5191,8 +5191,8 @@ void segas32_state::multi32_common_init()
{
uint8_t *ROM = memregion("sega")->base();
uint32_t size = memregion("sega")->bytes();
membank("multipcmbanklo")->configure_entries(0, size / 0x80000, &ROM[0]);
membank("multipcmbankhi")->configure_entries(0, size / 0x80000, &ROM[0]);
membank("multipcmbanklo")->configure_entries(0, size / 0x80000, &ROM[0], 0x80000);
membank("multipcmbankhi")->configure_entries(0, size / 0x80000, &ROM[0], 0x80000);
segas32_common_init();
}

40
src/mame/drivers/vgmplay.cpp
View File

@ -121,6 +121,11 @@ public:
READ8_MEMBER(c352_rom_r);
READ8_MEMBER(qsound_rom_r);
DECLARE_WRITE8_MEMBER(multipcm_bank_lo_a_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_hi_a_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_lo_b_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_hi_b_w);
private:
struct rom_block {
offs_t start_address;
@ -147,6 +152,13 @@ private:
uint32_t m_ym2612_stream_offset;
uint32_t m_multipcma_bank_l;
uint32_t m_multipcma_bank_r;
uint32_t m_multipcma_banked;
uint32_t m_multipcmb_bank_l;
uint32_t m_multipcmb_bank_r;
uint32_t m_multipcmb_banked;
uint8_t rom_r(int chip, uint8_t type, offs_t offset);
uint32_t handle_data_block(uint32_t address);
void blocks_clear();
@ -164,11 +176,6 @@ public:
DECLARE_READ8_MEMBER(file_r);
DECLARE_READ8_MEMBER(file_size_r);
DECLARE_WRITE8_MEMBER(multipcm_bank_lo_a_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_hi_a_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_lo_b_w);
DECLARE_WRITE8_MEMBER(multipcm_bank_hi_b_w);
void vgmplay(machine_config &config);
private:
std::vector<uint8_t> m_file_data;
@ -203,13 +210,6 @@ private:
required_device<ym2608_device> m_ym2608;
required_device<qsound_device> m_qsound;
uint32_t m_multipcma_bank_l;
uint32_t m_multipcma_bank_r;
uint32_t m_multipcma_banked;
uint32_t m_multipcmb_bank_l;
uint32_t m_multipcmb_bank_r;
uint32_t m_multipcmb_banked;
uint32_t r32(int offset) const;
uint8_t r8(int offset) const;
};
@ -1337,7 +1337,7 @@ READ8_MEMBER(vgmplay_state::file_size_r)
return size >> (8*offset);
}
WRITE8_MEMBER(vgmplay_state::multipcm_bank_hi_a_w)
WRITE8_MEMBER(vgmplay_device::multipcm_bank_hi_a_w)
{
if (offset & 1)
m_multipcma_bank_l = (m_multipcma_bank_l & 0xff) | (data << 16);
@ -1345,7 +1345,7 @@ WRITE8_MEMBER(vgmplay_state::multipcm_bank_hi_a_w)
m_multipcma_bank_r = (m_multipcma_bank_r & 0xff) | (data << 16);
}
WRITE8_MEMBER(vgmplay_state::multipcm_bank_lo_a_w)
WRITE8_MEMBER(vgmplay_device::multipcm_bank_lo_a_w)
{
if (offset & 1)
m_multipcma_bank_l = (m_multipcma_bank_l & 0xff00) | data;
@ -1355,7 +1355,7 @@ WRITE8_MEMBER(vgmplay_state::multipcm_bank_lo_a_w)
m_multipcma_banked = 1;
}
WRITE8_MEMBER(vgmplay_state::multipcm_bank_hi_b_w)
WRITE8_MEMBER(vgmplay_device::multipcm_bank_hi_b_w)
{
if (offset & 1)
m_multipcmb_bank_l = (m_multipcmb_bank_l & 0xff) | (data << 16);
@ -1363,7 +1363,7 @@ WRITE8_MEMBER(vgmplay_state::multipcm_bank_hi_b_w)
m_multipcmb_bank_r = (m_multipcmb_bank_r & 0xff) | (data << 16);
}
WRITE8_MEMBER(vgmplay_state::multipcm_bank_lo_b_w)
WRITE8_MEMBER(vgmplay_device::multipcm_bank_lo_b_w)
{
if (offset & 1)
m_multipcmb_bank_l = (m_multipcmb_bank_l & 0xff00) | data;
@ -1408,11 +1408,11 @@ static ADDRESS_MAP_START( soundchips_map, AS_IO, 8, vgmplay_state )
AM_RANGE(vgmplay_device::A_NESAPU, vgmplay_device::A_NESAPU+0x1f) AM_DEVWRITE ("nescpu:nesapu", nesapu_device, write)
AM_RANGE(vgmplay_device::A_NESRAM, vgmplay_device::A_NESRAM+0xffff) AM_RAM AM_SHARE("nesapu_ram")
AM_RANGE(vgmplay_device::A_MULTIPCMA, vgmplay_device::A_MULTIPCMA+3) AM_DEVWRITE ("multipcma", multipcm_device, write )
AM_RANGE(vgmplay_device::A_MULTIPCMA+4, vgmplay_device::A_MULTIPCMA+7) AM_WRITE(multipcm_bank_hi_a_w)
AM_RANGE(vgmplay_device::A_MULTIPCMA+8, vgmplay_device::A_MULTIPCMA+11) AM_WRITE(multipcm_bank_lo_a_w)
AM_RANGE(vgmplay_device::A_MULTIPCMA+4, vgmplay_device::A_MULTIPCMA+7) AM_DEVWRITE ("vgmplay", vgmplay_device, multipcm_bank_hi_a_w)
AM_RANGE(vgmplay_device::A_MULTIPCMA+8, vgmplay_device::A_MULTIPCMA+11) AM_DEVWRITE ("vgmplay", vgmplay_device, multipcm_bank_lo_a_w)
AM_RANGE(vgmplay_device::A_MULTIPCMB, vgmplay_device::A_MULTIPCMB+3) AM_DEVWRITE ("multipcmb", multipcm_device, write )
AM_RANGE(vgmplay_device::A_MULTIPCMB+4, vgmplay_device::A_MULTIPCMB+7) AM_WRITE(multipcm_bank_hi_b_w)
AM_RANGE(vgmplay_device::A_MULTIPCMB+8, vgmplay_device::A_MULTIPCMB+11) AM_WRITE(multipcm_bank_lo_b_w)
AM_RANGE(vgmplay_device::A_MULTIPCMB+4, vgmplay_device::A_MULTIPCMB+7) AM_DEVWRITE ("vgmplay", vgmplay_device, multipcm_bank_hi_b_w)
AM_RANGE(vgmplay_device::A_MULTIPCMB+8, vgmplay_device::A_MULTIPCMB+11) AM_DEVWRITE ("vgmplay", vgmplay_device, multipcm_bank_lo_b_w)
AM_RANGE(vgmplay_device::A_POKEYA, vgmplay_device::A_POKEYA+0xf) AM_DEVWRITE ("pokeya", pokey_device, write)
AM_RANGE(vgmplay_device::A_POKEYB, vgmplay_device::A_POKEYB+0xf) AM_DEVWRITE ("pokeyb", pokey_device, write)
AM_RANGE(vgmplay_device::A_YMF271, vgmplay_device::A_YMF271+0xf) AM_DEVWRITE ("ymf271", ymf271_device, write)