Skip to content

Commit

Permalink
srcclean in preparation for MAME 0.259 release freeze.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuavas
cuavas committed Aug 24, 2024
1 parent 23e9abc commit 617d79b
Show file tree
Hide file tree
Showing 13 changed files with 104 additions and 104 deletions.
10 changes: 5 additions & 5 deletions hash/leapfrog_leappad_cart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ license:CC0-1.0
</dataarea>
</part>
</software>

<software name="smartguid4" supported="no">
<description>FUN-damentals Series - Smart Guide to 4rd Grade (UK)</description>
<year>2002</year>
Expand All @@ -212,7 +212,7 @@ license:CC0-1.0
<rom name="500-00534.u1" size="0x400000" crc="0944792f" sha1="f013394ebddb6d89c2feeb3d645c170e2d7be746" />
</dataarea>
</part>
</software>
</software>

<software name="smartguid5" supported="no">
<description>FUN-damentals Series - Smart Guide to 5th Grade (UK)</description>
Expand Down Expand Up @@ -1149,7 +1149,7 @@ license:CC0-1.0
</dataarea>
</part>
</software>

<software name="goochoco" supported="no">
<description>Okaasan to Issho: Goo Choco Lantan: Spoo no Fushigi na Oto no Daibouken! (Japan)</description>
<year>2002</year>
Expand All @@ -1161,7 +1161,7 @@ license:CC0-1.0
<rom name="9p4-0113a.u1" size="0x200000" crc="04c4174a" sha1="c9e4a1f22a69f7d60e1d1b11bca8338546e52271" />
</dataarea>
</part>
</software>
</software>

<software name="kumpoohj" supported="no">
<description>Kuma no Pooh-san Hachimitsu no tsubo ga ippai Pooh-san to kazu·katachi (Japan)</description>
Expand All @@ -1179,7 +1179,7 @@ license:CC0-1.0
<software name="dis1bf" supported="no">
<description>Disney's World of English 1: Birthday Fun (Japan)</description>
<year>200?</year>
<publisher>LeapFrog / Disney</publisher>
<publisher>LeapFrog / Disney</publisher>
<info name="serial" value="500-10047"/>
<part name="cart" interface="leapfrog_leappad_cart">
<dataarea name="rom" size="0x800000">
Expand Down
2 changes: 1 addition & 1 deletion src/devices/machine/z80dma.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ int z80dma_device::z80daisy_irq_ack()
else
{
LOGINT("z80dma_irq_ack: failed to find an interrupt to ack!\n");
return 0;
return 0;
}
}

Expand Down
44 changes: 22 additions & 22 deletions src/mame/altos/altos586.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,21 @@ class altos586_mmu_device : public device_t, public device_memory_interface
u16 m_err_addr2;

enum : u16 {
INVALID_INSN = 0x0001, // Invalid Instruction
END_OF_STACK = 0x0008, // End of Stack Warning
SYS_W_VIOLATION = 0x0010, // System write Violation
USER_W_VIOLATION = 0x0080, // User Mode Write Violation
IOP_W_VIOLATION = 0x0400, // I/O Processor Write Violation
USER_ACC_VIOLATION = 0x0800, // User Mode Access Violation
INVALID_INSN = 0x0001, // Invalid Instruction
END_OF_STACK = 0x0008, // End of Stack Warning
SYS_W_VIOLATION = 0x0010, // System write Violation
USER_W_VIOLATION = 0x0080, // User Mode Write Violation
IOP_W_VIOLATION = 0x0400, // I/O Processor Write Violation
USER_ACC_VIOLATION = 0x0800, // User Mode Access Violation
};
u16 m_violation;

