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

Minor code cleanup; moved 'krokha' to arcade section. (#9262)

Browse Source
This commit is contained in:
shattered 2022-02-15 16:25:09 +00:00 committed by GitHub
parent 17da27f074
commit f6053b1e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 75 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mame/arcade.flt
View File

@ -669,6 +669,7 @@ kontest.cpp
kopunch.cpp
kpontoon.cpp
kpython.cpp
krokha.cpp
ksayakyu.cpp
ksys573.cpp
kungfur.cpp

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

@ -82,7 +82,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGPIA(...) LOGMASKED(LOG_PIA, __VA_ARGS__)

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

@ -49,7 +49,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGPIA(...) LOGMASKED(LOG_PIA, __VA_ARGS__)

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

@ -63,7 +63,7 @@ static constexpr int KCGD_PAGE_1 = 005574;
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGVRAM(...) LOGMASKED(LOG_VRAM, __VA_ARGS__)

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

@ -84,7 +84,7 @@ static constexpr int KSM_STATUSLINE_VRAM = 0xF8B0;
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

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

@ -30,7 +30,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

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

@ -57,7 +57,7 @@ static constexpr int VC_DISP_VERT = 256;
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

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

@ -88,7 +88,7 @@
#define LOG_DEBUG (1U << 2)
#define VERBOSE (LOG_GENERAL)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

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

@ -81,7 +81,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_GENERAL)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

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

@ -181,7 +181,7 @@ Notes on floppy drive:
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

13
src/mame/drivers/krokha.cpp
View File

@ -28,6 +28,7 @@
#include "cpu/i8085/i8085.h"
#include "sound/spkrdev.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@ -121,7 +122,7 @@ uint32_t krokha_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
uint16_t ma = 0xe0 + y;
for (uint8_t ra = 0; ra < 8; ra++)
{
for (uint16_t x = ma; x < ma + 64*32; x += 32)
for (uint16_t x = ma; x < ma + 64 * 32; x += 32)
{
uint16_t chr = m_p_videoram[x] << 3;
uint8_t gfx = m_p_chargen[chr | ra];
@ -146,9 +147,9 @@ void krokha_state::krokha(machine_config &config)
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_refresh_hz(50);
m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); // XXX
m_screen->set_size(64*8, 32*8);
m_screen->set_visarea(9*8, (48+9)*8-1, 0*8, 32*8-1);
m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500));
m_screen->set_size(64 * 8, 32 * 8);
m_screen->set_visarea(9 * 8, (48 + 9) * 8 - 1, 0 * 8, 32 * 8 - 1);
m_screen->set_screen_update(FUNC(krokha_state::screen_update));
m_screen->set_palette("palette");
m_screen->screen_vblank().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@ -169,5 +170,5 @@ ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
COMP( 1990, krokha, 0, 0, krokha, krokha, krokha_state, empty_init, "SKB Kontur", "Krokha", 0 )
// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT, COMPANY FULLNAME
GAME( 1990, krokha, 0, krokha, krokha, krokha_state, empty_init, ROT0, "SKB Kontur", "Krokha", 0 )

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

@ -53,7 +53,7 @@
#define LOG_SYSREG (1U << 2)
//#define VERBOSE (LOG_GENERAL | LOG_BANK | LOG_SYSREG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGBANK(format, ...) LOGMASKED(LOG_BANK, "%11.6f at %s: " format, machine().time().as_double(), machine().describe_context(), __VA_ARGS__)

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

@ -50,7 +50,7 @@
#define VERBOSE (LOG_GENERAL)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"

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

@ -48,7 +48,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__)

46
src/mame/drivers/sm7238.cpp
View File

