Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release0266'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Robbbert
Robbbert committed May 28, 2024
2 parents cf8f329 + 18ab277 commit 577e8aa
Show file tree
Hide file tree
Showing 75 changed files with 1,817 additions and 1,645 deletions.
8 changes: 4 additions & 4 deletions hash/ibm5170.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24171,7 +24171,7 @@ Bombs: An amusing little desktop game.
<description>Electronics Principles 3.0</description>
<year>1997</year>
<publisher>EPT Educational Software</publisher>

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk1.img" size="1474560" crc="effbf2c7" sha1="3462a6fbc29dd0b5059c58e503cae3b0c2c75169"/>
Expand Down Expand Up @@ -24201,19 +24201,19 @@ Bombs: An amusing little desktop game.
<description>HP DeskJet -kirjoitinohjelmisto DeskJet 600- ja 660C -kirjoittimille (Fin)</description>
<year>1995</year>
<publisher>Hewlett-Packard</publisher>

<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="c2184-10016.img" size="1474560" crc="601c263d" sha1="d7e8d4892a519aad964dd5f3b08fe73a9ebc066a"/>
</dataarea>
</part>

<part name="flop2" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="c2184-10017.img" size="1474560" crc="6d69fd64" sha1="a3b11e36a0e5345a50ecebe15f0fa372bb5baf0d"/>
</dataarea>
</part>

<part name="flop3" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="c2184-10018.img" size="1474560" crc="3e99bc78" sha1="2a9aa6bea9ca7f6197d53aa9c2cf2546c8c2e1ab"/>
Expand Down
6 changes: 3 additions & 3 deletions hash/kisssite_cd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,9 @@ license:CC0-1.0
</diskarea>
</part>
</software>

<!-- Dance Karaoke Series 26 - not dumped -->

<!-- Dance Karaoke Series 27 - seen but not dumped -->

<!-- Dance Karaoke Series 28 - not dumped -->
Expand All @@ -301,7 +301,7 @@ license:CC0-1.0
<!-- Dance Karaoke Series 30 - not dumped -->

<!-- Dance Karaoke Series 31 - seen but not dumped -->

<!-- are there discs numbered higher than 31? -->

<software name="dancebst" supported="no">
Expand Down
10 changes: 5 additions & 5 deletions hash/neogeo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11523,7 +11523,7 @@ license:CC0-1.0
<dataarea name="sprites" size="0x2000000">
<rom loadflag="load16_byte" name="teot-b3-c1.bin" offset="0x0000000" size="0x1000000" crc="f183c0a2" sha1="d28055f79d56f915a803ab1c1b08f08b3eaaf1fe" />
<rom loadflag="load16_byte" name="teot-b3-c2.bin" offset="0x0000001" size="0x1000000" crc="93f47c21" sha1="9bb37e45fac53d6be67f6f6e1c9c662d73f7556e" />
</dataarea>
</dataarea>
</part>
</software>

Expand Down Expand Up @@ -11638,10 +11638,10 @@ license:CC0-1.0
<rom offset="0x000000" size="0x010000" name="dod-m1.bin" crc="fb945087" sha1="a2bae6907bf02c93068f9ee23409506277c8a027" />
</dataarea>
<dataarea name="ymsnd:adpcma" size="0x1000000">
<rom name="dod-v1.bin" offset="0x000000" size="0x400000" crc="8ab79ed9" sha1="8b1d2ade7494a81b9fa79763aaa54bbf7f4cf394" />
<rom name="dod-v2.bin" offset="0x400000" size="0x400000" crc="9aae5145" sha1="b218b47eafe8a5d25cbfadbd685de1b291c23af2" />
<rom name="dod-v3.bin" offset="0x800000" size="0x400000" crc="9ad3e804" sha1="8f309e64b8582aad0f9f3258dee0d96f2c04f7e4" />
<rom name="dod-v4.bin" offset="0xc00000" size="0x400000" crc="9ad3e804" sha1="8f309e64b8582aad0f9f3258dee0d96f2c04f7e4" />
<rom name="dod-v1.bin" offset="0x000000" size="0x400000" crc="8ab79ed9" sha1="8b1d2ade7494a81b9fa79763aaa54bbf7f4cf394" />
<rom name="dod-v2.bin" offset="0x400000" size="0x400000" crc="9aae5145" sha1="b218b47eafe8a5d25cbfadbd685de1b291c23af2" />
<rom name="dod-v3.bin" offset="0x800000" size="0x400000" crc="9ad3e804" sha1="8f309e64b8582aad0f9f3258dee0d96f2c04f7e4" />
<rom name="dod-v4.bin" offset="0xc00000" size="0x400000" crc="9ad3e804" sha1="8f309e64b8582aad0f9f3258dee0d96f2c04f7e4" />
</dataarea>
<dataarea name="sprites" size="0x2800000">
<rom loadflag="load16_byte" name="dod-c1.bin" offset="0x000000" size="0x1400000" crc="050ee046" sha1="ca5a02ba92f7bdbedbb7c0c881eb3cf454140918" />
Expand Down
12 changes: 6 additions & 6 deletions hash/tmc600_quik.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ license:CC0-1.0
<year>1982</year>
<publisher>Telercas</publisher>
<info name="usage" value="W, RUN" />
<part name="quik" interface="tmc600_quik">

