Merge tag 'mame0270' into HEAD

MAME 0.270

android-project/app/src/main/AndroidManifest.xml

@@ -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 -->

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.

hash/thinkpad8xx.xml

@@ -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">

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[]; >> $@

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
 

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 )

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"),

src/mame/shared/dcs.h

@@ -104,7 +104,6 @@ class dcs_audio_device : public device_t, public device_mixer_interface
 	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;