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

srcclean in preparation for MAME 0.259 release branch

Browse Source
This commit is contained in:
Vas Crabb 2023-09-24 04:18:36 +10:00
parent ef68540dce
commit 7c9be5b7b0
18 changed files with 182 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/devices/bus/c64/tibdd001.cpp
View File

@ -85,8 +85,8 @@ void c64_tib_dd_001_device::device_add_mconfig(machine_config &config)
c64_tib_dd_001_device::c64_tib_dd_001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_TIB_DD_001, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_fdc(*this, GM82C765B_TAG),
m_floppy(*this, GM82C765B_TAG":0")
m_fdc(*this, GM82C765B_TAG),
m_floppy(*this, GM82C765B_TAG":0")
{
}
@ -117,25 +117,25 @@ uint8_t c64_tib_dd_001_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2,
{
if (!roml)
{
data = m_roml[offset & 0x1fff];
data = m_roml[offset & 0x1fff];
}
if (sphi2 && !io1)
{
if (BIT(offset, 0))
{
data = m_fdc->fifo_r();
}
else
{
data = m_fdc->msr_r();
}
}
if (sphi2 && !io1)
{
if (BIT(offset, 0))
{
data = m_fdc->fifo_r();
}
else
{
data = m_fdc->msr_r();
}
}
if (sphi2 && !io2)
{
m_fdc->reset();
}
if (sphi2 && !io2)
{
m_fdc->reset();
}
return data;
}
@ -147,16 +147,16 @@ uint8_t c64_tib_dd_001_device::c64_cd_r(offs_t offset, uint8_t data, int sphi2,
void c64_tib_dd_001_device::c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2)
{
if (sphi2 && !io1)
{
if (BIT(offset, 0))
{
m_fdc->fifo_w(data);
}
}
if (sphi2 && !io1)
{
if (BIT(offset, 0))
{
m_fdc->fifo_w(data);
}
}
if (sphi2 && !io2)
{
m_fdc->reset();
}
if (sphi2 && !io2)
{
m_fdc->reset();
}
}

2
src/devices/bus/c64/tibdd001.h
View File