@ -11,6 +11,7 @@
- graphics options
- colors
- document hardware and ROM variants, verify if pixel stretching is done
- verify blink frequency
****************************************************************************/
@ -21,28 +22,29 @@
#include "machine/bankdev.h"
#include "machine/clock.h"
#include "machine/i8251.h"
#include "machine/pit8253.h"
#include "machine/pic8259.h"
#include "machine/km035.h"
#include "machine/nvram.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "emupal.h"
#include "screen.h"
static constexpr int KSM_COLUMNS_MAX = 132;
static constexpr int KSM_TOTAL_HORZ = KSM_COLUMNS_MAX * 10;
static constexpr int KSM_DISP_HORZ = KSM_COLUMNS_MAX * 8;
static constexpr int KSM_TOTAL_VERT = 260;
static constexpr int KSM_DISP_VERT = 250;
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"
#define KSM_COLUMNS_MAX 132
#define KSM_TOTAL_HORZ (KSM_COLUMNS_MAX*10)
#define KSM_DISP_HORZ (KSM_COLUMNS_MAX*8)
#define KSM_TOTAL_VERT 260
#define KSM_DISP_VERT 250
class sm7238_state : public driver_device
{
public:
@ -68,8 +70,6 @@ public:
, m_screen(*this, "screen")
{ }
static constexpr feature_type unemulated_features() { return feature::KEYBOARD; }
void sm7238(machine_config &config);
private:
@ -97,7 +97,7 @@ private:
} m_video;
virtual void machine_reset() override;
virtual void video_start() override;
required_device<i8080_cpu_device> m_maincpu;
required_device<nvram_device> m_nvram;
required_device<address_map_bank_device> m_videobank;
@ -156,10 +156,6 @@ void sm7238_state::machine_reset()
m_videobank->set_bank(0);
}
void sm7238_state::video_start()
{
}
void sm7238_state::control_w(uint8_t data)
{
LOG("Control Write: %02xh: lut %d nvram %d c2 %d iack %d\n",
@ -237,7 +233,7 @@ uint32_t sm7238_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
uint8_t ctl2 = 0;
uint16_t sy = 0, ma = 0;
bool double_width = false, double_height = false, bottom_half = false;
bool blink((m_screen->frame_number() % 30) > 14); // XXX guess
bool blink((m_screen->frame_number() % 30) > 14);
for (uint8_t y = 0; y < 26; y++)
{
@ -356,7 +352,7 @@ GFXDECODE_END
void sm7238_state::sm7238(machine_config &config)
{
I8080(config, m_maincpu, 16.5888_MHz_XTAL/9);
I8080(config, m_maincpu, 16.5888_MHz_XTAL / 9);
m_maincpu->set_addrmap(AS_PROGRAM, &sm7238_state::sm7238_mem);
m_maincpu->set_addrmap(AS_IO, &sm7238_state::sm7238_io);
m_maincpu->in_inta_func().set("pic8259", FUNC(pic8259_device::acknowledge));
@ -378,19 +374,19 @@ void sm7238_state::sm7238(machine_config &config)
m_pic8259->out_int_callback().set_inputline(m_maincpu, 0);
PIT8253(config, m_t_hblank, 0);
m_t_hblank->set_clk<1>(16.384_MHz_XTAL/9); // XXX workaround -- keyboard is slower and doesn't sync otherwise
m_t_hblank->set_clk<1>(16.384_MHz_XTAL / 9); // FIXME -- keyboard is slower and doesn't sync otherwise
m_t_hblank->out_handler<1>().set(FUNC(sm7238_state::write_keyboard_clock));
PIT8253(config, m_t_vblank, 0);
m_t_vblank->set_clk<2>(16.5888_MHz_XTAL/9);
m_t_vblank->set_clk<2>(16.5888_MHz_XTAL / 9);
m_t_vblank->out_handler<2>().set(FUNC(sm7238_state::write_printer_clock));
PIT8253(config, m_t_color, 0);
PIT8253(config, m_t_iface, 0);
m_t_iface->set_clk<1>(16.5888_MHz_XTAL/9);
m_t_iface->set_clk<1>(16.5888_MHz_XTAL / 9);
m_t_iface->out_handler<1>().set(m_i8251line, FUNC(i8251_device::write_txc));
m_t_iface->set_clk<2>(16.5888_MHz_XTAL/9);
m_t_iface->set_clk<2>(16.5888_MHz_XTAL / 9);
m_t_iface->out_handler<2>().set(m_i8251line, FUNC(i8251_device::write_rxc));
// serial connection to host

38
src/mame/drivers/superga2.cpp
View File

@ -2,7 +2,7 @@
// copyright-holders:R. Belmont, Sergey Svishchev
/***************************************************************************
Super Games ][
Nippel Super Games ][
An arcade board designed to run modified games from Apple ][.
Most of Apple hardware is missing, keyboard port is reused for joysticks.
@ -39,15 +39,15 @@
class superga2_state : public driver_device
{
public:
superga2_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, A2_CPU_TAG),
m_screen(*this, "screen"),
m_ram(*this, RAM_TAG),
m_video(*this, A2_VIDEO_TAG),
m_a2common(*this, "a2common"),
m_speaker(*this, "speaker"),
m_softlatch(*this, "softlatch")
superga2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, A2_CPU_TAG)
, m_screen(*this, "screen")
, m_ram(*this, RAM_TAG)
, m_video(*this, A2_VIDEO_TAG)
, m_a2common(*this, "a2common")
, m_speaker(*this, "speaker")
, m_softlatch(*this, "softlatch")
{ }
static constexpr feature_type imperfect_features() { return feature::PALETTE; }
@ -72,8 +72,8 @@ public:
uint8_t switches_r(offs_t offset);
uint8_t reset_r(offs_t offset);
void kuzmich(machine_config &config);
void kuzmich_map(address_map &map);
void superga2(machine_config &config);
void superga2_map(address_map &map);
private:
int m_speaker_state;
@ -185,7 +185,7 @@ void superga2_state::ram_w(offs_t offset, uint8_t data)
}
}
void superga2_state::kuzmich_map(address_map &map)
void superga2_state::superga2_map(address_map &map)
{
map(0x0000, 0xbfff).rw(FUNC(superga2_state::ram_r), FUNC(superga2_state::ram_w));
map(0xc000, 0xc000).mirror(0xf).portr("P1").nopw();
@ -198,7 +198,7 @@ void superga2_state::kuzmich_map(address_map &map)
INPUT PORTS
***************************************************************************/
static INPUT_PORTS_START( kuzmich )
static INPUT_PORTS_START( superga2 )
PORT_START("P1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@ -210,11 +210,11 @@ static INPUT_PORTS_START( kuzmich )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
INPUT_PORTS_END
void superga2_state::kuzmich(machine_config &config)
void superga2_state::superga2(machine_config &config)
{
/* basic machine hardware */
M6502(config, m_maincpu, 1021800);
m_maincpu->set_addrmap(AS_PROGRAM, &superga2_state::kuzmich_map);
m_maincpu->set_addrmap(AS_PROGRAM, &superga2_state::superga2_map);
APPLE2_VIDEO(config, m_video, XTAL(14'318'181)).set_screen(m_screen);
APPLE2_COMMON(config, m_a2common, XTAL(14'318'181));
@ -229,7 +229,7 @@ void superga2_state::kuzmich(machine_config &config)
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
/* soft switches */
F9334(config, m_softlatch); // F14 (labeled 74LS259 on some boards and in the Apple ][ Reference Manual)
F9334(config, m_softlatch);
m_softlatch->q_out_cb<0>().set(m_video, FUNC(a2_video_device::txt_w));
m_softlatch->q_out_cb<1>().set(m_video, FUNC(a2_video_device::mix_w));
m_softlatch->q_out_cb<2>().set(m_video, FUNC(a2_video_device::scr_w));
@ -251,5 +251,5 @@ ROM_START(kuzmich)
ROM_LOAD("ke.bin", 0x0000, 0x8000, CRC(102d246b) SHA1(492dcdf0cc31190a97057a69010e2c9c23b6e59d))
ROM_END
// YEAR NAME PARENT MACHINE INPUT CLASS INIT COMPANY FULLNAME
GAME( 199?, kuzmich, 0, kuzmich, kuzmich, superga2_state, empty_init, ROT0, "Nippel", "Kuzmich-Egorych", MACHINE_SUPPORTS_SAVE )
// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT, COMPANY FULLNAME
GAME( 199?, kuzmich, 0, superga2, superga2, superga2_state, empty_init, ROT0, "Nippel", "Kuzmich-Egorych", MACHINE_SUPPORTS_SAVE )

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

@ -57,7 +57,7 @@
#define LOG_DEBUG (1U << 2)
//#define VERBOSE (LOG_DEBUG)
//#define LOG_OUTPUT_FUNC printf
//#define LOG_OUTPUT_FUNC osd_printf_info
#include "logmacro.h"

54
src/mame/machine/km035.cpp
View File

@ -60,12 +60,12 @@ void km035_device::device_add_mconfig(machine_config &config)
I8035(config, m_maincpu, XTAL(4'608'000));
m_maincpu->set_addrmap(AS_PROGRAM, &km035_device::km035_map);
m_maincpu->bus_out_cb().set(FUNC(km035_device::bus_w));
m_maincpu->p1_in_cb().set(FUNC(km035_device::p1_r));
m_maincpu->p1_in_cb().set([this] () { return m_p1; });
m_maincpu->p1_out_cb().set(FUNC(km035_device::p1_w));
m_maincpu->p2_in_cb().set(FUNC(km035_device::p2_r));
m_maincpu->p2_in_cb().set([this] () { return m_p2; });
m_maincpu->p2_out_cb().set(FUNC(km035_device::p2_w));
m_maincpu->t0_in_cb().set(FUNC(km035_device::t0_r));
m_maincpu->t1_in_cb().set(FUNC(km035_device::t1_r));
m_maincpu->t0_in_cb().set([this] () { return m_keylatch; });
m_maincpu->t1_in_cb().set([this] () { return m_rx; });
SPEAKER(config, "mono").front_center();
BEEP(config, m_speaker, 3250).add_route(ALL_OUTPUTS, "mono", 0.50);
@ -248,7 +248,7 @@ INPUT_PORTS_END
ioport_constructor km035_device::device_input_ports() const
{
return INPUT_PORTS_NAME( km035 );
return INPUT_PORTS_NAME(km035);
}
//**************************************************************************
@ -260,12 +260,12 @@ ioport_constructor km035_device::device_input_ports() const
//-------------------------------------------------
km035_device::km035_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, KM035, tag, owner, clock),
m_maincpu(*this, KM035_CPU_TAG),
m_speaker(*this, KM035_SPK_TAG),
m_kbd(*this, "KBD%u", 0),
m_tx_handler(*this),
m_rts_handler(*this)
: device_t(mconfig, KM035, tag, owner, clock)
, m_maincpu(*this, KM035_CPU_TAG)
, m_speaker(*this, KM035_SPK_TAG)
, m_kbd(*this, "KBD%u", 0)
, m_tx_handler(*this)
, m_rts_handler(*this)
{
}
@ -290,7 +290,7 @@ void km035_device::device_reset()
}
WRITE_LINE_MEMBER( km035_device::write_rxd )
WRITE_LINE_MEMBER(km035_device::write_rxd)
{
LOG("write_rxd %d\n", state);
m_maincpu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE);
@ -320,7 +320,7 @@ void km035_device::p1_w(uint8_t data)
LOGDBG("p1_w %02x = row %d col %d tx %d\n", data, (data>>4)&15, data&7, !BIT(data, 3));
m_p1 = data;
sense = m_kbd[(data>>4) & 15]->read();
sense = m_kbd[(data >> 4) & 15]->read();
m_keylatch = BIT(sense, (data & 7));
if (m_keylatch)
LOG("keypress at row %d col %d\n", (data>>4)&15, data&7);
@ -335,16 +335,6 @@ void km035_device::p2_w(uint8_t data)
m_p2 = data;
}
uint8_t km035_device::p1_r()
{
return m_p1;
}
uint8_t km035_device::p2_r()
{
return m_p2;
}
//-------------------------------------------------
// bus_w -
//-------------------------------------------------
@ -353,21 +343,3 @@ void km035_device::bus_w(uint8_t data)
{
LOGDBG("bus_w %02x\n", data);
}
//-------------------------------------------------
// t0_r -
//-------------------------------------------------
READ_LINE_MEMBER( km035_device::t0_r )
{
return m_keylatch;
}
//-------------------------------------------------
// t1_r -
//-------------------------------------------------
READ_LINE_MEMBER( km035_device::t1_r )
{
return m_rx;
}

5
src/mame/machine/km035.h
View File

@ -27,6 +27,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_rxd );
void km035_map(address_map &map);
protected:
// device-level overrides
virtual void device_add_mconfig(machine_config &config) override;
@ -52,10 +53,6 @@ private:
void bus_w(uint8_t data);
void p1_w(uint8_t data);
void p2_w(uint8_t data);
uint8_t p1_r();
uint8_t p2_r();
DECLARE_READ_LINE_MEMBER( t0_r );
DECLARE_READ_LINE_MEMBER( t1_r );
};
// device type definition

1
src/mame/mess.flt
View File

@ -528,7 +528,6 @@ korgm1.cpp
korgws.cpp
korgz3.cpp
kramermc.cpp
krokha.cpp
kron.cpp
krz2000.cpp
ktm3.cpp