diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index fda98bb687e32..495e63f443550 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index fbdcc2a092634..87fbe33ec0d8e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ # 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. diff --git a/hash/thinkpad8xx.xml b/hash/thinkpad8xx.xml index 385509cdd48cb..5894b611cdfd4 100644 --- a/hash/thinkpad8xx.xml +++ b/hash/thinkpad8xx.xml @@ -13,13 +13,15 @@ license:CC0-1.0 IBM + + - + @@ -53,8 +55,8 @@ license:CC0-1.0 - - + + @@ -79,8 +81,8 @@ license:CC0-1.0 - - + + diff --git a/makefile b/makefile index 97227bd2f4e4f..ddf809310a0bf 100644 --- a/makefile +++ b/makefile @@ -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[]; >> $@ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 3b40f94fdfa53..e29409ec20a7f 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -42384,9 +42384,6 @@ p8000_16 // @source:skeleton/palestra.cpp palestra -@source:skeleton/pap2.cpp -pap2 - @source:skeleton/pcksurfer.cpp pcksurfer // (c) 2006 Datawind diff --git a/src/mame/motorola/mex68kecb.cpp b/src/mame/motorola/mex68kecb.cpp index 1d092b687b634..7dc4b5b16239f 100644 --- a/src/mame/motorola/mex68kecb.cpp +++ b/src/mame/motorola/mex68kecb.cpp @@ -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 ) diff --git a/src/mame/shared/dcs.cpp b/src/mame/shared/dcs.cpp index 3906ef80b4bc6..f206dca836a01 100644 --- a/src/mame/shared/dcs.cpp +++ b/src/mame/shared/dcs.cpp @@ -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"), diff --git a/src/mame/shared/dcs.h b/src/mame/shared/dcs.h index b0e628ce543a8..41583d966eee3 100644 --- a/src/mame/shared/dcs.h +++ b/src/mame/shared/dcs.h @@ -104,7 +104,6 @@ class dcs_audio_device : public device_t, public device_mixer_interface optional_region_ptr m_bootrom; optional_shared_ptr m_internal_program_ram; optional_shared_ptr m_external_program_ram; - optional_shared_ptr m_internal_data_ram; optional_shared_ptr m_iram; optional_memory_bank m_data_bank; diff --git a/src/mame/skeleton/pap2.cpp b/src/mame/skeleton/pap2.cpp deleted file mode 100644 index f00c4f0248f2c..0000000000000 --- a/src/mame/skeleton/pap2.cpp +++ /dev/null @@ -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 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 )