Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 09:20:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

srcclean and manual cleanup in preparation for 0.263 release.

Browse Source
This commit is contained in:
Vas Crabb 2024-02-25 01:56:09 +11:00
parent cc621cca1d
commit 9827b7f547
35 changed files with 341 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hash/ekara_japan.xml
View File

@ -181,7 +181,7 @@ license:CC0-1.0
These are audio-only devices, not XaviX based and do not connect to a TV. They are still e-Kara branded but have
nothing in common hardware-wise. This information has been left here for reference only.
The base units are as follows, they appear to contain an MCU rather than a ROM
KH-01 Standard

4
hash/ekara_japan_m.xml
View File

@ -192,7 +192,7 @@ license:CC0-1.0
</dataarea>
</part>
</software>
<software name="mc0016">
<description>Artist Mini Volume 9 (Yamaguchi Momoe) (Japan) (MC0016-ATM)</description>
<year>2003</year>
@ -203,6 +203,6 @@ license:CC0-1.0
<rom name="mc0016-atm.u1" size="0x080000" crc="937c07dd" sha1="6c3570394e781dec96e98d95db3a3c564abe35a4"/>
</dataarea>
</part>
</software>
</software>
</softwarelist>

4
hash/ekara_japan_packin.xml
View File

@ -18,7 +18,7 @@ license:CC0-1.0
*KR-1 Kirarin Revolution (comes in kira kara Starter Set bundled with Kirarin Revolution microphone) (inside cart is marked AC0009-KIR)
*PR-06 Misora Hibari (inside cart is marked AC0009)
*BX01-MOR Morning Musume Special (sticker inside cart is marked CS019-004A)
The following cartridges with 'PR' codes have also been seen, they appear to be single song cartridges
and it is unknown how they were distributed (maybe pack-ins, but no pack-in box has been identified)
These are bright pink in colour with blue/white paper labels
@ -70,5 +70,5 @@ license:CC0-1.0
</dataarea>
</part>
</software>
</softwarelist>

6
hash/spectrum_cass.xml
View File

@ -16452,7 +16452,7 @@ Side B: Laser Shoot (original release)
<description>La Diosa de Cozumel (Retro Gamer edition)</description>
<year>2013</year>
<publisher>Axel Springer / Matra Computer Automations</publisher>
<info name="alt_title" value="Diosa de Cozumel"/> <!-- in-game title -->
<info name="alt_title" value="Diosa de Cozumel"/> <!-- in-game title -->
<info name="author" value="Andrés Samudio (Samusoft)"/>
<info name="language" value="Spanish" />
<info name="usage" value="48K" />
@ -16467,7 +16467,7 @@ Side B: Laser Shoot (original release)
<description>La Diosa de Cozumel (Matra edition)</description>
<year>2015</year>
<publisher>Matra Computer Automations</publisher>
<info name="alt_title" value="Diosa de Cozumel"/> <!-- in-game title -->
<info name="alt_title" value="Diosa de Cozumel"/> <!-- in-game title -->
<info name="author" value="Andrés Samudio (Samusoft)"/>
<info name="language" value="Spanish" />
<info name="usage" value="48K" />
@ -66218,7 +66218,7 @@ Side A doesn't work.
<description>Desdobramentos de Totobola</description>
<year>198?</year>
<publisher>Astor Software</publisher>
<info name="alt_title" value="Desdobramento de Totobola"/> <!-- in-game title -->
<info name="alt_title" value="Desdobramento de Totobola"/> <!-- in-game title -->
<info name="author" value="J. Branco / N. Tiago"/>
<info name="language" value="Portuguese" />
<info name="usage" value="48K" />

30
src/devices/bus/idpartner/bus.cpp
View File

@ -19,8 +19,8 @@ namespace bus::idpartner {
***********************************************************************/
device_exp_card_interface::device_exp_card_interface(const machine_config &mconfig, device_t &device)
: device_interface(device, "idpartner_card")
, m_bus(nullptr)
: device_interface(device, "idpartner_card")
, m_bus(nullptr)
{
}
@ -29,9 +29,9 @@ device_exp_card_interface::device_exp_card_interface(const machine_config &mconf
***********************************************************************/
bus_connector_device::bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IDPARTNER_BUS_CONNECTOR, tag, owner, clock)
, device_single_card_slot_interface<device_exp_card_interface>(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
: device_t(mconfig, IDPARTNER_BUS_CONNECTOR, tag, owner, clock)
, device_single_card_slot_interface<device_exp_card_interface>(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
{
}
@ -41,9 +41,9 @@ bus_connector_device::bus_connector_device(const machine_config &mconfig, const
void bus_connector_device::device_resolve_objects()
{
device_exp_card_interface *const exp_card = get_card_device();
if (exp_card)
exp_card->set_bus(m_bus);
device_exp_card_interface *const exp_card = get_card_device();
if (exp_card)
exp_card->set_bus(m_bus);
}
void bus_connector_device::device_start()
@ -55,11 +55,11 @@ void bus_connector_device::device_start()
***********************************************************************/
bus_device::bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IDPARTNER_BUS, tag, owner, clock)
, m_io(*this, finder_base::DUMMY_TAG, -1)
, m_int_handler(*this)
, m_nmi_handler(*this)
, m_drq_handler(*this)
: device_t(mconfig, IDPARTNER_BUS, tag, owner, clock)
, m_io(*this, finder_base::DUMMY_TAG, -1)
, m_int_handler(*this)
, m_nmi_handler(*this)
, m_drq_handler(*this)
{
}
@ -82,6 +82,6 @@ void bus_device::device_reset()
void idpartner_exp_devices(device_slot_interface &device)
{
device.option_add("gdp", IDPARTNER_GDP);
device.option_add("sasi", IDPARTNER_SASI);
device.option_add("gdp", IDPARTNER_GDP);
device.option_add("sasi", IDPARTNER_SASI);
}

86
src/devices/bus/idpartner/bus.h
View File

@ -58,61 +58,61 @@ class device_exp_card_interface;
class bus_connector_device : public device_t, public device_single_card_slot_interface<device_exp_card_interface>
{
public:
// construction/destruction
template <typename T, typename U>
bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&bus_tag, U &&opts, const char *dflt)
: bus_connector_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
m_bus.set_tag(std::forward<T>(bus_tag));
}
// construction/destruction
template <typename T, typename U>
bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&bus_tag, U &&opts, const char *dflt)
: bus_connector_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
m_bus.set_tag(std::forward<T>(bus_tag));
}
bus_connector_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
bus_connector_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
protected:
// device_t implementation
virtual void device_resolve_objects() override;
virtual void device_start() override;
// device_t implementation
virtual void device_resolve_objects() override;
virtual void device_start() override;
// configuration
required_device<bus_device> m_bus;
// configuration
required_device<bus_device> m_bus;
};
class bus_device : public device_t
{
public:
// construction/destruction
bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// construction/destruction
bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration
template <typename T> void set_io_space(T &&tag, int spacenum) { m_io.set_tag(std::forward<T>(tag), spacenum); }
// inline configuration
template <typename T> void set_io_space(T &&tag, int spacenum) { m_io.set_tag(std::forward<T>(tag), spacenum); }
// callbacks
auto int_handler() { return m_int_handler.bind(); }
auto nmi_handler() { return m_nmi_handler.bind(); }
auto drq_handler() { return m_drq_handler.bind(); }
// callbacks
auto int_handler() { return m_int_handler.bind(); }
auto nmi_handler() { return m_nmi_handler.bind(); }
auto drq_handler() { return m_drq_handler.bind(); }
// called from expansion device
void int_w(int state) { m_int_handler(state); }
void nmi_w(int state) { m_nmi_handler(state); }
void drq_w(int state) { m_drq_handler(state); }
// called from expansion device
void int_w(int state) { m_int_handler(state); }
void nmi_w(int state) { m_nmi_handler(state); }
void drq_w(int state) { m_drq_handler(state); }
address_space &io() { return *m_io; }
address_space &io() { return *m_io; }
private:
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
// internal state
required_address_space m_io;
// internal state
required_address_space m_io;
devcb_write_line m_int_handler;
devcb_write_line m_nmi_handler;
devcb_write_line m_drq_handler;
devcb_write_line m_int_handler;
devcb_write_line m_nmi_handler;
devcb_write_line m_drq_handler;
};
// ======================> device_exp_card_interface
@ -120,15 +120,15 @@ private:
class device_exp_card_interface : public device_interface
{
protected:
// construction/destruction
device_exp_card_interface(const machine_config &mconfig, device_t &device);
// construction/destruction
device_exp_card_interface(const machine_config &mconfig, device_t &device);
public:
// inline configuration
void set_bus(bus_device *bus) { m_bus = bus; }
// inline configuration
void set_bus(bus_device *bus) { m_bus = bus; }
protected:
bus_device *m_bus;
bus_device *m_bus;
};
} // namespace bus::idpartner

