diff --git a/docs/release/build/uprel.bat b/docs/release/build/uprel.bat index 0c899781856..4f9d2c0ec13 100644 --- a/docs/release/build/uprel.bat +++ b/docs/release/build/uprel.bat @@ -1,6 +1,6 @@ \goto end git fetch upstream -git merge upstream/release0268 +git merge upstream/release0269 git checkout master :end pause diff --git a/docs/release/src/devices/imagedev/floppy.cpp b/docs/release/src/devices/imagedev/floppy.cpp index 822dcb496ae..1aefef12c7f 100644 --- a/docs/release/src/devices/imagedev/floppy.cpp +++ b/docs/release/src/devices/imagedev/floppy.cpp @@ -160,7 +160,6 @@ format_registration::format_registration() void format_registration::add_fm_containers() { - add(FLOPPY_HFE_FORMAT); add(FLOPPY_MFM_FORMAT); add(FLOPPY_TD0_FORMAT); add(FLOPPY_IMD_FORMAT); diff --git a/docs/release/src/emu/ioport.cpp b/docs/release/src/emu/ioport.cpp index a9191c30e06..88fec600f0c 100644 --- a/docs/release/src/emu/ioport.cpp +++ b/docs/release/src/emu/ioport.cpp @@ -338,22 +338,22 @@ void ioport_list::append(device_t &device, std::string &errorbuf) // input_type_entry - constructors //------------------------------------------------- -input_type_entry::input_type_entry(ioport_type type, ioport_group group, int player, const char *token, const char *name, input_seq standard) noexcept - : m_type(type), - m_group(group), - m_player(player), - m_token(token), - m_name(name) +input_type_entry::input_type_entry(ioport_type type, ioport_group group, int player, const char *token, const char *name, input_seq standard) noexcept : + m_type(type), + m_group(group), + m_player(player), + m_token(token), + m_name(name) { m_defseq[SEQ_TYPE_STANDARD] = m_seq[SEQ_TYPE_STANDARD] = standard; } -input_type_entry::input_type_entry(ioport_type type, ioport_group group, int player, const char *token, const char *name, input_seq standard, input_seq decrement, input_seq increment) noexcept - : m_type(type), - m_group(group), - m_player(player), - m_token(token), - m_name(name) +input_type_entry::input_type_entry(ioport_type type, ioport_group group, int player, const char *token, const char *name, input_seq standard, input_seq decrement, input_seq increment) noexcept : + m_type(type), + m_group(group), + m_player(player), + m_token(token), + m_name(name) { m_defseq[SEQ_TYPE_STANDARD] = m_seq[SEQ_TYPE_STANDARD] = standard; m_defseq[SEQ_TYPE_INCREMENT] = m_seq[SEQ_TYPE_INCREMENT] = increment; @@ -423,12 +423,12 @@ void input_type_entry::restore_default_seq() noexcept // digital_joystick - constructor //------------------------------------------------- -digital_joystick::digital_joystick(int player, int number) - : m_player(player), - m_number(number), - m_current(0), - m_current4way(0), - m_previous(0) +digital_joystick::digital_joystick(int player, int number) : + m_player(player), + m_number(number), + m_current(0), + m_current4way(0), + m_previous(0) { } @@ -565,10 +565,10 @@ void ioport_condition::initialize(device_t &device) // ioport_setting - constructor //------------------------------------------------- -ioport_setting::ioport_setting(ioport_field &field, ioport_value _value, const char *_name) - : m_field(field), - m_value(_value), - m_name(_name) +ioport_setting::ioport_setting(ioport_field &field, ioport_value _value, const char *_name) : + m_field(field), + m_value(_value), + m_name(_name) { } @@ -582,10 +582,10 @@ ioport_setting::ioport_setting(ioport_field &field, ioport_value _value, const c // ioport_diplocation - constructor //------------------------------------------------- -ioport_diplocation::ioport_diplocation(const char *name, u8 swnum, bool invert) - : m_name(name), - m_number(swnum), - m_invert(invert) +ioport_diplocation::ioport_diplocation(const char *name, u8 swnum, bool invert) : + m_name(name), + m_number(swnum), + m_invert(invert) { } @@ -599,34 +599,34 @@ ioport_diplocation::ioport_diplocation(const char *name, u8 swnum, bool invert) // ioport_field - constructor //------------------------------------------------- -ioport_field::ioport_field(ioport_port &port, ioport_type type, ioport_value defvalue, ioport_value maskbits, const char *name) - : m_next(nullptr), - m_port(port), - m_modcount(port.modcount()), - m_mask(maskbits), - m_defvalue(defvalue & maskbits), - m_type(type), - m_player(0), - m_flags(0), - m_impulse(0), - m_name(name), - m_read(port.device()), - m_write(port.device()), - m_write_param(0), - m_digital_value(false), - m_min(0), - m_max(maskbits), - m_sensitivity(0), - m_delta(0), - m_centerdelta(0), - m_crosshair_axis(CROSSHAIR_AXIS_NONE), - m_crosshair_scale(1.0), - m_crosshair_offset(0), - m_crosshair_altaxis(0), - m_crosshair_mapper(port.device()), - m_full_turn_count(0), - m_remap_table(nullptr), - m_way(0) +ioport_field::ioport_field(ioport_port &port, ioport_type type, ioport_value defvalue, ioport_value maskbits, const char *name) : + m_next(nullptr), + m_port(port), + m_modcount(port.modcount()), + m_mask(maskbits), + m_defvalue(defvalue & maskbits), + m_type(type), + m_player(0), + m_flags(0), + m_impulse(0), + m_name(name), + m_read(port.device()), + m_write(port.device()), + m_write_param(0), + m_digital_value(false), + m_min(0), + m_max(maskbits), + m_sensitivity(0), + m_delta(0), + m_centerdelta(0), + m_crosshair_axis(CROSSHAIR_AXIS_NONE), + m_crosshair_scale(1.0), + m_crosshair_offset(0), + m_crosshair_altaxis(0), + m_crosshair_mapper(port.device()), + m_full_turn_count(0), + m_remap_table(nullptr), + m_way(0) { // reset sequences and chars for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) @@ -1356,15 +1356,15 @@ void ioport_field::init_live_state(analog_field *analog) // ioport_field_live - constructor //------------------------------------------------- -ioport_field_live::ioport_field_live(ioport_field &field, analog_field *analog) - : analog(analog), - joystick(nullptr), - value(field.defvalue()), - impulse(0), - last(0), - toggle(field.toggle()), - joydir(digital_joystick::JOYDIR_COUNT), - lockout(false) +ioport_field_live::ioport_field_live(ioport_field &field, analog_field *analog) : + analog(analog), + joystick(nullptr), + value(field.defvalue()), + impulse(0), + last(0), + toggle(field.toggle()), + joydir(digital_joystick::JOYDIR_COUNT), + lockout(false) { // fill in the basic values for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype) @@ -1412,12 +1412,12 @@ ioport_field_live::ioport_field_live(ioport_field &field, analog_field *analog) // ioport_port - constructor //------------------------------------------------- -ioport_port::ioport_port(device_t &owner, const char *tag) - : m_next(nullptr), - m_device(owner), - m_tag(tag), - m_modcount(0), - m_active(0) +ioport_port::ioport_port(device_t &owner, const char *tag) : + m_next(nullptr), + m_device(owner), + m_tag(tag), + m_modcount(0), + m_active(0) { } @@ -1636,10 +1636,10 @@ void ioport_port::update_defvalue(bool flush_defaults) // ioport_port_live - constructor //------------------------------------------------- -ioport_port_live::ioport_port_live(ioport_port &port) - : defvalue(0), - digital(0), - outputvalue(0) +ioport_port_live::ioport_port_live(ioport_port &port) : + defvalue(0), + digital(0), + outputvalue(0) { // iterate over fields for (ioport_field &field : port.fields()) @@ -1672,15 +1672,15 @@ ioport_port_live::ioport_port_live(ioport_port &port) // ioport_manager - constructor //------------------------------------------------- -ioport_manager::ioport_manager(running_machine &machine) - : m_machine(machine) - , m_safe_to_read(false) - , m_last_frame_time(attotime::zero) - , m_last_delta_nsec(0) - , m_playback_accumulated_speed(0) - , m_playback_accumulated_frames(0) - , m_deselected_card_config() - , m_applied_device_defaults(false) +ioport_manager::ioport_manager(running_machine &machine) : + m_machine(machine), + m_safe_to_read(false), + m_last_frame_time(attotime::zero), + m_last_delta_nsec(0), + m_playback_accumulated_speed(0), + m_playback_accumulated_frames(0), + m_deselected_card_config(), + m_applied_device_defaults(false) { for (auto &entries : m_type_to_entry) std::fill(std::begin(entries), std::end(entries), nullptr); @@ -3165,13 +3165,13 @@ void ioport_manager::record_port(ioport_port &port) // ioport_configurer - constructor //------------------------------------------------- -ioport_configurer::ioport_configurer(device_t &owner, ioport_list &portlist, std::string &errorbuf) - : m_owner(owner), - m_portlist(portlist), - m_errorbuf(errorbuf), - m_curport(nullptr), - m_curfield(nullptr), - m_cursetting(nullptr) +ioport_configurer::ioport_configurer(device_t &owner, ioport_list &portlist, std::string &errorbuf) : + m_owner(owner), + m_portlist(portlist), + m_errorbuf(errorbuf), + m_curport(nullptr), + m_curfield(nullptr), + m_cursetting(nullptr) { } @@ -3368,10 +3368,10 @@ ioport_configurer& ioport_configurer::onoff_alloc(const char *name, ioport_value // dynamic_field - constructor //------------------------------------------------- -dynamic_field::dynamic_field(ioport_field &field) - : m_field(field) - , m_shift(0) - , m_oldval(field.defvalue()) +dynamic_field::dynamic_field(ioport_field &field) : + m_field(field), + m_shift(0), + m_oldval(field.defvalue()) { // fill in the data for (ioport_value mask = field.mask(); !(mask & 1); mask >>= 1) @@ -3425,36 +3425,36 @@ void dynamic_field::write(ioport_value newval) // analog_field - constructor //------------------------------------------------- -analog_field::analog_field(ioport_field &field) - : m_field(field) - , m_shift(compute_shift(field.mask())) - , m_adjdefvalue((field.defvalue() & field.mask()) >> m_shift) - , m_adjmin((field.minval() & field.mask()) >> m_shift) - , m_adjmax((field.maxval() & field.mask()) >> m_shift) - , m_adjoverride((field.defvalue() & field.mask()) >> m_shift) - , m_sensitivity(field.sensitivity()) - , m_reverse(field.analog_reverse()) - , m_delta(field.delta()) - , m_centerdelta(field.centerdelta()) - , m_accum(0) - , m_previous(0) - , m_previousanalog(0) - , m_minimum(osd::input_device::ABSOLUTE_MIN) - , m_maximum(osd::input_device::ABSOLUTE_MAX) - , m_center(0) - , m_reverse_val(0) - , m_scalepos(0) - , m_scaleneg(0) - , m_keyscalepos(0) - , m_keyscaleneg(0) - , m_positionalscale(0) - , m_absolute(false) - , m_wraps(false) - , m_autocenter(false) - , m_single_scale(false) - , m_interpolate(false) - , m_lastdigital(false) - , m_use_adjoverride(false) +analog_field::analog_field(ioport_field &field) : + m_field(field), + m_shift(compute_shift(field.mask())), + m_adjdefvalue((field.defvalue() & field.mask()) >> m_shift), + m_adjmin((field.minval() & field.mask()) >> m_shift), + m_adjmax((field.maxval() & field.mask()) >> m_shift), + m_adjoverride((field.defvalue() & field.mask()) >> m_shift), + m_sensitivity(field.sensitivity()), + m_reverse(field.analog_reverse()), + m_delta(field.delta()), + m_centerdelta(field.centerdelta()), + m_accum(0), + m_previous(0), + m_previousanalog(0), + m_minimum(osd::input_device::ABSOLUTE_MIN), + m_maximum(osd::input_device::ABSOLUTE_MAX), + m_center(0), + m_reverse_val(0), + m_scalepos(0), + m_scaleneg(0), + m_keyscalepos(0), + m_keyscaleneg(0), + m_positionalscale(0), + m_absolute(false), + m_wraps(false), + m_autocenter(false), + m_single_scale(false), + m_interpolate(false), + m_lastdigital(false), + m_use_adjoverride(false) { // set basic parameters based on the configured type switch (field.type()) @@ -3666,10 +3666,11 @@ s32 analog_field::apply_settings(s32 value) const value -= osd::input_device::ABSOLUTE_MIN; // map differently for positive and negative values + const s32 adjust = m_field.analog_reset() ? 0 : (1 << 23); if (value >= 0) - value = apply_scale(value, m_scalepos); + value = ((s64(value) * m_scalepos) + adjust) / (1 << 24); else - value = apply_scale(value, m_scaleneg); + value = ((s64(value) * m_scaleneg) - adjust) / (1 << 24); value += m_adjdefvalue; // for relative devices, wrap around when we go past the edge diff --git a/docs/release/src/frontend/mame/ui/ui.cpp b/docs/release/src/frontend/mame/ui/ui.cpp index df7fd502929..c7a5b118206 100644 --- a/docs/release/src/frontend/mame/ui/ui.cpp +++ b/docs/release/src/frontend/mame/ui/ui.cpp @@ -450,7 +450,7 @@ void mame_ui_manager::config_load_pointers( { auto const timeout(targetnode->get_attribute_float("activity_timeout", -1.0F)); auto const ms(std::lround(timeout * 1000.0F)); - if ((100 <= ms) && (10'000 >= ms)) + if ((0 <= ms) && (10'000 >= ms)) { m_pointer_options[index].timeout = std::chrono::milliseconds(ms); if (config_type::SYSTEM == cfg_type) @@ -1773,7 +1773,6 @@ std::chrono::steady_clock::duration mame_ui_manager::pointer_activity_timeout(in } - //------------------------------------------------- // hide_inactive_pointers - get per-target hide // inactive pointers setting diff --git a/docs/release/src/osd/modules/lib/osdobj_common.cpp b/docs/release/src/osd/modules/lib/osdobj_common.cpp index ade829c067f..6b98367c3f0 100644 --- a/docs/release/src/osd/modules/lib/osdobj_common.cpp +++ b/docs/release/src/osd/modules/lib/osdobj_common.cpp @@ -58,6 +58,7 @@ const options_entry osd_options::s_option_entries[] = { nullptr, nullptr, core_options::option_type::HEADER, "OSD DEBUGGING OPTIONS" }, { OSDOPTION_DEBUGGER, OSDOPTVAL_AUTO, core_options::option_type::STRING, "debugger used: " }, + { OSDOPTION_DEBUGGER_HOST, "localhost", core_options::option_type::STRING, "address to bind to for gdbstub debugger" }, { OSDOPTION_DEBUGGER_PORT, "23946", core_options::option_type::INTEGER, "port to use for gdbstub debugger" }, { OSDOPTION_DEBUGGER_FONT ";dfont", OSDOPTVAL_AUTO, core_options::option_type::STRING, "font to use for debugger views" }, { OSDOPTION_DEBUGGER_FONT_SIZE ";dfontsize", "0", core_options::option_type::FLOAT, "font size to use for debugger views" }, diff --git a/docs/release/src/osd/winui/winui.cpp b/docs/release/src/osd/winui/winui.cpp index 87aa6c03c02..ea55a7deb58 100644 --- a/docs/release/src/osd/winui/winui.cpp +++ b/docs/release/src/osd/winui/winui.cpp @@ -4556,7 +4556,8 @@ static BOOL MameCommand(HWND hwnd,int id, HWND hwndCtl, UINT codeNotify) string s = GetBgDir(); string as = util::zippath_parent(s); size_t t1 = as.length()-1; - if (as[t1] == '\\') as.substr(0, t1-1); + if (as[t1] == '\\') + as = as.substr(0, t1-1); t1 = as.find(':'); if (t1 != string::npos) { diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index 2eec23e33e1..9511d3a6c11 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.268.0" +#define BARE_BUILD_VERSION "0.269.0" extern const char bare_build_version[]; extern const char build_version[]; diff --git a/hash/more/pasopia7_cass.xml b/hash/more/pasopia7_cass.xml index 668df1721c1..03f9e8712e1 100644 --- a/hash/more/pasopia7_cass.xml +++ b/hash/more/pasopia7_cass.xml @@ -1,6 +1,6 @@ - + 3D Golf Simulation (19xx)(T&E) @@ -52,4 +52,44 @@ + + Osaka no Jin + ???? + unknown + + + + + + + + Shogi tape by Apollo Technica for Pasopia 7 (side 1) + ???? + unknown + + + + + + + + SPY-0011 + ???? + unknown + + + + + + + + Tsume Shogi + ???? + unknown + + + + + + diff --git a/makefile b/makefile index bd2cf795ed2..7c82f97fcc0 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.268.x"' > $@ + @echo '#define BARE_BUILD_VERSION "0.269.0"' > $@ @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.268.x" > $@ + @echo #define BARE_BUILD_VERSION "0.269.0" > $@ @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/version.cpp b/src/version.cpp index d2ddf3844da..9511d3a6c11 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.268.x" +#define BARE_BUILD_VERSION "0.269.0" extern const char bare_build_version[]; extern const char build_version[];