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

(nw) remove some superfluous const, eliminate a superfluous temp, remove superflous semicolons, etc. and also fix a known broken build script change

Browse Source
This commit is contained in:
Vas Crabb 2019-02-18 00:48:52 +11:00
parent e65f6d75e1
commit 01ccbd89c9
14 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/genie.lua
View File

@ -87,7 +87,7 @@ function addprojectflags()
end
if version >= 60000 then
buildoptions_cpp {
--"-flifetime-dse=1",
"-flifetime-dse=1",
}
end
end

4
src/devices/bus/uts_kbd/400kbd.cpp
View File

@ -23,9 +23,11 @@
***************************************************************************/
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "bus/uts_kbd/400kbd.h"
#include "cpu/mcs48/mcs48.h"
DEFINE_DEVICE_TYPE(UTS_400_KEYBOARD, uts_400_keyboard_device, "uts_400kbd", "UTS 400-Format Keyboard (F3621-04-000)")
uts_400_keyboard_device::uts_400_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)

6
src/devices/bus/uts_kbd/400kbd.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:AJR
#ifndef MAME_BUS_UTS_400KBD_H
#define MAME_BUS_UTS_400KBD_H
#ifndef MAME_BUS_UTS_KBD_400KBD_H
#define MAME_BUS_UTS_KBD_400KBD_H
#pragma once
@ -41,4 +41,4 @@ private:
DECLARE_DEVICE_TYPE(UTS_400_KEYBOARD, uts_400_keyboard_device)
#endif // MAME_BUS_UTS_400KBD_H
#endif // MAME_BUS_UTS_KBD_400KBD_H

4
src/devices/bus/uts_kbd/extw.cpp
View File

@ -30,9 +30,11 @@
***************************************************************************/
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "bus/uts_kbd/extw.h"
#include "cpu/mcs48/mcs48.h"
DEFINE_DEVICE_TYPE(UTS_EXTW_KEYBOARD, uts_extw_keyboard_device, "uts_extw", "UTS Expanded Typewriter Keyboard (F4725-25)")
uts_extw_keyboard_device::uts_extw_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)

6
src/devices/bus/uts_kbd/uts_kbd.h
View File

@ -6,8 +6,8 @@
***************************************************************************/
#ifndef MAME_BUS_UTS_KBD_H
#define MAME_BUS_UTS_KBD_H 1
#ifndef MAME_BUS_UTS_KBD_UTS_KBD_H
#define MAME_BUS_UTS_KBD_UTS_KBD_H
#pragma once
@ -98,4 +98,4 @@ WRITE_LINE_MEMBER(uts_keyboard_port_device::ready_w)
m_kbd->ready_w(state);
}
#endif // MAME_BUS_UTS_KBD_H
#endif // MAME_BUS_UTS_KBD_UTS_KBD_H

21
src/devices/cpu/hphybrid/hphybrid.cpp
View File