182
src/devices/bus/idpartner/gdp.cpp
View File

@ -19,63 +19,63 @@
namespace {
class idpartner_gdp_device :
public device_t,
public bus::idpartner::device_exp_card_interface
public device_t,
public bus::idpartner::device_exp_card_interface
{
public:
// construction/destruction
idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// construction/destruction
idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
private:
void char_w(u8 data) { m_avdc->buffer_w(data); }
void attr_w(u8 data) { m_avdc->attr_buffer_w(data); }
void scroll_w(u8 data) { m_scroll = data; }
u8 common_r() { m_common ^= 0x10; return m_common; }
void porta_w(u8 data);
void portb_w(u8 data);
void char_w(u8 data) { m_avdc->buffer_w(data); }
void attr_w(u8 data) { m_avdc->attr_buffer_w(data); }
void scroll_w(u8 data) { m_scroll = data; }
u8 common_r() { m_common ^= 0x10; return m_common; }
void porta_w(u8 data);
void portb_w(u8 data);
void vram_w(offs_t offset, u8 data);
u8 vram_r(offs_t offset);
void msl_w(u8 data);
void gdc_map(address_map &map);
void int_w(int state) { m_bus->int_w(state); }
void nmi_w(int state) { m_bus->nmi_w(state); }
void msl_w(u8 data);
void gdc_map(address_map &map);
void int_w(int state) { m_bus->int_w(state); }
void nmi_w(int state) { m_bus->nmi_w(state); }
SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
TIMER_DEVICE_CALLBACK_MEMBER(scanline) { m_gdc->update_scanline(param); }
SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
TIMER_DEVICE_CALLBACK_MEMBER(scanline) { m_gdc->update_scanline(param); }
void char_map(address_map &map);
void attr_map(address_map &map);
void char_map(address_map &map);
void attr_map(address_map &map);
required_device<ef9365_device> m_gdc;
memory_share_creator<u8> m_vram;
required_device<scn2674_device> m_avdc;
required_device<z80pio_device> m_pio;
required_device<palette_device> m_palette;
required_region_ptr<u8> m_p_chargen;
required_device<ef9365_device> m_gdc;
memory_share_creator<u8> m_vram;
required_device<scn2674_device> m_avdc;
required_device<z80pio_device> m_pio;
required_device<palette_device> m_palette;
required_region_ptr<u8> m_p_chargen;
u8 m_scroll;
u8 m_common;
u8 m_scroll;
u8 m_common;
};
idpartner_gdp_device::idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IDPARTNER_GDP, tag, owner, clock)
, bus::idpartner::device_exp_card_interface(mconfig, *this)
, m_gdc(*this, "gdc")
, m_vram(*this, "vram", 0x20000, ENDIANNESS_LITTLE)
, m_avdc(*this, "avdc")
, m_pio(*this, "pio")
, m_palette(*this, "palette")
, m_p_chargen(*this, "chargen")
, m_scroll(0)
, m_common(0)
: device_t(mconfig, IDPARTNER_GDP, tag, owner, clock)
, bus::idpartner::device_exp_card_interface(mconfig, *this)
, m_gdc(*this, "gdc")
, m_vram(*this, "vram", 0x20000, ENDIANNESS_LITTLE)
, m_avdc(*this, "avdc")
, m_pio(*this, "pio")
, m_palette(*this, "palette")
, m_p_chargen(*this, "chargen")
, m_scroll(0)
, m_common(0)
{
}
@ -85,54 +85,54 @@ idpartner_gdp_device::idpartner_gdp_device(const machine_config &mconfig, const
void idpartner_gdp_device::device_start()
{
save_item(NAME(m_scroll));
save_item(NAME(m_scroll));
}
void idpartner_gdp_device::device_reset()
{
m_bus->io().install_read_handler (0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_r))); // Thomson GDP EF9367
m_bus->io().install_write_handler(0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_w))); // Thomson GDP EF9367
m_bus->io().install_read_handler (0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::read_alt))); // PIO - Graphics
m_bus->io().install_write_handler(0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::write_alt))); // PIO - Graphics
m_bus->io().install_write_handler(0x34, 0x34, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::char_w))); // char reg
m_bus->io().install_write_handler(0x35, 0x35, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::attr_w))); // attr reg
m_bus->io().install_write_handler(0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::scroll_w))); // scroll reg/common input
m_bus->io().install_read_handler (0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::common_r))); // common input
m_bus->io().install_read_handler (0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::read))); // AVDC SCN2674
m_bus->io().install_write_handler(0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::write))); // AVDC SCN2674
m_bus->io().install_read_handler (0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_r))); // Thomson GDP EF9367
m_bus->io().install_write_handler(0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_w))); // Thomson GDP EF9367
m_bus->io().install_read_handler (0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::read_alt))); // PIO - Graphics
m_bus->io().install_write_handler(0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::write_alt))); // PIO - Graphics
m_bus->io().install_write_handler(0x34, 0x34, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::char_w))); // char reg
m_bus->io().install_write_handler(0x35, 0x35, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::attr_w))); // attr reg
m_bus->io().install_write_handler(0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::scroll_w))); // scroll reg/common input
m_bus->io().install_read_handler (0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::common_r))); // common input
m_bus->io().install_read_handler (0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::read))); // AVDC SCN2674
m_bus->io().install_write_handler(0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::write))); // AVDC SCN2674
}
void idpartner_gdp_device::porta_w(u8 data)
{
//printf("porta_w:%02x\n",data);
//printf("porta_w:%02x\n",data);
}
void idpartner_gdp_device::portb_w(u8 data)
{
//printf("portb_w:%02x\n",data);
//printf("portb_w:%02x\n",data);
}
void idpartner_gdp_device::msl_w(u8 data)
{
//printf("msl_w:%02x\n",data);
//printf("msl_w:%02x\n",data);
}
void idpartner_gdp_device::vram_w(offs_t offset, u8 data)
{
u16 addr = (m_scroll << 7) - offset;
m_vram[addr] = data;
u16 addr = (m_scroll << 7) - offset;
m_vram[addr] = data;
}
u8 idpartner_gdp_device::vram_r(offs_t offset)
{
u16 addr = (m_scroll << 7) - offset;
u16 addr = (m_scroll << 7) - offset;
return m_vram[addr];
}
// 16 * 4164 DRAM
void idpartner_gdp_device::gdc_map(address_map &map)
{
map(0x0000, 0x1ffff).rw(FUNC(idpartner_gdp_device::vram_r), FUNC(idpartner_gdp_device::vram_w));
map(0x0000, 0x1ffff).rw(FUNC(idpartner_gdp_device::vram_r), FUNC(idpartner_gdp_device::vram_w));
}
@ -140,15 +140,15 @@ void idpartner_gdp_device::gdc_map(address_map &map)
void idpartner_gdp_device::char_map(address_map &map)
{
map(0x0000, 0x0fff).ram().share("charram");
map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
}
// 2 * 6116 SRAM for attributes
void idpartner_gdp_device::attr_map(address_map &map)
{
map(0x0000, 0x0fff).ram().share("attrmap");
map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
}
map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
}
/* F4 Character Displayer */
static const gfx_layout gdp_charlayout =
@ -194,44 +194,44 @@ SCN2674_DRAW_CHARACTER_MEMBER( idpartner_gdp_device::draw_character )
void idpartner_gdp_device::device_add_mconfig(machine_config &config)
{
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
screen.set_screen_update(m_gdc, FUNC(ef9365_device::screen_update));
screen.set_size(1024, 512);
screen.set_visarea(0, 1024-1, 0, 512-1);
screen.set_refresh_hz(50);
PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
screen.set_screen_update(m_gdc, FUNC(ef9365_device::screen_update));
screen.set_size(1024, 512);
screen.set_visarea(0, 1024-1, 0, 512-1);
screen.set_refresh_hz(50);
PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
screen_device &screen2(SCREEN(config, "screen2", SCREEN_TYPE_RASTER, rgb_t::green()));
screen2.set_screen_update(m_avdc, FUNC(scn2674_device::screen_update));
screen2.set_size(1024, 512);
screen2.set_visarea(0, 1024-1, 0, 512-1);
screen2.set_refresh_hz(50);
screen_device &screen2(SCREEN(config, "screen2", SCREEN_TYPE_RASTER, rgb_t::green()));
screen2.set_screen_update(m_avdc, FUNC(scn2674_device::screen_update));
screen2.set_size(1024, 512);
screen2.set_visarea(0, 1024-1, 0, 512-1);
screen2.set_refresh_hz(50);
GFXDECODE(config, "gfxdecode", "palette", gfx_partner);
GFXDECODE(config, "gfxdecode", "palette", gfx_partner);
EF9365(config, m_gdc, XTAL(24'000'000) / 16); // EF9367 1.5 MHz
m_gdc->set_screen("screen");
m_gdc->set_addrmap(0, &idpartner_gdp_device::gdc_map);
m_gdc->set_palette_tag("palette");
m_gdc->set_nb_bitplanes(1);
m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_1024x512);
m_gdc->write_msl().set(FUNC(idpartner_gdp_device::msl_w));
EF9365(config, m_gdc, XTAL(24'000'000) / 16); // EF9367 1.5 MHz
m_gdc->set_screen("screen");
m_gdc->set_addrmap(0, &idpartner_gdp_device::gdc_map);
m_gdc->set_palette_tag("palette");
m_gdc->set_nb_bitplanes(1);
m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_1024x512);
m_gdc->write_msl().set(FUNC(idpartner_gdp_device::msl_w));
TIMER(config, "scanline").configure_scanline(FUNC(idpartner_gdp_device::scanline), "screen", 0, 1);
TIMER(config, "scanline").configure_scanline(FUNC(idpartner_gdp_device::scanline), "screen", 0, 1);
SCN2674(config, m_avdc, XTAL(24'000'000) / 16); // SCN2674B
m_avdc->set_screen("screen2");
m_avdc->set_character_width(12);
SCN2674(config, m_avdc, XTAL(24'000'000) / 16); // SCN2674B
m_avdc->set_screen("screen2");
m_avdc->set_character_width(12);
m_avdc->set_addrmap(0, &idpartner_gdp_device::char_map);
m_avdc->set_addrmap(1, &idpartner_gdp_device::attr_map);
m_avdc->set_display_callback(FUNC(idpartner_gdp_device::draw_character));
//m_avdc->intr_callback().set(FUNC(idpartner_gdp_device::nmi_w));
m_avdc->set_display_callback(FUNC(idpartner_gdp_device::draw_character));
//m_avdc->intr_callback().set(FUNC(idpartner_gdp_device::nmi_w));
Z80PIO(config, m_pio, XTAL(8'000'000) / 2);
m_pio->out_int_callback().set(FUNC(idpartner_gdp_device::int_w));
m_pio->out_pa_callback().set(FUNC(idpartner_gdp_device::porta_w));
m_pio->out_pb_callback().set(FUNC(idpartner_gdp_device::portb_w));
Z80PIO(config, m_pio, XTAL(8'000'000) / 2);
m_pio->out_int_callback().set(FUNC(idpartner_gdp_device::int_w));
m_pio->out_pa_callback().set(FUNC(idpartner_gdp_device::porta_w));
m_pio->out_pb_callback().set(FUNC(idpartner_gdp_device::portb_w));
}
} // anonymous namespace

