Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge tag 'mame0199'

Browse Source 
MAME 0.199
This commit is contained in:
Vas Crabb 2018-06-27 11:54:12 +10:00
commit 8aa76c1011
10 changed files with 65 additions and 60 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="198"
android:versionName="0.198"
android:versionCode="199"
android:versionName="0.199"
android:installLocation="auto">
<!-- Android 5.0 -->

4
makefile
View File

@ -1584,14 +1584,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.198"' > $@
@echo '#define BARE_BUILD_VERSION "0.199"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.198" > $@
@echo #define BARE_BUILD_VERSION "0.199" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

3
src/devices/bus/nes/mmc5.cpp
View File

@ -18,9 +18,6 @@
#include "emu.h"
#include "mmc5.h"
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE
#include "sound/nes_apu.h" // temp hack to pass the additional sound regs to APU...
#ifdef NES_PCB_DEBUG
#define VERBOSE 1

4
src/devices/bus/nes/mmc5.h
View File

@ -7,9 +7,9 @@
#include "nxrom.h"
#include "sound/nes_apu.h" // temp hack to pass the additional sound regs to APU...
#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE
class ppu2c0x_device;
class nesapu_device;
// ======================> nes_exrom_device

72
src/devices/machine/upd765.cpp
View File

@ -21,7 +21,9 @@
#define VERBOSE (LOG_GENERAL | LOG_WARN )
#include "logmacro.h"
#include <iomanip> // std::setw
#include <iomanip>
#include <sstream>
#define LOGWARN(...) LOGMASKED(LOG_WARN, __VA_ARGS__)
#define LOGSHIFT(...) LOGMASKED(LOG_SHIFT, __VA_ARGS__)
@ -759,7 +761,7 @@ void upd765_family_device::live_run(attotime limit)
if(read_one_bit(limit))
return;
LOGSHIFT("%s: shift = %04x data=%02x c=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg,
LOGSHIFT("%s: shift = %04x data=%02x c=%d\n", tts(cur_live.tm), cur_live.shift_reg,
(cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) |
(cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) |
(cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) |
@ -775,7 +777,7 @@ void upd765_family_device::live_run(attotime limit)
cur_live.data_separator_phase = false;
cur_live.bit_counter = 0;
cur_live.state = READ_HEADER_BLOCK_HEADER;
LOGLIVE("%s: Found A1\n", tts(cur_live.tm).c_str());
LOGLIVE("%s: Found A1\n", tts(cur_live.tm));
}
if(!mfm && cur_live.shift_reg == 0xf57e) {
@ -783,7 +785,7 @@ void upd765_family_device::live_run(attotime limit)
cur_live.data_separator_phase = false;
cur_live.bit_counter = 0;
cur_live.state = READ_ID_BLOCK;
LOGLIVE("%s: Found IDAM\n", tts(cur_live.tm).c_str());
LOGLIVE("%s: Found IDAM\n", tts(cur_live.tm));
}
break;
@ -791,7 +793,7 @@ void upd765_family_device::live_run(attotime limit)
if(read_one_bit(limit))
return;
LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg,
LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm), cur_live.shift_reg,
(cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) |
(cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) |
(cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) |
@ -811,11 +813,11 @@ void upd765_family_device::live_run(attotime limit)
if(cur_live.shift_reg != 0x4489)
cur_live.state = SEARCH_ADDRESS_MARK_HEADER;
else
LOGLIVE("%s: Found A1\n", tts(cur_live.tm).c_str());
LOGLIVE("%s: Found A1\n", tts(cur_live.tm));
break;
}
if(cur_live.data_reg != 0xfe) {
LOGLIVE("%s: No ident byte found after triple-A1, continue search\n", tts(cur_live.tm).c_str());
LOGLIVE("%s: No ident byte found after triple-A1, continue search\n", tts(cur_live.tm));
cur_live.state = SEARCH_ADDRESS_MARK_HEADER;
break;
}
@ -833,7 +835,7 @@ void upd765_family_device::live_run(attotime limit)
break;
int slot = (cur_live.bit_counter >> 4)-1;
LOGLIVE("%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm).c_str(), slot, cur_live.data_reg, cur_live.crc);
LOGLIVE("%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm), slot, cur_live.data_reg, cur_live.crc);
cur_live.idbuf[slot] = cur_live.data_reg;
if(slot == 5) {
live_delay(IDLE);
@ -846,7 +848,7 @@ void upd765_family_device::live_run(attotime limit)
if(read_one_bit(limit))
return;
LOGSHIFT("%s: shift = %04x data=%02x c=%d.%x\n", tts(cur_live.tm).c_str(), cur_live.shift_reg,
LOGSHIFT("%s: shift = %04x data=%02x c=%d.%x\n", tts(cur_live.tm), cur_live.shift_reg,
(cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) |
(cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) |
(cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) |
@ -891,7 +893,7 @@ void upd765_family_device::live_run(attotime limit)
if(read_one_bit(limit))
return;
LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg,
LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm), cur_live.shift_reg,
(cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) |
(cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) |
(cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) |
@ -1202,7 +1204,7 @@ void upd765_family_device::live_run(attotime limit)
break;
default:
LOGWARN("%s: Unknown live state %d\n", tts(cur_live.tm).c_str(), cur_live.state);
LOGWARN("%s: Unknown live state %d\n", tts(cur_live.tm), cur_live.state);
return;
}
}
@ -1832,7 +1834,7 @@ void upd765_family_device::read_data_continue(floppy_info &fi)
return;
default:
LOGWARN("%s: read sector unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: read sector unknown sub-state %d\n", ttsn(), fi.sub_state);
return;
}
}
@ -1970,7 +1972,7 @@ void upd765_family_device::write_data_continue(floppy_info &fi)
return;
default:
LOGWARN("%s: write sector unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: write sector unknown sub-state %d\n", ttsn(), fi.sub_state);
return;
}
}
@ -2156,7 +2158,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi)
return;
default:
LOGWARN("%s: read track unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: read track unknown sub-state %d\n", ttsn(), fi.sub_state);
return;
}
}
@ -2237,7 +2239,7 @@ void upd765_family_device::format_track_continue(floppy_info &fi)
return;
default:
LOGWARN("%s: format track unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: format track unknown sub-state %d\n", ttsn(), fi.sub_state);
return;
}
}
@ -2327,7 +2329,7 @@ void upd765_family_device::read_id_continue(floppy_info &fi)
return;
default:
LOGWARN("%s: read id unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: read id unknown sub-state %d\n", ttsn(), fi.sub_state);
return;
}
}
@ -2351,33 +2353,31 @@ bool upd765_family_device::get_irq() const
std::string upd765_family_device::tts(attotime t)
{
char buf[256];
const char *sign = "";
if(t.seconds() < 0) {
t = attotime::zero-t;
t = attotime::zero - t;
sign = "-";
}
int nsec = t.attoseconds() / ATTOSECONDS_PER_NANOSECOND;
sprintf(buf, "%s%04d.%03d,%03d,%03d", sign, int(t.seconds()), nsec/1000000, (nsec/1000)%1000, nsec % 1000);
return buf;
int const nsec = t.attoseconds() / ATTOSECONDS_PER_NANOSECOND;
return util::string_format("%s%04d.%03d,%03d,%03d", sign, int(t.seconds()), nsec/1000000, (nsec/1000)%1000, nsec % 1000);
}
std::string upd765_family_device::results()
std::string upd765_family_device::results() const
{
std::stringstream stream;
std::ostringstream stream;
stream << "results=(";
if (result_pos==0) stream << "none";
if (!result_pos) stream << "none";
else
for (int i=0; i < result_pos; i++)
{
stream << std::hex << std::setw(2) << std::setfill('0') << (int)result[i];
if (i < result_pos-1) stream << ',';
}
{
stream << std::hex << std::setfill('0') << std::setw(2) << unsigned(result[0]);
for (int i=1; i < result_pos; i++)
stream << ',' << std::setw(2) << unsigned(result[i]);
}
stream << ')';
return stream.str();
}
std::string upd765_family_device::ttsn()
std::string upd765_family_device::ttsn() const
{
return tts(machine().time());
}
@ -2428,7 +2428,7 @@ void upd765_family_device::run_drive_ready_polling()
void upd765_family_device::index_callback(floppy_image_device *floppy, int state)
{
LOGSTATE("Index pulse %d\n", state);
LOGLIVE("%s: Pulse %d\n", ttsn().c_str(), state);
LOGLIVE("%s: Pulse %d\n", ttsn(), state);
for(floppy_info & fi : flopi) {
if(fi.dev != floppy)
continue;
@ -2472,7 +2472,7 @@ void upd765_family_device::index_callback(floppy_image_device *floppy, int state
break;
default:
LOGWARN("%s: Index pulse on unknown sub-state %d\n", ttsn().c_str(), fi.sub_state);
LOGWARN("%s: Index pulse on unknown sub-state %d\n", ttsn(), fi.sub_state);
break;
}
@ -2520,7 +2520,7 @@ void upd765_family_device::general_continue(floppy_info &fi)
break;
default:
LOGWARN("%s: general_continue on unknown main-state %d\n", ttsn().c_str(), fi.main_state);
LOGWARN("%s: general_continue on unknown main-state %d\n", ttsn(), fi.main_state);
break;
}
}
@ -2561,7 +2561,7 @@ bool upd765_family_device::write_one_bit(const attotime &limit)
void upd765_family_device::live_write_raw(uint16_t raw)
{
LOGLIVE("%s: write %04x %04x\n", tts(cur_live.tm).c_str(), raw, cur_live.crc);
LOGLIVE("%s: write %04x %04x\n", tts(cur_live.tm), raw, cur_live.crc);
cur_live.shift_reg = raw;
cur_live.data_bit_context = raw & 1;
}
@ -2581,7 +2581,7 @@ void upd765_family_device::live_write_mfm(uint8_t mfm)
cur_live.data_reg = mfm;
cur_live.shift_reg = raw;
cur_live.data_bit_context = context;
LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm).c_str(), mfm, cur_live.crc, raw);
LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm), mfm, cur_live.crc, raw);
}
void upd765_family_device::live_write_fm(uint8_t fm)
@ -2593,7 +2593,7 @@ void upd765_family_device::live_write_fm(uint8_t fm)
cur_live.data_reg = fm;
cur_live.shift_reg = raw;
cur_live.data_bit_context = fm & 1;
LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm).c_str(), fm, cur_live.crc, raw);
LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm), fm, cur_live.crc, raw);
}
bool upd765_family_device::sector_matches() const

