Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-09-28 03:20:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MAME 0.270

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmbzGxgACgkQwXSxAYxA
 cQ4jEBAAq5w8GC6tcFwoTLp36h316XRqfqXG9lfQKnge1ccdgh5o4DbyUE8H5VzJ
 91RsRreszqxBw+12L/x7b74omC1nNARkXT1dL+NAF11ojoxXZ5qrTdyHbJFv1sL8
 lFsaVej3rAGtD0dxRy+EuEqTj/UCtiSB1IXAgHjeL4/Qi0nrxj7WlUrM0t7gNpQu
 AmCzRwmk4dy89unKsl4RC214xAE4e6hdhw47fIg2OgLXVPh5rKFHDdX8fBexNvFU
 TvJPaaWrK6XDvF9crP+NNJqidLcSFs5TISTaV46q/UvbXx1ueNDeganTTuuO3s+7
 Zkpedfrnxt/JMdrB7dFb6d+6Y3F4mZO0ZPaZ/wkczuxzH5pSHSXQTK71ozftHdiZ
 AhVKpf2nDyEn+tJROIH9lVRO2TMKZThXGbEOgGNwwXsiFGaoyLLmeqYlBpsJq4ZM
 Iiw9jX/bqpMXvqjtlsaYFdAPGKfRyBrpa+qqLZ1n+EYq/D3pblWh3fq2nzp/yd9/
 Q370gxcnDXQ6OtKb+NwfPl2F2byMSaZs4sxXAyl2MbMilq3hayJn+IMpsEZsBnYt
 fyzWTmkgefiexGL+kby89YSfR+DCSW+aGymgd6aEyj4x3qoeKeFm2QfeS3W2lj75
 YxYNik/GAcqdenX7QCg1mLWvY7Nk5ZKOsSj71FdMGBcbVJgWYLo=
 =YdCV
 -----END PGP SIGNATURE-----

Merge tag 'mame0270' into HEAD

MAME 0.270
This commit is contained in:
Vas Crabb 2024-09-26 02:49:28 +10:00
commit 0d7807babf
9 changed files with 17 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View file

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="269"
android:versionName="0.269"
android:versionCode="270"
android:versionName="0.270"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

4
docs/source/conf.py
View file

@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors'
# built documents.
#
# The short X.Y version.
version = '0.269'
version = '0.270'
# The full version, including alpha/beta/rc tags.
release = '0.269'
release = '0.270'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

12
hash/thinkpad8xx.xml
View file

@ -13,13 +13,15 @@ license:CC0-1.0
<publisher>IBM</publisher>
<sharedfeat name="compatibility" value="800,820,850" />
<part name="cdrom1" interface="cdrom">
<feature name="part_id" value="AIX 4 Volume 1 of 2" />
<diskarea name="cdrom">
<disk name="aix_4.1.5_disc_01" sha1="4c49c8190e33c2c7f13a74d7332d384edd6b3042" />
</diskarea>
</part>
<part name="cdrom2" interface="cdrom">
<feature name="part_id" value="AIX 4 Volume 2 of 2" />
<diskarea name="cdrom">
<disk name="aix_4.1.5_disc_01" sha1="228afedd90619e89c6b466b4970bda0e5a3e9a13" />
<disk name="aix_4.1.5_disc_02" sha1="228afedd90619e89c6b466b4970bda0e5a3e9a13" />
</diskarea>
</part>
</software>
@ -53,8 +55,8 @@ license:CC0-1.0
<part name="flop" interface="floppy">
<feature name="part_id" value="Solaris MDB Boot 2.5.1 Release PowerPC Platform Edition (IBM Hardware Platform)"/>
<feature name="part_number" value="702-4348-06"/>
<dataarea name="flop" size="168000">
<rom name="solaris_2_5_1_mdb_boot_ppc_ibm.img" size="168000" crc="b45832e2" sha1="be9e11364816ab5f3362396ed0f457d4a2e61188" />
<dataarea name="flop" size="1474560">
<rom name="solaris_2_5_1_mdb_boot_ppc_ibm.img" size="1474560" crc="b45832e2" sha1="be9e11364816ab5f3362396ed0f457d4a2e61188" />
</dataarea>
</part>
<part name="cdrom1" interface="cdrom">
@ -79,8 +81,8 @@ license:CC0-1.0
<sharedfeat name="compatibility" value="800,820,850" />
<part name="flop" interface="floppy">
<feature name="part_id" value="Windows NT ARC Boot Firmware v1.51"/>
<dataarea name="flop" size="168000">
<rom name="winnt_arc_151.img" size="168000" crc="98db8c77" sha1="56be119ce7a0020bf4caabd099d2eae8e249305c" />
<dataarea name="flop" size="1474560">
<rom name="winnt_arc_151.img" size="1474560" crc="98db8c77" sha1="56be119ce7a0020bf4caabd099d2eae8e249305c" />
</dataarea>
</part>
<part name="cdrom" interface="cdrom">

4
makefile
View file

@ -1578,7 +1578,7 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.269"' > $@
@echo '#define BARE_BUILD_VERSION "0.270"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.269" > $@
@echo #define BARE_BUILD_VERSION "0.270" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@

3
src/mame/mame.lst
View file

@ -42384,9 +42384,6 @@ p8000_16 //
@source:skeleton/palestra.cpp
palestra
@source:skeleton/pap2.cpp
pap2
@source:skeleton/pcksurfer.cpp
pcksurfer // (c) 2006 Datawind

4
src/mame/motorola/mex68kecb.cpp
View file