182
src/devices/bus/idpartner/sasi.cpp
View File

@ -16,46 +16,46 @@
namespace {
class idpartner_sasi_device :
public device_t,
public bus::idpartner::device_exp_card_interface
public device_t,
public bus::idpartner::device_exp_card_interface
{
public:
// construction/destruction
idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// construction/destruction
idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// device_t implementation
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
u8 stat_r();
u8 data_r();
void ctrl_w(u8 data);
void data_w(u8 data);
void reset_w(u8 data);
u8 stat_r();
u8 data_r();
void ctrl_w(u8 data);
void data_w(u8 data);
void reset_w(u8 data);
void req_w(int state);
void io_w(int state);
void io_w(int state);
private:
required_device<nscsi_bus_device> m_sasibus;
required_device<nscsi_callback_device> m_sasi;
int m_drq_enable;
int m_data_enable;
int m_prev_daq;
int m_drq_enable;
int m_data_enable;
int m_prev_daq;
};
idpartner_sasi_device::idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, IDPARTNER_SASI, tag, owner, clock)
, bus::idpartner::device_exp_card_interface(mconfig, *this)
, m_sasibus(*this, "sasibus")
: device_t(mconfig, IDPARTNER_SASI, tag, owner, clock)
, bus::idpartner::device_exp_card_interface(mconfig, *this)
, m_sasibus(*this, "sasibus")
, m_sasi(*this, "sasibus:7:scsicb")
, m_drq_enable(0)
, m_data_enable(0)
, m_prev_daq(0)
, m_drq_enable(0)
, m_data_enable(0)
, m_prev_daq(0)
{
}
@ -65,101 +65,101 @@ idpartner_sasi_device::idpartner_sasi_device(const machine_config &mconfig, cons
void idpartner_sasi_device::device_start()
{
m_bus->io().install_read_handler (0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::stat_r))); // RDSTAT
m_bus->io().install_read_handler (0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_r))); // RDDATA
m_bus->io().install_write_handler(0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::ctrl_w))); // WRCONTR
m_bus->io().install_write_handler(0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_w))); // WRDATA
m_bus->io().install_write_handler(0x12, 0x12, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::reset_w))); // RESET
m_bus->io().install_read_handler (0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::stat_r))); // RDSTAT
m_bus->io().install_read_handler (0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_r))); // RDDATA
m_bus->io().install_write_handler(0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::ctrl_w))); // WRCONTR
m_bus->io().install_write_handler(0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_w))); // WRDATA
m_bus->io().install_write_handler(0x12, 0x12, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::reset_w))); // RESET
save_item(NAME(m_drq_enable));
save_item(NAME(m_data_enable));
save_item(NAME(m_prev_daq));
save_item(NAME(m_drq_enable));
save_item(NAME(m_data_enable));
save_item(NAME(m_prev_daq));
}
void idpartner_sasi_device::device_reset()
{
m_drq_enable = 0;
m_data_enable = 0;
m_prev_daq = 0;
m_bus->drq_w(0);
m_drq_enable = 0;
m_data_enable = 0;
m_prev_daq = 0;
m_bus->drq_w(0);
}
u8 idpartner_sasi_device::stat_r()
{
u8 data = (m_sasi->req_r() << 7)
| (m_sasi->io_r() << 6)
| (m_sasi->msg_r() << 5)
| (m_sasi->cd_r() << 4)
| (m_sasi->bsy_r() << 3);
return data;
| (m_sasi->io_r() << 6)
| (m_sasi->msg_r() << 5)
| (m_sasi->cd_r() << 4)
| (m_sasi->bsy_r() << 3);
return data;
}
u8 idpartner_sasi_device::data_r()
{
u8 data = m_sasi->read();
if (m_data_enable)
{
m_sasi->ack_w(1);
if (m_drq_enable)
{
m_bus->drq_w(0);
m_prev_daq = 0;
}
}
return data;
u8 data = m_sasi->read();
if (m_data_enable)
{
m_sasi->ack_w(1);
if (m_drq_enable)
{
m_bus->drq_w(0);
m_prev_daq = 0;
}
}
return data;
}
void idpartner_sasi_device::ctrl_w(u8 data)
{
m_sasi->write(BIT(data,0));
m_sasi->sel_w(BIT(data,0));
m_data_enable = BIT(data,1);
m_drq_enable = BIT(data,5);
if (m_data_enable && m_drq_enable)
{
m_bus->drq_w(m_sasi->req_r());
m_prev_daq = m_sasi->req_r();
} else {
if (m_prev_daq)
m_bus->drq_w(0);
m_prev_daq = 0;
}
m_sasi->write(BIT(data,0));
m_sasi->sel_w(BIT(data,0));
m_data_enable = BIT(data,1);
m_drq_enable = BIT(data,5);
if (m_data_enable && m_drq_enable)
{
m_bus->drq_w(m_sasi->req_r());
m_prev_daq = m_sasi->req_r();
} else {
if (m_prev_daq)
m_bus->drq_w(0);
m_prev_daq = 0;
}
}
void idpartner_sasi_device::data_w(u8 data)
{
m_sasi->write(data);
if (m_data_enable)
{
m_sasi->ack_w(1);
if (m_drq_enable)
{
m_bus->drq_w(0);
m_prev_daq = 0;
}
}
m_sasi->write(data);
if (m_data_enable)
{
m_sasi->ack_w(1);
if (m_drq_enable)
{
m_bus->drq_w(0);
m_prev_daq = 0;
}
}
}
void idpartner_sasi_device::reset_w(u8 data)
{
m_sasi->rst_w(1);
m_sasi->rst_w(0);
m_sasi->rst_w(1);
m_sasi->rst_w(0);
}
void idpartner_sasi_device::req_w(int state)
{
m_sasi->ack_w(0);
if (m_data_enable && m_drq_enable)
{
m_bus->drq_w(state);
m_prev_daq = state;
}
m_sasi->ack_w(0);
if (m_data_enable && m_drq_enable)
{
m_bus->drq_w(state);
m_prev_daq = state;
}
}
void idpartner_sasi_device::io_w(int state)
{
if (state)
m_sasi->write(0); // clears lateched data
if (state)
m_sasi->write(0); // clears lateched data
}
void idpartner_sasi_device::device_add_mconfig(machine_config &config)
@ -167,12 +167,14 @@ void idpartner_sasi_device::device_add_mconfig(machine_config &config)
NSCSI_BUS(config, m_sasibus);
NSCSI_CONNECTOR(config, "sasibus:0", default_scsi_devices, "s1410", true);
NSCSI_CONNECTOR(config, "sasibus:7", default_scsi_devices, "scsicb", true)
.option_add_internal("scsicb", NSCSI_CB)
.machine_config([this](device_t* device) {
downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(idpartner_sasi_device::req_w));
downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(idpartner_sasi_device::io_w));
});
}
.option_add_internal("scsicb", NSCSI_CB)
.machine_config(
[this] (device_t* device)
{
downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(idpartner_sasi_device::req_w));
downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(idpartner_sasi_device::io_w));
});
}
} // anonymous namespace
DEFINE_DEVICE_TYPE_PRIVATE(IDPARTNER_SASI, bus::idpartner::device_exp_card_interface, idpartner_sasi_device, "partner_sai", "Iskra Delta Partner SASI card")