@ -26,7 +26,7 @@
// ======================> c64_tib_dd_001_device
class c64_tib_dd_001_device : public device_t,
public device_c64_expansion_card_interface
public device_c64_expansion_card_interface
{
public:
// construction/destruction

18
src/devices/bus/nscsi/tape.cpp
View File

@ -659,16 +659,16 @@ void nscsi_tape_device::handle_read_position() // optional; SCSI-2 section 10.2.
}
const bool bom = status == tape_status::BOM;
const bool eom = status == tape_status::EW
|| status == tape_status::UNKNOWN_EW
|| status == tape_status::EOM;
|| status == tape_status::UNKNOWN_EW
|| status == tape_status::EOM;
const bool bpu = status == tape_status::UNKNOWN
|| status == tape_status::UNKNOWN_EW
|| status == tape_status::EOM;
|| status == tape_status::UNKNOWN_EW
|| status == tape_status::EOM;
assert(sizeof(scsi_cmdbuf) >= 20);
memset(scsi_cmdbuf, 0, 20);
scsi_cmdbuf[0] = (bom ? 0x80 : 0) // is position at BOM
| (eom ? 0x40 : 0) // is position between EW and EOM
| (bpu ? 0x04 : 0); // is next block address invalid; "block position unknown"
| (eom ? 0x40 : 0) // is position between EW and EOM
| (bpu ? 0x04 : 0); // is next block address invalid; "block position unknown"
put_u32be(&scsi_cmdbuf[4], block_addr); // address of next block to be read/written; "first block location"
put_u32be(&scsi_cmdbuf[8], block_addr); // address of last buffered block; we don't support buffering, so we set it to next block address; "last block location"
scsi_data_in(SBUF_MAIN, 20);
@ -753,9 +753,9 @@ void nscsi_tape_device::handle_space() // mandatory; SCSI-2 section 10.2.12
const bool reverse = req_dir_items_num < 0;
const u32 req_items_num = reverse ? -req_dir_items_num : req_dir_items_num;
const auto result = marks ? (reverse ? m_image->get_file()->space_filemarks_reverse(req_items_num)
: m_image->get_file()->space_filemarks(req_items_num))
: (reverse ? m_image->get_file()->space_blocks_reverse(req_items_num)
: m_image->get_file()->space_blocks(req_items_num));
: m_image->get_file()->space_filemarks(req_items_num))
: (reverse ? m_image->get_file()->space_blocks_reverse(req_items_num)
: m_image->get_file()->space_blocks(req_items_num));
const auto status = result.first;
const u32 items_num = result.second;
switch (status) {

4
src/devices/bus/spectrum/nemoide.cpp
View File

@ -38,7 +38,7 @@ private:
u8 nemoide_device::ata_r(offs_t offset)
{
const u16 data = m_ata->cs0_r((offset >> 5) & 7);
const u16 data = m_ata->cs0_r((offset >> 5) & 7);
if (!machine().side_effects_disabled())
m_ata_data_latch = data >> 8;
@ -48,7 +48,7 @@ u8 nemoide_device::ata_r(offs_t offset)
void nemoide_device::ata_w(offs_t offset, u8 data)
{
const u16 ata_data = (m_ata_data_latch << 8) | data;
m_ata->cs0_w((offset >> 5) & 7, ata_data);
m_ata->cs0_w((offset >> 5) & 7, ata_data);
}
void nemoide_device::map_io(address_map &map)

6
src/devices/machine/nscsi_bus.cpp
View File

@ -631,10 +631,10 @@ void nscsi_full_device::set_sense_data(const u8 sense_key, const u16 sense_key_c
memset(scsi_sense_buffer, 0, 18);
if (data) {
scsi_sense_buffer[0] = (data->invalid ? 0 : 0x80) // even though SCSI-2 section 8.2.14 implies valid bit should always be set, other sections such as 10.2.12 disagree!
| (data->deferred ? 0x71 : 0x70);
| (data->deferred ? 0x71 : 0x70);
scsi_sense_buffer[2] = (data->filemark ? 0x80 : 0)
| (data->eom ? 0x40 : 0)
| (data->bad_len ? 0x20 : 0); // "incorrect length indicator"
| (data->eom ? 0x40 : 0)
| (data->bad_len ? 0x20 : 0); // "incorrect length indicator"
put_s32be(&scsi_sense_buffer[3], data->info);
}
else

4
src/devices/video/pc_vga_matrox.cpp
View File

@ -662,10 +662,10 @@ uint32_t matrox_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &b
m_test_x -= 1 << (machine().input().code_pressed(JOYCODE_BUTTON2) ? 4 : 0);;
//if(machine().input().code_pressed(JOYCODE_Y_DOWN_SWITCH))
// m_test_y++;
// m_test_y++;
//if(machine().input().code_pressed(JOYCODE_Y_UP_SWITCH))
// m_test_y--;
// m_test_y--;
if(machine().input().code_pressed(JOYCODE_Y_DOWN_SWITCH))
m_start_offs+= 0x100 << (machine().input().code_pressed(JOYCODE_BUTTON2) ? 8 : 0);

72
src/lib/util/multibyte.h
View File

@ -25,44 +25,44 @@ using osd::s64;
inline constexpr u16 get_u16be(const u8 *const buf) noexcept
{
return ((const u16)buf[0] << 8)
| ((const u16)buf[1] << 0);
| ((const u16)buf[1] << 0);
}
inline constexpr u32 get_u24be(const u8 *const buf) noexcept
{
return ((const u32)buf[0] << 16)
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 0);
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 0);
}
inline constexpr u32 get_u32be(const u8 *const buf) noexcept
{
return ((const u32)buf[0] << 24)
| ((const u32)buf[1] << 16)
| ((const u32)buf[2] << 8)
| ((const u32)buf[3] << 0);
| ((const u32)buf[1] << 16)
| ((const u32)buf[2] << 8)
| ((const u32)buf[3] << 0);
}
inline constexpr u64 get_u48be(const u8 *const buf) noexcept
{
return ((const u64)buf[0] << 40)
| ((const u64)buf[1] << 36)
| ((const u64)buf[2] << 24)
| ((const u64)buf[3] << 16)
| ((const u64)buf[4] << 8)
| ((const u64)buf[5] << 0);
| ((const u64)buf[1] << 36)
| ((const u64)buf[2] << 24)
| ((const u64)buf[3] << 16)
| ((const u64)buf[4] << 8)
| ((const u64)buf[5] << 0);
}
inline constexpr u64 get_u64be(const u8 *const buf) noexcept
{
return ((const u64)buf[0] << 56)
| ((const u64)buf[1] << 48)
| ((const u64)buf[2] << 40)
| ((const u64)buf[3] << 36)
| ((const u64)buf[4] << 24)
| ((const u64)buf[5] << 16)
| ((const u64)buf[6] << 8)
| ((const u64)buf[7] << 0);
| ((const u64)buf[1] << 48)
| ((const u64)buf[2] << 40)
| ((const u64)buf[3] << 36)
| ((const u64)buf[4] << 24)
| ((const u64)buf[5] << 16)
| ((const u64)buf[6] << 8)
| ((const u64)buf[7] << 0);
}
inline void put_u16be(u8 *buf, const u16 data) noexcept
@ -169,44 +169,44 @@ inline void put_s64be(u8 *buf, const s64 data) noexcept
inline constexpr u16 get_u16le(const u8 *const buf) noexcept
{
return ((const u16)buf[0] << 0)
| ((const u16)buf[1] << 8);
| ((const u16)buf[1] << 8);
}
inline constexpr u32 get_u24le(const u8 *const buf) noexcept
{
return ((const u32)buf[0] << 0)
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 16);
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 16);
}
inline constexpr u32 get_u32le(const u8 *const buf) noexcept
{
return ((const u32)buf[0] << 0)
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 16)
| ((const u32)buf[3] << 24);
| ((const u32)buf[1] << 8)
| ((const u32)buf[2] << 16)
| ((const u32)buf[3] << 24);
}
inline constexpr u64 get_u48le(const u8 *const buf) noexcept
{
return ((const u64)buf[0] << 0)
| ((const u64)buf[1] << 8)
| ((const u64)buf[2] << 16)
| ((const u64)buf[3] << 24)
| ((const u64)buf[4] << 32)
| ((const u64)buf[5] << 40);
| ((const u64)buf[1] << 8)
| ((const u64)buf[2] << 16)
| ((const u64)buf[3] << 24)
| ((const u64)buf[4] << 32)
| ((const u64)buf[5] << 40);
}
inline constexpr u64 get_u64le(const u8 *const buf) noexcept
{
return ((const u64)buf[0] << 0)
| ((const u64)buf[1] << 8)
| ((const u64)buf[2] << 16)
| ((const u64)buf[3] << 24)
| ((const u64)buf[4] << 32)
| ((const u64)buf[5] << 40)
| ((const u64)buf[6] << 48)
| ((const u64)buf[7] << 56);
| ((const u64)buf[1] << 8)
| ((const u64)buf[2] << 16)
| ((const u64)buf[3] << 24)
| ((const u64)buf[4] << 32)
| ((const u64)buf[5] << 40)
| ((const u64)buf[6] << 48)
| ((const u64)buf[7] << 56);
}
inline void put_u16le(u8 *buf, const u16 data) noexcept