@ -243,11 +243,8 @@ void hp_hybrid_cpu_device::device_start()
set_icountptr(m_icount);
m_pa_changed_func.resolve_safe();
m_opcode_func.resolve();
m_opcode_func.resolve_safe();
m_stm_func.resolve();
// Cache active state of m_stm_func & m_opcode_func
m_opcode_func_defd = bool(m_opcode_func);
m_stm_func_defd = bool(m_stm_func);
}
void hp_hybrid_cpu_device::device_reset()
@ -960,7 +957,7 @@ uint16_t hp_hybrid_cpu_device::RM(uint32_t addr)
// Any access to internal registers removes forcing of BSC 2x
m_forced_bsc_25 = false;
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_RAL_MASK | CYCLE_RD_MASK);
m_curr_cycle = 0;
}
@ -1029,7 +1026,7 @@ uint16_t hp_hybrid_cpu_device::RM(uint32_t addr)
return tmp;
} else {
m_icount -= m_r_cycles;
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_RD_MASK);
m_curr_cycle = 0;
}
@ -1082,7 +1079,7 @@ void hp_hybrid_cpu_device::WM(uint32_t addr , uint16_t v)
// Any access to internal registers removes forcing of BSC 2x
m_forced_bsc_25 = false;
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_RAL_MASK | CYCLE_WR_MASK);
m_curr_cycle = 0;
}
@ -1152,7 +1149,7 @@ void hp_hybrid_cpu_device::WM(uint32_t addr , uint16_t v)
m_icount -= REGISTER_RW_CYCLES;
} else {
m_icount -= m_w_cycles;
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_WR_MASK);
m_curr_cycle = 0;
}
@ -1201,9 +1198,7 @@ uint16_t hp_hybrid_cpu_device::fetch_at(uint32_t addr)
{
m_curr_cycle |= CYCLE_IFETCH_MASK;
uint16_t opcode = RM(addr);
if (m_opcode_func_defd) {
m_opcode_func(opcode);
}
m_opcode_func(opcode);
return opcode;
}
@ -1622,7 +1617,7 @@ bool hp_5061_3011_cpu_device::execute_no_bpc(uint16_t opcode , uint16_t& next_pc
// 16 bits units.
WM(tmp_addr >> 1 , tmp);
} else {
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_WR_MASK);
m_curr_cycle = 0;
}
@ -1996,7 +1991,7 @@ bool hp_09825_67907_cpu_device::execute_no_bpc(uint16_t opcode , uint16_t& next_
// 16 bits units.
WM(tmp_addr , tmp);
} else {
if (m_stm_func_defd) {
if (m_stm_func) {
m_stm_func(m_curr_cycle | CYCLE_WR_MASK);
m_curr_cycle = 0;
}

2
src/devices/cpu/hphybrid/hphybrid.h
View File

@ -157,9 +157,7 @@ protected:
devcb_write8 m_pa_changed_func;
uint8_t m_last_pa;
bool m_opcode_func_defd;
devcb_write16 m_opcode_func;
bool m_stm_func_defd;
devcb_write8 m_stm_func;
int m_icount;

4
src/lib/netlist/nl_base.h
View File

@ -750,7 +750,7 @@ namespace netlist
void update_devs() NL_NOEXCEPT;
const netlist_time next_scheduled_time() const noexcept { return m_next_scheduled_time; }
netlist_time next_scheduled_time() const noexcept { return m_next_scheduled_time; }
void set_next_scheduled_time(netlist_time ntime) noexcept { m_next_scheduled_time = ntime; }
bool isRailNet() const noexcept { return !(m_railterminal == nullptr); }
@ -1416,7 +1416,7 @@ namespace netlist
/* run functions */
const netlist_time time() const NL_NOEXCEPT { return m_time; }
netlist_time time() const NL_NOEXCEPT { return m_time; }
void process_queue(const netlist_time delta) NL_NOEXCEPT;
void abort_current_queue_slice() NL_NOEXCEPT { m_queue.retime(detail::queue_t::entry_t(m_time, nullptr)); }

2
src/lib/netlist/nl_setup.cpp
View File

@ -971,7 +971,7 @@ const logic_family_desc_t *setup_t::family_from_model(const pstring &model)
// Sources
// ----------------------------------------------------------------------------------------
bool setup_t::parse_stream(std::unique_ptr<plib::pistream> istrm, const pstring &name)
bool setup_t::parse_stream(std::unique_ptr<plib::pistream> &&istrm, const pstring &name)
{
return parser_t(std::move(plib::ppreprocessor(&m_defines).process(std::move(istrm))), *this).parse(name);
}

2
src/lib/netlist/nl_setup.h
View File

@ -299,7 +299,7 @@ namespace netlist
std::unique_ptr<plib::pistream> get_data_stream(const pstring &name);
bool parse_stream(std::unique_ptr<plib::pistream> istrm, const pstring &name);
bool parse_stream(std::unique_ptr<plib::pistream> &&istrm, const pstring &name);
/* register a source */

2
src/mame/drivers/capbowl.cpp
View File

@ -324,7 +324,7 @@ MACHINE_CONFIG_START(capbowl_state::capbowl)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", capbowl_state, interrupt)
// watchdog: 555 timer 16 cycles, edge triggered, ~0.3s
attotime period = PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6);
attotime const period = PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6);
WATCHDOG_TIMER(config, m_watchdog).set_time(period * 16 - period / 2);
MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP

17
src/mame/drivers/testpat.cpp
View File

@ -29,6 +29,8 @@ Radio, 1985, N6
#include <cmath>
namespace {
#define MASTER_CLOCK (4000000)
#define V_TOTAL_PONG 315
#define H_TOTAL_PONG 256 // tbc
@ -51,10 +53,10 @@ public:
protected:
// driver_device overrides
virtual void machine_start() override { };
virtual void machine_reset() override { };
virtual void machine_start() override { }
virtual void machine_reset() override { }
virtual void video_start() override { };
virtual void video_start() override { }
private:
};
@ -78,10 +80,10 @@ public:
protected:
// driver_device overrides
virtual void machine_start() override { };
virtual void machine_reset() override { };
virtual void machine_start() override { }
virtual void machine_reset() override { }
virtual void video_start() override { };
virtual void video_start() override { }
private:
NETDEV_ANALOG_CALLBACK_MEMBER(video_out_cb);
@ -141,5 +143,8 @@ ROM_START( tp1985 ) /* dummy to satisfy game entry*/
ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
ROM_END
} // anonymous namespace
SYST( 1983, tp1983, 0, 0, tp1983, tp1983, tp1983_state, empty_init, "Radio", "TV Test Pattern Generator 1983", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
SYST( 1985, tp1985, 0, 0, tp1985, tp1985, tp1985_state, empty_init, "Radio", "TV Test Pattern Generator 1985", MACHINE_NO_SOUND_HW)

4
src/mame/drivers/xavix.cpp
View File

@ -1717,8 +1717,8 @@ CONS( 2000, popira, 0, 0, xavix_cart_popira,popira, xavix_cart_st
CONS( 2003, taikodp, 0, 0, xavix_i2c_taiko, taikodp, xavix_i2c_cart_state, init_xavix, "Takara / SSD Company LTD", "Taiko De Popira (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ ) // inputs? are the drums analog?
// Let’s!TVプレイ 超にんきスポット!ころがしほーだい たまごっちりぞーと (Let's! TV Play Chou Ninki Spot! Korogashi Hodai Tamagotchi Resort) (only on the Japanese list? http://test.shinsedai.co.jp/english/products/Applied/list.html ) This also allows you to use an IR reciever to import a Tamagotchi from compatible games
CONS( 2006, ltv_tam, 0, 0, xavix_i2c_24lc04, ltv_tam,xavix_i2c_ltv_tam_state, init_xavix, "Bandai / SSD Company LTD", "Let's! TV Play Chou Ninki Spot! Korogashi Hodai Tamagotchi Resort (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// Let’s!TVプレイ 超にんきスポット!ころがしほーだい たまごっちりぞーと (Let's! TV Play Chou Ninki Spot! Korogashi-Houdai Tamagotchi Resort) (only on the Japanese list? http://test.shinsedai.co.jp/english/products/Applied/list.html ) This also allows you to use an IR reciever to import a Tamagotchi from compatible games
CONS( 2006, ltv_tam, 0, 0, xavix_i2c_24lc04, ltv_tam,xavix_i2c_ltv_tam_state, init_xavix, "Bandai / SSD Company LTD", "Let's! TV Play Chou Ninki Spot! Korogashi-Houdai Tamagotchi Resort (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )

6
src/osd/modules/sound/sdl_sound.cpp
View File

@ -80,7 +80,7 @@ private:
static void sdl_callback(void *userdata, Uint8 *stream, int len);
int lock_buffer();
void lock_buffer();
void unlock_buffer();
void attenuate(int16_t *data, int bytes);
void copy_sample_data(bool is_throttled, const int16_t *data, int bytes_to_copy);
@ -179,7 +179,7 @@ int sound_sdl::ring_buffer::pop(void *data, size_t size)
//============================================================
// lock_buffer
//============================================================
int sound_sdl::lock_buffer()
void sound_sdl::lock_buffer()
{
if (!buf_locked)
SDL_LockAudio();
@ -187,8 +187,6 @@ int sound_sdl::lock_buffer()
if (LOG_SOUND)
*sound_log << "locking\n";
return 0;
}
//============================================================