10
src/devices/bus/pci/ess_maestro.cpp
View File

@ -87,14 +87,14 @@ uint8_t es1946_solo1e_device::capptr_r()
void es1946_solo1e_device::config_map(address_map &map)
{
pci_card_device::config_map(map);
// map(0x40, 0x41) Legacy Audio Control
// map(0x50, 0x53) ES1946 Config
// map(0x60, 0x61) DDMA Control
// map(0x40, 0x41) Legacy Audio Control
// map(0x50, 0x53) ES1946 Config
// map(0x60, 0x61) DDMA Control
// ACPI
map(0xc0, 0xc0).lr8(NAME([] () { return 0x01; }));
map(0xc1, 0xc1).lr8(NAME([] () { return 0x00; })); // NULL pointer
// map(0xc2, 0xc3) Power Management Capabilities
// map(0xc4, 0xc5) Power Management Control/Status
// map(0xc2, 0xc3) Power Management Capabilities
// map(0xc4, 0xc5) Power Management Control/Status
}
void es1946_solo1e_device::extended_map(address_map &map)

6
src/devices/bus/pci/ess_maestro.h
View File

@ -22,10 +22,10 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual const tiny_rom_entry *device_rom_region() const override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;

8
src/devices/bus/pci/vt6306.cpp
View File