8
src/lib/util/simh_tape_file.cpp
View File

@ -42,16 +42,16 @@ inline const bool is_simh_marker_eod_forward(const simh_marker marker)
{
// this function is used when we're reading normally (from BOM to EOM); returns true for markers that we consider EOD
return marker == simh_marker::ERASE_GAP
|| is_simh_marker_half_gap_forward(marker)
|| marker == simh_marker::EOM; // logical EOM
|| is_simh_marker_half_gap_forward(marker)
|| marker == simh_marker::EOM; // logical EOM
}
inline const bool is_simh_marker_eod_reverse(const simh_marker marker)
{
// this function is used when we're reading in reverse (from EOM to BOM); returns true for markers that we consider EOD
return marker == simh_marker::ERASE_GAP
|| is_simh_marker_half_gap_reverse(marker)
|| marker == simh_marker::EOM; // logical EOM
|| is_simh_marker_half_gap_reverse(marker)
|| marker == simh_marker::EOM; // logical EOM
}
enum class simh_marker_class : u8 {

2
src/mame/amstrad/amstrad.cpp
View File

@ -1311,5 +1311,5 @@ COMP( 1990, cpc464p, 0, 0, cpcplus, plus, amstrad_state, empty_i
COMP( 1990, cpc6128p, 0, 0, cpcplus, plus, amstrad_state, empty_init, "Amstrad plc", "Amstrad CPC6128+", 0 )
CONS( 1990, gx4000, 0, 0, gx4000, gx4000, amstrad_state, empty_init, "Amstrad plc", "Amstrad GX4000", 0 )
COMP( 1989, kccomp, cpc464, 0, kccomp, kccomp, amstrad_state, empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" M?hlhausen",
"KC Compact", 0 )
"KC Compact", 0 )
COMP( 1993, al520ex, cpc464, 0, aleste, aleste, amstrad_state, empty_init, "Patisonic", "Aleste 520EX", MACHINE_IMPERFECT_SOUND )

2
src/mame/apple/apple3_m.cpp
View File

@ -68,7 +68,7 @@ static constexpr XTAL APPLE2_CLOCK(1'021'800);
// 2 MHz mode has every ~130th cycle stretched, and there are also dram refresh cycles
// happening which slows the clock back to 1MHz for some periods.
// There is mentioned in Apple documentation the result is ~1.8MHz
// PH0 Measured on a logic analyser when running a loop in ram with the screen off
// PH0 Measured on a logic analyser when running a loop in ram with the screen off
// averaged over a long capture is 1.905MHz.
static constexpr XTAL A3_2MHZ_CLOCK(1'905'000);

2
src/mame/capcom/lwings.cpp
View File

@ -1849,7 +1849,7 @@ ROM_START( trojanj )
ROM_REGION( 0x10000, "gfx4", 0 )
ROM_LOAD( "tb_25.15n", 0x00000, 0x8000, CRC(6e38c6fa) SHA1(c51228d5d063dcf4361c76fa49dbe18db80c50a0) ) /* Bk Tiles */
ROM_LOAD( "tb_24.13n", 0x08000, 0x8000, CRC(14fc6cf2) SHA1(080a2d845cb36c637f76d8e062725bd13dd1aed0) )
ROM_REGION( 0x08000, "gfx5", 0 )
ROM_LOAD( "tb_23.9n", 0x00000, 0x08000, CRC(eda13c0e) SHA1(806f0819af8b25c2b46de3d1fd95bc9c0e883bd9) ) /* Tile Map */

6
src/mame/efo/cedar_magnet.cpp
View File

@ -1112,9 +1112,9 @@ ROM_START( mag_exzi )
ROM_END
/*
Track 79 side 1 (file offset 0x0ee800) would not read, but it appears to be outside of the used data
this also has many scores stored on the disk at offset 0x01cc00, invalidating these does reset the
score table to 'EFO 100000' scores, but then it never writes new scores?
Track 79 side 1 (file offset 0x0ee800) would not read, but it appears to be outside of the used data
this also has many scores stored on the disk at offset 0x01cc00, invalidating these does reset the
score table to 'EFO 100000' scores, but then it never writes new scores?
*/
ROM_START( mag_pdak )
BIOS_ROM

2
src/mame/konami/djmain.cpp
View File

@ -2620,7 +2620,7 @@ GAME( 1999, bmcompmx, 0, djmainj, bmcompmx, djmain_state, init_beatmania
GAME( 1999, bmcompmxb,bmcompmx, djmainj, bmcompmx, djmain_state, init_beatmania, ROT0, "Konami", "beatmania complete MIX (ver JA-B)", 0 )
GAME( 1999, bmcmxaac, bmcompmx, djmainu, bmcompmx, djmain_state, init_beatmania, ROT0, "Konami", "beatmania complete MIX (ver AA-C)", 0 )
GAME( 1999, hmcompmx, bmcompmx, djmainu, bmcompmx, djmain_state, init_hmcompmx, ROT0, "Konami", "hiphopmania complete MIX (ver UA-B)", 0 )
GAME( 1999, bscompmx, bmcompmx, djmainu, bmcompmx, djmain_state, init_bscompmx, ROT0, "Konami", "beatstage complete MIX (ver KA-B)", 0 )
GAME( 1999, bscompmx, bmcompmx, djmainu, bmcompmx, djmain_state, init_bscompmx, ROT0, "Konami", "beatstage complete MIX (ver KA-B)", 0 )
GAME( 1999, bm4thmix, 0, djmainj, bm4thmix, djmain_state, init_bm4thmix, ROT0, "Konami", "beatmania 4th MIX (ver JA-A)", 0 )
GAME( 1999, bs4thmix, bm4thmix, djmainu, bm4thmix, djmain_state, init_bs4thmix, ROT0, "Konami", "beatstage 4th MIX (ver KA-A)", 0 )
GAME( 1999, bm5thmix, 0, djmainj, bm5thmix, djmain_state, init_bm5thmix, ROT0, "Konami", "beatmania 5th MIX (ver JA-A)", 0 )

48
src/mame/layout/dnbanban.lay
View File

@ -67,66 +67,66 @@ copyright-holders: Roberto Fresca, Grull Osgo
<element name="stat" defstate="0">
<text string="off" state="0">
<color red="1.0" green="0.0" blue="0.0" />
</text>
</text>
<text string="on" state="1">
<color red="0.0" green="1.0" blue="0.0" />
</text>
</element>
</text>
</element>
<element name="statinv" defstate="1">
<text string="off" state="1">
<color red="1.0" green="0.0" blue="0.0" />
</text>
</text>
<text string="on" state="0">
<color red="0.0" green="1.0" blue="0.0" />
</text>
</element>
</text>
</element>
<element name="hscore">
<text string="High Score">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</element>
</text>
</element>
<element name="score">
<text string="Score">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</element>
</text>
</element>
<element name="selg">
<text string="-- Selected Game -- " align="2">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</element>
</text>
</element>
<element name="sel1">
<text string="Doraneko" align="2">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</text>
</element>
<element name="sel2">
<text string="Koneko" align="2">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</text>
</element>
<element name="ecoin">
<text string="Coin Enable">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</text>
</element>
<element name="ccount">
<text string="Coin Counter (Signal)">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</text>
</element>
<element name="mute">
<text string="Sound Mute">
<color red="0.7" green="0.7" blue="0.7" />
</text>
</text>
</element>
@ -279,7 +279,7 @@ copyright-holders: Roberto Fresca, Grull Osgo
<simplecounter maxstate="999" digits="3">
<color red="1.0" green="1.0" blue="1.0"/>
</simplecounter>
</element>
</element>
<element name="blk">
<rect>
@ -334,9 +334,9 @@ copyright-holders: Roberto Fresca, Grull Osgo
<!-- Fence & Arms test -->
<repeat count="4">
<param name="x" start="335" increment="65" />
<param name="i" start="0" increment="1" />
<element ref="arm">
<param name="x" start="335" increment="65" />
<param name="i" start="0" increment="1" />
<element ref="arm">
<animate name="mpos~i~" />
<bounds state="0" x="~x~" y="180" width="40" height="100" />
<bounds state="282" x="~x~" y="280" width="40" height="100" />
@ -346,7 +346,7 @@ copyright-holders: Roberto Fresca, Grull Osgo
<element ref="blk">
<bounds x="300" y="180" width="300" height="70" />
</element>
<element ref="fence">
<bounds x="300" y="250" width="300" height="30" />
</element>
@ -668,7 +668,7 @@ copyright-holders: Roberto Fresca, Grull Osgo
</element>
<element name="p8led0" ref="led">
<bounds x="75" y="460" width="9" height="9" />
</element>
</element>
</view>
</mamelayout>

6
src/mame/misc/dgpix.cpp
View File

@ -489,7 +489,7 @@ void dgpix_state::dgpix(machine_config &config)
/*
Elfin
dgPIX Entertainment Inc. 1999
@ -512,7 +512,7 @@ ROM_START( elfin )
ROM_END
/*
Jump Jump
dgPIX Entertainment Inc. 1999
@ -830,7 +830,7 @@ void dgpix_state::init_letsdnce()
void dgpix_state::init_btplay2k()
{
u8 *rom = memregion("flash")->base() + 0x1c00000;
rom[BYTE4_XOR_BE(0x3a7914)] = 3;
rom[BYTE4_XOR_BE(0x3a7915)] = 0;
rom[BYTE4_XOR_BE(0x3a7916)] = 3;

118
src/mame/misc/katosmedz80.cpp
View File

@ -23,7 +23,7 @@
OKI M6295GS
4-DIP switches bank
***************************************************************************************************
Some videos about the machine...
@ -39,14 +39,14 @@
We have two characters...
Doraneko (ドラネコ) (means Stray Cat)
Doraneko (ドラネコ) (means Stray Cat)
Koneko (コネコ) (means Kitten)
The game is basically similar to other gator/alligator games, where you must hit 4 mechanical
cat arms that make attempts to steal the food through a fence.
There is a rank system based on the number of hits you can get in the game. After time out,
if you have at least 50 hits, you can get extended time.
if you have at least 50 hits, you can get extended time.
Hits Level Japanese Translation Extended Game
------+-------+------------------+---------------------------+---------------
@ -61,12 +61,12 @@
The game has a DIP switch that trigger the Test Mode. This Mode start to handle the stepper motors
of all arms, and test a sequence of lamps while triggers all the game sounds.
Test mode: Press START 1 to test the stepper motors / arms.
Some cat's speeches:
"Umasouda nyaa" ----> "Looks delicious nyaa" (at start of a game)
"Gochisousama" -----> "Thank you for the food" (at end of the game)
@ -78,7 +78,7 @@
***************************************************************************************************
Error codes:
E1 = Arm 1 sensor error.
E2 = Arm 2 sensor error.
E3 = Arm 3 sensor error.
@ -163,50 +163,50 @@
(partial)
.------v------.
--(PA3)-|01 40|-(PA4)--
--(PA2)-|02 IC10 39|-(PA5)--
--(PA1)-|03 38|-(PA6)--
--(PA0)-|04 PPI#0 37|-(PA7)--
--(/RD)-|05 36|-(/WR)--
--(/CS)-|06 35|-(RES)--
--(GND)-|07 34|-(D0)--
---(A1)-|08 33|-(D1)--
---(A0)-|09 NEC 32|-(D2)--
--(PC7)-|10 31|-(D3)--
--(PC6)-|11 D71055C 30|-(D4)--
--(PC5)-|12 29|-(D5)--
--(PC4)-|13 28|-(D6)--
--(PC0)-|14 27|-(D7)--
--(PC1)-|15 26|-(Vcc)--
--(PC2)-|16 25|-(PB7)--
--(PC3)-|17 24|-(PB6)--
--(PB0)-|18 23|-(PB5)--
--(PB1)-|19 22|-(PB4)--
--(PB2)-|20 21|-(PB3)--
--(PA3)-|01 40|-(PA4)--
--(PA2)-|02 IC10 39|-(PA5)--
--(PA1)-|03 38|-(PA6)--
--(PA0)-|04 PPI#0 37|-(PA7)--
--(/RD)-|05 36|-(/WR)--
--(/CS)-|06 35|-(RES)--
--(GND)-|07 34|-(D0)--
---(A1)-|08 33|-(D1)--
---(A0)-|09 NEC 32|-(D2)--
--(PC7)-|10 31|-(D3)--
--(PC6)-|11 D71055C 30|-(D4)--
--(PC5)-|12 29|-(D5)--
--(PC4)-|13 28|-(D6)--
--(PC0)-|14 27|-(D7)--
--(PC1)-|15 26|-(Vcc)--
--(PC2)-|16 25|-(PB7)--
--(PC3)-|17 24|-(PB6)--
--(PB0)-|18 23|-(PB5)--
--(PB1)-|19 22|-(PB4)--
--(PB2)-|20 21|-(PB3)--
'-------------'
.------v------.
DSW#4 --(PA3)-|01 40|-(PA4)--
DSW#3 --(PA2)-|02 IC5 39|-(PA5)--
DSW#2 --(PA1)-|03 38|-(PA6)--
DSW#1 --(PA0)-|04 PPI#1 37|-(PA7)--
--(/RD)-|05 36|-(/WR)--
--(/CS)-|06 35|-(RES)--
--(GND)-|07 34|-(D0)--
---(A1)-|08 33|-(D1)--
---(A0)-|09 NEC 32|-(D2)--
--(PC7)-|10 31|-(D3)--
--(PC6)-|11 D71055C 30|-(D4)--
--(PC5)-|12 29|-(D5)--
--(PC4)-|13 28|-(D6)--
--(PC0)-|14 27|-(D7)--
--(PC1)-|15 26|-(Vcc)--
--(PC2)-|16 25|-(PB7)--
--(PC3)-|17 24|-(PB6)--
--(PB0)-|18 23|-(PB5)--
--(PB1)-|19 22|-(PB4)--
--(PB2)-|20 21|-(PB3)--
DSW#4 --(PA3)-|01 40|-(PA4)--
DSW#3 --(PA2)-|02 IC5 39|-(PA5)--
DSW#2 --(PA1)-|03 38|-(PA6)--
DSW#1 --(PA0)-|04 PPI#1 37|-(PA7)--
--(/RD)-|05 36|-(/WR)--
--(/CS)-|06 35|-(RES)--
--(GND)-|07 34|-(D0)--
---(A1)-|08 33|-(D1)--
---(A0)-|09 NEC 32|-(D2)--
--(PC7)-|10 31|-(D3)--
--(PC6)-|11 D71055C 30|-(D4)--
--(PC5)-|12 29|-(D5)--
--(PC4)-|13 28|-(D6)--
--(PC0)-|14 27|-(D7)--
--(PC1)-|15 26|-(Vcc)--
--(PC2)-|16 25|-(PB7)--
--(PC3)-|17 24|-(PB6)--
--(PB0)-|18 23|-(PB5)--
--(PB1)-|19 22|-(PB4)--
--(PB2)-|20 21|-(PB3)--
'-------------'
@ -228,7 +228,7 @@
| | | |
'-+-+-+-+-+-+-+-' '-+-+-+-+-+-+-+-+-'
74HC04 74HC4040
***************************************************************************************************
@ -386,10 +386,10 @@ void katosmedz80_state::ppi0_b_w(uint8_t data)
m[i] = (data >> (i * 2)) & 0x03;
if (m[i] == ((m_pre[i] + 1) % 4))
m_var[i]++; // arm goes forward
m_var[i]++; // arm goes forward
if (m[i] == ((m_pre[i] - 1) & 3))
m_var[i]--; // arm goes back
m_var[i]--; // arm goes back
if (m[i] == m_pre[i])
logerror("Motor_%i Stopped\n", i + 1); // delete after debug
@ -400,7 +400,7 @@ void katosmedz80_state::ppi0_b_w(uint8_t data)
m_sensors &= 0xff - m_bit; // sensor on
if (m_var[i] < 0x07)
m_sensors |= m_bit; // sensor off
m_sensors |= m_bit; // sensor off
logerror("Motor_%i: %02X - m_sensors:%02X\n", i + 1, m_var[i], m_sensors);
m_pre[i] = m[i];
@ -422,7 +422,7 @@ void katosmedz80_state::ppi0_c_w(uint8_t data)
---- ---x Lamp 1: Doraneko (ドラネコ) Start / Game
---- --x- Lamp 2: Koneko (コネコ) Start / Game
---- -x-- * On Game: Blinks | Off Game and Test Mode: Turns ON when unknown key "I" is active
---- x--- * High when hits give points. It could be the "Eyes" effect actuator. Related to RAM 4047-4048
---- x--- * High when hits give points. It could be the "Eyes" effect actuator. Related to RAM 4047-4048
---x ---- Low: Arm 1 Action. Low when food Lamp 1 is On
--x- ---- Low: Arm 2 Action. Low when food Lamp 2 is On
-x-- ---- Low: Arm 3 Action. Low when food Lamp 3 is On
@ -473,7 +473,7 @@ void katosmedz80_state::ppi1_c_w(uint8_t data)
*/
// Digit Selector for multiplexed 7Seg display
for(u8 i = 0; i < 4; i++)
for(u8 i = 0; i < 4; i++)
if(((data >> i) & 1) == 1)
dn = i;
@ -522,7 +522,7 @@ static INPUT_PORTS_START( dnbanban )
x--- ---- Arm 4 Hit microswitch
*/
PORT_BIT( 0x55, IP_ACTIVE_HIGH, IPT_CUSTOM )PORT_CUSTOM_MEMBER(katosmedz80_state, arm_sensors_r)
PORT_BIT( 0x55, IP_ACTIVE_HIGH, IPT_CUSTOM )PORT_CUSTOM_MEMBER(katosmedz80_state, arm_sensors_r)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1) PORT_NAME("Hit Arm 1")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD2) PORT_NAME("Hit Arm 2")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_POKER_HOLD3) PORT_NAME("Hit Arm 3")
@ -552,8 +552,8 @@ static INPUT_PORTS_START( dnbanban )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I) PORT_NAME("IN1-8") // to figure out...
PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) // Doraneko (ドラネコ) Start
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) // Koneko (コネコ) Start
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) // Doraneko (ドラネコ) Start
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) // Koneko (コネコ) Start
PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) // not accessed in game code
INPUT_PORTS_END
@ -597,11 +597,11 @@ void katosmedz80_state::dnbanban(machine_config &config)
*********************************************/
ROM_START( dnbanban )
ROM_REGION( 0x8000, "maincpu", 0 )
ROM_LOAD( "g25_a.ic17", 0x0000, 0x8000, CRC(ef441127) SHA1(69fea4992abb2c4905d3831b6f18e464088f0ec7) ) // MBM27C256A, 1xxxxxxxxxxxxxx = 0xFF
ROM_REGION( 0x8000, "maincpu", 0 )
ROM_LOAD( "g25_a.ic17", 0x0000, 0x8000, CRC(ef441127) SHA1(69fea4992abb2c4905d3831b6f18e464088f0ec7) ) // MBM27C256A, 1xxxxxxxxxxxxxx = 0xFF
ROM_REGION( 0x40000, "oki", ROMREGION_ERASE00 )
ROM_LOAD( "g25_v.ic7", 0x00000, 0x20000, CRC(87c7d45d) SHA1(3f035d5e62fe62111cee978ed1708e902c98526a) ) // MBM27C1000
ROM_REGION( 0x40000, "oki", ROMREGION_ERASE00 )
ROM_LOAD( "g25_v.ic7", 0x00000, 0x20000, CRC(87c7d45d) SHA1(3f035d5e62fe62111cee978ed1708e902c98526a) ) // MBM27C1000
ROM_END
}