@ -232,5 +232,5 @@ ROM_END
// Driver
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1981, mex68kecb, 0, 0, mex68kecb, mex68kecb, mex68kecb_state, empty_init, "Motorola", "Motorola 68K ECB", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1981, mex68kecb, 0, 0, mex68kecb, mex68kecb, mex68kecb_state, empty_init, "Motorola", "68000 Educational Computer Board", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )

5
src/mame/shared/dcs.cpp
View file

@ -404,7 +404,7 @@ void dcs_audio_device::dsio_data_map(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x1fff).m(m_ram_map, FUNC(address_map_bank_device::amap16));
map(0x2000, 0x3fdf).ram().share(m_internal_data_ram);
map(0x2000, 0x3fdf).ram();
map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
@ -444,7 +444,7 @@ void dcs_audio_device::denver_data_map(address_map &map)
{
map.unmap_value_high();
map(0x0000, 0x1fff).m(m_ram_map, FUNC(address_map_bank_device::amap16));
map(0x2000, 0x3fdf).ram().share(m_internal_data_ram);
map(0x2000, 0x3fdf).ram();
map(0x3fe0, 0x3fff).rw(FUNC(dcs_audio_device::adsp_control_r), FUNC(dcs_audio_device::adsp_control_w));
}
@ -693,7 +693,6 @@ dcs_audio_device::dcs_audio_device(const machine_config &mconfig, device_type ty
m_bootrom(*this, DEVICE_SELF),
m_internal_program_ram(*this, "dcsint"),
m_external_program_ram(*this, "dcsext"),
m_internal_data_ram(*this, "dcsint_data"),
m_iram(*this, "iram"),
m_data_bank(*this, "databank"),
m_rom_page(*this, "rompage"),

1
src/mame/shared/dcs.h
View file

@ -104,7 +104,6 @@ protected:
optional_region_ptr<uint16_t> m_bootrom;
optional_shared_ptr<uint32_t> m_internal_program_ram;
optional_shared_ptr<uint32_t> m_external_program_ram;
optional_shared_ptr<uint32_t> m_internal_data_ram;
optional_shared_ptr<uint16_t> m_iram;
optional_memory_bank m_data_bank;

99
src/mame/skeleton/pap2.cpp
View file

@ -1,99 +0,0 @@
/*
Linksys PAP2 two-port analog telephone adapter
ESS Visba 3 ES3890F @ 27MHz (CPU/MCU)
Realtek RTL8019AS (NIC)
ICSI IC41LV16100S-50KG (2MB RAM)
SST39VF080-70-4C-EI (1MB flash ROM)
2x Silicon Labs Si3210-KT (line interfaces)
Four of the five LEDs are controlled by ES3890F GPIOs
Power LEDs are connected to AUX1[4] and AUX1[5] (pin 112 and 113)
Phone 1 LED is connected to AUX1[6] (pin 114)
Phone 2 LED is connected to AUX1[7] (pin 115)
Ethernet LED is connected to RTL8019AS somehow
RTL8019AS pin 65 is tied to VDD to disable PnP
RTL8019AS pin 96 is tied to ground to share the flash ROM's 8-bit data bus
RTL8019AS registers are selected when ES3890F pin 19 (/CS1) is low
It looks like the RTL8019AS EEPROM pins are connected to ES3890F AUX2[0-3]?
There are several ATAs based on essentially the same hardware:
Sipura SPA-2000
Sipura SPA-1000
Sipura SPA-3000 (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, unknown line interfaces)
Sipura SPA-1001 (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, 1x Si3210)
Sipura SPA-2100 (Sipura SIP316F @ 27MHz, 2x RTL8019AS, 8MB RAM, 2MB flash, unknown line interfaces)
Sipura SPA-2002
Linksys PAP2T (ES3890F, RTL8019AS, 2MB RAM, 1MB flash, 2x Si3215)
Linksys SPA2102?
There are also ATAs with similar names but probably very different hardware:
Linksys PAP2 V2
Cisco SPA112
Cisco SPA122
*/
#include "emu.h"
#include "cpu/mipsx/mipsx.h"
namespace {
class pap2_state : public driver_device
{
public:
pap2_state(machine_config const &mconfig, device_type type, char const *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
{
}
void pap2(machine_config &config) ATTR_COLD;
protected:
virtual void machine_reset() override;
private:
required_device<cpu_device> m_maincpu;
void mem(address_map &map);
};
void pap2_state::machine_reset()
{
m_maincpu->set_state_int(STATE_GENPC, 0x1cffff80); // might actually be 0x7fffff80 with a ROM mirror
}
void pap2_state::mem(address_map &map)
{
map(0x00000000, 0x001fffff).ram();
map(0x1c000000, 0x1c0fffff).mirror(0x00f00000).rom().region("maincpu", 0);
// ES3890F registers at 0x20000000-0x2000ffff, ES6008 datasheet could be helpful
}
void pap2_state::pap2(machine_config &config)
{
MIPSX(config, m_maincpu, 27'000'000);
m_maincpu->set_addrmap(AS_PROGRAM, &pap2_state::mem);
}
INPUT_PORTS_START(pap2)
INPUT_PORTS_END
ROM_START(pap2)
ROM_REGION32_BE(0x100000, "maincpu", 0 )
ROM_LOAD("linksys-pap2-2.0.12-ls_rom dump of pap2 flash chip.rom", 0x000000, 0x100000, BAD_DUMP CRC(4d0f1e5d) SHA1(73b163b00a3709a14f7419283c8515dd91009598) )
ROM_END
}
SYST( 200?, pap2, 0, 0, pap2, pap2, pap2_state, empty_init, "Linksys (Cisco)", "PAP2", MACHINE_IS_SKELETON )