<part name="quik" interface="tmc600_quik">
<dataarea name="quik" size="4672">
<rom name="demo.tmc600" size="4672" crc="fce7ad03" sha1="fada958bb9648619eb5ce04dc4c829091e34b665"/>
</dataarea>
Expand All @@ -23,8 +23,8 @@ license:CC0-1.0
<year>1982</year>
<publisher>Telercas</publisher>
<info name="usage" value="W, RUN" />
<part name="quik" interface="tmc600_quik">

<part name="quik" interface="tmc600_quik">
<dataarea name="quik" size="2025">
<rom name="demo2.tmc600" size="2025" crc="592e97c7" sha1="8f92f0dd7aee3b3aae56a06a4117796ff4643811"/>
</dataarea>
Expand All @@ -36,8 +36,8 @@ license:CC0-1.0
<year>1982</year>
<publisher>Telercas</publisher>
<info name="usage" value="W, RUN" />
<part name="quik" interface="tmc600_quik">

<part name="quik" interface="tmc600_quik">
<dataarea name="quik" size="817">
<rom name="snoopy.tmc600" size="817" crc="884976b0" sha1="0c2dc1a0fef94ac359313414b43a281b909bc7f2"/>
</dataarea>
Expand Down
10 changes: 5 additions & 5 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1631,18 +1631,18 @@ tests: $(REGTESTS)
cleansrc:
@echo Cleaning up tabs/spaces/end of lines....
ifeq (posix,$(SHELLTYPE))
$(SILENT) find src \( \
$(SILENT)- find src \( \
-name \*.c -o -name \*.cpp -o \
-name \*.h -o -name \*.hpp -o -name \*.hxx -o \
-name \*.ipp -o \
-name \*.mm -o \
-name \*.lay -o \
-name \*.lst \
\) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT) find hash \( -name \*.hsi -o -name \*.xml \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT) find bgfx \( -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT) find plugins \( -name \*.lua -o -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT) find scripts \( -name \*.lua \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT)- find hash \( -name \*.hsi -o -name \*.xml \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT)- find bgfx \( -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT)- find plugins \( -name \*.lua -o -name \*.json \) -print0 | xargs -0 -n 20 ./srcclean >&2
$(SILENT)- find scripts \( -name \*.lua \) -print0 | xargs -0 -n 20 ./srcclean >&2
else
$(shell for /r src %%i in (*.c, *.cpp, *.h, *.hpp, *.hxx, *.ipp, *.mm, *.lay, *.lst) do srcclean %%i >&2 )
$(shell for /r hash %%i in (*.hsi, *.xml) do srcclean %%i >&2 )
Expand Down
2 changes: 1 addition & 1 deletion src/devices/bus/msx/cart/franky.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void msx_cart_franky_device::device_add_mconfig(machine_config &config)
m_vdp->set_is_pal(false);
m_vdp->n_int().set(*this, FUNC(msx_cart_franky_device::irq_out));
// There is no NMI signal on the cartridge slot, so no way to hook this up
// m_vdp->n_nmi().set_inputline(maincpu, INPUT_LINE_NMI);
//m_vdp->n_nmi().set_inputline(maincpu, INPUT_LINE_NMI);
m_vdp->add_route(ALL_OUTPUTS, "franky", 1.00);
}