enum {
IOP_W = 11, // Allow I/O Processor Write
SYS_W = 12, // Allow System Write
STACK_BOUND = 13, // Stack Boundary Page
USER_ACC = 14, // Allow User Access
USER_W = 15, // Allow User Write
IOP_W = 11, // Allow I/O Processor Write
SYS_W = 12, // Allow System Write
STACK_BOUND = 13, // Stack Boundary Page
USER_ACC = 14, // Allow User Access
USER_W = 15, // Allow User Write
};
u16 m_map_ram[256];
};
Expand Down Expand Up @@ -499,17 +499,17 @@ void altos586_state::iop_io(address_map &map)
{
map.global_mask(0xff);

map(0x00, 0x00).w(FUNC(altos586_state::hiaddr_w)); // 0x00 Address Latch
map(0x20, 0x23).rw("iop_pit0", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x20 PIT 0
map(0x24, 0x27).rw("iop_pit1", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x24 PIT 1
map(0x28, 0x2b).rw("iop_sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x28 SIO 0
map(0x2c, 0x2f).rw("iop_sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x2C SIO 1
map(0x30, 0x33).rw("iop_sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x30 SIO 2
map(0x34, 0x37).rw("iop_pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); // 0x34 PIO
map(0x38, 0x3b).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); // 0x38 FDC
map(0x3c, 0x3f).rw("iop_dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // 0x3C DMA
map(0x40, 0x40).noprw(); // 0x40 DMA - Clear carrier sense and parity error bit
map(0x80, 0x9f).rw("iop_rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); // 0x80 RTC - Counter - thousandths of seconds
map(0x00, 0x00).w(FUNC(altos586_state::hiaddr_w)); // 0x00 Address Latch
map(0x20, 0x23).rw("iop_pit0", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x20 PIT 0
map(0x24, 0x27).rw("iop_pit1", FUNC(pit8254_device::read), FUNC(pit8254_device::write)); // 0x24 PIT 1
map(0x28, 0x2b).rw("iop_sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x28 SIO 0
map(0x2c, 0x2f).rw("iop_sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x2C SIO 1
map(0x30, 0x33).rw("iop_sio2", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w)); // 0x30 SIO 2
map(0x34, 0x37).rw("iop_pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt)); // 0x34 PIO
map(0x38, 0x3b).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write)); // 0x38 FDC
map(0x3c, 0x3f).rw("iop_dma", FUNC(z80dma_device::read), FUNC(z80dma_device::write)); // 0x3C DMA
map(0x40, 0x40).noprw(); // 0x40 DMA - Clear carrier sense and parity error bit
map(0x80, 0x9f).rw("iop_rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)); // 0x80 RTC - Counter - thousandths of seconds
// 0x60 586T Generate MULTIBUS interrupt
}

Expand Down
26 changes: 13 additions & 13 deletions src/mame/altos/altos586_hdc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
[2] Preliminary 8600 User Manual
Section 7. System Specs.
4.5. Rigid Disk Controllers and Interface
Specification Revision 4.2, May 27, 1982, Page 52-62
4.5. Rigid Disk Controllers and Interface
Specification Revision 4.2, May 27, 1982, Page 52-62
[3] Preliminary 8600 User Manual
Section 7. System Specs.
A. Rigid Disk Controller Documentation
Specification Revision 4.2, May 27, 1982, Page 95-108
A. Rigid Disk Controller Documentation
Specification Revision 4.2, May 27, 1982, Page 95-108
Note: The Altos 8600 manuals [2] and [3] describe a controller
wired differently (the 8089 seems to be in local mode, not remote),
Expand Down Expand Up @@ -369,13 +369,13 @@ void altos586_hdc_device::attn_w(uint16_t data)

void altos586_hdc_device::device_start()
{
save_item(NAME(m_status));
save_item(NAME(m_seek_status));
save_item(NAME(m_cyl_latch));
save_item(NAME(m_cyl[0]));
save_item(NAME(m_cyl[1]));
save_pointer(NAME(m_sector), std::size(m_sector));
save_item(NAME(m_secoffset));
save_item(NAME(m_drive));
save_item(NAME(m_head));
save_item(NAME(m_status));
save_item(NAME(m_seek_status));
save_item(NAME(m_cyl_latch));
save_item(NAME(m_cyl[0]));
save_item(NAME(m_cyl[1]));
save_pointer(NAME(m_sector), std::size(m_sector));
save_item(NAME(m_secoffset));
save_item(NAME(m_drive));
save_item(NAME(m_head));
}
2 changes: 1 addition & 1 deletion src/mame/atari/a2600.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class tvboy_state : public a2600_base_state

void tvboy(machine_config &config);
void tvboyn(machine_config &config);

protected:
virtual void machine_start() override;
virtual void machine_reset() override;
Expand Down
4 changes: 2 additions & 2 deletions src/mame/capcom/alien.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ ROM_END
ROM_START( dokodemo )
ROM_REGION32_LE( 0x1000000, "maincpu", 0 ) // BIOS code
ROM_LOAD32_WORD( "ic30", 0x000000, 0x400000, BAD_DUMP CRC(74687757) SHA1(96b6e3725bcf16e92c6966f9b9ce93cfdd7ba641) ) // needs verification if this game really use same boot ROMs as pingu/gekimaka
ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) //
ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) //

ROM_REGION( 0x800100, "ymz770_flash1", ROMREGION_ERASEFF ) //sound samples flash rom, not really needed, programmed by boot loader
ROM_LOAD16_WORD_SWAP( "flash1", 0x000000, 0x800000, BAD_DUMP CRC(dda4879f) SHA1(4aa06247ca674e86be6c111db7f6abf1ed6e121d) )
Expand Down Expand Up @@ -673,7 +673,7 @@ ROM_END
ROM_START( wontame )
ROM_REGION32_LE( 0x1000000, "maincpu", 0 ) // BIOS code
ROM_LOAD32_WORD( "ic30", 0x000000, 0x400000, BAD_DUMP CRC(74687757) SHA1(96b6e3725bcf16e92c6966f9b9ce93cfdd7ba641) ) // needs verification if this game really use same boot ROMs as pingu/gekimaka
ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) //
ROM_LOAD32_WORD( "ic33", 0x000002, 0x400000, BAD_DUMP CRC(ba2e6716) SHA1(49c5abb9d96e3f4a78ed4dced7a9f052a96b186d) ) //

ROM_REGION( 0x800100, "ymz770_flash1", ROMREGION_ERASEFF )
ROM_LOAD16_WORD_SWAP( "flash1", 0x000000, 0x800000, BAD_DUMP CRC(056e982e) SHA1(4b29218b00d7023c0b748aae13752f0c12539750) )
Expand Down
2 changes: 1 addition & 1 deletion src/mame/gaelco/gaelco3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ ROM_END

/*
Football Power has a small PCB inside the ball controller, very similar to the one found on
Gaelco Football, with two accelerometers and a PIC.
Gaelco Football, with two accelerometers and a PIC.
_________________
| ______ |
_| / / |
Expand Down
20 changes: 10 additions & 10 deletions src/mame/konami/k052109.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ address lines), and then reading it from the 051962.
180c-1833: A y scroll
1a00-1bff: A x scroll
1c00 : Maps the three 8kB RAM chips to memory addresses.
------xx select the configuration from this table
RAM0 RAM1 RAM2
00 A~B 6~7 8~9 Reset state
01 8~9 4~5 6~7
10 6~7 2~3 4~5
11 4~5 0~1 2~3 TMNT setting
---xxx-- affects how RAMs are accessed
-x------
0 = replace bits 5:4 of color attribute by bits 1:0
1 = do not alter color attribute (gradius3,xmen)
------xx select the configuration from this table
RAM0 RAM1 RAM2
00 A~B 6~7 8~9 Reset state
01 8~9 4~5 6~7
10 6~7 2~3 4~5
11 4~5 0~1 2~3 TMNT setting
---xxx-- affects how RAMs are accessed
-x------
0 = replace bits 5:4 of color attribute by bits 1:0
1 = do not alter color attribute (gradius3,xmen)
1c80 : row/column scroll control
------xx layer A row scroll
00 = disabled
Expand Down
10 changes: 5 additions & 5 deletions src/mame/layout/kn5000.lay
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ license:CC0-1.0

<!-- define elements -->

<element name="vector_art">
<image><data><![CDATA[
<element name="vector_art">
<image><data><![CDATA[
<svg width="1280" height="640" viewBox="0 0 338.6 169.3">
<g transform="translate(47.95,-15.32)">
<path style="stroke:#222;stroke-width:0.2;" d="m 189.36,21.12 v 5.13 m 0.69,-5.17 v 5.20 M 51.92,21.12 v 5.13 m 0.69,-5.17 v 5.20 m 125.41,-2.17 -0.03,2.19 h 1.67 l -0.66,-2.18 -0.97,-0 z M 69.13,165.59 c -0.21,1.74 -0.34,3.5 -0.38,5.26 0.036,1.76 0.16,3.51 0.38,5.26 H 172.72 c 0.21,-1.74 0.34,-3.5 0.38,-5.26 -0,-1.76 -0.09,-3.51 -0.27,-5.26 h -41.75 c -3.15,2.10 -6.85,3.23 -10.63,3.23 -3.78,-0 -7.48,-1.13 -10.63,-3.23 z M 290.58,26.85 C 258.15,24.17 225.69,21.81 193.14,21.16 H 49.61 c -32.55,0.44 -65,3.19 -97.44,5.7 m 0,101.11 H 290.58 m -83.17,0.03 -7.89,-96.95 c -0.21,-2.62 -2.11,-4.74 -4.74,-4.74 H 47.6 c -2.62,0 -4.54,2.1 -4.74,4.74 l -7.1,96.95" />
<path style="fill:#cba47d" d="m 184,28 v 0.6 h -3 v 0.46 h 5.43 v -0.3 l -1.82,-0.73 z M -32.27,74.75 c -0.1,0 -0.09,0.06 -0.09,0.13 v 1.92 c 0,0 -0.05,0 -0.09,0 -0.29,-0.02 -0.61,0.2 -0.64,0.5 -0.03,0.24 0.22,0.44 0.45,0.41 0.29,-0.03 0.5,-0.32 0.46,-0.61 v -1.52 c 0.02,-0.02 0.06,0.03 0.08,0.03 0.23,0.14 0.43,0.36 0.45,0.65 0.02,0.22 -0.05,0.44 -0.13,0.64 0.25,-0.31 0.33,-0.76 0.16,-1.13 -0.09,-0.21 -0.29,-0.34 -0.4,-0.54 a 1.08,1.08 0 0 1 -0.16,-0.44 c -0.02,-0.03 -0.06,-0.04 -0.09,-0.04 z m 54.37,105 0.97,2.56 1.07,-2.6 z m 44.4,0 0.97,2.56 1.07,-2.56 z m 54.5,0 0.97,2.6 1.1,-2.6 z" />
</g></svg>
]]></data></image>
</element>
]]></data></image>
</element>

<element name="red_led" defstate="0">
<disk state="1">
Expand Down Expand Up @@ -407,7 +407,7 @@ license:CC0-1.0

<element name="msp_bank" ref="dark_grey_pill_button" inputtag="CPL_SEG3" inputmask="0x02"><bounds x="111" y="247" width="37" height="21"/></element>
<element name="msp_menu" ref="dark_grey_pill_button" inputtag="CPL_SEG3" inputmask="0x04"><bounds x="184" y="247" width="37" height="21"/></element>

<element name="msp_stop_record" ref="dark_grey_pill_button" inputtag="CPL_SEG3" inputmask="0x08"><bounds x="260" y="247" width="37" height="21"/></element>
<element name="CPL_24" ref="green_led"><!-- MSP: MENU --><bounds x="200" y="236" width="5" height="5"/></element>

Expand Down
78 changes: 39 additions & 39 deletions src/mame/matsushita/kn5000.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// copyright-holders:Felipe Sanches
/******************************************************************************
Technics SX-KN5000 music keyboard driver
Technics SX-KN5000 music keyboard driver
******************************************************************************/

Expand All @@ -18,15 +18,15 @@
class mn89304_vga_device : public svga_device
{
public:
// construction/destruction
mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// construction/destruction
mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);

protected:
virtual void device_reset() override;
virtual void device_reset() override;

virtual void palette_update() override;
virtual void recompute_params() override;
virtual uint16_t offset() override;
virtual void palette_update() override;
virtual void recompute_params() override;
virtual uint16_t offset() override;
};

DEFINE_DEVICE_TYPE(MN89304_VGA, mn89304_vga_device, "mn89304_vga", "MN89304 VGA")
Expand All @@ -35,51 +35,51 @@ DEFINE_DEVICE_TYPE(MN89304_VGA, mn89304_vga_device, "mn89304_vga", "MN89304 VGA"
mn89304_vga_device::mn89304_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: svga_device(mconfig, MN89304_VGA, tag, owner, clock)
{
// ...
// ...
}

void mn89304_vga_device::device_reset()
{
svga_device::device_reset();
svga.rgb8_en = 1;
svga_device::device_reset();
svga.rgb8_en = 1;
}

// sets up mode 0, by default it will throw 155 Hz, assume divided by 3
void mn89304_vga_device::recompute_params()
{
u8 xtal_select = (vga.miscellaneous_output & 0x0c) >> 2;
int xtal;

switch(xtal_select & 3)
{
case 0: xtal = XTAL(25'174'800).value() / 3; break;
case 1: xtal = XTAL(28'636'363).value() / 3; break;
case 2:
default:
throw emu_fatalerror("MN89304: setup ext. clock select");
}

recompute_params_clock(1, xtal);
u8 xtal_select = (vga.miscellaneous_output & 0x0c) >> 2;
int xtal;

switch(xtal_select & 3)
{
case 0: xtal = XTAL(25'174'800).value() / 3; break;
case 1: xtal = XTAL(28'636'363).value() / 3; break;
case 2:
default:
throw emu_fatalerror("MN89304: setup ext. clock select");
}

recompute_params_clock(1, xtal);
}


void mn89304_vga_device::palette_update()
{
// 4bpp RAMDAC
for (int i = 0; i < 256; i++)
{
set_pen_color(
i,
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 0]),
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 1]),
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 2])
);
}
// 4bpp RAMDAC
for (int i = 0; i < 256; i++)
{
set_pen_color(
i,
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 0]),
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 1]),
pal4bit(vga.dac.color[3*(i & vga.dac.mask) + 2])
);
}
}