@ -33,7 +33,7 @@ vt6306_device::vt6306_device(const machine_config &mconfig, device_type type, co
{
set_ids(0x11063044, 0x00, 0x0c0010, 0x11063044);
// Sunix UFC3212V has these values
// set_ids(0x11063044, 0x46, 0x0c0010, 0x1106e8c1);
// set_ids(0x11063044, 0x46, 0x0c0010, 0x1106e8c1);
}
vt6306_device::vt6306_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@ -52,7 +52,7 @@ void vt6306_device::device_start()
add_map(2048, M_MEM, FUNC(vt6306_device::ohci_mmio_map));
add_map( 128, M_IO, FUNC(vt6306_device::vio_map));
// add_map( 256, M_MEM, FUNC(vt6306_device::cardbus_map));
// add_map( 256, M_MEM, FUNC(vt6306_device::cardbus_map));
// INTA#
intr_pin = 1;
@ -81,11 +81,11 @@ u8 vt6306_device::capptr_r()
void vt6306_device::config_map(address_map &map)
{
pci_card_device::config_map(map);
// map(0x40, 0x43) PCI HCI Control (?)
// map(0x40, 0x43) PCI HCI Control (?)
// ACPI
map(0x50, 0x50).lr8(NAME([] () { return 0x01; }));
map(0x51, 0x51).lr8(NAME([] () { return 0x00; })); // NULL pointer
// map(0x52, 0x57) PCI Power Management v1.1
// map(0x52, 0x57) PCI Power Management v1.1
}
void vt6306_device::ohci_mmio_map(address_map &map)

4
src/devices/bus/pci/vt6306.h
View File

@ -20,8 +20,8 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;

18
src/devices/bus/qbus/dvk_mx.cpp
View File

@ -2,19 +2,19 @@
// copyright-holders:Sergey Svishchev
/***************************************************************************
DVK "MX" floppy controller (decimal ID 3.057.122)
DVK "MX" floppy controller (decimal ID 3.057.122)
Supports four 5.25" drives (single- or double-sided, 40- or 80-track).
Supports four 5.25" drives (single- or double-sided, 40- or 80-track).
Uses FM encoding and software-defined track format;
usually 11 sectors of 256 bytes, with simple additive checksum.
Uses FM encoding and software-defined track format;
usually 11 sectors of 256 bytes, with simple additive checksum.
RT-11 driver name: MX.SYS
RT-11 driver name: MX.SYS
References:
https://emuverse.ru/downloads/computers/DVK/docs/KMD/kngmd_MX_2.djvu
https://torlus.com/floppy/forum/viewtopic.php?t=1384
http://hobot.pdp-11.ru/ukdwk_archive/dwkwebcomplekt/DWKFiles/mx/README.mx1
References:
https://emuverse.ru/downloads/computers/DVK/docs/KMD/kngmd_MX_2.djvu
https://torlus.com/floppy/forum/viewtopic.php?t=1384
http://hobot.pdp-11.ru/ukdwk_archive/dwkwebcomplekt/DWKFiles/mx/README.mx1
***************************************************************************/

2
src/devices/bus/qbus/dvk_mx.h
View File

@ -2,7 +2,7 @@
// copyright-holders:Sergey Svishchev
/***************************************************************************
DVK "MX" floppy controller (decimal ID 3.057.122)
DVK "MX" floppy controller (decimal ID 3.057.122)
***************************************************************************/

4
src/devices/bus/tim011/aycard.cpp
View File

@ -4,7 +4,7 @@
TIM-011 AY Card
Card created by Zoran Urosevic.
Card created by Zoran Urosevic.
**********************************************************************/
@ -25,7 +25,7 @@ static INPUT_PORTS_START(joystick)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON2)
INPUT_PORTS_END
INPUT_PORTS_END
class tim011_aycard_device :
public device_t,

2
src/devices/cpu/sh/sh7042.cpp
View File

@ -84,7 +84,7 @@ u8 sh7042_device::adcr_r()
void sh7042_device::adcsr_w(u8 data)
{
logerror("adcsr_w %02x\n", data);
// u8 prev = m_adcsr;
// u8 prev = m_adcsr;
m_adcsr = (data & 0x7f) | (m_adcsr & data & CSR_ADF);
}

2
src/devices/cpu/sh/sh7042.h
View File

@ -59,7 +59,7 @@ private:
u8 adcr_r();
void adcsr_w(u8 data);
void adcr_w(u8 data);
void do_sci_w(int sci, int state);
};

20
src/devices/cpu/t11/t11.h
View File

@ -56,21 +56,21 @@ protected:
// K1801 microcode constants
enum
{
VM1_STACK = 0177674, // start of HALT mode save area
VM1_SEL1 = 0177716, // DIP switch register (read) and HALT mode selector (write)
SEL1_HALT = 010
VM1_STACK = 0177674, // start of HALT mode save area
VM1_SEL1 = 0177716, // DIP switch register (read) and HALT mode selector (write)
SEL1_HALT = 010
};
enum
{
// DEC command set extensions
IS_LEIS = 1 << 0, // MARK, RTT, SOB, SXT, XOR
IS_EIS = 1 << 1, // same plus ASH, ASHC, MUL, DIV
IS_MFPT = 1 << 2, // MFPT
IS_MXPS = 1 << 3, // MFPS, MTPS
IS_T11 = 1 << 4, // LEIS without MARK
IS_LEIS = 1 << 0, // MARK, RTT, SOB, SXT, XOR
IS_EIS = 1 << 1, // same plus ASH, ASHC, MUL, DIV
IS_MFPT = 1 << 2, // MFPT
IS_MXPS = 1 << 3, // MFPS, MTPS
IS_T11 = 1 << 4, // LEIS without MARK
// K1801 command set extensions
IS_VM1 = 1 << 5, // START, STEP
IS_VM2 = 1 << 6, // same plus RSEL, MxUS, RCPx, WCPx
IS_VM1 = 1 << 5, // START, STEP
IS_VM2 = 1 << 6, // same plus RSEL, MxUS, RCPx, WCPx
};
t11_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);

2
src/devices/machine/z80dma.cpp
View File