Expand Down
2 changes: 1 addition & 1 deletion src/devices/bus/pccard/ataflash.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void ata_flash_pccard_device::device_reset()
m_cis[8] = 0x01; // Size of Fields Byte (2:TPCC_RFSZ 4:TPCC_RMSZ 2:TPCC_RASZ)
m_cis[9] = 0x03; // TPCC_LAST (2:RFU 6:Last Index) (count of 0x1b?)
m_cis[10] = 0x00; // TPCC_RADR
m_cis[11] = 0x02; // TPCC_RADR
m_cis[11] = 0x02; // TPCC_RADR
m_cis[12] = 0x0f; // TPCC_RMSK
m_cis[13] = 0x21; // CISTPL_FUNCID
m_cis[14] = 0x02; // TPL_LINK
Expand Down
86 changes: 43 additions & 43 deletions src/devices/bus/rs232/teletex800.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
namespace {

ROM_START( teletex800 )
ROM_REGION( 0x1000, "z80", 0 )
ROM_LOAD( "ix44_ver1.1.u57", 0x0000, 0x1000, CRC(5c11b89c) SHA1(4911332709a8dcda12e72bcdf7a0acd58d65cbfd) )
ROM_REGION( 0x1000, "z80", 0 )
ROM_LOAD( "ix44_ver1.1.u57", 0x0000, 0x1000, CRC(5c11b89c) SHA1(4911332709a8dcda12e72bcdf7a0acd58d65cbfd) )
ROM_END

static const z80_daisy_config z80_daisy_chain[] =
{
{ nullptr }
{ nullptr }
};

static void printer_devices(device_slot_interface &device)
{
device.option_add("printer", SERIAL_PRINTER);
device.option_add("printer", SERIAL_PRINTER);
}

static INPUT_PORTS_START( teletex800 )
Expand All @@ -34,68 +34,68 @@ INPUT_PORTS_END
class teletex_800_device : public device_t, public device_rs232_port_interface
{
public:
teletex_800_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TELETEX_800, tag, owner, clock),
teletex_800_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, TELETEX_800, tag, owner, clock),
device_rs232_port_interface(mconfig, *this),
m_maincpu(*this, "z80"),
m_ctc(*this, "ctc"),
m_sio(*this, "sio"),
m_acia(*this, "acia"),
m_pia(*this, "pia"),
m_pia_cp(*this, "pia_cp")
m_maincpu(*this, "z80"),
m_ctc(*this, "ctc"),
m_sio(*this, "sio"),
m_acia(*this, "acia"),
m_pia(*this, "pia"),
m_pia_cp(*this, "pia_cp")
{
}

protected:
virtual const tiny_rom_entry *device_rom_region() const override
{
return ROM_NAME( teletex800 );
}
{
return ROM_NAME( teletex800 );
}

virtual void device_add_mconfig(machine_config &config) override
{
// main board
Z80(config, m_maincpu, XTAL(4'915'200));
m_maincpu->set_daisy_config(z80_daisy_chain);
m_maincpu->set_addrmap(AS_PROGRAM, &teletex_800_device::program_map);
m_maincpu->set_addrmap(AS_IO, &teletex_800_device::io_map);
virtual void device_add_mconfig(machine_config &config) override
{
// main board
Z80(config, m_maincpu, XTAL(4'915'200));
m_maincpu->set_daisy_config(z80_daisy_chain);
m_maincpu->set_addrmap(AS_PROGRAM, &teletex_800_device::program_map);
m_maincpu->set_addrmap(AS_IO, &teletex_800_device::io_map);

Z80CTC(config, m_ctc, XTAL(4'915'200));
Z80SIO(config, m_sio, XTAL(4'915'200));
ACIA6850(config, m_acia);
PIA6821(config, m_pia);
Z80CTC(config, m_ctc, XTAL(4'915'200));
Z80SIO(config, m_sio, XTAL(4'915'200));
ACIA6850(config, m_acia);
PIA6821(config, m_pia);

RS232_PORT(config, "printer", printer_devices, "printer");
RS232_PORT(config, "printer", printer_devices, "printer");

// control panel
PIA6821(config, m_pia_cp);
}
// control panel
PIA6821(config, m_pia_cp);
}