uint16_t mn89304_vga_device::offset()
{
return svga_device::offset() << 3;
return svga_device::offset() << 3;
}


Expand Down Expand Up @@ -152,7 +152,7 @@ void kn5000_state::maincpu_mem(address_map &map)
map(0x300000, 0x3fffff).rom().region("custom_data", 0); // 8MBit FLASH ROM @ IC19 (CS5)
map(0x400000, 0x7fffff).rom().region("rhythm_data", 0); // 32MBit ROM @ IC14 (A22=1 and CS5)
map(0x800000, 0x82ffff).rom().region("subprogram", 0); // not sure yet in which chip this is stored, but I suspect it should be IC19
// map(0xc00000, 0xdfffff).mirror(0x200000).rom().region("table_data", 0); //2 * 8MBit ROMs @ IC1, IC3 (CS2)
// map(0xc00000, 0xdfffff).mirror(0x200000).rom().region("table_data", 0); //2 * 8MBit ROMs @ IC1, IC3 (CS2)
map(0xe00000, 0xffffff).mask(0x1fffff).rom().region("program", 0); //2 * 8MBit FLASH ROMs @ IC4, IC6
}

Expand Down Expand Up @@ -686,10 +686,10 @@ void kn5000_state::kn5000(machine_config &config)
// bit 6 = (input) COM.MAC
// bit 7 = (input) COM.MIDI
// TODO: m_maincpu->portz_read().set([this] {
// TODO: return ioport("COM_SELECT")->read() | (m_sstat << 2);
// TODO: return ioport("COM_SELECT")->read() | (m_sstat << 2);
// TODO: });
// TODO: m_maincpu->portz_write().set([this] (u8 data) {
// TODO: m_mstat = data & 3;
// TODO: m_mstat = data & 3;
// TODO: });


Expand Down Expand Up @@ -718,10 +718,10 @@ void kn5000_state::kn5000(machine_config &config)
// bit 3 (not used)
// bit 4 = (input) MSTAT1
// TODO: m_subcpu->portd_read().set([this] {
// TODO: return (BIT(m_mstat, 0) << 2) | (BIT(m_mstat, 1) << 4);
// TODO: return (BIT(m_mstat, 0) << 2) | (BIT(m_mstat, 1) << 4);
// TODO: });
// TODO: m_subcpu->portd_write().set([this] (u8 data) {
// TODO: m_sstat = data & 3;
// TODO: m_sstat = data & 3;
// TODO: });


Expand Down
Loading

0 comments on commit 617d79b

Please sign in to comment.