diff options
author | 2019-09-16 23:08:39 +1000 | |
---|---|---|
committer | 2019-09-16 23:10:04 +1000 | |
commit | faea4753b53bc27b055b60d671b71d88da2e86f1 (patch) | |
tree | 56f47920fbdc9498ea3577be8a4f61ea9b344652 | |
parent | c5d9d87dfd3db1825478c91fa28b6eb8545e6c5d (diff) |
(nw) misc cleanup:
* ngpc.xml: fixed some Japanese titles
* ds1994.cpp: added FIXME comments, removed redundant tag from logging helper, corrected device name, removed copy/pasted application note (copyright infringement)
* midvunit.cpp: marked "recreated" PAL program as a bad dump
-rw-r--r-- | hash/ngpc.xml | 8 | ||||
-rw-r--r-- | src/devices/machine/ds1994.cpp | 45 | ||||
-rw-r--r-- | src/mame/drivers/midvunit.cpp | 4 |
3 files changed, 11 insertions, 46 deletions
diff --git a/hash/ngpc.xml b/hash/ngpc.xml index 858ec85ec69..d33c74b59ba 100644 --- a/hash/ngpc.xml +++ b/hash/ngpc.xml @@ -651,7 +651,7 @@ NEOP00220 NeoGeo Cup '98 Plus (Euro) [confirmed?] <publisher>SNK</publisher> <info name="serial" value="NeoP00630" /> <info name="release" value="20000120" /> - <info name="alt_title" value="めざせ!漢字王" /> + <info name="alt_title" value="めざせ!漢字王" /> <part name="cart" interface="ngp_cart"> <dataarea name="rom" size="2097152"> <rom name="mezase! kanji ou (japan).bin" size="2097152" crc="a52e1c82" sha1="030a59f990e96649001582be2d5acc9af18424fe" /> @@ -1348,7 +1348,7 @@ NEOP00220 NeoGeo Cup '98 Plus (Euro) [confirmed?] <publisher>SNK</publisher> <info name="serial" value="NeoP00300" /> <info name="release" value="19990610 (JPN)" /> - <info name="alt_title" value="ポケット格闘シリーズ サムライスピリッツ!2" /> + <info name="alt_title" value="ポケット格闘シリーズ サムライスピリッツ!2" /> <part name="cart" interface="ngp_cart"> <dataarea name="rom" size="2097152"> <rom name="samurai shodown! 2 - pocket fighting series (world) (en,ja).bin" size="2097152" crc="4f7fb156" sha1="2ec4da369d3b91af15defa64429bd9daac7ee9b5" /> @@ -1490,7 +1490,7 @@ NEOP00220 NeoGeo Cup '98 Plus (Euro) [confirmed?] <publisher>Dyna</publisher> <info name="serial" value="NeoP00780" /> <info name="release" value="19991216" /> - <info name="alt_title" value="それいけ!!花札道" /> + <info name="alt_title" value="それいけ!!花札道場" /> <part name="cart" interface="ngp_cart"> <dataarea name="rom" size="524288"> <rom name="soreike!! hanafuda doujou (japan).bin" size="524288" crc="05fa3eb0" sha1="f4a4264eaf1605086ccbc526f21da222aa6341bf" /> @@ -1633,7 +1633,7 @@ NEOP00220 NeoGeo Cup '98 Plus (Euro) [confirmed?] <publisher>SNK</publisher> <info name="serial" value="NeoP00490" /> <info name="release" value="19991111" /> - <info name="alt_title" value="つなげてポンッ!2" /> + <info name="alt_title" value="つなげてポンツ!2" /> <part name="cart" interface="ngp_cart"> <dataarea name="rom" size="1048576"> <rom name="tsunagete pon! 2 (japan).bin" size="1048576" crc="129091bb" sha1="db030e02819d50315f15c00b93c3a46f1f89d126" /> diff --git a/src/devices/machine/ds1994.cpp b/src/devices/machine/ds1994.cpp index 8b379f6ba82..bf0f6eef017 100644 --- a/src/devices/machine/ds1994.cpp +++ b/src/devices/machine/ds1994.cpp @@ -9,6 +9,9 @@ * */ +// FIXME: convert to device_rtc_interface and remove time.h +// FIXME: convert logging to use logmacro.h + #include "emu.h" #include "machine/ds1994.h" @@ -25,12 +28,12 @@ inline void ds1994_device::verboselog(int n_level, const char *s_fmt, ...) va_start(v, s_fmt); vsprintf(buf, s_fmt, v); va_end(v); - logerror("ds1994 %s %s: %s", tag(), machine().describe_context(), buf); + logerror("ds1994 %s: %s", machine().describe_context(), buf); } } // device type definition -DEFINE_DEVICE_TYPE(DS1994, ds1994_device, "ds1994", "DS1994 RTC + BACKUP RAM") +DEFINE_DEVICE_TYPE(DS1994, ds1994_device, "ds1994", "DS1994 iButton 4Kb Memory Plus Time") ds1994_device::ds1994_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, DS1994, tag, owner, clock), device_nvram_interface(mconfig, *this) @@ -768,41 +771,3 @@ void ds1994_device::nvram_write(emu_file &file) file.write(m_rtc, RTC_SIZE); file.write(m_regs, REGS_SIZE); } - -/* - -app74.pdf - -Under normal circumstances an ibutton will sample the line 30us after the falling edge of the start condition. -The internal time base of ibutton may deviate from its nominal value. The allowed tollerance band ranges from 15us to 60us. -This means that the actual slave sampling may occur anywhere from 15 and 60us after the start condition, which is a ratio of 1 to 4. -During this time frame the voltage on the data line must stay below Vilmax or above Vihmin. - -In the 1-Wire system, the logical values 1 and 0 are represented by certain voltages in special waveforms. -The waveforms needed to write commands or data to ibuttons are called write-1 and write-0 time slots. -The duration of a low pulse to write a 1 must be shorter than 15us. -To write a 0, the duration of the low pulse must be at least 60us to cope with worst-case conditions. - -The duration of the active part of a time slot can be extended beyond 60us. -The maximum extension is limited by the fact that a low pulse of a duration of at least eight active time slots ( 480us ) is defined as a Reset Pulse. -Allowing the same worst-case tolerance ratio, a low pulse of 120us might be sufficient for a reset. -This limits the extension of the active part of a time slot to a maximum of 120us to prevent misinterpretation with reset. - -Commands and data are sent to ibuttons by combining write-0 and write-1 time slots. -To read data, the master has to generate read-data time slots to define the start condition of each bit. -The read-data time slots looks essentially the same as a write-1 time slot from the masters point of view. -Starting at the high-to-low transition, the ibuttons sends 1 bit of its addressed contents. -If the data bit is a 1, the ibutton leaves the pulse unchanged. -If the data bit is a 0, the ibutton will pull the data line low for 15us. -In this time frame data is valid for reading by the master. -The duration of the low pulse sent by the master should be a minimum of 1us with a maximum value as short as possible to maximize the master sampling window. - -The Reset Pulse provides a clear starting condition that supersedes any time slot synchronisation. -It is defined as single low pulse of minimum duration of eight time slots or 480us followed by a Reset-high time tRSTH of another 480us. -After a Reset Pulse has been sent, the ibutton will wait for the time tPDH and then generate a Pulse-Presence Pulse of duration tPDL. -No other communication on the 1-Wire bus is allowed during tRSTH. - -There are 1,000 microseconds in a millisecond, and 1,000 milliseconds in a second. -Thus, there are 1,000,000 microseconds in a second. Why is it "usec"? -The "u" is supposed to look like the Greek letter Mu that we use for "micro". . -*/ diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 5ed78778e39..319eff9f656 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -1300,7 +1300,7 @@ ROM_START( crusnusa ) /* Version 4.1, Mon Feb 13 1995 - 16:53:40 */ ROM_LOAD32_BYTE( "cusa.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) ) ROM_REGION( 0x0b33, "pals", 0 ) // all protected - ROM_LOAD("a-19993.u38", 0x0000, 0x02e5, CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */ + ROM_LOAD("a-19993.u38", 0x0000, 0x02e5, BAD_DUMP CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */ ROM_LOAD("a-19670.u43", 0x0000, 0x0144, BAD_DUMP CRC(acafcc97) SHA1(b6f916838d08590a536fe925ec62d66e6ea3dcbc) ) /* TIBPAL20L8-10CNT */ ROM_LOAD("a-19668.u52", 0x0000, 0x0157, BAD_DUMP CRC(7915134e) SHA1(aeb22e46abdc14a9e9b34cfe3b77da3e29b789fe) ) /* GAL20V8B */ ROM_LOAD("a-19671.u54", 0x0000, 0x02dd, BAD_DUMP CRC(b9cce038) SHA1(8d1df026bdac66ea5493e9e51c23f8eb182b024e) ) /* TIBPAL22V10-15BCNT */ @@ -1343,7 +1343,7 @@ ROM_START( crusnusa40 ) /* Version 4.0, Wed Feb 08 1995 - 10:45:14 */ ROM_LOAD32_BYTE( "cusa.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) ) ROM_REGION( 0x0b33, "pals", 0 ) // all protected - ROM_LOAD("a-19993.u38", 0x0000, 0x02e5, CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */ + ROM_LOAD("a-19993.u38", 0x0000, 0x02e5, BAD_DUMP CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */ ROM_LOAD("a-19670.u43", 0x0000, 0x0144, BAD_DUMP CRC(acafcc97) SHA1(b6f916838d08590a536fe925ec62d66e6ea3dcbc) ) /* TIBPAL20L8-10CNT */ ROM_LOAD("a-19668.u52", 0x0000, 0x0157, BAD_DUMP CRC(7915134e) SHA1(aeb22e46abdc14a9e9b34cfe3b77da3e29b789fe) ) /* GAL20V8B */ ROM_LOAD("a-19671.u54", 0x0000, 0x02dd, BAD_DUMP CRC(b9cce038) SHA1(8d1df026bdac66ea5493e9e51c23f8eb182b024e) ) /* TIBPAL22V10-15BCNT */ |