virtual ioport_constructor device_input_ports() const override
{
return INPUT_PORTS_NAME( teletex800 );
}
{
return INPUT_PORTS_NAME( teletex800 );
}

virtual void device_start() override
{
}

private:
required_device<z80_device> m_maincpu;
required_device<z80ctc_device> m_ctc;
required_device<z80sio_device> m_sio;
required_device<acia6850_device> m_acia;
required_device<z80ctc_device> m_ctc;
required_device<z80sio_device> m_sio;
required_device<acia6850_device> m_acia;
required_device<pia6821_device> m_pia;
required_device<pia6821_device> m_pia_cp;

void program_map(address_map &map)
{
map(0x0000, 0x0fff).rom().region("z80", 0);
}
void program_map(address_map &map)
{
map(0x0000, 0x0fff).rom().region("z80", 0);
}

void io_map(address_map &map)
{
}
void io_map(address_map &map)
{
}
};

} // anonymous namespace
Expand Down
2 changes: 1 addition & 1 deletion src/devices/cpu/h8/h8_intc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ u8 h8h_intc_device::isr_r()
void h8h_intc_device::isr_w(u8 data)
{
m_isr &= data; // edge/level
// logerror("isr = %02x / %02x\n", data, m_isr);
//logerror("isr = %02x / %02x\n", data, m_isr);
check_level_irqs(false);
update_irq_state();
}
Expand Down
2 changes: 1 addition & 1 deletion src/devices/cpu/mipsx/mipsxdasm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int mipsx_disassembler::get_sh_amount(int shift)
}

static const char *regnames[32] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
"r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31" };
"r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31" };

const char *mipsx_disassembler::get_regname(u8 reg)
{
Expand Down
80 changes: 40 additions & 40 deletions src/devices/cpu/sh/sh7042.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,50 +301,50 @@ void sh7042_device::device_add_mconfig(machine_config &config)
SH_DMAC_CHANNEL(config, m_dmac3, *this, m_intc);
SH_MTU(config, m_mtu, *this, 5);
SH_MTU_CHANNEL(config, m_mtu0, *this, 4, 0x60, m_intc, 88,
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::INPUT_C,
sh_mtu_channel_device::INPUT_D);
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::INPUT_C,
sh_mtu_channel_device::INPUT_D);
SH_MTU_CHANNEL(config, m_mtu1, *this, 2, 0x4c, m_intc, 96,
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::CHAIN).set_chain(m_mtu2);
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::CHAIN).set_chain(m_mtu2);
SH_MTU_CHANNEL(config, m_mtu2, *this, 2, 0x4c, m_intc, 104,
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::INPUT_C,
sh_mtu_channel_device::DIV_1024);
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B,
sh_mtu_channel_device::INPUT_C,
sh_mtu_channel_device::DIV_1024);
SH_MTU_CHANNEL(config, m_mtu3, *this, 4, 0x60, m_intc, 112,
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::DIV_1024,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B);
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::DIV_1024,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B);
SH_MTU_CHANNEL(config, m_mtu4, *this, 4, 0x60, m_intc, 120,
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::DIV_1024,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B);
sh_mtu_channel_device::DIV_1,
sh_mtu_channel_device::DIV_4,
sh_mtu_channel_device::DIV_16,
sh_mtu_channel_device::DIV_64,
sh_mtu_channel_device::DIV_256,
sh_mtu_channel_device::DIV_1024,
sh_mtu_channel_device::INPUT_A,
sh_mtu_channel_device::INPUT_B);
SH_PORT32(config, m_porta, *this, 0, 0x00000000, 0xff000000);
SH_PORT16(config, m_portb, *this, 0, 0x0000, 0xfc00);
SH_PORT16(config, m_portc, *this, 1, 0x0000, 0x0000);
Expand Down
Loading

0 comments on commit 577e8aa

Please sign in to comment.