4
src/mame/taito/sbmjb.cpp
View File

@ -3,12 +3,12 @@
/*
Taito redemption games
Honoo no Invader (炎のインベーダー) (c) 1997 Taito
Bubblen Roulette (バブルンるーれっと) (c) 1997 Taito - video: https://www.youtube.com/watch?v=AaugRz3cqv0
Sonic Blast Man's Janken Battle (ソニックブラストマンのジャンケンバトル) (c) 1998 Taito - video: https://www.youtube.com/watch?v=AFWLMHbpQz8
Other undumped games believed to use the same hardware:
Harikiri Junior Baseball (はりきりジュニアベースボール) (c) 1998 Taito - video: https://www.youtube.com/watch?v=eRZctnd8whE
Packy's Treasure Slot (パッキイのトレジャースロット) (c) 1997 Taito - video: https://www.youtube.com/watch?v=IPse14eGiqM

2
src/mame/trs/trs80_quik.cpp
View File

@ -122,7 +122,7 @@ QUICKLOAD_LOAD_MEMBER(trs80_quickload_device::quickload_cb)
LOG("/CMD load module header '%s'\n", data);
break;
case CMD_TYPE_COPYRIGHT_BLOCK: // 1F - copyright info err = file.read(&data, length, actual);
case CMD_TYPE_COPYRIGHT_BLOCK: // 1F - copyright info err = file.read(&data, length, actual);
if (actual != length)
{
logerror("/CMD error reading block type %02x\n", type);