4
src/devices/machine/upd765.h
View File

@ -346,8 +346,8 @@ protected:
emu_timer *poll_timer;
static std::string tts(attotime t);
std::string results();
std::string ttsn();
std::string results() const;
std::string ttsn() const;
enum {
C_CONFIGURE,

2
src/emu/romentry.cpp
View File

@ -8,7 +8,9 @@
*********************************************************************/
#include "emu.h"
#include "romentry.h"
#include "strformat.h"

2
src/emu/softlist.cpp
View File

@ -8,7 +8,9 @@
***************************************************************************/
#include "emu.h"
#include "softlist.h"
#include "hash.h"
#include "expat.h"

8
src/emu/xtal.cpp
View File

@ -48,6 +48,9 @@
#include "emu.h"
#include <cfloat>
#include <cmath>
// This array *must* stay in order, it's binary-searched
const double XTAL::known_xtals[] = {
@ -382,8 +385,9 @@ bool XTAL::validate(double base_clock)
if(slot > last_index)
slot = slot ^ (step | (step >> 1));
else {
double sfreq = known_xtals[slot];
if(base_clock == sfreq) {
const double sfreq = known_xtals[slot];
const double diff = std::abs((base_clock - sfreq) / base_clock);
if(diff <= (2 * DBL_EPSILON)) {
last_correct_value = base_clock;
return true;
}

22
src/mame/drivers/buggychl.cpp
View File

@ -513,24 +513,24 @@ void buggychl_state::machine_reset()
MACHINE_CONFIG_START(buggychl_state::buggychl)
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", Z80, XTAL(48'000'000)/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
MCFG_DEVICE_ADD("maincpu", Z80, 48_MHz_XTAL/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
MCFG_DEVICE_PROGRAM_MAP(buggychl_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", buggychl_state, irq0_line_hold)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz according to schematics */
MCFG_DEVICE_ADD("audiocpu", Z80, 8_MHz_XTAL/2) /* 4 MHz according to schematics */
MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL(8'000'000)/2)/2)/256)/64)) // timer irq
//MCFG_TIMER_DEVICE_ADD_PERIODIC("soundirq", "audiocpu", irq0_line_hold, ((((XTAL_8MHz/2)/2)/256)/64))
MCFG_DEVICE_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, 8_MHz_XTAL/2/2/256/64) // timer irq
//MCFG_TIMER_DEVICE_ADD_PERIODIC("soundirq", "audiocpu", irq0_line_hold, 8_MHz_XTAL/2/2/256/64)
// The schematics (which are at least partly for the wrong sound board) show a configurable timer with rates of
// 61.035Hz ((((XTAL_8MHz/2)/2)/256)/128)
// or 122.0Hz ((((XTAL_8MHz/2)/2)/256)/64)
// 61.035Hz (8_MHz_XTAL/2/2/256/128)
// or 122.0Hz (8_MHz_XTAL/2/2/256/64)
// similar to flstory.cpp and other Taito MSM5232 based games.
// The real sound pcb probably lacks the latch for this configurable timer, but does have a jumper which likely has a similar function.
// The game code implies the timer int is enable/disabled by one of the "sound_enable_w" bits?
// TODO: actually hook this up?
/* audiocpu nmi is caused by (main->sound semaphore)&&(sound_nmi_enabled), identical to bubble bobble. */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, (XTAL(48'000'000)/8)/2) /* CPUspeed/2 MHz according to schematics, so 3MHz if cpu is jumpered for 6MHz */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 48_MHz_XTAL/8/2) /* CPUspeed/2 MHz according to schematics, so 3MHz if cpu is jumpered for 6MHz */
MCFG_WATCHDOG_ADD("watchdog")
@ -543,7 +543,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
// derived from ladyfrog.cpp, causes glitches?
// MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
// MCFG_SCREEN_RAW_PARAMS( 8_MHz_XTAL, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz
MCFG_SCREEN_UPDATE_DRIVER(buggychl_state, screen_update_buggychl)
MCFG_SCREEN_PALETTE("palette")
@ -566,17 +566,17 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_TA7630_ADD("ta7630")
MCFG_DEVICE_ADD("ay1", YM2149, XTAL(8'000'000)/4)
MCFG_DEVICE_ADD("ay1", YM2149, 8_MHz_XTAL/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay1_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("ay2", YM2149, XTAL(8'000'000)/4)
MCFG_DEVICE_ADD("ay2", YM2149, 8_MHz_XTAL/4)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay2_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_DEVICE_ADD("msm", MSM5232, 8_MHz_XTAL/4)
MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1