@ -493,7 +493,7 @@ TIMER_CALLBACK_MEMBER(z80dma_device::timerproc)
{
m_out_int_cb(CLEAR_LINE);
m_is_pulse = false;
}
}
else
{
if ((m_byte_counter & 0xff)==PULSE_CTRL && is_ready())

2
src/devices/sound/swp30.cpp
View File

@ -1494,7 +1494,7 @@ void swp30_device::execute_run()
while(adr <= target_address) {
m_dpcm_current[chan] = m_dpcm_next[chan];
s32 sample = m_dpcm_next[chan] + m_dpcm[(m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff];
// logerror("## + sample %08x %02x %d\n", adr, (m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff, sample);
// logerror("## + sample %08x %02x %d\n", adr, (m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff, sample);
adr ++;
if(sample < -0x8000)
sample = -0x8000;

2
src/devices/video/atirage.cpp
View File

@ -222,7 +222,7 @@ void atirageiidvd_device::device_start()
m_regs0[CONFIG_CHIP_ID] = 0x55;
m_regs0[CONFIG_CHIP_ID+1] = 0x47;
m_regs0[CONFIG_CHIP_ID+3] = 0x3a;
// m_regs0[CRTC_GEN_CNTL+3] = 0;
// m_regs0[CRTC_GEN_CNTL+3] = 0;
// TODO: opt-in Mach64 legacy x86 memory & i/o VGA bridge control
command = 0;

2
src/mame/midway/midyunit.cpp
View File

@ -896,7 +896,7 @@ static INPUT_PORTS_START( term2 )
PORT_DIPSETTING( 0xc000, DEF_STR( USA ) )
PORT_DIPSETTING( 0x8000, DEF_STR( French ) )
PORT_DIPSETTING( 0x4000, DEF_STR( German ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
PORT_DIPSETTING( 0x0000, DEF_STR( Unused ))
PORT_DIPNAME( 0x2000, 0x0000, "Power-Up Test" ) PORT_DIPLOCATION("DS2:3")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ))
PORT_DIPSETTING( 0x2000, DEF_STR( On ))

4
src/mame/misc/gammagic.cpp
View File

@ -151,12 +151,12 @@ void gammagic_state::gammagic(machine_config &config)
ide.irq_pri().set("pci:07.0", FUNC(i82371sb_isa_device::pc_irq14_w));
ide.irq_sec().set("pci:07.0", FUNC(i82371sb_isa_device::pc_mirq0_w));
ide.subdevice<bus_master_ide_controller_device>("ide1")->slot(0).set_default_option("xm3301");
// ide.subdevice<bus_master_ide_controller_device>("ide1")->slot(0).set_option_machine_config("xm3301", cdrom_config);
// ide.subdevice<bus_master_ide_controller_device>("ide1")->slot(0).set_option_machine_config("xm3301", cdrom_config);
ide.subdevice<bus_master_ide_controller_device>("ide2")->slot(0).set_default_option(nullptr);
PCI_SLOT(config, "pci:1", pci_cards, 15, 0, 1, 2, 3, nullptr);
PCI_SLOT(config, "pci:2", pci_cards, 16, 1, 2, 3, 0, "ess_solo1");
// PCI_SLOT(config, "pci:3", pci_cards, 17, 2, 3, 0, 1, "voodoo");
// PCI_SLOT(config, "pci:3", pci_cards, 17, 2, 3, 0, 1, "voodoo");
PCI_SLOT(config, "pci:4", pci_cards, 18, 3, 0, 1, 2, "oti64111");
// FIXME: this should obviously map to above instead of direct PCI mount ...

32
src/mame/misc/goldnpkr.cpp
View File

@ -4154,33 +4154,33 @@ static INPUT_PORTS_START( op5cards )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(3)
PORT_MODIFY("SW1")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!8")
PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x01, DEF_STR( On ) )
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!7")
PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
PORT_DIPNAME( 0x04, 0x00, "Royal Flush" ) PORT_DIPLOCATION("SW1:!6")
PORT_DIPNAME( 0x04, 0x00, "Royal Flush" ) PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x04, "Lose" )
PORT_DIPSETTING( 0x00, "OK" )
PORT_DIPNAME( 0x08, 0x00, "Credit Max" ) PORT_DIPLOCATION("SW1:!5")
PORT_DIPNAME( 0x08, 0x00, "Credit Max" ) PORT_DIPLOCATION("SW1:!5")
PORT_DIPSETTING( 0x00, "Disable" )
PORT_DIPSETTING( 0x08, "Enable" )
PORT_DIPNAME( 0x10, 0x00, "Credit Max Amount" ) PORT_DIPLOCATION("SW1:!4")
PORT_DIPNAME( 0x10, 0x00, "Credit Max Amount" ) PORT_DIPLOCATION("SW1:!4")
PORT_DIPSETTING( 0x10, "200" )
PORT_DIPSETTING( 0x00, "500" )
PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!3")
PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!3")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x20, DEF_STR( On ) )
PORT_DIPNAME( 0x40, 0x40, "Double Up" ) PORT_DIPLOCATION("SW1:!2")
PORT_DIPNAME( 0x40, 0x40, "Double Up" ) PORT_DIPLOCATION("SW1:!2")
PORT_DIPSETTING( 0x00, "80%" )
PORT_DIPSETTING( 0x40, "90%" )
PORT_DIPNAME( 0x80, 0x80, "Port Check" ) PORT_DIPLOCATION("SW1:!1")
PORT_DIPNAME( 0x80, 0x80, "Port Check" ) PORT_DIPLOCATION("SW1:!1")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_MODIFY("SW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:!6,!7,!8") // coin2 = (coin1 x5); note = (coin1 x10)
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW2:!6,!7,!8") // coin2 = (coin1 x5); note = (coin1 x10)
PORT_DIPSETTING( 0x00, "Coin1 = 5C-1C; Coin2 = 1C-1C; Note = 1C-2C" )
PORT_DIPSETTING( 0x01, "Coin1 = 2C-1C; Coin2 = 1C-3C; Note = 1C-6C" )
PORT_DIPSETTING( 0x02, "Coin1 = 1C-1C; Coin2 = 1C-5C; Note = 1C-10C" )
@ -4189,16 +4189,16 @@ static INPUT_PORTS_START( op5cards )
PORT_DIPSETTING( 0x05, "Coin1 = 1C-4C; Coin2 = 1C-20C; Note = 1C-40C" )
PORT_DIPSETTING( 0x06, "Coin1 = 1C-5C; Coin2 = 1C-25C; Note = 1C-50C" )
PORT_DIPSETTING( 0x07, "Coin1 = 1C-10C; Coin2 = 1C-50C; Note = 1C-100C" )
PORT_DIPNAME( 0x08, 0x00, "Bet Max" ) PORT_DIPLOCATION("SW2:!5")
PORT_DIPNAME( 0x08, 0x00, "Bet Max" ) PORT_DIPLOCATION("SW2:!5")
PORT_DIPSETTING( 0x08, "10" )
PORT_DIPSETTING( 0x00, "20" )
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:!4")
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW2:!4")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
PORT_DIPNAME( 0x20, 0x20, "Game Duty" ) PORT_DIPLOCATION("SW2:!3")
PORT_DIPNAME( 0x20, 0x20, "Game Duty" ) PORT_DIPLOCATION("SW2:!3")
PORT_DIPSETTING( 0x20, "Weak" )
PORT_DIPSETTING( 0x00, "Strong" )
PORT_DIPNAME( 0xc0, 0xc0, "Pay Rate" ) PORT_DIPLOCATION("SW2:!2,!1")
PORT_DIPNAME( 0xc0, 0xc0, "Pay Rate" ) PORT_DIPLOCATION("SW2:!2,!1")
PORT_DIPSETTING( 0x00, "60%" )
PORT_DIPSETTING( 0x40, "70%" )
PORT_DIPSETTING( 0x80, "80%" )
@ -12065,7 +12065,7 @@ ROM_END
*/
ROM_START( op5cards )
ROM_REGION( 0x10000, "maincpu", 0 )
// ROM_LOAD( "noname.ic4", 0x8000, 0x8000, CRC(af0ea127) SHA1(466de9a3e2ebe81eac30bbd9139edd71738d33d4) ) // mapping the unrelated program, to check...
// ROM_LOAD( "noname.ic4", 0x8000, 0x8000, CRC(af0ea127) SHA1(466de9a3e2ebe81eac30bbd9139edd71738d33d4) ) // mapping the unrelated program, to check...
ROM_LOAD( "noname.ic4", 0xc000, 0x4000, CRC(af0ea127) SHA1(466de9a3e2ebe81eac30bbd9139edd71738d33d4) )
ROM_IGNORE( 0x4000) // discarding 2nd half (the unrelated program).
@ -12094,7 +12094,7 @@ ROM_END
ROM_COPY( "gfxpool", 0x2800, 0x0800, 0x0800 ) // src-dest-size
ROM_COPY( "gfxpool", 0x4800, 0x0000, 0x0800 ) // src-dest-size
ROM_REGION( 0x1800, "gfx3", 0 ) // nag, held, cards back
ROM_REGION( 0x1800, "gfx3", 0 ) // nag, held, cards back
ROM_COPY( "gfxpool", 0x1000, 0x1000, 0x0800 ) // src-dest-size
ROM_COPY( "gfxpool", 0x3000, 0x0800, 0x0800 ) // src-dest-size
ROM_COPY( "gfxpool", 0x5000, 0x0000, 0x0800 ) // src-dest-size
@ -12591,7 +12591,7 @@ void goldnpkr_state::init_lespenduj()
void goldnpkr_state::init_op5cards()
{
/* Seems to do a sort of blend
/* Seems to do a sort of blend
between a tile bytes from 1468-146f (top left backcard edge)
with 7468-746f range. In this game seems to be only for this tile.
*/

2
src/mame/pinball/recel.cpp
View File

@ -9,7 +9,7 @@ This is similar - but not the same - as Gottlieb System 1. Used by various Spani
pinball manufacturers. Recel is the name used for export Petaco machines.
Known machines:
Alaska, Hot & Cold, Screech, Mr. Evil, Torneo, Crazy Race, Fair Fight, Poker Plus, Mr. Doom, Cavalier, SwashBuckler,
Alaska, Hot & Cold, Screech, Mr. Evil, Torneo, Crazy Race, Fair Fight, Poker Plus, Mr. Doom, Cavalier, SwashBuckler,
Don Quijote, Space Game, Space Game (Bingo 6+1), The Flipper Game, Black Magic, Black Magic 4, Conquistador.
Suspected machines:

2
src/mame/rm/rm380z_m.cpp
View File

@ -265,7 +265,7 @@ void rm380z_state::init_rm380z()
{
m_videomode = RM380Z_VIDEOMODE_80COL;
m_port0_mask = 0xff;
m_fbfd_mask = 0x1f; // enable hw scrolling (uses lower 5 bits of counter)
m_fbfd_mask = 0x1f; // enable hw scrolling (uses lower 5 bits of counter)
}
void rm380z_state::init_rm380z34d()

12
src/mame/rm/rm380z_v.cpp
View File

@ -14,14 +14,14 @@ bool rm380z_state::get_rowcol_from_offset(int& row, int& col, offs_t offset) con
{
if (m_videomode == RM380Z_VIDEOMODE_40COL)
{
col = offset & 0x3f; // the 6 least significant bits give the column (0-39)
row = offset >> 6; // next 5 bits give the row (0-23)
col = offset & 0x3f; // the 6 least significant bits give the column (0-39)
row = offset >> 6; // next 5 bits give the row (0-23)
}
else
{
col = offset & 0x7f; // the 7 least significant bits give the column (0-79)
row = offset >> 7; // next bit gives bit 0 of row
row |= (m_fbfe & 0x0f) << 1; // the remaining 4 row bits come from the lower half of PORT 1
col = offset & 0x7f; // the 7 least significant bits give the column (0-79)
row = offset >> 7; // next bit gives bit 0 of row
row |= (m_fbfe & 0x0f) << 1; // the remaining 4 row bits come from the lower half of PORT 1
}
return ((row < RM380Z_SCREENROWS) && (col < RM380Z_SCREENCOLS));
@ -193,7 +193,7 @@ void rm380z_state::putChar_vdu80(int charnum, int attribs, int x, int y, bitmap_
{
const bool attrUnder = attribs & 0x02;
const bool attrRev = attribs & 0x08;
int data_pos = (charnum % 128) * 16;
for (int r=0; r < 10; r++, data_pos++)

4
src/mame/sfrj/galaxy.cpp
View File

@ -555,7 +555,7 @@ void galaxy_state::galaxyp(machine_config &config)
}
// Original Galaksija kit came with v28 version of ROM A
// at end of 1984 ROM B appeared and people patched their ROM A v28
// at end of 1984 ROM B appeared and people patched their ROM A v28
// to make it auto boot ROM B
// later official v29 was made to auto boot ROM B
// chargen also include prompt char with logo of Mipro, Voja Antonic company
@ -594,7 +594,7 @@ ROM_START (galaxyp)
ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
ROM_DEFAULT_BIOS("v29c")
ROM_SYSTEM_BIOS( 0, "v29c", "ROM A v29 boot ROM C" )
ROMX_LOAD( "rom_a_v29c.dd8", 0x0000, 0x1000, CRC(5cb8fb2a) SHA1(fdddae2b08d0dc81eb6191a92e60ac411d8150e9), ROM_BIOS(0) )
ROMX_LOAD( "rom_a_v29c.dd8", 0x0000, 0x1000, CRC(5cb8fb2a) SHA1(fdddae2b08d0dc81eb6191a92e60ac411d8150e9), ROM_BIOS(0) )
ROM_SYSTEM_BIOS( 1, "v29", "ROM A v29" )
ROMX_LOAD( "rom_a_v29.dd8", 0x0000, 0x1000, CRC(e6853bc1) SHA1(aea7a4c0c7ffe1f212f7b9faecfd728862ac6904), ROM_BIOS(1) )

2
src/mame/sfrj/idpartner.cpp
View File

@ -181,7 +181,7 @@ private:
void update_floppy_motor();
void xx2_w(int state) { if (state) { m_floppy_motor = 0; update_floppy_motor(); } }
void write_speed1_clock(int state) { m_sio1->txca_w(state); m_sio1->rxca_w(state); }
void write_speed2_clock(int state) { m_sio1->txcb_w(state); m_sio1->rxcb_w(state); }
void write_speed2_clock(int state) { m_sio1->txcb_w(state); m_sio1->rxcb_w(state); }
void write_speed3_clock(int state) { m_sio2->txca_w(state); m_sio2->rxca_w(state); }
void write_speed4_clock(int state) { m_sio2->txcb_w(state); m_sio2->rxcb_w(state); }
uint8_t memory_read_byte(offs_t offset) { return m_program.read_byte(offset); }

12
src/mame/sfrj/lola8a.cpp
View File

@ -50,10 +50,10 @@ BASIC commands : (must be in UPPERcase)
ARG CALL RND LEFT RIGHT DOT SGN SIN FREE PI FN TAN COS POP PEEK INP LN EXP ATN
Image display is mono, COLOUR x (x = 0 to 3) command switch drawing in mode
0 - nothing
1 - set 1 on drawn pixel
2 - set 0 on drawn pixel
3 - xor drawn pixel with current value
0 - nothing
1 - set 1 on drawn pixel
2 - set 0 on drawn pixel
3 - xor drawn pixel with current value
Unknown how to produce sound - there's no commands.
@ -73,7 +73,7 @@ Control Keys
- C : break? (only does a newline)
- L : clear screen
- M : same as pressing Enter
- Y : invert screen
- Y : invert screen
TO DO
- How to use the sound?
@ -485,7 +485,7 @@ MC6845_UPDATE_ROW( lola8a_state::crtc_update_row )
for (u8 x = 0; x < x_count; x++)
{
u16 mem = (x+ma)*8 + ra;
u8 gfx = m_p_videoram[mem] ^ ((cursor_x == x) ? 0xff : 0) ^ inv;
u8 gfx = m_p_videoram[mem] ^ ((cursor_x == x) ? 0xff : 0) ^ inv;
if (ra == 8) // empty line when Ctrl-A is used
gfx = inv;

2
src/mame/sigma/sigmab52.cpp
View File

@ -125,7 +125,7 @@
0x6030 - 0x6030 ; Audio CPU IRQ ack
0x6050 - 0x6050 ; Sound latch
0x6060 - 0x6061 ; YM3812
0x6060 - 0x6061 ; YM3812
0x8000 - 0xFFFF ; ROM space.

4
src/mame/skeleton/hudson_poems.cpp
View File

@ -512,9 +512,9 @@ u32 hudson_poems_state::poems_8000038_r(offs_t offset, u32 mem_mask)
/*
if (m_mainram[0x1baf8/4] == 0x00000000)
return 0xffffffff;
return 0xffffffff;
else
return 0x00000000;
return 0x00000000;
*/
}

2
src/mame/yamaha/ymmu10.cpp
View File

@ -109,7 +109,7 @@ void mu10_state::pb_w(u16 data)
cur_pb = data;
logerror("led %d gain %d\n", BIT(data, 0), BIT(data, 2));
}
u8 mu10_state::pb_r()
{
// bit 3 = a/d plugged in

16
src/mame/yamaha/ymmu15.cpp
View File

@ -34,7 +34,7 @@ public:
mu15_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
// , m_nvram(*this, "ram")
// , m_nvram(*this, "ram")
, m_lcd(*this, "lcd")
, m_ram(*this, "ram")
{ }
@ -43,8 +43,8 @@ public:
private:
required_device<swx00_device> m_maincpu;
// required_device<nvram_device> m_nvram;
// required_device<swp00_device> m_swp00;
// required_device<nvram_device> m_nvram;
// required_device<swp00_device> m_swp00;
required_device<mu5lcd_device> m_lcd;
required_shared_ptr<u16> m_ram;
@ -67,7 +67,7 @@ void mu15_state::s_map(address_map &map)
{
map(0x000000, 0x3fffff).rom().region("swx00", 0);
map(0x400000, 0x40ffff).ram().share(m_ram);
// map(0x400000, 0x4007ff).m(m_swp00, FUNC(swp00_device::map));
// map(0x400000, 0x4007ff).m(m_swp00, FUNC(swp00_device::map));
}
void mu15_state::c_map(address_map &map)
@ -177,9 +177,9 @@ void mu15_state::mu15(machine_config &config)
m_maincpu->set_addrmap(m_maincpu->c_bus_id(), &mu15_state::c_map);
m_maincpu->set_addrmap(m_maincpu->s_bus_id(), &mu15_state::s_map);
// m_maincpu->read_porta().set(FUNC(mu15_state::pa_r));
// m_maincpu->read_portb().set(FUNC(mu15_state::pa_r));
// m_maincpu->write_portb().set(FUNC(mu15_state::pa_w));
// m_maincpu->read_porta().set(FUNC(mu15_state::pa_r));
// m_maincpu->read_portb().set(FUNC(mu15_state::pa_r));
// m_maincpu->write_portb().set(FUNC(mu15_state::pa_w));
#if 0
m_maincpu->read_adc<0>().set(FUNC(mu15_state::adc_ar_r));
@ -203,7 +203,7 @@ void mu15_state::mu15(machine_config &config)
m_maincpu->read_port9().set_constant(0);
#endif
// NVRAM(config, m_nvram, nvram_device::DEFAULT_NONE);
// NVRAM(config, m_nvram, nvram_device::DEFAULT_NONE);
MU5LCD(config, m_lcd);

6
src/mame/yamaha/ymvl1.cpp
View File

@ -142,7 +142,7 @@ void vl1_state::main_w(u16 data)
BIT(data, 7),
BIT(data, 8, 2),
BIT(data, 15));
m_main_ctrl = data;
m_subcpu1->set_input_line(INPUT_LINE_HALT, !BIT(data, 8));
m_subcpu2->set_input_line(INPUT_LINE_HALT, !BIT(data, 9));
@ -159,7 +159,7 @@ void vl1_state::sub1_w(u16 data)
logerror("sub1_w dsp = %d %d\n",
BIT(data, 0),
BIT(data, 1));
m_sub1_ctrl = data;
m_dspv2->set_input_line(INPUT_LINE_RESET, !BIT(data, 0));
m_dspv3->set_input_line(INPUT_LINE_RESET, !BIT(data, 1));
@ -175,7 +175,7 @@ void vl1_state::sub2_w(u16 data)
if(1)
logerror("sub2_w dsp = %d\n",
BIT(data, 0));
m_sub2_ctrl = data;
m_dspv1->set_input_line(INPUT_LINE_RESET, !BIT(data, 0));
}