summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-10-25 12:32:15 +1100
committer Vas Crabb <vas@vastheman.com>2020-10-25 12:32:15 +1100
commit87948d7b89dd8ba69d23aaba47935cc07b0b5f1e (patch)
treed12c2f85c80270e5a8292dd3a63956b5e86a44bb
parent8c453c2dafd527250f2fa571e512a761d93e939a (diff)
srcclean in preparation for 0.226 release branch
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp18
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp9
-rw-r--r--src/devices/bus/neogeo/prot_fatfury2.cpp12
-rw-r--r--src/devices/bus/vsmile/mat.h22
-rw-r--r--src/devices/machine/generalplus_gpl16250soc.cpp2
-rw-r--r--src/devices/machine/generalplus_gpl16250soc_video.cpp6
-rw-r--r--src/devices/sound/hc55516.cpp28
-rw-r--r--src/devices/sound/hc55516.h6
-rw-r--r--src/devices/sound/tt5665.cpp78
-rw-r--r--src/emu/rendutil.cpp2
-rw-r--r--src/lib/formats/aquarius_caq.cpp4
-rw-r--r--src/lib/formats/csw_cas.cpp8
-rw-r--r--src/lib/netlist/plib/pfunction.cpp4
-rw-r--r--src/mame/audio/nl_armora.cpp2
-rw-r--r--src/mame/audio/nl_barrier.cpp4
-rw-r--r--src/mame/audio/nl_boxingb.cpp4
-rw-r--r--src/mame/audio/nl_brdrline.cpp2658
-rw-r--r--src/mame/audio/nl_frogs.cpp228
-rw-r--r--src/mame/audio/nl_spacewar.cpp4
-rw-r--r--src/mame/audio/nl_tailg.cpp4
-rw-r--r--src/mame/drivers/galpani3.cpp10
-rw-r--r--src/mame/drivers/generalplus_gpl_unknown.cpp2
-rw-r--r--src/mame/drivers/itech32.cpp4
-rw-r--r--src/mame/drivers/kpython.cpp8
-rw-r--r--src/mame/drivers/nes_clone.cpp4
-rw-r--r--src/mame/drivers/nes_sh6578.cpp2
-rw-r--r--src/mame/drivers/nes_vt02_vt03.cpp2
-rw-r--r--src/mame/drivers/nwk-tr.cpp18
-rw-r--r--src/mame/drivers/pacman.cpp14
-rw-r--r--src/mame/drivers/rfslotspcpent.cpp4
-rw-r--r--src/mame/drivers/wheelfir.cpp14
-rw-r--r--src/mame/includes/sidepckt.h2
-rw-r--r--src/mame/layout/dfs500.lay20
-rw-r--r--src/mame/machine/m6502_swap_op_d5_d6.cpp4
-rw-r--r--src/mame/machine/nl_tank.cpp16
-rw-r--r--src/mame/mame.lst2
-rw-r--r--src/mame/video/ms32.cpp28
37 files changed, 1630 insertions, 1627 deletions
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index 20342e6fd14..b2043c20f30 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -156,7 +156,7 @@ uint8_t a2bus_hsscsi_device::read_c0nx(uint8_t offset)
return m_ncr5380->read(offset);
case 6:
- if (m_dma_control & 1) // pseudo-DMA?
+ if (m_dma_control & 1) // pseudo-DMA?
{
return m_ncr5380->dma_r();
}
@@ -166,19 +166,19 @@ uint8_t a2bus_hsscsi_device::read_c0nx(uint8_t offset)
return m_ncr5380->read(offset);
}
- case 8: // DMA address low
+ case 8: // DMA address low
return m_dma_addr & 0xff;
- case 9: // DMA address high
+ case 9: // DMA address high
return (m_dma_addr >> 8) & 0xff;
- case 0xa: // DMA size low
+ case 0xa: // DMA size low
return m_dma_size & 0xff;
- case 0xb: // DMA size high
+ case 0xb: // DMA size high
return (m_dma_size >> 8) & 0xff;
- case 0xc: // DMA control
+ case 0xc: // DMA control
return m_dma_control;
case 0xe: // code at cf32 wants to RMW this without killing the ROM bank
@@ -204,7 +204,7 @@ void a2bus_hsscsi_device::write_c0nx(uint8_t offset, uint8_t data)
{
switch (offset)
{
- case 0: // data out register; in PDMA mode, it's assumed this goes to DMA as reads do
+ case 0: // data out register; in PDMA mode, it's assumed this goes to DMA as reads do
if (m_dma_control & 1)
{
m_ncr5380->dma_w(data);
@@ -252,7 +252,7 @@ void a2bus_hsscsi_device::write_c0nx(uint8_t offset, uint8_t data)
case 0xc: // DMA control
//printf("%02x to DMA control\n", data);
- m_dma_control &= ~0x2b; // clear the read/write bits
+ m_dma_control &= ~0x2b; // clear the read/write bits
m_dma_control |= (data & 0x2b);
break;
@@ -332,5 +332,5 @@ void a2bus_hsscsi_device::write_c800(uint16_t offset, uint8_t data)
WRITE_LINE_MEMBER( a2bus_hsscsi_device::drq_w )
{
m_drq = (state ? 0x80 : 0x00);
-// printf("DRQ to %d\n", state);
+// printf("DRQ to %d\n", state);
}
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index c0232ea74dd..4912cf53c0d 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -141,7 +141,8 @@ INPUT_CHANGED_MEMBER(a2bus_pic_device::x_char_width)
u8 a2bus_pic_device::read_c0nx(u8 offset)
{
- LOG("Read C0n%01X\n", offset);
+ if (!machine().side_effects_disabled())
+ LOG("Read C0n%01X\n", offset);
switch (offset & 0x07U)
{
@@ -156,11 +157,13 @@ u8 a2bus_pic_device::read_c0nx(u8 offset)
break;
case 6U:
- enable_irq();
+ if (!machine().side_effects_disabled())
+ enable_irq();
break;
case 7U:
- reset_mode();
+ if (!machine().side_effects_disabled())
+ reset_mode();
break;
}
diff --git a/src/devices/bus/neogeo/prot_fatfury2.cpp b/src/devices/bus/neogeo/prot_fatfury2.cpp
index b88d7b43ec1..d28b417b33d 100644
--- a/src/devices/bus/neogeo/prot_fatfury2.cpp
+++ b/src/devices/bus/neogeo/prot_fatfury2.cpp
@@ -42,9 +42,9 @@ uint16_t fatfury2_prot_device::protection_r(offs_t offset)
u8 gad = m_pro_ct0->gad_r();
u8 gbd = m_pro_ct0->gbd_r();
/*
- Data pin from PRO-CT0
- D0 D1 D2 D3 D4 D5 D6 D7
- GAD2 GAD3 GAD0 GAD1 GBD2 GBD3 GBD0 GBD1
+ Data pin from PRO-CT0
+ D0 D1 D2 D3 D4 D5 D6 D7
+ GAD2 GAD3 GAD0 GAD1 GBD2 GBD3 GBD0 GBD1
*/
return (BIT(gbd, 0, 2) << 6) | (BIT(gbd, 2, 2) << 4) | (BIT(gad, 0, 2) << 2) | (BIT(gad, 2, 2) << 0);
}
@@ -61,9 +61,9 @@ void fatfury2_prot_device::protection_w(offs_t offset, uint16_t data)
// C16-31 = A4-A19, C0-C15 = D0-D15
/*
- Address/Data pin mapping into PRO-CT0
- C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 C16 C17 C18 C19 C20 C21 C22 C23 C24 C25 C26 C27 C28 C29 C30 C31 LOAD EVEN H
- D0 D4 D1 D5 D2 D6 D3 D7 D8 D12 D9 D13 D10 D14 D11 D15 A4 A8 A5 A9 A6 A10 A7 A11 A12 A16 A13 A17 A14 A18 A15 A19 A1 A2 A3
+ Address/Data pin mapping into PRO-CT0
+ C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 C16 C17 C18 C19 C20 C21 C22 C23 C24 C25 C26 C27 C28 C29 C30 C31 LOAD EVEN H
+ D0 D4 D1 D5 D2 D6 D3 D7 D8 D12 D9 D13 D10 D14 D11 D15 A4 A8 A5 A9 A6 A10 A7 A11 A12 A16 A13 A17 A14 A18 A15 A19 A1 A2 A3
*/
m_pro_ct0->c_w((u32(bitswap<16>(BIT(offset, 3, 16), 15, 11, 14, 10, 13, 9, 12, 8, 7, 3, 6, 2, 5, 1, 4, 0)) << 16) |
u32(bitswap<16>(data, 15, 11, 14, 10, 13, 9, 12, 8, 7, 3, 6, 2, 5, 1, 4, 0)));
diff --git a/src/devices/bus/vsmile/mat.h b/src/devices/bus/vsmile/mat.h
index e184b6b3d25..ec25eba195f 100644
--- a/src/devices/bus/vsmile/mat.h
+++ b/src/devices/bus/vsmile/mat.h
@@ -28,19 +28,19 @@ public:
enum stale_mat_inputs : uint16_t
{
STALE_NONE = 0U,
- STALE_YELLOW_RIGHT = 1U << 0,
- STALE_RED_LEFT = 1U << 1,
- STALE_CENTER = 1U << 2,
- STALE_UP = 1U << 3,
- STALE_DOWN = 1U << 4,
- STALE_GREEN = 1U << 5,
- STALE_OK = 1U << 6,
- STALE_QUIT = 1U << 7,
- STALE_HELP = 1U << 8,
- STALE_BLUE = 1U << 9,
+ STALE_YELLOW_RIGHT = 1U << 0,
+ STALE_RED_LEFT = 1U << 1,
+ STALE_CENTER = 1U << 2,
+ STALE_UP = 1U << 3,
+ STALE_DOWN = 1U << 4,
+ STALE_GREEN = 1U << 5,
+ STALE_OK = 1U << 6,
+ STALE_QUIT = 1U << 7,
+ STALE_HELP = 1U << 8,
+ STALE_BLUE = 1U << 9,
STALE_JOY = STALE_YELLOW_RIGHT | STALE_RED_LEFT,
- STALE_COLORS = STALE_CENTER | STALE_UP | STALE_DOWN | STALE_GREEN,
+ STALE_COLORS = STALE_CENTER | STALE_UP | STALE_DOWN | STALE_GREEN,
STALE_BUTTONS = STALE_OK | STALE_QUIT | STALE_HELP | STALE_BLUE,
STALE_ALL = STALE_JOY | STALE_COLORS | STALE_BUTTONS
};
diff --git a/src/devices/machine/generalplus_gpl16250soc.cpp b/src/devices/machine/generalplus_gpl16250soc.cpp
index 1892bbe0880..9be10ba7ae2 100644
--- a/src/devices/machine/generalplus_gpl16250soc.cpp
+++ b/src/devices/machine/generalplus_gpl16250soc.cpp
@@ -970,7 +970,7 @@ void sunplus_gcm394_base_device::base_internal_map(address_map &map)
map(0x0078b2, 0x0078b2).rw(FUNC(sunplus_gcm394_base_device::unkarea_78b2_r), FUNC(sunplus_gcm394_base_device::unkarea_78b2_w)); // 78b2 TimeBase C Control Register (P_TimeBaseC_Ctrl)
map(0x0078b8, 0x0078b8).w(FUNC(sunplus_gcm394_base_device::unkarea_78b8_w)); // 78b8 TimeBase Counter Reset Register (P_TimeBase_Reset)
-
+
map(0x0078c0, 0x0078c0).r(FUNC(sunplus_gcm394_base_device::unkarea_78c0_r)); // beijuehh
map(0x0078d0, 0x0078d0).r(FUNC(sunplus_gcm394_base_device::unkarea_78d0_r)); // jak_s500
diff --git a/src/devices/machine/generalplus_gpl16250soc_video.cpp b/src/devices/machine/generalplus_gpl16250soc_video.cpp
index ba6ca102ebf..4e2532b730e 100644
--- a/src/devices/machine/generalplus_gpl16250soc_video.cpp
+++ b/src/devices/machine/generalplus_gpl16250soc_video.cpp
@@ -1050,8 +1050,8 @@ void gcm394_base_video_device::palette_w(offs_t offset, uint16_t data)
{
LOGMASKED(LOG_GCM394_VIDEO_PALETTE,"palette writes with m_703a_palettebank %04x\n", m_703a_palettebank);
}
-
-
+
+
offset |= (m_703a_palettebank & 0x000c) << 6;
m_paletteram[offset] = data;
@@ -1060,7 +1060,7 @@ void gcm394_base_video_device::palette_w(offs_t offset, uint16_t data)
(((data >> 10) & 0x1f)<<3),
(((data >> 5) & 0x1f)<<3),
(((data >> 0) & 0x1f)<<3)));
-
+
}
uint16_t gcm394_base_video_device::palette_r(offs_t offset)
diff --git a/src/devices/sound/hc55516.cpp b/src/devices/sound/hc55516.cpp
index 2d96ad2cb3b..5cd17aa6f12 100644
--- a/src/devices/sound/hc55516.cpp
+++ b/src/devices/sound/hc55516.cpp
@@ -5,7 +5,7 @@
Continuously Variable Slope Demodulator standalone chip emulator:
Harris HC-55516 (sometimes labeled HCI-55516 or HC1-55516)
- Harris HC-55532 (sometimes labeled HCI-55532 or HC1-55532) [preliminary]
+ Harris HC-55532 (sometimes labeled HCI-55532 or HC1-55532) [preliminary]
Motorola MC-3417/MC-34115
Motorola MC-3418
TODO: research HC-55536 and HC-55564 differences vs HC-55516 (better auto-zeroing, and removal of the encoder offset compensation DAC?)
@@ -82,8 +82,8 @@ void cvsd_device_base::device_reset()
//-------------------------------------------------
/*void cvsd_device_base::device_clock_changed()
{
- // do nothing.
- //m_stream->set_sample_rate(clock());
+ // do nothing.
+ //m_stream->set_sample_rate(clock());
}*/
READ_LINE_MEMBER( cvsd_device_base::clock_r )
@@ -107,7 +107,7 @@ WRITE_LINE_MEMBER( cvsd_device_base::digin_w )
// the following encode related functions don't do anything yet, don't call them.
/*void cvsd_device_base::audio_in_w(int16_t data)
{
- assert(0);
+ assert(0);
}*/
WRITE_LINE_MEMBER( cvsd_device_base::dec_encq_w )
@@ -365,16 +365,16 @@ void hc55516_device::sound_stream_update(sound_stream &stream, std::vector<read_
auto &buffer = outputs[0];
/*
- if (!is_external_oscillator())
- {
- // track how many samples we've updated without a clock; if it's been more than 1/32 of a second, output silence
- m_samples_generated += buffer.samples();
- if (m_samples_generated > SAMPLE_RATE / 32)
- {
- m_samples_generated = SAMPLE_RATE;
- m_next_sample = 0;
- }
- }
+ if (!is_external_oscillator())
+ {
+ // track how many samples we've updated without a clock; if it's been more than 1/32 of a second, output silence
+ m_samples_generated += buffer.samples();
+ if (m_samples_generated > SAMPLE_RATE / 32)
+ {
+ m_samples_generated = SAMPLE_RATE;
+ m_next_sample = 0;
+ }
+ }
*/
if (is_external_oscillator())
diff --git a/src/devices/sound/hc55516.h b/src/devices/sound/hc55516.h
index 48c1b768a4f..7ae6bd0c14a 100644
--- a/src/devices/sound/hc55516.h
+++ b/src/devices/sound/hc55516.h
@@ -75,10 +75,10 @@ class hc55516_device : public cvsd_device_base
public:
hc55516_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- auto fzq_cb() { return m_fzq_pull_cb.bind(); } // /FZ (partial reset) pull callback, ok to leave unconnected (we assume it is pulled high)
- auto agc_cb() { return m_agc_push_cb.bind(); } // AGC callback function, called to push the state if the AGC pin changes, ok to leave unconnected
+ auto fzq_cb() { return m_fzq_pull_cb.bind(); } // /FZ (partial reset) pull callback, ok to leave unconnected (we assume it is pulled high)
+ auto agc_cb() { return m_agc_push_cb.bind(); } // AGC callback function, called to push the state if the AGC pin changes, ok to leave unconnected
- WRITE_LINE_MEMBER( fzq_w ); // /FZ (partial reset) push
+ WRITE_LINE_MEMBER( fzq_w ); // /FZ (partial reset) push
READ_LINE_MEMBER( agc_r ); // AGC pull
/* TODO: These are only relevant for encode mode, which isn't done yet! */
//WRITE_LINE_MEMBER( aptq_w ); // /APT (silence encoder output) push
diff --git a/src/devices/sound/tt5665.cpp b/src/devices/sound/tt5665.cpp
index 58fd55bfed8..0bd163f18df 100644
--- a/src/devices/sound/tt5665.cpp
+++ b/src/devices/sound/tt5665.cpp
@@ -33,46 +33,46 @@
1 if it is active
ADPCM data and volume is compatible with OKI MSM6295, but some Command
- byte is slightly different.
-
- Compares to other Tontek OKI MSM6295 derivatives:
- |--------------------|-----------------|-----------------|-----------------|
- | Part number | TT5665 | TT6297 | TT6298 |
- |--------------------|-----------------|-----------------|-----------------|
- | Address Bus width | 24bit (128MBit) | 24bit (128MBit) | 23bit (64MBit) |
- |--------------------|-----------------|-----------------|-----------------|
- | Output channels | 2 (DAOL/R) | 1 (DAO) | 1 (DAO) |
- |--------------------|-----------------|-----------------|-----------------|
- | Variable Frequency | SS, S0-1(For | Not exists | Not exists |
- | Pins | DAOL only) | | |
- |--------------------|-----------------|-----------------|-----------------|
- | Crystal Oscillator | 2 (XT, XTB) | 1 (XT) | 2 (XT, XTB) |
- | Pins | | | |
- |--------------------|-----------------|-----------------|-----------------|
- | Frequency Divider | DAOR: 136, 170 | 136 | 136 |
- | | DAOL: DAOR * n | | |
- | | (n : 1,2,4,8) | | |
- |--------------------|-----------------|-----------------|-----------------|
- These chips share Command bytes and ADPCM format.
-
- Frequency Table (Unit: KHz) :
+ byte is slightly different.
+
+ Compares to other Tontek OKI MSM6295 derivatives:
+ |--------------------|-----------------|-----------------|-----------------|
+ | Part number | TT5665 | TT6297 | TT6298 |
+ |--------------------|-----------------|-----------------|-----------------|
+ | Address Bus width | 24bit (128MBit) | 24bit (128MBit) | 23bit (64MBit) |
+ |--------------------|-----------------|-----------------|-----------------|
+ | Output channels | 2 (DAOL/R) | 1 (DAO) | 1 (DAO) |
+ |--------------------|-----------------|-----------------|-----------------|
+ | Variable Frequency | SS, S0-1(For | Not exists | Not exists |
+ | Pins | DAOL only) | | |
+ |--------------------|-----------------|-----------------|-----------------|
+ | Crystal Oscillator | 2 (XT, XTB) | 1 (XT) | 2 (XT, XTB) |
+ | Pins | | | |
+ |--------------------|-----------------|-----------------|-----------------|
+ | Frequency Divider | DAOR: 136, 170 | 136 | 136 |
+ | | DAOL: DAOR * n | | |
+ | | (n : 1,2,4,8) | | |
+ |--------------------|-----------------|-----------------|-----------------|
+ These chips share Command bytes and ADPCM format.
+
+ Frequency Table (Unit: KHz) :
|---------------------------|---------------------------|
- | SS = "1" | SS = "0" |
- |-----------------|---------------------------|---------------------------|
- | (S1,S0) | 00 | 01 | 10 | 11 | 00 | 01 | 10 | 11 |
- |----------|------|------|------|------|------|------|------|------|------|
- | OSC = | DAOR | 8.0 | 8.0 | 8.0 | 8.0 | 6.4 | 6.4 | 6.4 | 6.4 |
- | 1.088MHz |------|------|------|------|------|------|------|------|------|
- | | DAOL | 8.0 | 4.0 | 2.0 | 1.0 | 6.4 | 3.2 | 1.6 | 0.8 |
- |----------|------|------|------|------|------|------|------|------|------|
- | OSC = | DAOR | 16.0 | 16.0 | 16.0 | 16.0 | 12.8 | 12.8 | 12.8 | 12.8 |
- | 2.176MHz |------|------|------|------|------|------|------|------|------|
- | | DAOL | 16.0 | 8.0 | 4.0 | 2.0 | 12.8 | 6.4 | 3.2 | 1.6 |
- |----------|------|------|------|------|------|------|------|------|------|
- | OSC = | DAOR | 32.0 | 32.0 | 32.0 | 32.0 | 25.6 | 25.6 | 25.6 | 25.6 |
- | 4.352MHz |------|------|------|------|------|------|------|------|------|
- | | DAOL | 32.0 | 16.0 | 8.0 | 4.0 | 25.6 | 12.8 | 6.4 | 3.2 |
- |----------|------|------|------|------|------|------|------|------|------|
+ | SS = "1" | SS = "0" |
+ |-----------------|---------------------------|---------------------------|
+ | (S1,S0) | 00 | 01 | 10 | 11 | 00 | 01 | 10 | 11 |
+ |----------|------|------|------|------|------|------|------|------|------|
+ | OSC = | DAOR | 8.0 | 8.0 | 8.0 | 8.0 | 6.4 | 6.4 | 6.4 | 6.4 |
+ | 1.088MHz |------|------|------|------|------|------|------|------|------|
+ | | DAOL | 8.0 | 4.0 | 2.0 | 1.0 | 6.4 | 3.2 | 1.6 | 0.8 |
+ |----------|------|------|------|------|------|------|------|------|------|
+ | OSC = | DAOR | 16.0 | 16.0 | 16.0 | 16.0 | 12.8 | 12.8 | 12.8 | 12.8 |
+ | 2.176MHz |------|------|------|------|------|------|------|------|------|
+ | | DAOL | 16.0 | 8.0 | 4.0 | 2.0 | 12.8 | 6.4 | 3.2 | 1.6 |
+ |----------|------|------|------|------|------|------|------|------|------|
+ | OSC = | DAOR | 32.0 | 32.0 | 32.0 | 32.0 | 25.6 | 25.6 | 25.6 | 25.6 |
+ | 4.352MHz |------|------|------|------|------|------|------|------|------|
+ | | DAOL | 32.0 | 16.0 | 8.0 | 4.0 | 25.6 | 12.8 | 6.4 | 3.2 |
+ |----------|------|------|------|------|------|------|------|------|------|
***************************************************************************/
diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp
index 64887d111bd..443887b6305 100644
--- a/src/emu/rendutil.cpp
+++ b/src/emu/rendutil.cpp
@@ -942,7 +942,7 @@ ru_imgformat render_detect_image(util::core_file &file)
jpeg_destroy_decompress(&cinfo);
file.seek(0, SEEK_SET);
}
-
+
// Microsoft DIB: check for valid header
util::msdib_error const msdib = util::msdib_verify_header(file);
file.seek(0, SEEK_SET);
diff --git a/src/lib/formats/aquarius_caq.cpp b/src/lib/formats/aquarius_caq.cpp
index aecb883aabf..6a94b587939 100644
--- a/src/lib/formats/aquarius_caq.cpp
+++ b/src/lib/formats/aquarius_caq.cpp
@@ -24,8 +24,8 @@ static const cassette_image::Modulation aquarius_caq_modulation =
cassette_image::MODULATION_SINEWAVE,
900.0 - 300, 900.0, 900.0 + 300,
1800.0 - 600, 1800.0, 1800.0 + 600
-
-
+
+
};
/*-------------------------------------------------
diff --git a/src/lib/formats/csw_cas.cpp b/src/lib/formats/csw_cas.cpp
index 3db3eb70c34..e55346cef4e 100644
--- a/src/lib/formats/csw_cas.cpp
+++ b/src/lib/formats/csw_cas.cpp
@@ -111,7 +111,7 @@ static cassette_image::error csw_cassette_load(cassette_image *cassette)
LOG_FORMATS("Unsupported Major Version\n");
return cassette_image::error::INVALID_IMAGE;
}
-
+
/* csw data */
switch (compression)
{
@@ -141,13 +141,13 @@ static cassette_image::error csw_cassette_load(cassette_image *cassette)
std::vector<uint8_t> gz_ptr;
z_stream d_stream;
int err;
-
+
gz_ptr.resize(8);
d_stream.next_in = (unsigned char *) &image_data[csw_data];
d_stream.avail_in = image_size - 0x34 - header[0x23];
d_stream.total_in = 0;
-
+
d_stream.next_out = &gz_ptr[0];
d_stream.avail_out = 1;
d_stream.total_out = 0;
@@ -186,7 +186,7 @@ static cassette_image::error csw_cassette_load(cassette_image *cassette)
}
bit ^= 0xff;
}
- }
+ }
while (err == Z_OK);
if (err != Z_STREAM_END)
diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp
index d592a90d670..59afc15dd04 100644
--- a/src/lib/netlist/plib/pfunction.cpp
+++ b/src/lib/netlist/plib/pfunction.cpp
@@ -410,11 +410,11 @@ namespace plib {
case OP: \
if (ADJ == 2) {\
if (m_precompiled[ptr-3].cmd() == PUSH_CONST && m_precompiled[ptr-2].cmd() == PUSH_CONST && m_precompiled[ptr-1].cmd() == PUSH_CONST) \
- { ptr--; m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 3; ptr++; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-2)); ptr-=2;} \
+ { ptr--; m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 3; ptr++; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-2)); ptr-=2;} \
else { ptr++; } \
} else if (ADJ == 1) {\
if (m_precompiled[ptr-2].cmd() == PUSH_CONST && m_precompiled[ptr-1].cmd() == PUSH_CONST) \
- { m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 2; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-1)); ptr--;} \
+ { m_precompiled[ptr-2] = rpn_inst(EXPR); n -= 2; std::copy(m_precompiled.begin()+(ptr+1), m_precompiled.end(), m_precompiled.begin()+(ptr-1)); ptr--;} \
else { ptr++; } \
} else if (ADJ == 0) {\
if (m_precompiled[ptr-1].cmd() == PUSH_CONST) \
diff --git a/src/mame/audio/nl_armora.cpp b/src/mame/audio/nl_armora.cpp
index 05775622295..89291d3f782 100644
--- a/src/mame/audio/nl_armora.cpp
+++ b/src/mame/audio/nl_armora.cpp
@@ -224,7 +224,7 @@ NETLIST_START(armora)
D_1N914(D8)
-// Q_2N3904(Q1) // NPN -- not used
+// Q_2N3904(Q1) // NPN -- not used
Q_2N3906(Q2) // PNP
Q_2N3906(Q3) // PNP
Q_2N3906(Q4) // PNP
diff --git a/src/mame/audio/nl_barrier.cpp b/src/mame/audio/nl_barrier.cpp
index 929e666eb08..2ec716fd61c 100644
--- a/src/mame/audio/nl_barrier.cpp
+++ b/src/mame/audio/nl_barrier.cpp
@@ -128,8 +128,8 @@ NETLIST_START(barrier)
Q_2N3904(Q2) // NPN
#endif
Q_2N6426(Q3) // NPN Darlington
-// Q_2N6292(Q4) // NPN -- not used
-// Q_2N6107(Q5) // PNP -- not used
+// Q_2N6292(Q4) // NPN -- not used
+// Q_2N6107(Q5) // PNP -- not used
Q_2N6426(Q6) // NPN Darlington
Q_2N3904(Q7) // NPN
diff --git a/src/mame/audio/nl_boxingb.cpp b/src/mame/audio/nl_boxingb.cpp
index 6d80f60f1b2..1e620e9d447 100644
--- a/src/mame/audio/nl_boxingb.cpp
+++ b/src/mame/audio/nl_boxingb.cpp
@@ -395,8 +395,8 @@ NETLIST_START(boxingb)
Q_2N3906(Q26) // PNP
// Q_2N6292(Q27) // PNP -- part of final amp (not emulated)
// Q_2N6107(Q28) // NPN -- part of final amp (not emulated)
-// Q_2N5210(Q29) // NPN -- not used
-// Q_2N5210(Q30) // NPN -- not used
+// Q_2N5210(Q29) // NPN -- not used
+// Q_2N5210(Q30) // NPN -- not used
Q_2N3906(Q31) // PNP
Q_2N3906(Q32) // PNP
Q_2N3906(Q33) // PNP
diff --git a/src/mame/audio/nl_brdrline.cpp b/src/mame/audio/nl_brdrline.cpp
index e08121f90fa..a9be0c857c5 100644
--- a/src/mame/audio/nl_brdrline.cpp
+++ b/src/mame/audio/nl_brdrline.cpp
@@ -108,72 +108,72 @@
*/
#endif
static NETLIST_START(_MB4391)
- // MB4391 (fake implementation)
- // 2020 by beta-tester (https://github.com/beta-tester)
- //
- // values by guesses
- // for brdrline schematics only
- //
- // Vmix = -(Vcon - 4.759384) / (4.759384 - 2.839579)
- // Vmix2 = pow(Vmix, 2)
- // Vout = Vin * Vmix2
- //
- // Vcon(max) = 4.759384
- // Vcon(min) = 2.839584...2.839579 (@3.002360417e+01)(@3.152360417e+01)
- //AFUNC(fx, 5, "(A1)")
- //
- //AFUNC(fx, 5, "min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579)))")
- //AFUNC(fx, 5, "min(1, max(0, -(A1 - (A2-0.24)) / ((A2-0.24) - (A2/2+0.34))))")
- //
- // Vin(offset)=2.5 (VCC/2)
- //AFUNC(fx, 5, "(A0)")
- //AFUNC(fx, 5, "(A0-2.5)")
- //AFUNC(fx, 5, "(A0-(A2/2))")
- //
- // vin * mix
- //AFUNC(fx, 5, "(A0-(A2/2)) * (min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579))))")
- //
- // vin * pow(mix, 2)
- AFUNC(fx, 5, "(A0-(A2/2)) * pow((min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579))), 2))")
-
- RES(R1, RES_K(10))
- RES(R2, RES_K(10))
- NET_C(VCC, R1.1)
- NET_C(IN, R1.2, R2.1)
- NET_C(R2.2, GND)
-
- RES(Rout, RES_K(1))
- NET_C(fx.Q, Rout.1) // fx(IN, CON, VCC, GND, RO) = OUT
-
- // INPUT
- ALIAS(IN, fx.A0) // IN
- ALIAS(CON, fx.A1) // CON
- ALIAS(VCC, fx.A2) // VCC
- ALIAS(GND, fx.A3) // GND
- ALIAS(RO, fx.A4) // RO
-
- // OUTPUT
- ALIAS(OUT, Rout.2) // OUT
+ // MB4391 (fake implementation)
+ // 2020 by beta-tester (https://github.com/beta-tester)
+ //
+ // values by guesses
+ // for brdrline schematics only
+ //
+ // Vmix = -(Vcon - 4.759384) / (4.759384 - 2.839579)
+ // Vmix2 = pow(Vmix, 2)
+ // Vout = Vin * Vmix2
+ //
+ // Vcon(max) = 4.759384
+ // Vcon(min) = 2.839584...2.839579 (@3.002360417e+01)(@3.152360417e+01)
+ //AFUNC(fx, 5, "(A1)")
+ //
+ //AFUNC(fx, 5, "min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579)))")
+ //AFUNC(fx, 5, "min(1, max(0, -(A1 - (A2-0.24)) / ((A2-0.24) - (A2/2+0.34))))")
+ //
+ // Vin(offset)=2.5 (VCC/2)
+ //AFUNC(fx, 5, "(A0)")
+ //AFUNC(fx, 5, "(A0-2.5)")
+ //AFUNC(fx, 5, "(A0-(A2/2))")
+ //
+ // vin * mix
+ //AFUNC(fx, 5, "(A0-(A2/2)) * (min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579))))")
+ //
+ // vin * pow(mix, 2)
+ AFUNC(fx, 5, "(A0-(A2/2)) * pow((min(1, max(0, -(A1 - 4.759384) / (4.759384 - 2.839579))), 2))")
+
+ RES(R1, RES_K(10))
+ RES(R2, RES_K(10))
+ NET_C(VCC, R1.1)
+ NET_C(IN, R1.2, R2.1)
+ NET_C(R2.2, GND)
+
+ RES(Rout, RES_K(1))
+ NET_C(fx.Q, Rout.1) // fx(IN, CON, VCC, GND, RO) = OUT
+
+ // INPUT
+ ALIAS(IN, fx.A0) // IN
+ ALIAS(CON, fx.A1) // CON
+ ALIAS(VCC, fx.A2) // VCC
+ ALIAS(GND, fx.A3) // GND
+ ALIAS(RO, fx.A4) // RO
+
+ // OUTPUT
+ ALIAS(OUT, Rout.2) // OUT
NETLIST_END()
static NETLIST_START(_MB4391_DIP)
- SUBMODEL(_MB4391, A)
- SUBMODEL(_MB4391, B)
-
- NC_PIN(NC)
-
- DIPPINS( /* +--------------+ */
- A.IN, /* IN1 |1 ++ 16| VCC1 */ A.VCC,
- A.CON, /* CON1 |2 15| OUT1 */ A.OUT,
- A.GND, /* GND1 |3 14| RO1 */ A.RO,
- NC.I, /* |4 MB4391 13| */ NC.I,
- B.IN, /* IN2 |5 12| VCC2 */ B.VCC,
- B.CON, /* CON2 |6 11| OUT2 */ B.OUT,
- B.GND, /* GND2 |7 10| RO2 */ B.RO,
- NC.I, /* |8 9| */ NC.I
- /* +--------------+ */
- )
+ SUBMODEL(_MB4391, A)
+ SUBMODEL(_MB4391, B)
+
+ NC_PIN(NC)
+
+ DIPPINS( /* +--------------+ */
+ A.IN, /* IN1 |1 ++ 16| VCC1 */ A.VCC,
+ A.CON, /* CON1 |2 15| OUT1 */ A.OUT,
+ A.GND, /* GND1 |3 14| RO1 */ A.RO,
+ NC.I, /* |4 MB4391 13| */ NC.I,
+ B.IN, /* IN2 |5 12| VCC2 */ B.VCC,
+ B.CON, /* CON2 |6 11| OUT2 */ B.OUT,
+ B.GND, /* GND2 |7 10| RO2 */ B.RO,
+ NC.I, /* |8 9| */ NC.I
+ /* +--------------+ */
+ )
NETLIST_END()
/* ----------------------------------------------------------------------------
* Library section content END
@@ -194,9 +194,9 @@ NETLIST_END()
#define UNUSED_TTL_Q(_name) HINT(_name, NC)
#define UNUSED_TTL_I(_name) NET_C(_name, GND)
#define UNUSED_OP_OUT_MINUS(_name_out, _name_minus) \
- NET_C(_name_out, _name_minus)
+ NET_C(_name_out, _name_minus)
#define UNUSED_OP_PLUS(_name_plus) \
- NET_C(UNUSED_OP_REF, _name_plus)
+ NET_C(UNUSED_OP_REF, _name_plus)
/*
* hack
@@ -210,21 +210,21 @@ NETLIST_END()
*/
// diode MA150 (nothing special, only for quick discharging caps)
#define MA150(_name) \
- DIODE(_name, "D")
+ DIODE(_name, "D")
// npn transistor 2SC458
#define C458(_name) \
- QBJT_EB(_name, "NPN")
+ QBJT_EB(_name, "NPN")
// MB4391 one half of
//#define MB4391(_name) NET_REGISTER_DEV_X(MB4391, _name)
#define MB4391(_name) \
- SUBMODEL(_MB4391, _name)
+ SUBMODEL(_MB4391, _name)
// MB4391 full dip
//#define MB4391_DIP(_name) NET_REGISTER_DEV_X(MB4391_DIP, _name)
#define MB4391_DIP(_name) \
- SUBMODEL(_MB4391_DIP, _name)
+ SUBMODEL(_MB4391_DIP, _name)
@@ -260,1102 +260,1102 @@ NETLIST_END()
// ---------------------------------------------------------------------------
static NETLIST_START(brdrline_schematics)
- /* ------------------------------------------------------------------------
- * UNUSED_OP_REF
- * -----------------------------------------------------------------------*/
- // UNUSED_OP_REF
- POT(UNUSED_OP_RES, RES_K(20))
- PARAM(UNUSED_OP_RES.DIAL, 0.5)
- NET_C(V12, UNUSED_OP_RES.1)
- NET_C(GND, UNUSED_OP_RES.3)
- ALIAS(UNUSED_OP_REF, UNUSED_OP_RES.2)
-
-
- /* ------------------------------------------------------------------------
- * RST (RESET for sound)
- * t(0s) = lo, t(2s) = high, t(infinite) = high
- * -----------------------------------------------------------------------*/
- RES(R171, RES_K(47))
- CAP(C78, CAP_U(47))
-
- TTL_74123_DIP(IC37) // shared by GUN_SOUND, RST
- NET_C(GND, IC37.8/*GND*/)
- NET_C(V5, IC37.16/*VCC*/)
-
- NET_C(GND, IC37.9/*A2*/)
- NET_C(V5, IC37.10/*B2*/, IC37.11/*CLRQ2*/, R171.1)
- NET_C(IC37.6/*C2*/, C78.1)
- NET_C(IC37.7/*RC2*/, C78.2, R171.2)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC37.5/*Q2*/)
-
- // --------------------------------
- // OUTPUT
- ALIAS(RST, IC37.12/*QQ2*/)
-
-
- /* ------------------------------------------------------------------------
- * GUN_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(GUN_TRG, R156.2)
-
- // --------------------------------
- // TRG -> CON
- MA150(D1)
- RES(R156, RES_K(1))
- RES(R155, RES_K(47))
- RES(R89, 470)
- RES(R90, RES_K(470))
- RES(R91, RES_K(470))
- CAP(C73, CAP_U(1))
- CAP(C45, CAP_U(1))
- NET_C(GND, C45.2)
- NET_C(V5, IC37.2/*B1*/, IC37.3/*CLRQ1*/
- , R156.1, R155.1, R91.1)
- NET_C(R156.2, IC37.1/*A1*/)
- NET_C(IC37.14/*C1*/, C73.1)
- NET_C(IC37.15/*RC1*/, C73.2, R155.2)
- NET_C(IC37.4/*QQ1*/, D1.K)
- NET_C(D1.A, R89.1)
- NET_C(R89.2, C45.1, R90.2)
- NET_C(R91.2, R90.1, IC27.12/*PLUS4*/)
- NET_C(IC27.14/*OUT4*/, IC27.13/*MINUS4*/, IC20.2/*CON1*/)
-
- // --------------------------------
- // NOISE
- RES(R132, RES_K(220))
- RES(R133, RES_K(22))
- RES(R134, RES_K(15))
- RES(R93, RES_K(15))
- RES(R92, RES_K(150))
- RES(R88, RES_K(100))
- CAP(C62, CAP_U(2.2))
- CAP(C63, CAP_U(0.01))
- CAP(C48, CAP_U(0.01))
-
- MM5837(IC26)
- PARAM(IC26.FREQ, 24000)
- NET_C(GND, IC26.VDD/*1*/, IC26.VGG/*2*/)
- NET_C(V12, IC26.VSS/*4*/) // left out decoupling caps (0.1uF & 22uF parallel to GND)
-
- LM324_DIP(IC27) // shared by GUN_SOUND, _, GUN_SOUND, GUN_SOUND
- NET_C(GND, IC27.11/*GND*/)
- NET_C(V12, IC27.4/*VCC*/)
-
- NET_C(IC26.OUT/*3*/, C62.1)
- NET_C(C62.2, R132.1)
- NET_C(R132.2, IC27.2/*MINUS1*/, R133.1)
- NET_C(IC27.3/*PLUS1*/, V6)
- NET_C(IC27.1/*OUT1*/, R133.2, R134.1)
- NET_C(R134.2, R93.1, C63.1)
- NET_C(R93.2, C48.1, IC27.10/*PLUS3*/)
- NET_C(C48.2, GND)
- NET_C(IC27.8/*OUT3*/, C63.2, R92.1, C46.1)
- NET_C(IC27.9/*MINUS3*/, R92.2, R88.1)
- NET_C(R88.2, V6)
-
- // --------------------------------
- // CON, MIX -> OUT
- MB4391_DIP(IC20) // shared by GUN_SOUND, CRY_SOUND
- NET_C(GND, IC20.3/*GND1*/, IC20.7/*GND2*/)
- NET_C(V5, IC20.16/*VCC1*/, IC20.12/*VCC2*/)
- CAP(C46, CAP_U(2.2))
- CAP(C25, CAP_U(2.2))
- CAP(C26, CAP_P(680))
- NET_C(C26.2, GND)
- NET_C(IC20.14/*RO1*/, C26.1)
- NET_C(IC20.1/*IN1*/, C46.2)
- NET_C(IC20.15/*OUT1*/, C25.1)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC37.13/*Q1*/)
-
- UNUSED_OP_OUT_MINUS(IC27.7/*OUT2*/, IC27.6/*MINUS2*/)
- UNUSED_OP_PLUS(IC27.5/*PLUS2*/)
-
- // --------------------------------
- // OUTPUT
- NET_C(GUN_SOUND, C25.2)
-
-
- /* ------------------------------------------------------------------------
- * JEEP_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(JEEP_ON, R151.2)
-
- // --------------------------------
- TTL_7408_DIP(IC29) // shared by _, JEEP_SOUND, _, _
- NET_C(GND, IC29.7/*GND*/)
- NET_C(V5, IC29.14/*VCC*/)
-
- TTL_7416_DIP(IC36) // shared by _, _, JEEP_SOUND, _, _, _
- NET_C(GND, IC36.7/*GND*/)
- NET_C(V5, IC36.14/*VCC*/)
-
- TTL_7474_DIP(IC30)
- NET_C(GND, IC30.7/*GND*/)
- NET_C(V5, IC30.14/*VCC*/)
-
- TTL_7474_DIP(IC32)
- NET_C(GND, IC32.7/*GND*/)
- NET_C(V5, IC32.14/*VCC*/)
-
- NE555(IC31)
- NET_C(GND, IC31.GND/*1*/)
- NET_C(V5, IC31.VCC/*8*/)
-
- RES(R123, RES_K(51))
- RES(R150, RES_K(1))
- RES(R151, RES_K(1))
- RES(R152, RES_K(1))
- RES(R153, RES_K(33))
- RES(R154, RES_K(1))
- RES(R157, RES_K(51))
- RES(R158, RES_K(51))
- CAP(C58, CAP_U(0.047))
- CAP(C59, CAP_U(2.2))
- CAP(C72, CAP_U(0.1))
-
- NET_C(GND, C72.2, C58.2)
- NET_C(V5, R150.1, R152.1, R154.1, R151.1
- , IC30.1/*CLR1*/, IC30.4/*PR1*/, IC30.10/*PR2*/, IC30.13/*CLR2*/
- , IC32.1/*CLR1*/, IC32.4/*PR1*/, IC32.10/*PR2*/, IC32.13/*CLR2*/
- )
- NET_C(IC36.5/*A3*/, R151.2)
- NET_C(IC36.6/*Q3*/, R152.2
- , IC31.RESET/*4*/
- )
- NET_C(IC31.DISCH/*7*/, R150.2, R153.1)
- NET_C(IC31.THRESH/*6*/, IC31.TRIG/*2*/, R153.2, C72.1)
- NET_C(IC31.OUT/*3*/, R154.2
- , IC32.3/*CLK1*/, IC30.3/*CLK1*/, IC30.11/*CLK2*/
- )
- NET_C(IC32.6/*QQ1*/, R157.1
- , IC32.2/*D1*/, IC32.11/*CLK2*/
- )
- NET_C(IC32.8/*QQ2*/, IC32.12/*D2*/, R158.1)
- NET_C(IC29.6/*Q2*/, IC30.2/*D1*/)
- NET_C(IC30.5/*Q1*/, IC30.12/*D2*/)
- NET_C(IC30.6/*QQ1*/, IC29.4/*A2*/)
- NET_C(IC30.8/*QQ2*/, IC29.5/*B2*/, R123.1)
- NET_C(R123.2, R157.2, R158.2, C58.1, C59.1)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC30.9/*Q2*/)
-
- NC_(IC31.CONT/*5*/)
-
- NC_(IC32.5/*Q1*/)
- NC_(IC32.9/*Q2*/)
-
- UNUSED_TTL_I(IC29.1/*A1*/)
- UNUSED_TTL_I(IC29.2/*B1*/)
- UNUSED_TTL_Q(IC29.3/*Q1*/)
- UNUSED_TTL_Q(IC29.8/*Q3*/)
- UNUSED_TTL_I(IC29.9/*A3*/)
- UNUSED_TTL_I(IC29.10/*B3*/)
- UNUSED_TTL_Q(IC29.11/*Q4*/)
- UNUSED_TTL_I(IC29.12/*A4*/)
- UNUSED_TTL_I(IC29.13/*B4*/)
-
- UNUSED_TTL_I(IC36.1/*A1*/)
- UNUSED_TTL_Q(IC36.2/*Q1*/)
- UNUSED_TTL_I(IC36.3/*A2*/)
- UNUSED_TTL_Q(IC36.4/*Q2*/)
- UNUSED_TTL_Q(IC36.8/*Q4*/)
- UNUSED_TTL_I(IC36.9/*A4*/)
- UNUSED_TTL_Q(IC36.10/*Q5*/)
- UNUSED_TTL_I(IC36.11/*A5*/)
- UNUSED_TTL_Q(IC36.12/*Q6*/)
- UNUSED_TTL_I(IC36.13/*A6*/)
-
- // --------------------------------
- // OUTPUT
- NET_C(JEEP_SOUND, C59.2)
-
-
- /* ------------------------------------------------------------------------
- * POINT_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(POINT_TRG, R148.2)
-
- // --------------------------------
- // TRG -> CON
- RES(R148, RES_K(1))
- RES(R149, RES_K(47))
- MA150(D5)
- RES(R159, 470)
- RES(R164, RES_K(470))
- RES(R165, RES_K(470))
- RES(R163, RES_K(27))
- RES(R166, RES_K(12))
- RES(R169, RES_K(30))
- RES(R168, RES_K(10))
- CAP(C71, CAP_U(1))
- CAP(C74, CAP_U(1))
- NET_C(R148.1, V5)
- NET_C(IC35.9/*A2*/, R148.2)
- NET_C(IC35.10/*B2*/, IC35.11/*CLRQ2*/, V5)
- NET_C(IC35.6/*C2*/, C71.1)
- NET_C(IC35.7/*RC2*/, C71.2, R149.2)
- NET_C(R149.1, V5)
- NET_C(IC35.12/*QQ2*/, D5.K)
- NET_C(D5.A, R159.1)
- NET_C(R159.2, C74.1, R165.2)
- NET_C(C74.2, GND)
- NET_C(IC38.12/*PLUS4*/, R165.1, R164.2)
- NET_C(R164.1, V5)
- NET_C(IC38.14/*OUT4*/, IC38.13/*MINUS4*/, R166.1)
- NET_C(R163.1, V12)
- NET_C(IC38.10/*PLUS3*/, R163.2, R168.1)
- NET_C(R168.2, GND)
- NET_C(IC38.9/*MINUS3*/, R166.2, R169.1)
- NET_C(IC38.8/*OUT3*/, R169.2)
-
- // --------------------------------
- // UPPER STAGE -> MIX
- RES(R79, RES_K(30))
- RES(R80, RES_K(51))
- RES(R81, RES_K(51))
- RES(R78, RES_K(15))
- RES(R32, RES_K(30))
- RES(R33, RES_K(10))
- CAP(C43, CAP_U(0.022))
- C458(TR13)
- NE555(IC18)
- NET_C(GND, IC18.GND/*1*/)
- NET_C(V5, IC18.VCC/*8*/)
- LM324_DIP(IC25) // shared by ANIMAL_SOUND, POINT_SOUND, POINT_SOUND, POINT_SOUND
- NET_C(GND, IC25.11/*GND*/)
- NET_C(V12, IC25.4/*VCC*/)
- NET_C(IC38.8/*OUT3*/, R79.1, R80.1)
- NET_C(IC25.12/*PLUS4*/, R80.2, R81.1)
- NET_C(R81.2, GND)
- NET_C(IC25.13/*MINUS4*/, R79.2, C43.1, R78.1)
- NET_C(IC18.RESET/*4*/, RST)
- NET_C(R33.1, V5)
- NET_C(IC18.DISCH/*7*/, R33.2)
- NET_C(TR13.B, IC18.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR13.C, R78.2) // B & C swapped, wrong in schematics
- NET_C(TR13.E, GND)
- NET_C(IC25.14/*OUT4*/, IC18.TRIG/*2*/, IC18.THRESH/*6*/, C43.2, R32.1)
-
- // --------------------------------
- // MIDDLE STAGE -> UPPER STAGE
- RES(R84, RES_K(30))
- RES(R83, RES_K(51))
- RES(R82, RES_K(51))
- RES(R85, RES_K(15))
- RES(R35, RES_K(30))
- RES(R36, RES_K(10))
- RES(R37, RES_K(2.2))
- CAP(C44, CAP_P(6800))
- C458(TR14)
- NE555(IC19)
- NET_C(GND, IC19.GND/*1*/)
- NET_C(V5, IC19.VCC/*8*/)
- NET_C(IC38.8/*OUT3*/, R83.1, R84.1)
- NET_C(IC25.10/*PLUS3*/, R83.2, R82.1)
- NET_C(R82.2, GND)
- NET_C(IC25.9/*MINUS3*/, R84.2, C44.1, R85.1)
- NET_C(IC19.RESET/*4*/, RST)
- NET_C(R36.1, V5)
- NET_C(IC19.DISCH/*7*/, R36.2)
- NET_C(TR14.B, IC19.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR14.C, R85.2) // B & C swapped, wrong in schematics
- NET_C(TR14.E, GND)
- NET_C(IC25.8/*OUT3*/, IC19.TRIG/*2*/, IC19.THRESH/*6*/, C44.2, R35.2)
- NET_C(R35.1, R32.2)
- NET_C(R37.1, IC18.CONT/*5*/, IC19.CONT/*5*/)
-
- // --------------------------------
- // LOWER STAGE -> UPPER STAGE
- RES(R130, RES_K(30))
- RES(R129, RES_K(51))
- RES(R128, RES_K(51))
- RES(R131, RES_K(15))
- RES(R34, RES_K(10))
- CAP(C61, CAP_U(0.068))
- CAP(C60, CAP_U(0.022))
- CAP(C23, CAP_U(0.01))
- C458(TR4)
- NE555(IC8)
- NET_C(GND, IC8.GND/*1*/)
- NET_C(V5, IC8.VCC/*8*/)
- NET_C(IC38.8/*OUT3*/, R130.1, R129.1)
- NET_C(IC25.5/*PLUS2*/, R129.2, R128.1)
- NET_C(R128.2, GND)
- NET_C(IC25.6/*MINUS2*/, R130.2, C60.1, C61.1, R131.1)
- NET_C(IC8.RESET/*4*/, RST)
- NET_C(IC8.CONT/*5*/, C23.1)
- NET_C(C23.2, GND)
- NET_C(R34.1, V5)
- NET_C(IC8.DISCH/*7*/, R34.2)
- NET_C(TR4.B, IC8.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR4.C, R131.2) // B & C swapped, wrong in schematics
- NET_C(TR4.E, GND)
- NET_C(IC25.7/*OUT2*/, IC8.TRIG/*2*/, IC8.THRESH/*6*/, C61.2, C60.2, R37.2)
-
- // --------------------------------
- // CON, MIX -> OUT
- CAP(C15, CAP_U(2.2))
- CAP(C16, CAP_P(680))
- CAP(C13, CAP_U(2.2))
- NET_C(R32.2, C13.1)
- NET_C(IC5.1/*IN1*/, C13.2)
- NET_C(IC5.15/*OUT1*/, C15.1)
- NET_C(IC5.14/*RO1*/, C16.1)
- NET_C(C16.2, GND)
- NET_C(IC38.14/*OUT4*/, IC5.2/*CON1*/)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC35.5/*Q2*/)
-
- NET_C(IC8.OUT/*3*/, NC_IC8_OUT.1) // not connected in schematics
- RES(NC_IC8_OUT, RES_M(1))
- NET_C(NC_IC8_OUT.2, GND)
- NET_C(IC18.OUT/*3*/, NC_IC18_OUT.1) // not connected in schematics
- RES(NC_IC18_OUT, RES_M(1))
- NET_C(NC_IC18_OUT.2, GND)
- NET_C(IC19.OUT/*3*/, NC_IC19_OUT.1) // not connected in schematics
- RES(NC_IC19_OUT, RES_M(1))
- NET_C(NC_IC19_OUT.2, GND)
-
- // --------------------------------
- // OUTPUT
- NET_C(POINT_SOUND, C15.2)
-
-
- /* ------------------------------------------------------------------------
- * HIT_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(HIT_TRG, R147.1)
-
- // --------------------------------
- // TRG -> CON
- TTL_74123_DIP(IC35) // shared by HIT_SOUND, POINT_SOUND
- NET_C(GND, IC35.8/*GND*/)
- NET_C(V5, IC35.16/*VCC*/)
- RES(R147, RES_K(1))
- RES(R146, RES_K(47))
- RES(R160, 470)
- RES(R161, RES_K(470))
- RES(R162, RES_K(470))
- CAP(C70, CAP_U(1))
- CAP(C75, CAP_U(1))
- MA150(D6)
- NET_C(IC35.1/*A1*/, R147.1)
- NET_C(R147.2, V5)
- NET_C(IC35.2/*B1*/, IC35.3/*CLRQ1*/, V5)
- NET_C(IC35.14/*C1*/, C70.1)
- NET_C(IC35.15/*RC1*/, C70.2, R146.2)
- NET_C(R146.1, V5)
- NET_C(IC35.4/*QQ1*/, D6.K)
- NET_C(D6.A, R160.1)
- NET_C(R160.2, C75.1, R161.2)
- NET_C(C75.2, GND)
- NET_C(IC38.3/*PLUS1*/, R161.1, R162.2)
- NET_C(R162.1, V5)
- NET_C(IC38.1/*OUT1*/, IC38.2/*MINUS1*/)
-
- // --------------------------------
- // CON, MIX -> OUT
- MB4391_DIP(IC5) // shared by POINT_SOUND, HIT_SOUND
- NET_C(GND, IC5.3/*GND1*/, IC5.7/*GND2*/)
- NET_C(V5, IC5.16/*VCC1*/, IC5.12/*VCC2*/)
- CAP(C18, CAP_P(680))
- NET_C(C18.1, IC5.10/*RO2*/)
- NET_C(C18.2, GND)
- CAP(C14, CAP_U(2.2))
- CAP(C17, CAP_U(2.2))
- NET_C(IC5.6/*CON2*/, IC38.1/*OUT1*/)
- NET_C(IC5.11/*OUT2*/, C17.1)
- NET_C(IC5.5/*IN2*/, C14.2)
-
- // --------------------------------
- // LOWER STAGE -> MIX
- C458(TR11)
- NE555(IC16)
- NET_C(GND, IC16.GND/*1*/)
- NET_C(V5, IC16.VCC/*8*/)
- RES(R71, RES_K(51))
- RES(R70, RES_K(30))
- RES(R72, RES_K(51))
- RES(R69, RES_K(15))
- RES(R28, RES_K(10))
- RES(R76, RES_K(1))
- CAP(C39, CAP_U(0.01))
- CAP(C40, CAP_U(0.0033))
- NET_C(IC24.14/*OUT4*/, C14.1)
- NET_C(IC24.7/*OUT2*/, R70.1, R71.1)
- NET_C(IC24.12/*PLUS4*/, R71.2, R72.1)
- NET_C(R72.2, GND)
- NET_C(IC24.13/*MINUS4*/, R70.2, C39.1, C40.1, R69.1)
- NET_C(IC24.14/*OUT4*/, IC16.TRIG/*2*/, IC16.THRESH/*6*/, C39.2, C40.2)
- NET_C(IC16.RESET/*4*/, RST)
- NET_C(IC16.CONT/*5*/, R76.2)
- NET_C(R28.1, V5)
- NET_C(TR11.B, IC16.DISCH/*7*/, R28.2) // B & C swapped, wrong in schematics
- NET_C(TR11.C, R69.2) // B & C swapped, wrong in schematics
- NET_C(TR11.E, GND)
-
- NET_C(IC24.8/*OUT3*/, R76.1)
-
- RES(R119, RES_K(10))
- RES(R120, RES_K(39))
- RES(R121, RES_K(47))
- RES(R122, RES_K(15))
-
- LM324_DIP(IC24) // shared by EMAR_SOUND, HIT_SOUND, HIT_SOUND, HIT_SOUND
- NET_C(GND, IC24.11/*GND*/)
- NET_C(V12, IC24.4/*VCC*/)
-
- NET_C(V12, R120.1)
- NET_C(R120.2, R119.1)
- NET_C(IC24.5/*PLUS2*/, R120.2)
- NET_C(R119.2, GND)
- NET_C(IC24.6/*MINUS2*/, R122.2, R121.1)
- NET_C(IC24.7/*OUT2*/, R121.2)
-
- NET_C(IC24.8/*OUT3*/, R122.1)
-
- // --------------------------------
- // UPPER STAGE -> LOWER STAGE
- C458(TR12)
- NE555(IC17)
- NET_C(GND, IC17.GND/*1*/)
- NET_C(V5, IC17.VCC/*8*/)
- RES(R75, RES_K(470))
- RES(R74, RES_K(51))
- RES(R73, RES_K(51))
- RES(R77, RES_K(5.1))
- RES(R30, RES_K(10))
- CAP(C41, CAP_U(2.2))
- CAP(C42, CAP_U(2.2))
- CAP(C21, CAP_U(0.01))
- NET_C(V6, R75.1, R74.1)
- NET_C(C41.1, C42.1)
- NET_C(IC24.9/*MINUS3*/, R75.2, R77.1, C41.2)
- NET_C(IC24.10/*PLUS3*/, R74.2, R73.1)
- NET_C(R73.2, GND)
- NET_C(IC17.RESET/*4*/, RST)
- NET_C(R30.1, V5)
- NET_C(IC17.DISCH/*7*/, R30.2)
- NET_C(IC17.CONT/*5*/, C21.1)
- NET_C(C21.2, GND)
- NET_C(TR12.B, IC17.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR12.C, R77.2) // B & C swapped, wrong in schematics
- NET_C(TR12.E, GND)
- NET_C(IC24.8/*OUT3*/, IC17.TRIG/*2*/, IC17.THRESH/*6*/, C42.2)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC35.13/*Q1*/)
-
- NET_C(IC17.OUT/*3*/, NC_IC17_OUT.1) // not connected in schematics
- RES(NC_IC17_OUT, RES_M(1))
- NET_C(NC_IC17_OUT.2, GND)
- NET_C(IC16.OUT/*3*/, NC_IC16_OUT.1) // not connected in schematics
- RES(NC_IC16_OUT, RES_M(1))
- NET_C(NC_IC16_OUT.2, GND)
-
- // --------------------------------
- // OUTPUT
- NET_C(HIT_SOUND, C17.2)
-
-
- /* ------------------------------------------------------------------------
- * ANIMAL_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(ANIMAL_TRG, R145.2)
-
- // --------------------------------
- // TGG -> TRG2 -> CON
- RES(R145, RES_K(1))
- RES(R143, RES_K(47))
- RES(R144, RES_K(47))
- RES(R106, 470)
- RES(R108, RES_K(470))
- RES(R107, RES_K(470))
- CAP(C67, CAP_U(47))
- CAP(C66, CAP_U(47))
- CAP(C69, CAP_U(1))
- CAP(C53, CAP_U(1))
- MA150(D4)
- TTL_74123_DIP(IC34) // shared by ANIMAL_SOUND, ANIMAL_SOUND
- NET_C(GND, IC34.8/*GND*/)
- NET_C(V5, IC34.16/*VCC*/)
- NET_C(R145.1, V5)
- NET_C(IC34.1/*A1*/, R145.2)
- NET_C(IC34.2/*B1*/, IC34.3/*CLRQ1*/, V5)
- NET_C(IC34.14/*C1*/, C67.2, C66.2)
- NET_C(IC34.15/*RC1*/, C67.1, C66.1, R143.2)
- NET_C(R143.1, V5)
- NET_C(IC34.1/*A1*/, IC34.9/*A2*/)
- NET_C(IC34.13/*Q1*/, IC34.10/*B2*/, IC34.11/*CLRQ2*/)
- NET_C(IC34.6/*C2*/, C69.2)
- NET_C(IC34.7/*RC2*/, C69.1, R144.2)
- NET_C(R144.1, V5)
- NET_C(IC34.12/*QQ2*/, D4.K)
- NET_C(D4.A, R106.1)
- NET_C(R106.2, C53.1, R107.2)
- NET_C(C53.2, GND)
- NET_C(IC23.3/*PLUS1*/, R107.1, R108.2)
- NET_C(R108.1, V5)
- NET_C(IC23.1/*OUT1*/, IC23.2/*MINUS1*/, IC4.6/*CON2*/)
-
- // --------------------------------
- C458(TR16)
- RES(R110, RES_K(10))
- NET_C(IC34.13/*Q1*/, R110.1)
- NET_C(TR16.B, R110.2) // B & C swapped, wrong in schematics
- NET_C(TR16.C, R109.2) // B & C swapped, wrong in schematics
- NET_C(TR16.E, GND)
-
- C458(TR15)
- RES(R109, RES_K(1))
- RES(R44, 220)
- NET_C(R109.1, V5)
- NET_C(TR15.B, R109.2) // B & C swapped, wrong in schematics
- NET_C(TR15.C, C24.1) // B & C swapped, wrong in schematics
- NET_C(TR15.E, R44.1)
- NET_C(R44.2, C24.2)
-
- // --------------------------------
- // UPPER STAGE -> MIDDLE STAGE
- RES(R39, RES_K(51))
- RES(R38, RES_K(22))
- RES(R15, RES_K(51))
- RES(R41, RES_K(22))
- RES(R42, RES_K(36))
- RES(R43, RES_K(10))
- RES(R40, RES_M(1))
- CAP(C24, CAP_U(100))
- LM324_DIP(IC9) // shared by ANIMAL_SOUND, ANIMAL_SOUND, ANIMAL_SOUND, ANIMAL_SOUND
- NET_C(GND, IC9.11/*GND*/)
- NET_C(V12, IC9.4/*VCC*/)
- NET_C(R40.1, R39.1, V12)
- NET_C(IC9.5/*PLUS2*/, R39.2, R15.1)
- NET_C(R15.2, GND)
- NET_C(IC9.6/*MINUS2*/, R40.2, C24.1)
- NET_C(IC9.7/*OUT2*/, C24.2, R38.1)
- NET_C(R42.1, V12)
- NET_C(IC9.3/*PLUS1*/, R42.2, R43.1)
- NET_C(R43.2, GND)
- NET_C(IC9.2/*MINUS1*/, R38.2, R41.1)
- NET_C(IC9.1/*OUT1*/, R41.2)
-
- // --------------------------------
- // MIDDLE STAGE -> MIX
- RES(R11, RES_K(30))
- RES(R12, RES_K(51))
- RES(R13, RES_K(51))
- RES(R10, RES_K(1))
- RES(R9, RES_K(10))
- RES(R14, RES_K(5.1))
- RES(R16, RES_K(10))
- CAP(C1, CAP_U(0.033))
- C458(TR1)
- NE555(IC1)
- NET_C(GND, IC1.GND/*1*/)
- NET_C(V5, IC1.VCC/*8*/)
- NET_C(IC9.1/*OUT1*/, R11.1, R12.1)
- NET_C(IC9.12/*PLUS4*/, R12.2, R13.1)
- NET_C(R13.2, GND)
- NET_C(IC9.13/*MINUS4*/, R11.2, C1.1, R10.1)
- NET_C(IC1.RESET/*4*/, RST)
- NET_C(IC1.DISCH/*7*/, R9.2)
- NET_C(R9.1, V5)
- NET_C(TR1.B, IC1.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR1.C, R10.2) // B & C swapped, wrong in schematics
- NET_C(TR1.E, GND)
- NET_C(IC9.14/*OUT4*/, IC1.TRIG/*2*/, IC1.THRESH/*6*/, C1.2)
- NET_C(IC9.14/*OUT4*/, R16.1)
- NET_C(IC1.CONT/*5*/, R14.1)
-
- RES(R17, RES_K(5.1))
- RES(R18, RES_K(3.3))
- NET_C(IC9.8/*OUT3*/, IC9.9/*MINUS3*/, R14.2)
- NET_C(IC9.10/*PLUS3*/, R17.2, R18.2)
-
- // --------------------------------
- // LOWER STAGE -> MIDDLE STAGE
- RES(R59, RES_K(560))
- RES(R58, RES_K(51))
- RES(R57, RES_K(51))
- RES(R60, RES_K(5.1))
- RES(R23, RES_K(10))
- CAP(C34, CAP_U(1))
- CAP(C35, CAP_U(1))
- CAP(C7, CAP_U(0.01))
- C458(TR8)
- NE555(IC13)
- NET_C(GND, IC13.GND/*1*/)
- NET_C(V5, IC13.VCC/*8*/)
- NET_C(R59.1, R58.1, V6)
- NET_C(IC22.10/*PLUS3*/, R58.2, R57.1)
- NET_C(R57.2, GND)
- NET_C(IC22.9/*MINUS3*/, R59.2, C34.2, R60.1)
- NET_C(C34.1, C35.1)
- NET_C(IC13.RESET/*4*/, RST)
- NET_C(IC13.DISCH/*7*/, R23.2)
- NET_C(R23.1, V5)
- NET_C(IC13.CONT/*5*/, C7.1)
- NET_C(C7.2, GND)
- NET_C(TR8.B, IC13.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR8.C, R60.2) // B & C swapped, wrong in schematics
- NET_C(TR8.E, GND)
- NET_C(IC22.8/*OUT3*/, IC13.TRIG/*2*/, IC13.THRESH/*6*/, C35.2, R18.1)
-
- // --------------------------------
- // BOTTOM STAGE -> MIDDLE STAGE
- RES(R127, RES_K(56))
- RES(R125, RES_K(51))
- RES(R124, RES_K(51))
- RES(R126, RES_K(30))
- RES(R31, RES_K(10))
- CAP(C57, CAP_U(1))
- CAP(C56, CAP_U(1))
- CAP(C22, CAP_U(0.01))
- C458(TR3)
- NE555(IC7)
- NET_C(GND, IC7.GND/*1*/)
- NET_C(V5, IC7.VCC/*8*/)
- NET_C(R127.1, R125.1, V6)
- NET_C(IC25.3/*PLUS1*/, R125.2, R124.1)
- NET_C(R124.2, GND)
- NET_C(IC25.2/*MINUS1*/, R127.2, C57.2, R126.1)
- NET_C(C57.1, C56.1)
- NET_C(IC7.RESET/*4*/, RST)
- NET_C(IC7.CONT/*5*/, C22.1)
- NET_C(C22.2, GND)
- NET_C(IC7.DISCH/*7*/, R31.2)
- NET_C(R31.1, V5)
- NET_C(TR3.B, IC7.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR3.C, R126.2) // B & C swapped, wrong in schematics
- NET_C(TR3.E, GND)
- NET_C(IC25.1/*OUT1*/, IC7.TRIG/*2*/, IC7.THRESH/*6*/, C56.2)
- NET_C(IC25.1/*OUT1*/, R17.1)
-
- // --------------------------------
- // CON, MIX -> OUT
- CAP(C6, CAP_U(2.2))
- CAP(C11, CAP_U(2.2))
- CAP(C12, CAP_P(680))
- NET_C(IC4.10/*RO2*/, C12.1)
- NET_C(C12.2, GND)
- NET_C(R16.2, C6.1)
- NET_C(IC4.5/*IN2*/, C6.2)
- NET_C(IC4.11/*OUT2*/, C11.1)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC34.4/*QQ1*/)
- NC_(IC34.5/*Q2*/)
-
- NET_C(IC1.OUT/*3*/, NC_IC1_OUT.1) // not connected in schematics
- RES(NC_IC1_OUT, RES_M(1))
- NET_C(NC_IC1_OUT.2, GND)
-
- NET_C(IC13.OUT/*3*/, NC_IC13_OUT.1) // not connected in schematics
- RES(NC_IC13_OUT, RES_M(1))
- NET_C(NC_IC13_OUT.2, GND)
-
- NET_C(IC7.OUT/*3*/, NC_IC7_OUT.1) // not connected in schematics
- RES(NC_IC7_OUT, RES_M(1))
- NET_C(NC_IC7_OUT.2, GND)
-
-
- // --------------------------------
- // OUTPUT
- NET_C(ANIMAL_SOUND, C11.2)
-
-
- /* ------------------------------------------------------------------------
- * EMAR_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(EMAR_TRG, R142.2)
-
- // --------------------------------
- // TRG -> CON
- RES(R142, RES_K(1))
- RES(R141, RES_K(47))
- MA150(D3)
- RES(R103, 470)
- RES(R105, RES_K(470))
- RES(R104, RES_K(470))
- CAP(C68, CAP_U(1))
- CAP(C52, CAP_U(1))
- NET_C(IC33.9/*A2*/, R142.2)
- NET_C(R142.1, V5)
- NET_C(IC33.10/*B2*/, IC33.11/*CLRQ2*/, V5)
- NET_C(IC33.6/*C2*/, C68.1)
- NET_C(IC33.7/*RC2*/, C68.2, R141.2)
- NET_C(R141.1, V5)
- NET_C(IC33.12/*QQ2*/, D3.K)
- NET_C(D3.A, R103.1)
- NET_C(R103.2, C52.1, R105.2)
- NET_C(C52.2, GND)
- NET_C(IC22.5/*PLUS2*/, R105.1, R104.2)
- NET_C(R104.1, V5)
- NET_C(IC22.7/*OUT2*/, IC22.6/*MINUS2*/)
-
- // --------------------------------
- // CON, MIX -> OUT
- MB4391_DIP(IC4) // shared by EMAR_SOUND, ANIMAL_SOUND
- NET_C(GND, IC4.3/*GND1*/, IC4.7/*GND2*/)
- NET_C(V5, IC4.16/*VCC1*/, IC4.12/*VCC2*/)
- RES(R24, RES_K(10))
- CAP(C8, CAP_U(2.2))
- CAP(C9, CAP_U(2.2))
- CAP(C10, CAP_P(680))
- NET_C(IC22.7/*OUT2*/, IC4.2/*CON1*/)
- NET_C(IC4.14/*RO1*/, C10.1)
- NET_C(C10.2, GND)
- NET_C(IC4.15/*OUT1*/, C9.1)
- NET_C(IC4.1/*IN1*/, C8.2)
- NET_C(R24.2, C8.1)
-
- LM324_DIP(IC23) // shared by ANIMAL_SOUND, EMAR_SOUND, EMAR_SOUND, EMAR_SOUND
- NET_C(GND, IC23.11/*GND*/)
- NET_C(V12, IC23.4/*VCC*/)
-
- // --------------------------------
- // LOWER STAGE -> UPPER STAGE
- C458(TR2)
- NE555(IC6)
- NET_C(GND, IC6.GND/*1*/)
- NET_C(V5, IC6.VCC/*8*/)
- RES(R116, RES_K(470))
- RES(R117, RES_K(51))
- RES(R118, RES_K(51))
- RES(R115, RES_K(51))
- RES(R29, RES_K(10))
- CAP(C55, CAP_U(3.3))
- CAP(C54, CAP_U(3.3))
- CAP(C20, CAP_U(0.01))
- NET_C(R116.1, R117.1, V6)
- NET_C(IC24.3/*PLUS1*/, R117.2, R118.1)
- NET_C(R118.2, GND)
- NET_C(IC24.2/*MINUS1*/, R116.2, C55.2, R115.1)
- NET_C(C55.1, C54.1)
- NET_C(IC6.RESET/*4*/, RST)
- NET_C(IC6.CONT/*5*/, C20.1)
- NET_C(C20.2, GND)
- NET_C(IC6.DISCH/*7*/, R29.2)
- NET_C(R29.1, V5)
- NET_C(TR2.B, IC6.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR2.C, R115.2) // B & C swapped, wrong in schematics
- NET_C(TR2.E, GND)
- NET_C(IC24.1/*OUT1*/, IC6.TRIG/*2*/, IC6.THRESH/*6*/, C54.2)
-
- NET_C(IC24.1/*OUT1*/, R113.1)
- RES(R113, RES_K(22))
- RES(R111, RES_K(27))
- RES(R112, RES_K(10))
- RES(R114, RES_K(22))
- NET_C(R111.1, V12)
- NET_C(IC23.5/*PLUS2*/, R111.2, R112.1)
- NET_C(R112.2, GND)
- NET_C(IC23.6/*MINUS2*/, R113.2, R114.1)
- NET_C(IC23.7/*OUT2*/, R114.2)
-
- // --------------------------------
- // MIDDLE STAGE -> UPPER STAGE
- C458(TR10)
- NE555(IC15)
- NET_C(GND, IC15.GND/*1*/)
- NET_C(V5, IC15.VCC/*8*/)
- RES(R67, RES_K(220))
- RES(R66, RES_K(51))
- RES(R65, RES_K(51))
- RES(R68, RES_K(100))
- RES(R27, RES_K(10))
- RES(R26, RES_K(33))
- CAP(C38, CAP_U(1))
- CAP(C37, CAP_U(1))
- CAP(C19, CAP_U(0.01))
- NET_C(R67.1, R66.1, V6)
- NET_C(IC23.10/*PLUS3*/, R66.2, R65.1)
- NET_C(R65.2, GND)
- NET_C(IC23.9/*MINUS3*/, R67.2, C37.2, R68.1)
- NET_C(IC15.RESET/*4*/, RST)
- NET_C(IC15.CONT/*5*/, C19.1)
- NET_C(C19.2, GND)
- NET_C(IC15.DISCH/*7*/, R27.2)
- NET_C(R27.1, V5)
- NET_C(TR10.B, IC15.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR10.C, R68.2) // B & C swapped, wrong in schematics
- NET_C(TR10.E, GND)
- NET_C(IC23.8/*OUT3*/, IC15.TRIG/*2*/, IC15.THRESH/*6*/, C38.2)
- NET_C(C38.1, C37.1)
- NET_C(IC15.OUT/*3*/, R26.2)
-
- // --------------------------------
- // UPPER STAGE -> MIX
- C458(TR9)
- NE555(IC14)
- NET_C(GND, IC14.GND/*1*/)
- NET_C(V5, IC14.VCC/*8*/)
- RES(R62, RES_K(30))
- RES(R63, RES_K(51))
- RES(R64, RES_K(51))
- RES(R61, RES_K(15))
- RES(R25, RES_K(10))
- CAP(C36, CAP_U(0.022))
- CAP(C2, CAP_U(1)) // ? maybe 0.01uF
- NET_C(IC23.7/*OUT2*/, R62.1, R63.1)
- NET_C(IC23.12/*PLUS4*/, R63.2, R64.1)
- NET_C(R64.2, GND)
- NET_C(IC23.13/*MINUS4*/, R62.2, C36.1, R61.1)
- NET_C(IC14.RESET/*4*/, RST)
- NET_C(IC14.DISCH/*7*/, R25.2)
- NET_C(R25.1, V5)
- NET_C(IC14.CONT/*5*/, C2.1, R26.1)
- NET_C(C2.2, GND)
- NET_C(TR9.B, IC14.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR9.C, R61.2) // B & C swapped, wrong in schematics
- NET_C(TR9.E, GND)
- NET_C(IC23.14/*OUT4*/, IC14.TRIG/*2*/, IC14.THRESH/*6*/, C36.2)
- NET_C(IC23.14/*OUT4*/, R24.1)
-
- // --------------------------------
- // UNUSED PINS
- NC_(IC33.5/*Q2*/)
-
- NET_C(IC6.OUT/*3*/, NC_IC6_OUT.1) // not connected in schematics
- RES(NC_IC6_OUT, RES_M(1))
- NET_C(NC_IC6_OUT.2, GND)
- NET_C(IC14.OUT/*3*/, NC_IC14_OUT.1) // not connected in schematics
- RES(NC_IC14_OUT, RES_M(1))
- NET_C(NC_IC14_OUT.2, GND)
-
- // --------------------------------
- // OUTPUT
- NET_C(EMAR_SOUND, C9.2)
-
-
- /* ------------------------------------------------------------------------
- * WALK_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(WALK_TRG, R140.2)
-
- // --------------------------------
- NE555(IC28)
- NET_C(GND, IC28.GND/*1*/)
- NET_C(V5, IC28.VCC/*8*/)
-
- LM324_DIP(IC21) // shared by CRY_SOUND, WALK_SOUND, CRY_SOUND, CRY_SOUND
- NET_C(GND, IC21.11/*GND*/)
- NET_C(V12, IC21.4/*VCC*/)
-
- RES(R95, RES_K(100))
- RES(R96, RES_K(22))
- RES(R98, RES_K(27))
- RES(R137, RES_K(22))
- RES(R140, RES_K(1))
- CAP(C3, CAP_U(2.2))
- CAP(C50, CAP_U(0.1))
- CAP(C51, CAP_U(2.2))
- CAP(C65, CAP_U(0.01))
- CAP(C77, CAP_U(2.2))
-
- NET_C(GND, C65.2, C77.2, C50.2)
- NET_C(V6, IC21.5/*PLUS2*/)
- NET_C(V5, R140.1, R137.1)
- NET_C(R140.2, IC28.TRIG/*2*/)
- NET_C(C65.1, IC28.CONT/*5*/)
- NET_C(IC28.THRESH/*6*/, IC28.DISCH/*7*/, R137.2, C77.1)
- NET_C(IC28.OUT/*3*/ , R98.1)
- NET_C(R98.2, C50.1, C51.1)
- NET_C(C51.2, R96.1)
- NET_C(R96.2, R95.1, IC21.6/*MINUS2*/)
- NET_C(IC21.7/*OUT2*/, R95.2, C3.1)
-
- // --------------------------------
- // UNUSED PINS
- NET_C(V5, IC28.RESET/*4*/) // not connected on schematic
-
- // --------------------------------
- // OUTPUT
- NET_C(WALK_SOUND, C3.2)
-
-
- /* ------------------------------------------------------------------------
- * CRY_SOUND
- * -----------------------------------------------------------------------*/
- // INPUT
- NET_C(CRY_TRG, R139.2)
-
- // --------------------------------
- // TRG -> CON
- TTL_74123_DIP(IC33) // shared by CRY_SOUND, EMAR_SOUND
- NET_C(GND, IC33.8/*GND*/)
- NET_C(V5, IC33.16/*VCC*/)
- LM324_DIP(IC22) // shared by CRY_SOUND, EMAR_SOUND, ANIMAL_SOUND, CRY_SOUND
- NET_C(GND, IC22.11/*GND*/)
- NET_C(V12, IC22.4/*VCC*/)
- MA150(D2)
- RES(R139, RES_K(1))
- RES(R138, RES_K(47))
- RES(R97, 470)
- RES(R87, RES_K(470))
- RES(R94, RES_K(470))
- CAP(C64, CAP_U(1))
- NET_C(V5, R139.1, R138.1, R87.1)
- NET_C(GND, C49.2)
- NET_C(R139.2, IC33.1/*A1*/)
- NET_C(V5, IC33.2/*B1*/, IC33.3/*CLRQ1*/)
- NET_C(IC33.14/*C1*/, C64.1)
- NET_C(IC33.15/*RC1*/, C64.2, R138.2)
- NET_C(IC33.4/*QQ1*/, D2.K)
- NC_(IC33.13/*Q1*/)
- NET_C(D2.A, R97.1)
- NET_C(R97.2, C49.1, R94.2)
- NET_C(IC21.3/*PLUS1*/, R87.2, R94.1)
- NET_C(IC21.1/*OUT1*/, IC21.2/*MINUS1*/, IC20.6/*CON2*/)
-
- // --------------------------------
- // CON, MIX -> OUT
- RES(R86, RES_K(10))
- CAP(C47, CAP_U(2.2))
- CAP(C49, CAP_U(1))
- CAP(C28, CAP_P(680))
- CAP(C27, CAP_U(2.2))
- NET_C(IC21.14/*OUT4*/, R86.1)
- NET_C(R86.2, C47.1)
- NET_C(IC20.5/*IN2*/, C47.2)
- NET_C(IC20.10/*RO2*/, C28.1)
- NET_C(C28.2, GND)
- NET_C(IC20.11/*OUT2*/, C27.1)
-
- // --------------------------------
- // UPPER STAGE -> MIDDLE STAGE
- C458(TR7)
- NE555(IC12)
- NET_C(GND, IC12.GND/*1*/)
- NET_C(V5, IC12.VCC/*8*/)
- NET_C(RST, IC12.RESET/*4*/)
- RES(R22, RES_K(10))
- RES(R55, RES_K(51))
- RES(R54, RES_K(220))
- RES(R56, RES_K(51))
- RES(R53, RES_K(100))
- CAP(C33, CAP_U(0.22))
- CAP(C32, CAP_U(0.22))
- CAP(C5, CAP_U(0.01))
- NET_C(TR7.B, IC12.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR7.C, R53.2) // B & C swapped, wrong in schematics
- NET_C(TR7.E, GND)
- NET_C(V5, R22.1)
- NET_C(IC12.DISCH/*7*/, R22.2)
- NET_C(IC22.14/*OUT4*/, IC12.TRIG/*2*/, IC12.THRESH/*6*/)
- NET_C(IC22.14/*OUT4*/, C32.2)
- NET_C(C32.1, C33.1)
- NET_C(IC22.13/*MINUS4*/, R53.1, R54.2, C33.2)
- NET_C(IC22.12/*PLUS4*/, R55.2, R56.1)
- NET_C(R56.2, GND)
- NET_C(R54.1, R55.1, V6)
- NET_C(IC12.CONT/*5*/, C5.1)
- NET_C(C5.2, GND)
-
- RES(R99, RES_K(22))
- RES(R100, RES_K(100))
- RES(R101, RES_K(15))
- RES(R102, RES_K(33))
- NET_C(IC22.14/*OUT4*/, R100.1)
- NET_C(IC22.1/*OUT1*/, R102.2)
- NET_C(IC22.2/*MINUS1*/, R100.2, R102.1)
- NET_C(IC22.3/*PLUS1*/, R99.2, R101.1)
- NET_C(R99.1, V12)
- NET_C(R101.2, GND)
-
- // --------------------------------
- // LOWER STAGE -> MIDDLE STAGE
- C458(TR6)
- NE555(IC11)
- NET_C(GND, IC11.GND/*1*/)
- NET_C(V5, IC11.VCC/*8*/)
- NET_C(RST, IC11.RESET/*4*/)
- RES(R21, RES_K(10))
- RES(R49, RES_K(51))
- RES(R50, RES_K(51))
- RES(R51, RES_K(470))
- RES(R52, RES_K(5.1))
- CAP(C30, CAP_U(2.2))
- CAP(C31, CAP_U(2.2))
- CAP(C4, CAP_U(0.01))
- NET_C(TR6.B, IC11.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR6.C, R52.2) // B & C swapped, wrong in schematics
- NET_C(TR6.E, GND)
- NET_C(V5, R21.1)
- NET_C(IC11.DISCH/*7*/, R21.2)
- NET_C(IC21.8/*OUT3*/, IC11.TRIG/*2*/, IC11.THRESH/*6*/)
- NET_C(IC21.9/*MINUS3*/, R52.1, R51.2, C30.2)
- NET_C(C30.1, C31.1)
- NET_C(IC21.8/*OUT3*/, C31.2)
- NET_C(IC21.10/*PLUS3*/, R50.2, R49.1)
- NET_C(R49.2, GND)
- NET_C(V6, R51.1, R50.1)
- NET_C(IC11.CONT/*5*/, C4.1)
- NET_C(C4.2, GND)
- NET_C(IC21.8/*OUT3*/, R20.1)
- NET_C(IC10.CONT/*5*/, R20.2)
-
- // --------------------------------
- // MIDDLE STAGE -> MIX
- C458(TR5)
- NE555(IC10)
- NET_C(GND, IC10.GND/*1*/)
- NET_C(V5, IC10.VCC/*8*/)
- NET_C(RST, IC10.RESET/*4*/)
- RES(R19, RES_K(10))
- RES(R45, RES_K(15))
- RES(R46, RES_K(30))
- RES(R47, RES_K(51))
- RES(R48, RES_K(51))
- CAP(C29, CAP_U(0.022))
- RES(R20, RES_K(1))
-
- NET_C(TR5.B, IC10.DISCH/*7*/) // B & C swapped, wrong in schematics
- NET_C(TR5.C, R45.2) // B & C swapped, wrong in schematics
- NET_C(TR5.E, GND)
- NET_C(V5, R19.1)
- NET_C(IC10.DISCH/*7*/, R19.2)
- NET_C(IC21.14/*OUT4*/, IC10.TRIG/*2*/, IC10.THRESH/*6*/)
- NET_C(IC21.13/*MINUS4*/, R45.1, R46.2, C29.1)
- NET_C(IC21.12/*PLUS4*/, R47.2, R48.1)
- NET_C(R48.2, GND)
- NET_C(IC22.1/*OUT1*/, R46.1, R47.1)
- NET_C(IC21.14/*OUT4*/, C29.2)
-
- // --------------------------------
- // UNUSED PINS
- NET_C(IC10.OUT/*3*/, NC_IC10_OUT.1) // not connected in schematics
- RES(NC_IC10_OUT, RES_M(1))
- NET_C(NC_IC10_OUT.2, GND)
- NET_C(IC11.OUT/*3*/, NC_IC11_OUT.1) // not connected in schematics
- RES(NC_IC11_OUT, RES_M(1))
- NET_C(NC_IC11_OUT.2, GND)
- NET_C(IC12.OUT/*3*/, NC_IC12_OUT.1) // not connected in schematics
- RES(NC_IC12_OUT, RES_M(1))
- NET_C(NC_IC12_OUT.2, GND)
-
- // --------------------------------
- // OUTPUT
- NET_C(CRY_SOUND, C27.2)
+ /* ------------------------------------------------------------------------
+ * UNUSED_OP_REF
+ * -----------------------------------------------------------------------*/
+ // UNUSED_OP_REF
+ POT(UNUSED_OP_RES, RES_K(20))
+ PARAM(UNUSED_OP_RES.DIAL, 0.5)
+ NET_C(V12, UNUSED_OP_RES.1)
+ NET_C(GND, UNUSED_OP_RES.3)
+ ALIAS(UNUSED_OP_REF, UNUSED_OP_RES.2)
+
+
+ /* ------------------------------------------------------------------------
+ * RST (RESET for sound)
+ * t(0s) = lo, t(2s) = high, t(infinite) = high
+ * -----------------------------------------------------------------------*/
+ RES(R171, RES_K(47))
+ CAP(C78, CAP_U(47))
+
+ TTL_74123_DIP(IC37) // shared by GUN_SOUND, RST
+ NET_C(GND, IC37.8/*GND*/)
+ NET_C(V5, IC37.16/*VCC*/)
+
+ NET_C(GND, IC37.9/*A2*/)
+ NET_C(V5, IC37.10/*B2*/, IC37.11/*CLRQ2*/, R171.1)
+ NET_C(IC37.6/*C2*/, C78.1)
+ NET_C(IC37.7/*RC2*/, C78.2, R171.2)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC37.5/*Q2*/)
+
+ // --------------------------------
+ // OUTPUT
+ ALIAS(RST, IC37.12/*QQ2*/)
+
+
+ /* ------------------------------------------------------------------------
+ * GUN_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(GUN_TRG, R156.2)
+
+ // --------------------------------
+ // TRG -> CON
+ MA150(D1)
+ RES(R156, RES_K(1))
+ RES(R155, RES_K(47))
+ RES(R89, 470)
+ RES(R90, RES_K(470))
+ RES(R91, RES_K(470))
+ CAP(C73, CAP_U(1))
+ CAP(C45, CAP_U(1))
+ NET_C(GND, C45.2)
+ NET_C(V5, IC37.2/*B1*/, IC37.3/*CLRQ1*/
+ , R156.1, R155.1, R91.1)
+ NET_C(R156.2, IC37.1/*A1*/)
+ NET_C(IC37.14/*C1*/, C73.1)
+ NET_C(IC37.15/*RC1*/, C73.2, R155.2)
+ NET_C(IC37.4/*QQ1*/, D1.K)
+ NET_C(D1.A, R89.1)
+ NET_C(R89.2, C45.1, R90.2)
+ NET_C(R91.2, R90.1, IC27.12/*PLUS4*/)
+ NET_C(IC27.14/*OUT4*/, IC27.13/*MINUS4*/, IC20.2/*CON1*/)
+
+ // --------------------------------
+ // NOISE
+ RES(R132, RES_K(220))
+ RES(R133, RES_K(22))
+ RES(R134, RES_K(15))
+ RES(R93, RES_K(15))
+ RES(R92, RES_K(150))
+ RES(R88, RES_K(100))
+ CAP(C62, CAP_U(2.2))
+ CAP(C63, CAP_U(0.01))
+ CAP(C48, CAP_U(0.01))
+
+ MM5837(IC26)
+ PARAM(IC26.FREQ, 24000)
+ NET_C(GND, IC26.VDD/*1*/, IC26.VGG/*2*/)
+ NET_C(V12, IC26.VSS/*4*/) // left out decoupling caps (0.1uF & 22uF parallel to GND)
+
+ LM324_DIP(IC27) // shared by GUN_SOUND, _, GUN_SOUND, GUN_SOUND
+ NET_C(GND, IC27.11/*GND*/)
+ NET_C(V12, IC27.4/*VCC*/)
+
+ NET_C(IC26.OUT/*3*/, C62.1)
+ NET_C(C62.2, R132.1)
+ NET_C(R132.2, IC27.2/*MINUS1*/, R133.1)
+ NET_C(IC27.3/*PLUS1*/, V6)
+ NET_C(IC27.1/*OUT1*/, R133.2, R134.1)
+ NET_C(R134.2, R93.1, C63.1)
+ NET_C(R93.2, C48.1, IC27.10/*PLUS3*/)
+ NET_C(C48.2, GND)
+ NET_C(IC27.8/*OUT3*/, C63.2, R92.1, C46.1)
+ NET_C(IC27.9/*MINUS3*/, R92.2, R88.1)
+ NET_C(R88.2, V6)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ MB4391_DIP(IC20) // shared by GUN_SOUND, CRY_SOUND
+ NET_C(GND, IC20.3/*GND1*/, IC20.7/*GND2*/)
+ NET_C(V5, IC20.16/*VCC1*/, IC20.12/*VCC2*/)
+ CAP(C46, CAP_U(2.2))
+ CAP(C25, CAP_U(2.2))
+ CAP(C26, CAP_P(680))
+ NET_C(C26.2, GND)
+ NET_C(IC20.14/*RO1*/, C26.1)
+ NET_C(IC20.1/*IN1*/, C46.2)
+ NET_C(IC20.15/*OUT1*/, C25.1)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC37.13/*Q1*/)
+
+ UNUSED_OP_OUT_MINUS(IC27.7/*OUT2*/, IC27.6/*MINUS2*/)
+ UNUSED_OP_PLUS(IC27.5/*PLUS2*/)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(GUN_SOUND, C25.2)
+
+
+ /* ------------------------------------------------------------------------
+ * JEEP_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(JEEP_ON, R151.2)
+
+ // --------------------------------
+ TTL_7408_DIP(IC29) // shared by _, JEEP_SOUND, _, _
+ NET_C(GND, IC29.7/*GND*/)
+ NET_C(V5, IC29.14/*VCC*/)
+
+ TTL_7416_DIP(IC36) // shared by _, _, JEEP_SOUND, _, _, _
+ NET_C(GND, IC36.7/*GND*/)
+ NET_C(V5, IC36.14/*VCC*/)
+
+ TTL_7474_DIP(IC30)
+ NET_C(GND, IC30.7/*GND*/)
+ NET_C(V5, IC30.14/*VCC*/)
+
+ TTL_7474_DIP(IC32)
+ NET_C(GND, IC32.7/*GND*/)
+ NET_C(V5, IC32.14/*VCC*/)
+
+ NE555(IC31)
+ NET_C(GND, IC31.GND/*1*/)
+ NET_C(V5, IC31.VCC/*8*/)
+
+ RES(R123, RES_K(51))
+ RES(R150, RES_K(1))
+ RES(R151, RES_K(1))
+ RES(R152, RES_K(1))
+ RES(R153, RES_K(33))
+ RES(R154, RES_K(1))
+ RES(R157, RES_K(51))
+ RES(R158, RES_K(51))
+ CAP(C58, CAP_U(0.047))
+ CAP(C59, CAP_U(2.2))
+ CAP(C72, CAP_U(0.1))
+
+ NET_C(GND, C72.2, C58.2)
+ NET_C(V5, R150.1, R152.1, R154.1, R151.1
+ , IC30.1/*CLR1*/, IC30.4/*PR1*/, IC30.10/*PR2*/, IC30.13/*CLR2*/
+ , IC32.1/*CLR1*/, IC32.4/*PR1*/, IC32.10/*PR2*/, IC32.13/*CLR2*/
+ )
+ NET_C(IC36.5/*A3*/, R151.2)
+ NET_C(IC36.6/*Q3*/, R152.2
+ , IC31.RESET/*4*/
+ )
+ NET_C(IC31.DISCH/*7*/, R150.2, R153.1)
+ NET_C(IC31.THRESH/*6*/, IC31.TRIG/*2*/, R153.2, C72.1)
+ NET_C(IC31.OUT/*3*/, R154.2
+ , IC32.3/*CLK1*/, IC30.3/*CLK1*/, IC30.11/*CLK2*/
+ )
+ NET_C(IC32.6/*QQ1*/, R157.1
+ , IC32.2/*D1*/, IC32.11/*CLK2*/
+ )
+ NET_C(IC32.8/*QQ2*/, IC32.12/*D2*/, R158.1)
+ NET_C(IC29.6/*Q2*/, IC30.2/*D1*/)
+ NET_C(IC30.5/*Q1*/, IC30.12/*D2*/)
+ NET_C(IC30.6/*QQ1*/, IC29.4/*A2*/)
+ NET_C(IC30.8/*QQ2*/, IC29.5/*B2*/, R123.1)
+ NET_C(R123.2, R157.2, R158.2, C58.1, C59.1)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC30.9/*Q2*/)
+
+ NC_(IC31.CONT/*5*/)
+
+ NC_(IC32.5/*Q1*/)
+ NC_(IC32.9/*Q2*/)
+
+ UNUSED_TTL_I(IC29.1/*A1*/)
+ UNUSED_TTL_I(IC29.2/*B1*/)
+ UNUSED_TTL_Q(IC29.3/*Q1*/)
+ UNUSED_TTL_Q(IC29.8/*Q3*/)
+ UNUSED_TTL_I(IC29.9/*A3*/)
+ UNUSED_TTL_I(IC29.10/*B3*/)
+ UNUSED_TTL_Q(IC29.11/*Q4*/)
+ UNUSED_TTL_I(IC29.12/*A4*/)
+ UNUSED_TTL_I(IC29.13/*B4*/)
+
+ UNUSED_TTL_I(IC36.1/*A1*/)
+ UNUSED_TTL_Q(IC36.2/*Q1*/)
+ UNUSED_TTL_I(IC36.3/*A2*/)
+ UNUSED_TTL_Q(IC36.4/*Q2*/)
+ UNUSED_TTL_Q(IC36.8/*Q4*/)
+ UNUSED_TTL_I(IC36.9/*A4*/)
+ UNUSED_TTL_Q(IC36.10/*Q5*/)
+ UNUSED_TTL_I(IC36.11/*A5*/)
+ UNUSED_TTL_Q(IC36.12/*Q6*/)
+ UNUSED_TTL_I(IC36.13/*A6*/)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(JEEP_SOUND, C59.2)
+
+
+ /* ------------------------------------------------------------------------
+ * POINT_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(POINT_TRG, R148.2)
+
+ // --------------------------------
+ // TRG -> CON
+ RES(R148, RES_K(1))
+ RES(R149, RES_K(47))
+ MA150(D5)
+ RES(R159, 470)
+ RES(R164, RES_K(470))
+ RES(R165, RES_K(470))
+ RES(R163, RES_K(27))
+ RES(R166, RES_K(12))
+ RES(R169, RES_K(30))
+ RES(R168, RES_K(10))
+ CAP(C71, CAP_U(1))
+ CAP(C74, CAP_U(1))
+ NET_C(R148.1, V5)
+ NET_C(IC35.9/*A2*/, R148.2)
+ NET_C(IC35.10/*B2*/, IC35.11/*CLRQ2*/, V5)
+ NET_C(IC35.6/*C2*/, C71.1)
+ NET_C(IC35.7/*RC2*/, C71.2, R149.2)
+ NET_C(R149.1, V5)
+ NET_C(IC35.12/*QQ2*/, D5.K)
+ NET_C(D5.A, R159.1)
+ NET_C(R159.2, C74.1, R165.2)
+ NET_C(C74.2, GND)
+ NET_C(IC38.12/*PLUS4*/, R165.1, R164.2)
+ NET_C(R164.1, V5)
+ NET_C(IC38.14/*OUT4*/, IC38.13/*MINUS4*/, R166.1)
+ NET_C(R163.1, V12)
+ NET_C(IC38.10/*PLUS3*/, R163.2, R168.1)
+ NET_C(R168.2, GND)
+ NET_C(IC38.9/*MINUS3*/, R166.2, R169.1)
+ NET_C(IC38.8/*OUT3*/, R169.2)
+
+ // --------------------------------
+ // UPPER STAGE -> MIX
+ RES(R79, RES_K(30))
+ RES(R80, RES_K(51))
+ RES(R81, RES_K(51))
+ RES(R78, RES_K(15))
+ RES(R32, RES_K(30))
+ RES(R33, RES_K(10))
+ CAP(C43, CAP_U(0.022))
+ C458(TR13)
+ NE555(IC18)
+ NET_C(GND, IC18.GND/*1*/)
+ NET_C(V5, IC18.VCC/*8*/)
+ LM324_DIP(IC25) // shared by ANIMAL_SOUND, POINT_SOUND, POINT_SOUND, POINT_SOUND
+ NET_C(GND, IC25.11/*GND*/)
+ NET_C(V12, IC25.4/*VCC*/)
+ NET_C(IC38.8/*OUT3*/, R79.1, R80.1)
+ NET_C(IC25.12/*PLUS4*/, R80.2, R81.1)
+ NET_C(R81.2, GND)
+ NET_C(IC25.13/*MINUS4*/, R79.2, C43.1, R78.1)
+ NET_C(IC18.RESET/*4*/, RST)
+ NET_C(R33.1, V5)
+ NET_C(IC18.DISCH/*7*/, R33.2)
+ NET_C(TR13.B, IC18.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR13.C, R78.2) // B & C swapped, wrong in schematics
+ NET_C(TR13.E, GND)
+ NET_C(IC25.14/*OUT4*/, IC18.TRIG/*2*/, IC18.THRESH/*6*/, C43.2, R32.1)
+
+ // --------------------------------
+ // MIDDLE STAGE -> UPPER STAGE
+ RES(R84, RES_K(30))
+ RES(R83, RES_K(51))
+ RES(R82, RES_K(51))
+ RES(R85, RES_K(15))
+ RES(R35, RES_K(30))
+ RES(R36, RES_K(10))
+ RES(R37, RES_K(2.2))
+ CAP(C44, CAP_P(6800))
+ C458(TR14)
+ NE555(IC19)
+ NET_C(GND, IC19.GND/*1*/)
+ NET_C(V5, IC19.VCC/*8*/)
+ NET_C(IC38.8/*OUT3*/, R83.1, R84.1)
+ NET_C(IC25.10/*PLUS3*/, R83.2, R82.1)
+ NET_C(R82.2, GND)
+ NET_C(IC25.9/*MINUS3*/, R84.2, C44.1, R85.1)
+ NET_C(IC19.RESET/*4*/, RST)
+ NET_C(R36.1, V5)
+ NET_C(IC19.DISCH/*7*/, R36.2)
+ NET_C(TR14.B, IC19.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR14.C, R85.2) // B & C swapped, wrong in schematics
+ NET_C(TR14.E, GND)
+ NET_C(IC25.8/*OUT3*/, IC19.TRIG/*2*/, IC19.THRESH/*6*/, C44.2, R35.2)
+ NET_C(R35.1, R32.2)
+ NET_C(R37.1, IC18.CONT/*5*/, IC19.CONT/*5*/)
+
+ // --------------------------------
+ // LOWER STAGE -> UPPER STAGE
+ RES(R130, RES_K(30))
+ RES(R129, RES_K(51))
+ RES(R128, RES_K(51))
+ RES(R131, RES_K(15))
+ RES(R34, RES_K(10))
+ CAP(C61, CAP_U(0.068))
+ CAP(C60, CAP_U(0.022))
+ CAP(C23, CAP_U(0.01))
+ C458(TR4)
+ NE555(IC8)
+ NET_C(GND, IC8.GND/*1*/)
+ NET_C(V5, IC8.VCC/*8*/)
+ NET_C(IC38.8/*OUT3*/, R130.1, R129.1)
+ NET_C(IC25.5/*PLUS2*/, R129.2, R128.1)
+ NET_C(R128.2, GND)
+ NET_C(IC25.6/*MINUS2*/, R130.2, C60.1, C61.1, R131.1)
+ NET_C(IC8.RESET/*4*/, RST)
+ NET_C(IC8.CONT/*5*/, C23.1)
+ NET_C(C23.2, GND)
+ NET_C(R34.1, V5)
+ NET_C(IC8.DISCH/*7*/, R34.2)
+ NET_C(TR4.B, IC8.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR4.C, R131.2) // B & C swapped, wrong in schematics
+ NET_C(TR4.E, GND)
+ NET_C(IC25.7/*OUT2*/, IC8.TRIG/*2*/, IC8.THRESH/*6*/, C61.2, C60.2, R37.2)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ CAP(C15, CAP_U(2.2))
+ CAP(C16, CAP_P(680))
+ CAP(C13, CAP_U(2.2))
+ NET_C(R32.2, C13.1)
+ NET_C(IC5.1/*IN1*/, C13.2)
+ NET_C(IC5.15/*OUT1*/, C15.1)
+ NET_C(IC5.14/*RO1*/, C16.1)
+ NET_C(C16.2, GND)
+ NET_C(IC38.14/*OUT4*/, IC5.2/*CON1*/)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC35.5/*Q2*/)
+
+ NET_C(IC8.OUT/*3*/, NC_IC8_OUT.1) // not connected in schematics
+ RES(NC_IC8_OUT, RES_M(1))
+ NET_C(NC_IC8_OUT.2, GND)
+ NET_C(IC18.OUT/*3*/, NC_IC18_OUT.1) // not connected in schematics
+ RES(NC_IC18_OUT, RES_M(1))
+ NET_C(NC_IC18_OUT.2, GND)
+ NET_C(IC19.OUT/*3*/, NC_IC19_OUT.1) // not connected in schematics
+ RES(NC_IC19_OUT, RES_M(1))
+ NET_C(NC_IC19_OUT.2, GND)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(POINT_SOUND, C15.2)
+
+
+ /* ------------------------------------------------------------------------
+ * HIT_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(HIT_TRG, R147.1)
+
+ // --------------------------------
+ // TRG -> CON
+ TTL_74123_DIP(IC35) // shared by HIT_SOUND, POINT_SOUND
+ NET_C(GND, IC35.8/*GND*/)
+ NET_C(V5, IC35.16/*VCC*/)
+ RES(R147, RES_K(1))
+ RES(R146, RES_K(47))
+ RES(R160, 470)
+ RES(R161, RES_K(470))
+ RES(R162, RES_K(470))
+ CAP(C70, CAP_U(1))
+ CAP(C75, CAP_U(1))
+ MA150(D6)
+ NET_C(IC35.1/*A1*/, R147.1)
+ NET_C(R147.2, V5)
+ NET_C(IC35.2/*B1*/, IC35.3/*CLRQ1*/, V5)
+ NET_C(IC35.14/*C1*/, C70.1)
+ NET_C(IC35.15/*RC1*/, C70.2, R146.2)
+ NET_C(R146.1, V5)
+ NET_C(IC35.4/*QQ1*/, D6.K)
+ NET_C(D6.A, R160.1)
+ NET_C(R160.2, C75.1, R161.2)
+ NET_C(C75.2, GND)
+ NET_C(IC38.3/*PLUS1*/, R161.1, R162.2)
+ NET_C(R162.1, V5)
+ NET_C(IC38.1/*OUT1*/, IC38.2/*MINUS1*/)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ MB4391_DIP(IC5) // shared by POINT_SOUND, HIT_SOUND
+ NET_C(GND, IC5.3/*GND1*/, IC5.7/*GND2*/)
+ NET_C(V5, IC5.16/*VCC1*/, IC5.12/*VCC2*/)
+ CAP(C18, CAP_P(680))
+ NET_C(C18.1, IC5.10/*RO2*/)
+ NET_C(C18.2, GND)
+ CAP(C14, CAP_U(2.2))
+ CAP(C17, CAP_U(2.2))
+ NET_C(IC5.6/*CON2*/, IC38.1/*OUT1*/)
+ NET_C(IC5.11/*OUT2*/, C17.1)
+ NET_C(IC5.5/*IN2*/, C14.2)
+
+ // --------------------------------
+ // LOWER STAGE -> MIX
+ C458(TR11)
+ NE555(IC16)
+ NET_C(GND, IC16.GND/*1*/)
+ NET_C(V5, IC16.VCC/*8*/)
+ RES(R71, RES_K(51))
+ RES(R70, RES_K(30))
+ RES(R72, RES_K(51))
+ RES(R69, RES_K(15))
+ RES(R28, RES_K(10))
+ RES(R76, RES_K(1))
+ CAP(C39, CAP_U(0.01))
+ CAP(C40, CAP_U(0.0033))
+ NET_C(IC24.14/*OUT4*/, C14.1)
+ NET_C(IC24.7/*OUT2*/, R70.1, R71.1)
+ NET_C(IC24.12/*PLUS4*/, R71.2, R72.1)
+ NET_C(R72.2, GND)
+ NET_C(IC24.13/*MINUS4*/, R70.2, C39.1, C40.1, R69.1)
+ NET_C(IC24.14/*OUT4*/, IC16.TRIG/*2*/, IC16.THRESH/*6*/, C39.2, C40.2)
+ NET_C(IC16.RESET/*4*/, RST)
+ NET_C(IC16.CONT/*5*/, R76.2)
+ NET_C(R28.1, V5)
+ NET_C(TR11.B, IC16.DISCH/*7*/, R28.2) // B & C swapped, wrong in schematics
+ NET_C(TR11.C, R69.2) // B & C swapped, wrong in schematics
+ NET_C(TR11.E, GND)
+
+ NET_C(IC24.8/*OUT3*/, R76.1)
+
+ RES(R119, RES_K(10))
+ RES(R120, RES_K(39))
+ RES(R121, RES_K(47))
+ RES(R122, RES_K(15))
+
+ LM324_DIP(IC24) // shared by EMAR_SOUND, HIT_SOUND, HIT_SOUND, HIT_SOUND
+ NET_C(GND, IC24.11/*GND*/)
+ NET_C(V12, IC24.4/*VCC*/)
+
+ NET_C(V12, R120.1)
+ NET_C(R120.2, R119.1)
+ NET_C(IC24.5/*PLUS2*/, R120.2)
+ NET_C(R119.2, GND)
+ NET_C(IC24.6/*MINUS2*/, R122.2, R121.1)
+ NET_C(IC24.7/*OUT2*/, R121.2)
+
+ NET_C(IC24.8/*OUT3*/, R122.1)
+
+ // --------------------------------
+ // UPPER STAGE -> LOWER STAGE
+ C458(TR12)
+ NE555(IC17)
+ NET_C(GND, IC17.GND/*1*/)
+ NET_C(V5, IC17.VCC/*8*/)
+ RES(R75, RES_K(470))
+ RES(R74, RES_K(51))
+ RES(R73, RES_K(51))
+ RES(R77, RES_K(5.1))
+ RES(R30, RES_K(10))
+ CAP(C41, CAP_U(2.2))
+ CAP(C42, CAP_U(2.2))
+ CAP(C21, CAP_U(0.01))
+ NET_C(V6, R75.1, R74.1)
+ NET_C(C41.1, C42.1)
+ NET_C(IC24.9/*MINUS3*/, R75.2, R77.1, C41.2)
+ NET_C(IC24.10/*PLUS3*/, R74.2, R73.1)
+ NET_C(R73.2, GND)
+ NET_C(IC17.RESET/*4*/, RST)
+ NET_C(R30.1, V5)
+ NET_C(IC17.DISCH/*7*/, R30.2)
+ NET_C(IC17.CONT/*5*/, C21.1)
+ NET_C(C21.2, GND)
+ NET_C(TR12.B, IC17.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR12.C, R77.2) // B & C swapped, wrong in schematics
+ NET_C(TR12.E, GND)
+ NET_C(IC24.8/*OUT3*/, IC17.TRIG/*2*/, IC17.THRESH/*6*/, C42.2)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC35.13/*Q1*/)
+
+ NET_C(IC17.OUT/*3*/, NC_IC17_OUT.1) // not connected in schematics
+ RES(NC_IC17_OUT, RES_M(1))
+ NET_C(NC_IC17_OUT.2, GND)
+ NET_C(IC16.OUT/*3*/, NC_IC16_OUT.1) // not connected in schematics
+ RES(NC_IC16_OUT, RES_M(1))
+ NET_C(NC_IC16_OUT.2, GND)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(HIT_SOUND, C17.2)
+
+
+ /* ------------------------------------------------------------------------
+ * ANIMAL_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(ANIMAL_TRG, R145.2)
+
+ // --------------------------------
+ // TGG -> TRG2 -> CON
+ RES(R145, RES_K(1))
+ RES(R143, RES_K(47))
+ RES(R144, RES_K(47))
+ RES(R106, 470)
+ RES(R108, RES_K(470))
+ RES(R107, RES_K(470))
+ CAP(C67, CAP_U(47))
+ CAP(C66, CAP_U(47))
+ CAP(C69, CAP_U(1))
+ CAP(C53, CAP_U(1))
+ MA150(D4)
+ TTL_74123_DIP(IC34) // shared by ANIMAL_SOUND, ANIMAL_SOUND
+ NET_C(GND, IC34.8/*GND*/)
+ NET_C(V5, IC34.16/*VCC*/)
+ NET_C(R145.1, V5)
+ NET_C(IC34.1/*A1*/, R145.2)
+ NET_C(IC34.2/*B1*/, IC34.3/*CLRQ1*/, V5)
+ NET_C(IC34.14/*C1*/, C67.2, C66.2)
+ NET_C(IC34.15/*RC1*/, C67.1, C66.1, R143.2)
+ NET_C(R143.1, V5)
+ NET_C(IC34.1/*A1*/, IC34.9/*A2*/)
+ NET_C(IC34.13/*Q1*/, IC34.10/*B2*/, IC34.11/*CLRQ2*/)
+ NET_C(IC34.6/*C2*/, C69.2)
+ NET_C(IC34.7/*RC2*/, C69.1, R144.2)
+ NET_C(R144.1, V5)
+ NET_C(IC34.12/*QQ2*/, D4.K)
+ NET_C(D4.A, R106.1)
+ NET_C(R106.2, C53.1, R107.2)
+ NET_C(C53.2, GND)
+ NET_C(IC23.3/*PLUS1*/, R107.1, R108.2)
+ NET_C(R108.1, V5)
+ NET_C(IC23.1/*OUT1*/, IC23.2/*MINUS1*/, IC4.6/*CON2*/)
+
+ // --------------------------------
+ C458(TR16)
+ RES(R110, RES_K(10))
+ NET_C(IC34.13/*Q1*/, R110.1)
+ NET_C(TR16.B, R110.2) // B & C swapped, wrong in schematics
+ NET_C(TR16.C, R109.2) // B & C swapped, wrong in schematics
+ NET_C(TR16.E, GND)
+
+ C458(TR15)
+ RES(R109, RES_K(1))
+ RES(R44, 220)
+ NET_C(R109.1, V5)
+ NET_C(TR15.B, R109.2) // B & C swapped, wrong in schematics
+ NET_C(TR15.C, C24.1) // B & C swapped, wrong in schematics
+ NET_C(TR15.E, R44.1)
+ NET_C(R44.2, C24.2)
+
+ // --------------------------------
+ // UPPER STAGE -> MIDDLE STAGE
+ RES(R39, RES_K(51))
+ RES(R38, RES_K(22))
+ RES(R15, RES_K(51))
+ RES(R41, RES_K(22))
+ RES(R42, RES_K(36))
+ RES(R43, RES_K(10))
+ RES(R40, RES_M(1))
+ CAP(C24, CAP_U(100))
+ LM324_DIP(IC9) // shared by ANIMAL_SOUND, ANIMAL_SOUND, ANIMAL_SOUND, ANIMAL_SOUND
+ NET_C(GND, IC9.11/*GND*/)
+ NET_C(V12, IC9.4/*VCC*/)
+ NET_C(R40.1, R39.1, V12)
+ NET_C(IC9.5/*PLUS2*/, R39.2, R15.1)
+ NET_C(R15.2, GND)
+ NET_C(IC9.6/*MINUS2*/, R40.2, C24.1)
+ NET_C(IC9.7/*OUT2*/, C24.2, R38.1)
+ NET_C(R42.1, V12)
+ NET_C(IC9.3/*PLUS1*/, R42.2, R43.1)
+ NET_C(R43.2, GND)
+ NET_C(IC9.2/*MINUS1*/, R38.2, R41.1)
+ NET_C(IC9.1/*OUT1*/, R41.2)
+
+ // --------------------------------
+ // MIDDLE STAGE -> MIX
+ RES(R11, RES_K(30))
+ RES(R12, RES_K(51))
+ RES(R13, RES_K(51))
+ RES(R10, RES_K(1))
+ RES(R9, RES_K(10))
+ RES(R14, RES_K(5.1))
+ RES(R16, RES_K(10))
+ CAP(C1, CAP_U(0.033))
+ C458(TR1)
+ NE555(IC1)
+ NET_C(GND, IC1.GND/*1*/)
+ NET_C(V5, IC1.VCC/*8*/)
+ NET_C(IC9.1/*OUT1*/, R11.1, R12.1)
+ NET_C(IC9.12/*PLUS4*/, R12.2, R13.1)
+ NET_C(R13.2, GND)
+ NET_C(IC9.13/*MINUS4*/, R11.2, C1.1, R10.1)
+ NET_C(IC1.RESET/*4*/, RST)
+ NET_C(IC1.DISCH/*7*/, R9.2)
+ NET_C(R9.1, V5)
+ NET_C(TR1.B, IC1.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR1.C, R10.2) // B & C swapped, wrong in schematics
+ NET_C(TR1.E, GND)
+ NET_C(IC9.14/*OUT4*/, IC1.TRIG/*2*/, IC1.THRESH/*6*/, C1.2)
+ NET_C(IC9.14/*OUT4*/, R16.1)
+ NET_C(IC1.CONT/*5*/, R14.1)
+
+ RES(R17, RES_K(5.1))
+ RES(R18, RES_K(3.3))
+ NET_C(IC9.8/*OUT3*/, IC9.9/*MINUS3*/, R14.2)
+ NET_C(IC9.10/*PLUS3*/, R17.2, R18.2)
+
+ // --------------------------------
+ // LOWER STAGE -> MIDDLE STAGE
+ RES(R59, RES_K(560))
+ RES(R58, RES_K(51))
+ RES(R57, RES_K(51))
+ RES(R60, RES_K(5.1))
+ RES(R23, RES_K(10))
+ CAP(C34, CAP_U(1))
+ CAP(C35, CAP_U(1))
+ CAP(C7, CAP_U(0.01))
+ C458(TR8)
+ NE555(IC13)
+ NET_C(GND, IC13.GND/*1*/)
+ NET_C(V5, IC13.VCC/*8*/)
+ NET_C(R59.1, R58.1, V6)
+ NET_C(IC22.10/*PLUS3*/, R58.2, R57.1)
+ NET_C(R57.2, GND)
+ NET_C(IC22.9/*MINUS3*/, R59.2, C34.2, R60.1)
+ NET_C(C34.1, C35.1)
+ NET_C(IC13.RESET/*4*/, RST)
+ NET_C(IC13.DISCH/*7*/, R23.2)
+ NET_C(R23.1, V5)
+ NET_C(IC13.CONT/*5*/, C7.1)
+ NET_C(C7.2, GND)
+ NET_C(TR8.B, IC13.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR8.C, R60.2) // B & C swapped, wrong in schematics
+ NET_C(TR8.E, GND)
+ NET_C(IC22.8/*OUT3*/, IC13.TRIG/*2*/, IC13.THRESH/*6*/, C35.2, R18.1)
+
+ // --------------------------------
+ // BOTTOM STAGE -> MIDDLE STAGE
+ RES(R127, RES_K(56))
+ RES(R125, RES_K(51))
+ RES(R124, RES_K(51))
+ RES(R126, RES_K(30))
+ RES(R31, RES_K(10))
+ CAP(C57, CAP_U(1))
+ CAP(C56, CAP_U(1))
+ CAP(C22, CAP_U(0.01))
+ C458(TR3)
+ NE555(IC7)
+ NET_C(GND, IC7.GND/*1*/)
+ NET_C(V5, IC7.VCC/*8*/)
+ NET_C(R127.1, R125.1, V6)
+ NET_C(IC25.3/*PLUS1*/, R125.2, R124.1)
+ NET_C(R124.2, GND)
+ NET_C(IC25.2/*MINUS1*/, R127.2, C57.2, R126.1)
+ NET_C(C57.1, C56.1)
+ NET_C(IC7.RESET/*4*/, RST)
+ NET_C(IC7.CONT/*5*/, C22.1)
+ NET_C(C22.2, GND)
+ NET_C(IC7.DISCH/*7*/, R31.2)
+ NET_C(R31.1, V5)
+ NET_C(TR3.B, IC7.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR3.C, R126.2) // B & C swapped, wrong in schematics
+ NET_C(TR3.E, GND)
+ NET_C(IC25.1/*OUT1*/, IC7.TRIG/*2*/, IC7.THRESH/*6*/, C56.2)
+ NET_C(IC25.1/*OUT1*/, R17.1)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ CAP(C6, CAP_U(2.2))
+ CAP(C11, CAP_U(2.2))
+ CAP(C12, CAP_P(680))
+ NET_C(IC4.10/*RO2*/, C12.1)
+ NET_C(C12.2, GND)
+ NET_C(R16.2, C6.1)
+ NET_C(IC4.5/*IN2*/, C6.2)
+ NET_C(IC4.11/*OUT2*/, C11.1)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC34.4/*QQ1*/)
+ NC_(IC34.5/*Q2*/)
+
+ NET_C(IC1.OUT/*3*/, NC_IC1_OUT.1) // not connected in schematics
+ RES(NC_IC1_OUT, RES_M(1))
+ NET_C(NC_IC1_OUT.2, GND)
+
+ NET_C(IC13.OUT/*3*/, NC_IC13_OUT.1) // not connected in schematics
+ RES(NC_IC13_OUT, RES_M(1))
+ NET_C(NC_IC13_OUT.2, GND)
+
+ NET_C(IC7.OUT/*3*/, NC_IC7_OUT.1) // not connected in schematics
+ RES(NC_IC7_OUT, RES_M(1))
+ NET_C(NC_IC7_OUT.2, GND)
+
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(ANIMAL_SOUND, C11.2)
+
+
+ /* ------------------------------------------------------------------------
+ * EMAR_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(EMAR_TRG, R142.2)
+
+ // --------------------------------
+ // TRG -> CON
+ RES(R142, RES_K(1))
+ RES(R141, RES_K(47))
+ MA150(D3)
+ RES(R103, 470)
+ RES(R105, RES_K(470))
+ RES(R104, RES_K(470))
+ CAP(C68, CAP_U(1))
+ CAP(C52, CAP_U(1))
+ NET_C(IC33.9/*A2*/, R142.2)
+ NET_C(R142.1, V5)
+ NET_C(IC33.10/*B2*/, IC33.11/*CLRQ2*/, V5)
+ NET_C(IC33.6/*C2*/, C68.1)
+ NET_C(IC33.7/*RC2*/, C68.2, R141.2)
+ NET_C(R141.1, V5)
+ NET_C(IC33.12/*QQ2*/, D3.K)
+ NET_C(D3.A, R103.1)
+ NET_C(R103.2, C52.1, R105.2)
+ NET_C(C52.2, GND)
+ NET_C(IC22.5/*PLUS2*/, R105.1, R104.2)
+ NET_C(R104.1, V5)
+ NET_C(IC22.7/*OUT2*/, IC22.6/*MINUS2*/)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ MB4391_DIP(IC4) // shared by EMAR_SOUND, ANIMAL_SOUND
+ NET_C(GND, IC4.3/*GND1*/, IC4.7/*GND2*/)
+ NET_C(V5, IC4.16/*VCC1*/, IC4.12/*VCC2*/)
+ RES(R24, RES_K(10))
+ CAP(C8, CAP_U(2.2))
+ CAP(C9, CAP_U(2.2))
+ CAP(C10, CAP_P(680))
+ NET_C(IC22.7/*OUT2*/, IC4.2/*CON1*/)
+ NET_C(IC4.14/*RO1*/, C10.1)
+ NET_C(C10.2, GND)
+ NET_C(IC4.15/*OUT1*/, C9.1)
+ NET_C(IC4.1/*IN1*/, C8.2)
+ NET_C(R24.2, C8.1)
+
+ LM324_DIP(IC23) // shared by ANIMAL_SOUND, EMAR_SOUND, EMAR_SOUND, EMAR_SOUND
+ NET_C(GND, IC23.11/*GND*/)
+ NET_C(V12, IC23.4/*VCC*/)
+
+ // --------------------------------
+ // LOWER STAGE -> UPPER STAGE
+ C458(TR2)
+ NE555(IC6)
+ NET_C(GND, IC6.GND/*1*/)
+ NET_C(V5, IC6.VCC/*8*/)
+ RES(R116, RES_K(470))
+ RES(R117, RES_K(51))
+ RES(R118, RES_K(51))
+ RES(R115, RES_K(51))
+ RES(R29, RES_K(10))
+ CAP(C55, CAP_U(3.3))
+ CAP(C54, CAP_U(3.3))
+ CAP(C20, CAP_U(0.01))
+ NET_C(R116.1, R117.1, V6)
+ NET_C(IC24.3/*PLUS1*/, R117.2, R118.1)
+ NET_C(R118.2, GND)
+ NET_C(IC24.2/*MINUS1*/, R116.2, C55.2, R115.1)
+ NET_C(C55.1, C54.1)
+ NET_C(IC6.RESET/*4*/, RST)
+ NET_C(IC6.CONT/*5*/, C20.1)
+ NET_C(C20.2, GND)
+ NET_C(IC6.DISCH/*7*/, R29.2)
+ NET_C(R29.1, V5)
+ NET_C(TR2.B, IC6.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR2.C, R115.2) // B & C swapped, wrong in schematics
+ NET_C(TR2.E, GND)
+ NET_C(IC24.1/*OUT1*/, IC6.TRIG/*2*/, IC6.THRESH/*6*/, C54.2)
+
+ NET_C(IC24.1/*OUT1*/, R113.1)
+ RES(R113, RES_K(22))
+ RES(R111, RES_K(27))
+ RES(R112, RES_K(10))
+ RES(R114, RES_K(22))
+ NET_C(R111.1, V12)
+ NET_C(IC23.5/*PLUS2*/, R111.2, R112.1)
+ NET_C(R112.2, GND)
+ NET_C(IC23.6/*MINUS2*/, R113.2, R114.1)
+ NET_C(IC23.7/*OUT2*/, R114.2)
+
+ // --------------------------------
+ // MIDDLE STAGE -> UPPER STAGE
+ C458(TR10)
+ NE555(IC15)
+ NET_C(GND, IC15.GND/*1*/)
+ NET_C(V5, IC15.VCC/*8*/)
+ RES(R67, RES_K(220))
+ RES(R66, RES_K(51))
+ RES(R65, RES_K(51))
+ RES(R68, RES_K(100))
+ RES(R27, RES_K(10))
+ RES(R26, RES_K(33))
+ CAP(C38, CAP_U(1))
+ CAP(C37, CAP_U(1))
+ CAP(C19, CAP_U(0.01))
+ NET_C(R67.1, R66.1, V6)
+ NET_C(IC23.10/*PLUS3*/, R66.2, R65.1)
+ NET_C(R65.2, GND)
+ NET_C(IC23.9/*MINUS3*/, R67.2, C37.2, R68.1)
+ NET_C(IC15.RESET/*4*/, RST)
+ NET_C(IC15.CONT/*5*/, C19.1)
+ NET_C(C19.2, GND)
+ NET_C(IC15.DISCH/*7*/, R27.2)
+ NET_C(R27.1, V5)
+ NET_C(TR10.B, IC15.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR10.C, R68.2) // B & C swapped, wrong in schematics
+ NET_C(TR10.E, GND)
+ NET_C(IC23.8/*OUT3*/, IC15.TRIG/*2*/, IC15.THRESH/*6*/, C38.2)
+ NET_C(C38.1, C37.1)
+ NET_C(IC15.OUT/*3*/, R26.2)
+
+ // --------------------------------
+ // UPPER STAGE -> MIX
+ C458(TR9)
+ NE555(IC14)
+ NET_C(GND, IC14.GND/*1*/)
+ NET_C(V5, IC14.VCC/*8*/)
+ RES(R62, RES_K(30))
+ RES(R63, RES_K(51))
+ RES(R64, RES_K(51))
+ RES(R61, RES_K(15))
+ RES(R25, RES_K(10))
+ CAP(C36, CAP_U(0.022))
+ CAP(C2, CAP_U(1)) // ? maybe 0.01uF
+ NET_C(IC23.7/*OUT2*/, R62.1, R63.1)
+ NET_C(IC23.12/*PLUS4*/, R63.2, R64.1)
+ NET_C(R64.2, GND)
+ NET_C(IC23.13/*MINUS4*/, R62.2, C36.1, R61.1)
+ NET_C(IC14.RESET/*4*/, RST)
+ NET_C(IC14.DISCH/*7*/, R25.2)
+ NET_C(R25.1, V5)
+ NET_C(IC14.CONT/*5*/, C2.1, R26.1)
+ NET_C(C2.2, GND)
+ NET_C(TR9.B, IC14.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR9.C, R61.2) // B & C swapped, wrong in schematics
+ NET_C(TR9.E, GND)
+ NET_C(IC23.14/*OUT4*/, IC14.TRIG/*2*/, IC14.THRESH/*6*/, C36.2)
+ NET_C(IC23.14/*OUT4*/, R24.1)
+
+ // --------------------------------
+ // UNUSED PINS
+ NC_(IC33.5/*Q2*/)
+
+ NET_C(IC6.OUT/*3*/, NC_IC6_OUT.1) // not connected in schematics
+ RES(NC_IC6_OUT, RES_M(1))
+ NET_C(NC_IC6_OUT.2, GND)
+ NET_C(IC14.OUT/*3*/, NC_IC14_OUT.1) // not connected in schematics
+ RES(NC_IC14_OUT, RES_M(1))
+ NET_C(NC_IC14_OUT.2, GND)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(EMAR_SOUND, C9.2)
+
+
+ /* ------------------------------------------------------------------------
+ * WALK_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(WALK_TRG, R140.2)
+
+ // --------------------------------
+ NE555(IC28)
+ NET_C(GND, IC28.GND/*1*/)
+ NET_C(V5, IC28.VCC/*8*/)
+
+ LM324_DIP(IC21) // shared by CRY_SOUND, WALK_SOUND, CRY_SOUND, CRY_SOUND
+ NET_C(GND, IC21.11/*GND*/)
+ NET_C(V12, IC21.4/*VCC*/)
+
+ RES(R95, RES_K(100))
+ RES(R96, RES_K(22))
+ RES(R98, RES_K(27))
+ RES(R137, RES_K(22))
+ RES(R140, RES_K(1))
+ CAP(C3, CAP_U(2.2))
+ CAP(C50, CAP_U(0.1))
+ CAP(C51, CAP_U(2.2))
+ CAP(C65, CAP_U(0.01))
+ CAP(C77, CAP_U(2.2))
+
+ NET_C(GND, C65.2, C77.2, C50.2)
+ NET_C(V6, IC21.5/*PLUS2*/)
+ NET_C(V5, R140.1, R137.1)
+ NET_C(R140.2, IC28.TRIG/*2*/)
+ NET_C(C65.1, IC28.CONT/*5*/)
+ NET_C(IC28.THRESH/*6*/, IC28.DISCH/*7*/, R137.2, C77.1)
+ NET_C(IC28.OUT/*3*/ , R98.1)
+ NET_C(R98.2, C50.1, C51.1)
+ NET_C(C51.2, R96.1)
+ NET_C(R96.2, R95.1, IC21.6/*MINUS2*/)
+ NET_C(IC21.7/*OUT2*/, R95.2, C3.1)
+
+ // --------------------------------
+ // UNUSED PINS
+ NET_C(V5, IC28.RESET/*4*/) // not connected on schematic
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(WALK_SOUND, C3.2)
+
+
+ /* ------------------------------------------------------------------------
+ * CRY_SOUND
+ * -----------------------------------------------------------------------*/
+ // INPUT
+ NET_C(CRY_TRG, R139.2)
+
+ // --------------------------------
+ // TRG -> CON
+ TTL_74123_DIP(IC33) // shared by CRY_SOUND, EMAR_SOUND
+ NET_C(GND, IC33.8/*GND*/)
+ NET_C(V5, IC33.16/*VCC*/)
+ LM324_DIP(IC22) // shared by CRY_SOUND, EMAR_SOUND, ANIMAL_SOUND, CRY_SOUND
+ NET_C(GND, IC22.11/*GND*/)
+ NET_C(V12, IC22.4/*VCC*/)
+ MA150(D2)
+ RES(R139, RES_K(1))
+ RES(R138, RES_K(47))
+ RES(R97, 470)
+ RES(R87, RES_K(470))
+ RES(R94, RES_K(470))
+ CAP(C64, CAP_U(1))
+ NET_C(V5, R139.1, R138.1, R87.1)
+ NET_C(GND, C49.2)
+ NET_C(R139.2, IC33.1/*A1*/)
+ NET_C(V5, IC33.2/*B1*/, IC33.3/*CLRQ1*/)
+ NET_C(IC33.14/*C1*/, C64.1)
+ NET_C(IC33.15/*RC1*/, C64.2, R138.2)
+ NET_C(IC33.4/*QQ1*/, D2.K)
+ NC_(IC33.13/*Q1*/)
+ NET_C(D2.A, R97.1)
+ NET_C(R97.2, C49.1, R94.2)
+ NET_C(IC21.3/*PLUS1*/, R87.2, R94.1)
+ NET_C(IC21.1/*OUT1*/, IC21.2/*MINUS1*/, IC20.6/*CON2*/)
+
+ // --------------------------------
+ // CON, MIX -> OUT
+ RES(R86, RES_K(10))
+ CAP(C47, CAP_U(2.2))
+ CAP(C49, CAP_U(1))
+ CAP(C28, CAP_P(680))
+ CAP(C27, CAP_U(2.2))
+ NET_C(IC21.14/*OUT4*/, R86.1)
+ NET_C(R86.2, C47.1)
+ NET_C(IC20.5/*IN2*/, C47.2)
+ NET_C(IC20.10/*RO2*/, C28.1)
+ NET_C(C28.2, GND)
+ NET_C(IC20.11/*OUT2*/, C27.1)
+
+ // --------------------------------
+ // UPPER STAGE -> MIDDLE STAGE
+ C458(TR7)
+ NE555(IC12)
+ NET_C(GND, IC12.GND/*1*/)
+ NET_C(V5, IC12.VCC/*8*/)
+ NET_C(RST, IC12.RESET/*4*/)
+ RES(R22, RES_K(10))
+ RES(R55, RES_K(51))
+ RES(R54, RES_K(220))
+ RES(R56, RES_K(51))
+ RES(R53, RES_K(100))
+ CAP(C33, CAP_U(0.22))
+ CAP(C32, CAP_U(0.22))
+ CAP(C5, CAP_U(0.01))
+ NET_C(TR7.B, IC12.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR7.C, R53.2) // B & C swapped, wrong in schematics
+ NET_C(TR7.E, GND)
+ NET_C(V5, R22.1)
+ NET_C(IC12.DISCH/*7*/, R22.2)
+ NET_C(IC22.14/*OUT4*/, IC12.TRIG/*2*/, IC12.THRESH/*6*/)
+ NET_C(IC22.14/*OUT4*/, C32.2)
+ NET_C(C32.1, C33.1)
+ NET_C(IC22.13/*MINUS4*/, R53.1, R54.2, C33.2)
+ NET_C(IC22.12/*PLUS4*/, R55.2, R56.1)
+ NET_C(R56.2, GND)
+ NET_C(R54.1, R55.1, V6)
+ NET_C(IC12.CONT/*5*/, C5.1)
+ NET_C(C5.2, GND)
+
+ RES(R99, RES_K(22))
+ RES(R100, RES_K(100))
+ RES(R101, RES_K(15))
+ RES(R102, RES_K(33))
+ NET_C(IC22.14/*OUT4*/, R100.1)
+ NET_C(IC22.1/*OUT1*/, R102.2)
+ NET_C(IC22.2/*MINUS1*/, R100.2, R102.1)
+ NET_C(IC22.3/*PLUS1*/, R99.2, R101.1)
+ NET_C(R99.1, V12)
+ NET_C(R101.2, GND)
+
+ // --------------------------------
+ // LOWER STAGE -> MIDDLE STAGE
+ C458(TR6)
+ NE555(IC11)
+ NET_C(GND, IC11.GND/*1*/)
+ NET_C(V5, IC11.VCC/*8*/)
+ NET_C(RST, IC11.RESET/*4*/)
+ RES(R21, RES_K(10))
+ RES(R49, RES_K(51))
+ RES(R50, RES_K(51))
+ RES(R51, RES_K(470))
+ RES(R52, RES_K(5.1))
+ CAP(C30, CAP_U(2.2))
+ CAP(C31, CAP_U(2.2))
+ CAP(C4, CAP_U(0.01))
+ NET_C(TR6.B, IC11.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR6.C, R52.2) // B & C swapped, wrong in schematics
+ NET_C(TR6.E, GND)
+ NET_C(V5, R21.1)
+ NET_C(IC11.DISCH/*7*/, R21.2)
+ NET_C(IC21.8/*OUT3*/, IC11.TRIG/*2*/, IC11.THRESH/*6*/)
+ NET_C(IC21.9/*MINUS3*/, R52.1, R51.2, C30.2)
+ NET_C(C30.1, C31.1)
+ NET_C(IC21.8/*OUT3*/, C31.2)
+ NET_C(IC21.10/*PLUS3*/, R50.2, R49.1)
+ NET_C(R49.2, GND)
+ NET_C(V6, R51.1, R50.1)
+ NET_C(IC11.CONT/*5*/, C4.1)
+ NET_C(C4.2, GND)
+ NET_C(IC21.8/*OUT3*/, R20.1)
+ NET_C(IC10.CONT/*5*/, R20.2)
+
+ // --------------------------------
+ // MIDDLE STAGE -> MIX
+ C458(TR5)
+ NE555(IC10)
+ NET_C(GND, IC10.GND/*1*/)
+ NET_C(V5, IC10.VCC/*8*/)
+ NET_C(RST, IC10.RESET/*4*/)
+ RES(R19, RES_K(10))
+ RES(R45, RES_K(15))
+ RES(R46, RES_K(30))
+ RES(R47, RES_K(51))
+ RES(R48, RES_K(51))
+ CAP(C29, CAP_U(0.022))
+ RES(R20, RES_K(1))
+
+ NET_C(TR5.B, IC10.DISCH/*7*/) // B & C swapped, wrong in schematics
+ NET_C(TR5.C, R45.2) // B & C swapped, wrong in schematics
+ NET_C(TR5.E, GND)
+ NET_C(V5, R19.1)
+ NET_C(IC10.DISCH/*7*/, R19.2)
+ NET_C(IC21.14/*OUT4*/, IC10.TRIG/*2*/, IC10.THRESH/*6*/)
+ NET_C(IC21.13/*MINUS4*/, R45.1, R46.2, C29.1)
+ NET_C(IC21.12/*PLUS4*/, R47.2, R48.1)
+ NET_C(R48.2, GND)
+ NET_C(IC22.1/*OUT1*/, R46.1, R47.1)
+ NET_C(IC21.14/*OUT4*/, C29.2)
+
+ // --------------------------------
+ // UNUSED PINS
+ NET_C(IC10.OUT/*3*/, NC_IC10_OUT.1) // not connected in schematics
+ RES(NC_IC10_OUT, RES_M(1))
+ NET_C(NC_IC10_OUT.2, GND)
+ NET_C(IC11.OUT/*3*/, NC_IC11_OUT.1) // not connected in schematics
+ RES(NC_IC11_OUT, RES_M(1))
+ NET_C(NC_IC11_OUT.2, GND)
+ NET_C(IC12.OUT/*3*/, NC_IC12_OUT.1) // not connected in schematics
+ RES(NC_IC12_OUT, RES_M(1))
+ NET_C(NC_IC12_OUT.2, GND)
+
+ // --------------------------------
+ // OUTPUT
+ NET_C(CRY_SOUND, C27.2)
NETLIST_END()
@@ -1363,67 +1363,67 @@ NETLIST_END()
static NETLIST_START(brdrline_sound_out)
- LM324_DIP(IC38) // shared by HIT_SOUND, SOUND_OUT, POINT_SOUND, POINT_SOUND
- NET_C(GND, IC38.11/*GND*/)
- NET_C(V12, IC38.4/*VCC*/)
-
- POT(VR8, RES_K(200))
- POT(VR1, RES_K(200))
- POT(VR6, RES_K(200))
- POT(VR7, RES_K(200))
- POT(VR5, RES_K(500))
- POT(VR4, RES_K(200))
- POT(VR3, RES_K(200))
- POT(VR2, RES_K(200))
-
- PARAM(VR1.DIAL, 0.350) // GUN_SOUND
- PARAM(VR8.DIAL, 0.000) // JEEP_SOUND
- PARAM(VR6.DIAL, 0.985) // POINT_SOUND
- PARAM(VR7.DIAL, 0.640) // HIT_SOUND
- PARAM(VR5.DIAL, 0.960) // ANIMAL_SOUND
- PARAM(VR4.DIAL, 0.900) // EMAR_SOUND
- PARAM(VR3.DIAL, 0.000) // WALK_SOUND
- PARAM(VR2.DIAL, 0.900) // CRY_SOUND
-
- RES(R8, RES_K(22))
- RES(R1, RES_K(22))
- RES(R6, RES_K(22))
- RES(R7, RES_K(22))
- RES(R5, RES_K(22))
- RES(R4, RES_K(22))
- RES(R3, RES_K(22))
- RES(R2, RES_K(22))
- RES(R167, RES_K(10))
-
- CAP(C76, CAP_U(10))
-
- NET_C(VR8.1, VR8.2)
- NET_C(VR1.1, VR1.2)
- NET_C(VR6.1, VR6.2)
- NET_C(VR7.1, VR7.2)
- NET_C(VR5.1, VR5.2)
- NET_C(VR4.1, VR4.2)
- NET_C(VR3.1, VR3.2)
- NET_C(VR2.1, VR2.2)
-
- NET_C(VR8.3, R8.1)
- NET_C(VR1.3, R1.1)
- NET_C(VR6.3, R6.1)
- NET_C(VR7.3, R7.1)
- NET_C(VR5.3, R5.1)
- NET_C(VR4.3, R4.1)
- NET_C(VR3.3, R3.1)
- NET_C(VR2.3, R2.1)
-
- NET_C(R1.2, R2.2, R3.2, R4.2, R5.2, R6.2, R7.2, R8.2
- , IC38.6/*MINUS2*/
- , R167.1
- )
- NET_C(V6, IC38.5/*PLUS2*/)
- NET_C(IC38.7/*OUT2*/, R167.2, C76.1)
-
- // --------------------------------
- // INPUT
+ LM324_DIP(IC38) // shared by HIT_SOUND, SOUND_OUT, POINT_SOUND, POINT_SOUND
+ NET_C(GND, IC38.11/*GND*/)
+ NET_C(V12, IC38.4/*VCC*/)
+
+ POT(VR8, RES_K(200))
+ POT(VR1, RES_K(200))
+ POT(VR6, RES_K(200))
+ POT(VR7, RES_K(200))
+ POT(VR5, RES_K(500))
+ POT(VR4, RES_K(200))
+ POT(VR3, RES_K(200))
+ POT(VR2, RES_K(200))
+
+ PARAM(VR1.DIAL, 0.350) // GUN_SOUND
+ PARAM(VR8.DIAL, 0.000) // JEEP_SOUND
+ PARAM(VR6.DIAL, 0.985) // POINT_SOUND
+ PARAM(VR7.DIAL, 0.640) // HIT_SOUND
+ PARAM(VR5.DIAL, 0.960) // ANIMAL_SOUND
+ PARAM(VR4.DIAL, 0.900) // EMAR_SOUND
+ PARAM(VR3.DIAL, 0.000) // WALK_SOUND
+ PARAM(VR2.DIAL, 0.900) // CRY_SOUND
+
+ RES(R8, RES_K(22))
+ RES(R1, RES_K(22))
+ RES(R6, RES_K(22))
+ RES(R7, RES_K(22))
+ RES(R5, RES_K(22))
+ RES(R4, RES_K(22))
+ RES(R3, RES_K(22))
+ RES(R2, RES_K(22))
+ RES(R167, RES_K(10))
+
+ CAP(C76, CAP_U(10))
+
+ NET_C(VR8.1, VR8.2)
+ NET_C(VR1.1, VR1.2)
+ NET_C(VR6.1, VR6.2)
+ NET_C(VR7.1, VR7.2)
+ NET_C(VR5.1, VR5.2)
+ NET_C(VR4.1, VR4.2)
+ NET_C(VR3.1, VR3.2)
+ NET_C(VR2.1, VR2.2)
+
+ NET_C(VR8.3, R8.1)
+ NET_C(VR1.3, R1.1)
+ NET_C(VR6.3, R6.1)
+ NET_C(VR7.3, R7.1)
+ NET_C(VR5.3, R5.1)
+ NET_C(VR4.3, R4.1)
+ NET_C(VR3.3, R3.1)
+ NET_C(VR2.3, R2.1)
+
+ NET_C(R1.2, R2.2, R3.2, R4.2, R5.2, R6.2, R7.2, R8.2
+ , IC38.6/*MINUS2*/
+ , R167.1
+ )
+ NET_C(V6, IC38.5/*PLUS2*/)
+ NET_C(IC38.7/*OUT2*/, R167.2, C76.1)
+
+ // --------------------------------
+ // INPUT
#if (ENABLE_FRONTIERS)
// using AFUNCs here tends to remove the DC bias, so add
// it back in manually
@@ -1459,27 +1459,27 @@ static NETLIST_START(brdrline_sound_out)
ALIAS(CRY_SOUND, CRY_F.A0)
NET_C(CRY_F.Q, VR2.1)
#else
- ALIAS(JEEP_SOUND, VR8.1)
- ALIAS(GUN_SOUND, VR1.1)
- ALIAS(POINT_SOUND, VR6.1)
- ALIAS(HIT_SOUND, VR7.1)
- ALIAS(ANIMAL_SOUND, VR5.1)
- ALIAS(EMAR_SOUND, VR4.1)
- ALIAS(WALK_SOUND, VR3.1)
- ALIAS(CRY_SOUND, VR2.1)
+ ALIAS(JEEP_SOUND, VR8.1)
+ ALIAS(GUN_SOUND, VR1.1)
+ ALIAS(POINT_SOUND, VR6.1)
+ ALIAS(HIT_SOUND, VR7.1)
+ ALIAS(ANIMAL_SOUND, VR5.1)
+ ALIAS(EMAR_SOUND, VR4.1)
+ ALIAS(WALK_SOUND, VR3.1)
+ ALIAS(CRY_SOUND, VR2.1)
#endif
- // --------------------------------
- // OUTPUT
- RES(Rsound, RES_K(1)) // dummy load
- NET_C(C76.2, Rsound.1)
- NET_C(GND, Rsound.2)
+ // --------------------------------
+ // OUTPUT
+ RES(Rsound, RES_K(1)) // dummy load
+ NET_C(C76.2, Rsound.1)
+ NET_C(GND, Rsound.2)
#if 0
- // for test only
- AFUNC(CLIPPING, 1, "max(-0.11,min(0.11, A0))")
- NET_C(C76.2, CLIPPING.A0)
+ // for test only
+ AFUNC(CLIPPING, 1, "max(-0.11,min(0.11, A0))")
+ NET_C(C76.2, CLIPPING.A0)
#else
- ALIAS(SOUND_OUT, Rsound.1)
+ ALIAS(SOUND_OUT, Rsound.1)
#endif
NETLIST_END()
@@ -1494,114 +1494,114 @@ NETLIST_START(brdrline)
PARAM(Solver.DYNAMIC_TS, 1)
PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 4e-5)
#else
- SOLVER(solver, 48000)
+ SOLVER(solver, 48000)
#endif
- LOCAL_SOURCE(_MB4391)
- LOCAL_SOURCE(_MB4391_DIP)
+ LOCAL_SOURCE(_MB4391)
+ LOCAL_SOURCE(_MB4391_DIP)
- LOCAL_SOURCE(brdrline_schematics)
- LOCAL_SOURCE(brdrline_sound_out)
+ LOCAL_SOURCE(brdrline_schematics)
+ LOCAL_SOURCE(brdrline_sound_out)
- // --------------------------------
- // VOLTAGE SOURCES
- ANALOG_INPUT(V12, 12)
- ANALOG_INPUT(V5, 5)
- ANALOG_INPUT(V6, 6)
+ // --------------------------------
+ // VOLTAGE SOURCES
+ ANALOG_INPUT(V12, 12)
+ ANALOG_INPUT(V5, 5)
+ ANALOG_INPUT(V6, 6)
- // --------------------------------
- INCLUDE(brdrline_schematics)
+ // --------------------------------
+ INCLUDE(brdrline_schematics)
- // --------------------------------
- TTL_INPUT(I_SOUND_0, 1) // active low
- NET_C(GND, I_SOUND_0.GND)
- NET_C(V5, I_SOUND_0.VCC)
+ // --------------------------------
+ TTL_INPUT(I_SOUND_0, 1) // active low
+ NET_C(GND, I_SOUND_0.GND)
+ NET_C(V5, I_SOUND_0.VCC)
- TTL_INPUT(I_SOUND_1, 1) // active low
- NET_C(GND, I_SOUND_1.GND)
- NET_C(V5, I_SOUND_1.VCC)
+ TTL_INPUT(I_SOUND_1, 1) // active low
+ NET_C(GND, I_SOUND_1.GND)
+ NET_C(V5, I_SOUND_1.VCC)
- TTL_INPUT(I_SOUND_2, 1) // active low
- NET_C(GND, I_SOUND_2.GND)
- NET_C(V5, I_SOUND_2.VCC)
+ TTL_INPUT(I_SOUND_2, 1) // active low
+ NET_C(GND, I_SOUND_2.GND)
+ NET_C(V5, I_SOUND_2.VCC)
- TTL_INPUT(I_SOUND_3, 1) // active low
- NET_C(GND, I_SOUND_3.GND)
- NET_C(V5, I_SOUND_3.VCC)
+ TTL_INPUT(I_SOUND_3, 1) // active low
+ NET_C(GND, I_SOUND_3.GND)
+ NET_C(V5, I_SOUND_3.VCC)
- TTL_INPUT(I_SOUND_4, 1) // active low
- NET_C(GND, I_SOUND_4.GND)
- NET_C(V5, I_SOUND_4.VCC)
+ TTL_INPUT(I_SOUND_4, 1) // active low
+ NET_C(GND, I_SOUND_4.GND)
+ NET_C(V5, I_SOUND_4.VCC)
- TTL_INPUT(I_SOUND_5, 1) // active low
- NET_C(GND, I_SOUND_5.GND)
- NET_C(V5, I_SOUND_5.VCC)
+ TTL_INPUT(I_SOUND_5, 1) // active low
+ NET_C(GND, I_SOUND_5.GND)
+ NET_C(V5, I_SOUND_5.VCC)
- TTL_INPUT(I_SOUND_6, 1) // active low
- NET_C(GND, I_SOUND_6.GND)
- NET_C(V5, I_SOUND_6.VCC)
+ TTL_INPUT(I_SOUND_6, 1) // active low
+ NET_C(GND, I_SOUND_6.GND)
+ NET_C(V5, I_SOUND_6.VCC)
- TTL_INPUT(I_SOUND_7, 1) // active low
- NET_C(GND, I_SOUND_7.GND)
- NET_C(V5, I_SOUND_7.VCC)
+ TTL_INPUT(I_SOUND_7, 1) // active low
+ NET_C(GND, I_SOUND_7.GND)
+ NET_C(V5, I_SOUND_7.VCC)
#if 1
- // {---(A5)Logic Board---}{-(C1/2)Top-}{-Sound Board-}
- // D0 -> LS374( 3- 2) -> 40 -> PNK -> 9 -> ANIMAL_TRG
- // D1 -> LS374(18-19) -> 35 -> BRN -> 12 -> CRY_TRG
- // D2 -> LS374( 4- 5) -> 33 -> ORN -> 11 -> WALK_TRG
- // D3 -> LS374(17-16) -> 34 -> YEL -> 10 -> EMAR_TRG
- // D4 -> LS374( 7- 6) -> 32 -> BLU -> 8 -> HIT_TRG
- // D5 -> LS374(14-15) -> 31 -> GRY -> 7 -> POINT_TRG
- // D6 -> LS374( 8- 9) -> 30 -> WHT -> 6 -> JEEP_ON
- // D7 -> LS374(13-12) -> 29 -> GRN -> 5 -> GUN_TRG
- ALIAS(GUN_TRG, I_SOUND_7.Q)
- ALIAS(JEEP_ON, I_SOUND_6.Q)
- ALIAS(POINT_TRG, I_SOUND_5.Q)
- ALIAS(HIT_TRG, I_SOUND_4.Q)
- ALIAS(ANIMAL_TRG, I_SOUND_0.Q)
- ALIAS(EMAR_TRG, I_SOUND_3.Q)
- ALIAS(WALK_TRG, I_SOUND_2.Q)
- ALIAS(CRY_TRG, I_SOUND_1.Q)
+ // {---(A5)Logic Board---}{-(C1/2)Top-}{-Sound Board-}
+ // D0 -> LS374( 3- 2) -> 40 -> PNK -> 9 -> ANIMAL_TRG
+ // D1 -> LS374(18-19) -> 35 -> BRN -> 12 -> CRY_TRG
+ // D2 -> LS374( 4- 5) -> 33 -> ORN -> 11 -> WALK_TRG
+ // D3 -> LS374(17-16) -> 34 -> YEL -> 10 -> EMAR_TRG
+ // D4 -> LS374( 7- 6) -> 32 -> BLU -> 8 -> HIT_TRG
+ // D5 -> LS374(14-15) -> 31 -> GRY -> 7 -> POINT_TRG
+ // D6 -> LS374( 8- 9) -> 30 -> WHT -> 6 -> JEEP_ON
+ // D7 -> LS374(13-12) -> 29 -> GRN -> 5 -> GUN_TRG
+ ALIAS(GUN_TRG, I_SOUND_7.Q)
+ ALIAS(JEEP_ON, I_SOUND_6.Q)
+ ALIAS(POINT_TRG, I_SOUND_5.Q)
+ ALIAS(HIT_TRG, I_SOUND_4.Q)
+ ALIAS(ANIMAL_TRG, I_SOUND_0.Q)
+ ALIAS(EMAR_TRG, I_SOUND_3.Q)
+ ALIAS(WALK_TRG, I_SOUND_2.Q)
+ ALIAS(CRY_TRG, I_SOUND_1.Q)
#else
- /*
- * 2020-10-06 by 'beta-tester'
- * | | ||personal |personal |
- * | | ||assignment |assignment |
- * |brdrline |starrkr ||NL SOUND |plausibility |note
- * ---+-------------------------+------------------++-------------+-------------+----
- * D0 | |fire, jeep_field ||POINT_TRG.IN | |
- * D1 |next_sector, hit_rocket2 |hit_animal ||HIT_TRG.IN |+ |
- * D2 | |fire, next_sector ||WALK_TRG.IN | |
- * D3 | |fire ||CRY_TRG.IN | |
- * D4 |jeep_field | ||ANIMAL_TRG.IN|+++ |see note 1
- * D5 |fire | ||GUN_TRG.IN |++ |
- * D6 |jeep_path |jeep_path? ||JEEP_ON.IN |++ |
- * D7 |hit_animal | ||EMAR_TRG.IN |+ |
- *
- * note 1: as far as i remember (from the early 1980'th) it was triggered more often while crawling through the field at sector2 & 3,
- * issue in schematic/netlist?
- * or trigger?
- * or were the acrade what i played in the past a modified bootleg?
- * or is it only in my head?
- */
- ALIAS(GUN_TRG, I_SOUND_5.Q)
- ALIAS(JEEP_ON, I_SOUND_6.Q)
- ALIAS(POINT_TRG, I_SOUND_0.Q)
- ALIAS(HIT_TRG, I_SOUND_1.Q)
- ALIAS(ANIMAL_TRG, I_SOUND_4.Q)
- ALIAS(EMAR_TRG, I_SOUND_7.Q)
- ALIAS(WALK_TRG, I_SOUND_2.Q)
- ALIAS(CRY_TRG, I_SOUND_3.Q)
+ /*
+ * 2020-10-06 by 'beta-tester'
+ * | | ||personal |personal |
+ * | | ||assignment |assignment |
+ * |brdrline |starrkr ||NL SOUND |plausibility |note
+ * ---+-------------------------+------------------++-------------+-------------+----
+ * D0 | |fire, jeep_field ||POINT_TRG.IN | |
+ * D1 |next_sector, hit_rocket2 |hit_animal ||HIT_TRG.IN |+ |
+ * D2 | |fire, next_sector ||WALK_TRG.IN | |
+ * D3 | |fire ||CRY_TRG.IN | |
+ * D4 |jeep_field | ||ANIMAL_TRG.IN|+++ |see note 1
+ * D5 |fire | ||GUN_TRG.IN |++ |
+ * D6 |jeep_path |jeep_path? ||JEEP_ON.IN |++ |
+ * D7 |hit_animal | ||EMAR_TRG.IN |+ |
+ *
+ * note 1: as far as i remember (from the early 1980'th) it was triggered more often while crawling through the field at sector2 & 3,
+ * issue in schematic/netlist?
+ * or trigger?
+ * or were the acrade what i played in the past a modified bootleg?
+ * or is it only in my head?
+ */
+ ALIAS(GUN_TRG, I_SOUND_5.Q)
+ ALIAS(JEEP_ON, I_SOUND_6.Q)
+ ALIAS(POINT_TRG, I_SOUND_0.Q)
+ ALIAS(HIT_TRG, I_SOUND_1.Q)
+ ALIAS(ANIMAL_TRG, I_SOUND_4.Q)
+ ALIAS(EMAR_TRG, I_SOUND_7.Q)
+ ALIAS(WALK_TRG, I_SOUND_2.Q)
+ ALIAS(CRY_TRG, I_SOUND_3.Q)
#endif
- // --------------------------------
- INCLUDE(brdrline_sound_out)
+ // --------------------------------
+ INCLUDE(brdrline_sound_out)
- // --------------------------------
- ALIAS(OUTPUT, SOUND_OUT)
+ // --------------------------------
+ ALIAS(OUTPUT, SOUND_OUT)
NETLIST_END()
diff --git a/src/mame/audio/nl_frogs.cpp b/src/mame/audio/nl_frogs.cpp
index dc9ebe90a84..d15575fd436 100644
--- a/src/mame/audio/nl_frogs.cpp
+++ b/src/mame/audio/nl_frogs.cpp
@@ -52,14 +52,14 @@ NETLIST_START(frogs)
PARAM(Solver.DYNAMIC_TS, 1)
PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 4e-6)
- TTL_INPUT(I_SOUND_0, 0)
- TTL_INPUT(I_SOUND_1, 0)
- TTL_INPUT(I_SOUND_2, 0)
- TTL_INPUT(I_SOUND_3, 0)
- TTL_INPUT(I_SOUND_4, 0)
- TTL_INPUT(I_SOUND_5, 0)
- TTL_INPUT(I_SOUND_6, 0)
- TTL_INPUT(I_SOUND_7, 0)
+ TTL_INPUT(I_SOUND_0, 0)
+ TTL_INPUT(I_SOUND_1, 0)
+ TTL_INPUT(I_SOUND_2, 0)
+ TTL_INPUT(I_SOUND_3, 0)
+ TTL_INPUT(I_SOUND_4, 0)
+ TTL_INPUT(I_SOUND_5, 0)
+ TTL_INPUT(I_SOUND_6, 0)
+ TTL_INPUT(I_SOUND_7, 0)
NET_C(GND, I_SOUND_0.GND, I_SOUND_1.GND, I_SOUND_2.GND, I_SOUND_3.GND, I_SOUND_4.GND, I_SOUND_5.GND, I_SOUND_6.GND, I_SOUND_7.GND)
NET_C(I_V5, I_SOUND_0.VCC, I_SOUND_1.VCC, I_SOUND_2.VCC, I_SOUND_3.VCC, I_SOUND_4.VCC, I_SOUND_5.VCC, I_SOUND_6.VCC, I_SOUND_7.VCC)
@@ -75,95 +75,95 @@ NETLIST_START(frogs)
ANALOG_INPUT(I_V12, 12)
ANALOG_INPUT(I_VM12, -12)
- RES(R1, RES_K(3.3)) // SPLASH
- RES(R2, RES_K(3.3)) // SPLASH
- RES(R3, RES_K(3.3)) // CAPTURE
- RES(R4, RES_K(3.3)) // CAPTURE
- RES(R5, RES_K(3.3)) // TONGUE
- RES(R6, RES_K(3.3)) // TONGUE
- RES(R7, RES_K(3.3)) // HOP
- RES(R8, RES_K(3.3)) // HOP
- RES(R9, RES_K(3.3)) // JUMP
- RES(R10, RES_K(3.3)) // JUMP
- RES(R11, RES_K(3.3)) // FLY
- RES(R12, RES_K(10)) // FLY
- RES(R13, RES_K(10)) // SPLASH
- RES(R14, RES_K(4.7)) // SPLASH
- RES(R15, RES_K(100)) // SPLASH
- RES(R16, RES_K(4.7)) // CAPTURE
- RES(R17, RES_K(330)) // CAPTURE
- RES(R18, RES_K(4.7)) // TONGUE
- RES(R19, RES_K(100)) // TONGUE
- RES(R20, RES_K(4.7)) // HOP
- RES(R21, RES_K(3.3)) // HOP
- RES(R22, RES_K(4.7)) // JUMP
- RES(R23, RES_K(150)) // JUMP
- RES(R24, RES_K(4.7)) // FLY
- RES(R25, RES_K(22)) // SPLASH
- RES(R26, 51) // HOP
- RES(R27, RES_K(10)) // FLY
- RES(R28, RES_K(22)) // TONGUE
- RES(R29, RES_K(100)) // TONGUE
- RES(R30, RES_K(470)) // HOP
- RES(R31, 220) // HOP
- RES(R32, RES_K(33)) // HOP (mislabelled R22)
- RES(R33, 330) // JUMP
- RES(R34, 820) // JUMP
- RES(R35, RES_K(100)) // FLY
- RES(R36, RES_K(2.2)) // FLY
- RES(R37, RES_K(2.2)) // SPLASH
- RES(R38, RES_K(10)) // SPLASH
- RES(R39, RES_K(10)) // SPLASH
- RES(R40, RES_K(68)) // CAPTURE
- RES(R41, RES_K(4.7)) // CAPTURE
- RES(R42, RES_K(1)) // TONGUE
- RES(R43, RES_K(82)) // HOP
- RES(R44, RES_K(3.3)) // FLY
- RES(R45, RES_K(100)) // FLY
- RES(R46, RES_K(3.3)) // FLY
- POT(R47, RES_K(50)) // SPLASH
- RES(R48, RES_K(47)) // CAPTURE
- RES(R49, RES_K(3.3)) // CAPTURE
- RES(R50, RES_K(100)) // CAPTURE
- RES(R51, RES_K(39)) // TONGUE
- RES(R52, 51) // HOP
+ RES(R1, RES_K(3.3)) // SPLASH
+ RES(R2, RES_K(3.3)) // SPLASH
+ RES(R3, RES_K(3.3)) // CAPTURE
+ RES(R4, RES_K(3.3)) // CAPTURE
+ RES(R5, RES_K(3.3)) // TONGUE
+ RES(R6, RES_K(3.3)) // TONGUE
+ RES(R7, RES_K(3.3)) // HOP
+ RES(R8, RES_K(3.3)) // HOP
+ RES(R9, RES_K(3.3)) // JUMP
+ RES(R10, RES_K(3.3)) // JUMP
+ RES(R11, RES_K(3.3)) // FLY
+ RES(R12, RES_K(10)) // FLY
+ RES(R13, RES_K(10)) // SPLASH
+ RES(R14, RES_K(4.7)) // SPLASH
+ RES(R15, RES_K(100)) // SPLASH
+ RES(R16, RES_K(4.7)) // CAPTURE
+ RES(R17, RES_K(330)) // CAPTURE
+ RES(R18, RES_K(4.7)) // TONGUE
+ RES(R19, RES_K(100)) // TONGUE
+ RES(R20, RES_K(4.7)) // HOP
+ RES(R21, RES_K(3.3)) // HOP
+ RES(R22, RES_K(4.7)) // JUMP
+ RES(R23, RES_K(150)) // JUMP
+ RES(R24, RES_K(4.7)) // FLY
+ RES(R25, RES_K(22)) // SPLASH
+ RES(R26, 51) // HOP
+ RES(R27, RES_K(10)) // FLY
+ RES(R28, RES_K(22)) // TONGUE
+ RES(R29, RES_K(100)) // TONGUE
+ RES(R30, RES_K(470)) // HOP
+ RES(R31, 220) // HOP
+ RES(R32, RES_K(33)) // HOP (mislabelled R22)
+ RES(R33, 330) // JUMP
+ RES(R34, 820) // JUMP
+ RES(R35, RES_K(100)) // FLY
+ RES(R36, RES_K(2.2)) // FLY
+ RES(R37, RES_K(2.2)) // SPLASH
+ RES(R38, RES_K(10)) // SPLASH
+ RES(R39, RES_K(10)) // SPLASH
+ RES(R40, RES_K(68)) // CAPTURE
+ RES(R41, RES_K(4.7)) // CAPTURE
+ RES(R42, RES_K(1)) // TONGUE
+ RES(R43, RES_K(82)) // HOP
+ RES(R44, RES_K(3.3)) // FLY
+ RES(R45, RES_K(100)) // FLY
+ RES(R46, RES_K(3.3)) // FLY
+ POT(R47, RES_K(50)) // SPLASH
+ RES(R48, RES_K(47)) // CAPTURE
+ RES(R49, RES_K(3.3)) // CAPTURE
+ RES(R50, RES_K(100)) // CAPTURE
+ RES(R51, RES_K(39)) // TONGUE
+ RES(R52, 51) // HOP
RES(R53, RES_K(62))
- RES(R54, 470) // JUMP
- RES(R55, RES_K(22)) // JUMP
- RES(R56, RES_M(2.2)) // JUMP
+ RES(R54, 470) // JUMP
+ RES(R55, RES_K(22)) // JUMP
+ RES(R56, RES_M(2.2)) // JUMP
RES(R57, RES_K(22))
RES(R58, RES_K(22))
- RES(R59, RES_K(3.3)) // FLY
-// RES(R60, RES_K(10)) -- final amp
- RES(R61, RES_K(100)) // SPLASH
- RES(R62, RES_K(47)) // SPLASH
- RES(R63, RES_K(33)) // SPLASH
- RES(R64, RES_K(820)) // CAPTURE
- RES(R65, RES_K(150)) // CAPTURE
- RES(R66, 51) // CAPTURE
- RES(R67, 51) // CAPTURE
- RES(R68, RES_K(1)) // JUMP
- RES(R69, RES_K(82)) // JUMP
- RES(R70, 51) // JUMP
- RES(R71, RES_K(4.7)) // JUMP
- RES(R72, RES_K(27)) // FLY
- RES(R73, RES_K(10)) // FLY
- RES(R74, RES_K(1)) // FLY
- RES(R75, RES_K(10)) // JUMP
- RES(R76, RES_K(10)) // JUMP
- RES(R77, 560) // JUMP
- RES(R78, RES_K(10)) // JUMP
- RES(R79, RES_K(10)) // JUMP
- RES(R80, RES_K(39)) // FLY
- RES(R81, RES_K(100)) // FLY
- RES(R82, RES_K(10)) // FLY
- RES(R83, RES_K(100)) // JUMP
- RES(R84, RES_K(1)) // JUMP
- RES(R85, RES_K(10)) // JUMP
- RES(R86, RES_K(1)) // FLY
- RES(R87, RES_K(100)) // FLY
- RES(R88, RES_K(82)) // FLY
- RES(R90, RES_K(56)) // MIXER
+ RES(R59, RES_K(3.3)) // FLY
+// RES(R60, RES_K(10)) -- final amp
+ RES(R61, RES_K(100)) // SPLASH
+ RES(R62, RES_K(47)) // SPLASH
+ RES(R63, RES_K(33)) // SPLASH
+ RES(R64, RES_K(820)) // CAPTURE
+ RES(R65, RES_K(150)) // CAPTURE
+ RES(R66, 51) // CAPTURE
+ RES(R67, 51) // CAPTURE
+ RES(R68, RES_K(1)) // JUMP
+ RES(R69, RES_K(82)) // JUMP
+ RES(R70, 51) // JUMP
+ RES(R71, RES_K(4.7)) // JUMP
+ RES(R72, RES_K(27)) // FLY
+ RES(R73, RES_K(10)) // FLY
+ RES(R74, RES_K(1)) // FLY
+ RES(R75, RES_K(10)) // JUMP
+ RES(R76, RES_K(10)) // JUMP
+ RES(R77, 560) // JUMP
+ RES(R78, RES_K(10)) // JUMP
+ RES(R79, RES_K(10)) // JUMP
+ RES(R80, RES_K(39)) // FLY
+ RES(R81, RES_K(100)) // FLY
+ RES(R82, RES_K(10)) // FLY
+ RES(R83, RES_K(100)) // JUMP
+ RES(R84, RES_K(1)) // JUMP
+ RES(R85, RES_K(10)) // JUMP
+ RES(R86, RES_K(1)) // FLY
+ RES(R87, RES_K(100)) // FLY
+ RES(R88, RES_K(82)) // FLY
+ RES(R90, RES_K(56)) // MIXER
POT(R91, RES_K(100))
POT(R92, RES_M(1))
POT(R93, RES_M(1))
@@ -171,8 +171,8 @@ NETLIST_START(frogs)
POT(R95, RES_M(1))
POT(R96, RES_K(50))
-// CAP(C1, CAP_U(10))
-// CAP(C2, CAP_U(10))
+// CAP(C1, CAP_U(10))
+// CAP(C2, CAP_U(10))
CAP(C3, CAP_U(0.047))
CAP(C4, CAP_U(1))
CAP(C5, CAP_U(1))
@@ -204,8 +204,8 @@ NETLIST_START(frogs)
CAP(C31, CAP_U(0.47))
CAP(C32, CAP_U(0.47))
CAP(C33, CAP_U(0.05))
-// CAP(C34, CAP_U(0.05)) -- final amp
-// CAP(C35, CAP_U(0.05)) -- final amp
+// CAP(C34, CAP_U(0.05)) -- final amp
+// CAP(C35, CAP_U(0.05)) -- final amp
CAP(C36, CAP_U(0.05))
CAP(C37, CAP_U(0.05))
CAP(C38, CAP_U(0.05))
@@ -228,7 +228,7 @@ NETLIST_START(frogs)
CAP(C55, CAP_U(0.05))
CAP(C56, CAP_U(0.05))
CAP(C57, CAP_U(2.2))
-// CAP(C58, CAP_U(0.1)) -- final amp
+// CAP(C58, CAP_U(0.1)) -- final amp
CAP(C59, CAP_U(0.05))
CAP(C60, CAP_U(0.05))
CAP(C61, CAP_U(0.05))
@@ -288,19 +288,19 @@ NETLIST_START(frogs)
NE555_DIP(U5) // Timer
NE555_DIP(U6) // Timer
NE555_DIP(U7) // Timer
- LM741_DIP(U8) // Op. Amp.
+ LM741_DIP(U8) // Op. Amp.
NE555_DIP(U9) // Timer
- LM741_DIP(U10) // Op. Amp.
- LM741_DIP(U11) // Op. Amp.
+ LM741_DIP(U10) // Op. Amp.
+ LM741_DIP(U11) // Op. Amp.
NE555_DIP(U12) // Timer
-// LM741_DIP(U13) // Op. Amp. -- final amp
- LM741_DIP(U14) // Op. Amp.
+// LM741_DIP(U13) // Op. Amp. -- final amp
+ LM741_DIP(U14) // Op. Amp.
NE555_DIP(U15) // Timer
- LM741_DIP(U16) // Op. Amp.
- LM741_DIP(U17) // Op. Amp.
- LM741_DIP(U18) // Op. Amp.
+ LM741_DIP(U16) // Op. Amp.
+ LM741_DIP(U17) // Op. Amp.
+ LM741_DIP(U18) // Op. Amp.
NE555_DIP(U19) // Timer
- LM741_DIP(U20) // Op. Amp.
+ LM741_DIP(U20) // Op. Amp.
//
// JUMP
@@ -366,9 +366,9 @@ NETLIST_START(frogs)
NET_C(Q4.C, R18.1, U4.2)
NET_C(C13.2, U4.5)
NET_C(C5.1, U4.7, U4.6, R19.1, R29.1)
- RES(RU4, RES_K(100)) // netlist doesn't like unconnected
- NET_C(RU4.1, U4.3) // 555 outputs, so run it through
- NET_C(RU4.2, GND) // a 100k resistor to ground
+ RES(RU4, RES_K(100)) // netlist doesn't like unconnected
+ NET_C(RU4.1, U4.3) // 555 outputs, so run it through
+ NET_C(RU4.2, GND) // a 100k resistor to ground
NET_C(R29.2, Q11.B)
NET_C(Q11.E, Q12.B)
NET_C(Q12.E, R51.2)
@@ -376,9 +376,9 @@ NETLIST_START(frogs)
NET_C(Q13.E, R42.1)
NET_C(Q13.C, C49.2, U15.2, U15.6, U15.7, C50.1)
NET_C(U15.5, C41.2)
- RES(RU15, RES_K(100)) // netlist doesn't like unconnected
- NET_C(RU15.1, U15.3) // 555 outputs, so run it through
- NET_C(RU15.2, GND) // a 100k resistor to ground
+ RES(RU15, RES_K(100)) // netlist doesn't like unconnected
+ NET_C(RU15.1, U15.3) // 555 outputs, so run it through
+ NET_C(RU15.2, GND) // a 100k resistor to ground
ALIAS(ZIP, C50.2)
//
diff --git a/src/mame/audio/nl_spacewar.cpp b/src/mame/audio/nl_spacewar.cpp
index 1d1d9e7df40..73b9b39f298 100644
--- a/src/mame/audio/nl_spacewar.cpp
+++ b/src/mame/audio/nl_spacewar.cpp
@@ -133,8 +133,8 @@ NETLIST_START(spacewar)
Q_2N3904(Q2) // NPN
#endif
Q_2N6426(Q3) // NPN Darlington
-// Q_2N6292(Q4) // NPN -- not used
-// Q_2N6107(Q5) // PNP -- not used
+// Q_2N6292(Q4) // NPN -- not used
+// Q_2N6107(Q5) // PNP -- not used
Q_2N6426(Q6) // NPN Darlington
Q_2N3904(Q7) // NPN
diff --git a/src/mame/audio/nl_tailg.cpp b/src/mame/audio/nl_tailg.cpp
index 63c01ae4cf7..bdb72a14da7 100644
--- a/src/mame/audio/nl_tailg.cpp
+++ b/src/mame/audio/nl_tailg.cpp
@@ -204,8 +204,8 @@ NETLIST_START(tailg)
D_1N914(D8)
D_1N914(D9)
-// Q_2N3904(Q1) // NPN -- not used
-// Q_2N3904(Q2) // NPN -- not used
+// Q_2N3904(Q1) // NPN -- not used
+// Q_2N3904(Q2) // NPN -- not used
Q_2N3906(Q3) // PNP
Q_2N3906(Q4) // PNP
Q_2N3906(Q5) // PNP
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index 6e56e73c5db..3891d17393f 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -306,24 +306,24 @@ uint32_t galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rg
/*
else if (pridat==0x2f) // area outside of the girl
{
- //dst[drawx] = machine().rand()&0x3fff;
+ //dst[drawx] = machine().rand()&0x3fff;
}
else if (pridat==0x00) // the initial line / box that gets drawn
{
- //dst[drawx] = machine().rand()&0x3fff;
+ //dst[drawx] = machine().rand()&0x3fff;
}
else if (pridat==0x30) // during the 'gals boxes' on the intro
{
- //dst[drawx] = machine().rand()&0x3fff;
+ //dst[drawx] = machine().rand()&0x3fff;
}
else if (pridat==0x0c) // 'nice' at end of level
{
- //dst[drawx] = machine().rand()&0x3fff;
+ //dst[drawx] = machine().rand()&0x3fff;
}
else
{
- //printf("%02x, ",pridat);
+ //printf("%02x, ",pridat);
}
*/
}
diff --git a/src/mame/drivers/generalplus_gpl_unknown.cpp b/src/mame/drivers/generalplus_gpl_unknown.cpp
index 6aaef1a32d8..e5dda7f1b8c 100644
--- a/src/mame/drivers/generalplus_gpl_unknown.cpp
+++ b/src/mame/drivers/generalplus_gpl_unknown.cpp
@@ -24,7 +24,7 @@ public:
m_screen(*this, "screen"),
m_spirom(*this, "spi")
{ }
-
+
void generalplus_gpl_unknown(machine_config &config);
private:
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index b4b4e682e6a..8882fcc0ac9 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1187,12 +1187,12 @@ INPUT_PORTS_END
static INPUT_PORTS_START( shoottv )
PORT_INCLUDE( itech32_base_16bit )
- PORT_MODIFY("P1") /* 080000 */
+ PORT_MODIFY("P1") /* 080000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_MODIFY("P2") /* 100000 */
+ PORT_MODIFY("P2") /* 100000 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x00fc, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/kpython.cpp b/src/mame/drivers/kpython.cpp
index 36a9e1c276d..e17e0ac4af0 100644
--- a/src/mame/drivers/kpython.cpp
+++ b/src/mame/drivers/kpython.cpp
@@ -148,10 +148,10 @@ Notes:
8PIN_JVS - Common JVS Power Connectors (on other side of the PCB)
6PIN_JVS /
- TODO:
- More undumped games for Python/2?
- Python 2 is based on consumer PS2, can be derived with ps2sony.cpp?
- Everything
+ TODO:
+ More undumped games for Python/2?
+ Python 2 is based on consumer PS2, can be derived with ps2sony.cpp?
+ Everything
***************************************************************************/
diff --git a/src/mame/drivers/nes_clone.cpp b/src/mame/drivers/nes_clone.cpp
index acbf5f2063f..721b3c4dcf0 100644
--- a/src/mame/drivers/nes_clone.cpp
+++ b/src/mame/drivers/nes_clone.cpp
@@ -534,8 +534,8 @@ void nes_clone_afbm7800_state::update_banks()
/* not correct? desert falcon
if (m_extraregs[0] & 0x80)
{
- bankmask = 0x0f;
- outerchrbank = (m_extraregs[0] & 0x38) << 1;
+ bankmask = 0x0f;
+ outerchrbank = (m_extraregs[0] & 0x38) << 1;
}
else
*/
diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp
index 0199f70506f..2c0aaa9f633 100644
--- a/src/mame/drivers/nes_sh6578.cpp
+++ b/src/mame/drivers/nes_sh6578.cpp
@@ -740,7 +740,7 @@ CONS( 200?, ablwikid, 0, 0, nes_sh6578_pal, nes_sh6578, nes_sh6578_abl_wiki
CONS( 2001?, ts_handy11, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Techno Source / JungleTac", "Handy Boy 11-in-1 (TV Play Power)", MACHINE_NOT_WORKING ) // possibly newer than 2001
// from a blue coloured unit, a yellow one exists, is it the same?
-CONS( 2004?, vsmaxx15, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Senario / JungleTac", "Vs Maxx 15-in-1", MACHINE_NOT_WORKING )
+CONS( 2004?, vsmaxx15, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Senario / JungleTac", "Vs Maxx 15-in-1", MACHINE_NOT_WORKING )
// This is from the blue coloured unit with the 1p/2p slider (does it do anything / get read anywhere?)
// A version of the 25-in-1 on VT hardware also exists, with the downgraded version of Big Racing & removed copyrights etc. (probably the purple tinted version without the 1p/2p slider)
diff --git a/src/mame/drivers/nes_vt02_vt03.cpp b/src/mame/drivers/nes_vt02_vt03.cpp
index bc18923d595..2a03822689f 100644
--- a/src/mame/drivers/nes_vt02_vt03.cpp
+++ b/src/mame/drivers/nes_vt02_vt03.cpp
@@ -319,7 +319,7 @@ void nes_vt_swap_op_d5_d6_state::vt_external_space_map_senwld_512kbyte(address_m
void nes_vt_state::vt_external_space_map_1mbyte_majkon(address_map &map)
{
map(0x0000000, 0x00fffff).mirror(0x1f00000).r(FUNC(nes_vt_state::vt_rom_r));
- map(0x1400000, 0x1401fff).ram(); // rush'n attack writes to chr space, after setting the program and character outer bank to a mirror, is the correct way to handle it?
+ map(0x1400000, 0x1401fff).ram(); // rush'n attack writes to chr space, after setting the program and character outer bank to a mirror, is the correct way to handle it?
}
template <uint8_t NUM> uint8_t nes_vt_base_state::extrain_r()
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index 22e9381bccb..345e395525f 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -187,9 +187,9 @@ MADE IN JAPAN
|------------------------|
This pcb is the same as the A version but with one added chip:
2G - XICOR X76F041 Secure SerialFlash (SOIC8)
-
- Note: This chip is also present on *some* Hornet games on the GN715 CPU board at location
- 30C. The chip refreshes game and region specific serial data to the Timekeeper RAM if the
+
+ Note: This chip is also present on *some* Hornet games on the GN715 CPU board at location
+ 30C. The chip refreshes game and region specific serial data to the Timekeeper RAM if the
region ID matches the timekeeper. Because Racing Jam 2 and Thrill Drive came in a conversion
kit for Racing Jam, the two former games will first boot with a "backup data error" because
because of the timekeeper used for the incorrect game. Pressing the test switch then sets the
@@ -642,7 +642,7 @@ void nwktr_state::lanc2_w(offs_t offset, uint32_t data, uint32_t mem_mask)
}
if (offset == 4)
{
- // TODO: The data below would normally be present on the serialflash at 2G.
+ // TODO: The data below would normally be present on the serialflash at 2G.
if (core_stricmp(machine().system().name, "thrilld") == 0 ||
core_stricmp(machine().system().name, "thrilldb") == 0 ||
@@ -984,7 +984,7 @@ void nwktr_state::init_racingj()
{
m_konppc->set_cgboard_texture_bank(0, "bank5", memregion("user5")->base());
m_konppc->set_cgboard_texture_bank(0, "bank6", memregion("user6")->base()); // for some reason, additional CG roms are located on the slave CG board...
-
+
init_nwktr();
}
@@ -1009,7 +1009,7 @@ ROM_START(racingj)
ROM_REGION32_BE(0x800000, "user5", 0) // Master CG Board texture roms
ROM_LOAD32_WORD_SWAP( "676a13.8x", 0x000000, 0x400000, CRC(29077763) SHA1(ee087ca0d41966ca0fd10727055bb1dcd05a0873) )
ROM_LOAD32_WORD_SWAP( "676a14.16x", 0x000002, 0x400000, CRC(50a7e3c0) SHA1(7468a66111a3ddf7c043cd400fa175cae5f65632) )
-
+
ROM_REGION32_BE(0x800000, "user6", 0) // Slave CG Board texture roms
ROM_LOAD32_WORD_SWAP( "676a13.8x", 0x000000, 0x400000, CRC(29077763) SHA1(ee087ca0d41966ca0fd10727055bb1dcd05a0873) )
ROM_LOAD32_WORD_SWAP( "676a14.16x", 0x000002, 0x400000, CRC(50a7e3c0) SHA1(7468a66111a3ddf7c043cd400fa175cae5f65632) )
@@ -1037,7 +1037,7 @@ ROM_START(racingj2)
ROM_REGION32_BE(0x800000, "user5", 0) // Master CG Board texture roms
ROM_LOAD32_WORD_SWAP( "888a13.8x", 0x000000, 0x400000, CRC(2292f530) SHA1(0f4d1332708fd5366a065e0a928cc9610558b42d) )
ROM_LOAD32_WORD_SWAP( "888a14.16x", 0x000002, 0x400000, CRC(6a834a26) SHA1(d1fbd7ae6afd05f0edac4efde12a5a45aa2bc7df) )
-
+
ROM_REGION32_BE(0x800000, "user6", 0) // Slave CG Board texture roms
ROM_LOAD32_WORD_SWAP( "888a13.8x", 0x000000, 0x400000, CRC(2292f530) SHA1(0f4d1332708fd5366a065e0a928cc9610558b42d) )
ROM_LOAD32_WORD_SWAP( "888a14.16x", 0x000002, 0x400000, CRC(6a834a26) SHA1(d1fbd7ae6afd05f0edac4efde12a5a45aa2bc7df) )
@@ -1048,7 +1048,7 @@ ROM_START(racingj2)
ROM_REGION16_LE(0x1000000, "rfsnd", 0) // PCM sample roms
ROM_LOAD( "888a09.16p", 0x000000, 0x400000, CRC(11e2fed2) SHA1(24b8a367b59fedb62c56f066342f2fa87b135fc5) )
ROM_LOAD( "888a10.14p", 0x400000, 0x400000, CRC(328ce610) SHA1(dbbc779a1890c53298c0db129d496df048929496) )
-
+
ROM_REGION( 0x0000084, "laneeprom", 0 )
ROM_LOAD( "ge888ea.2g", 0x000000, 0x000084, NO_DUMP )
@@ -1068,7 +1068,7 @@ ROM_START(racingj2j)
ROM_REGION32_BE(0x800000, "user5", 0) // Master CG Board texture roms
ROM_LOAD32_WORD_SWAP( "888a13.8x", 0x000000, 0x400000, CRC(2292f530) SHA1(0f4d1332708fd5366a065e0a928cc9610558b42d) )
ROM_LOAD32_WORD_SWAP( "888a14.16x", 0x000002, 0x400000, CRC(6a834a26) SHA1(d1fbd7ae6afd05f0edac4efde12a5a45aa2bc7df) )
-
+
ROM_REGION32_BE(0x800000, "user6", 0) // Slave CG Board texture roms
ROM_LOAD32_WORD_SWAP( "888a13.8x", 0x000000, 0x400000, CRC(2292f530) SHA1(0f4d1332708fd5366a065e0a928cc9610558b42d) )
ROM_LOAD32_WORD_SWAP( "888a14.16x", 0x000002, 0x400000, CRC(6a834a26) SHA1(d1fbd7ae6afd05f0edac4efde12a5a45aa2bc7df) )
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index a091faedea0..92f25ee30fa 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -1739,13 +1739,13 @@ static INPUT_PORTS_START( mschamp )
INPUT_PORTS_END
/* Pacman Club inputs are similar to Ms. Pac-Man, except:
- - P1/P2 joystick inputs are multiplexed via $5004/5005 to allow 2P simultaneous play in "double command" mode
- - no rack test switch
- - different service mode inputs (bit 3 of DSW1 enables the test screen, bit 4 of IN1 just resets the game)
- - different bonus life values and only two lives options
- - difficulty switch is read, but has no effect. instead, higher difficulty is enabled in double command mode
- - free play mode is bugged; game is supposed to set up pointers to $5080/50c0 in RAM for later,
- but this only happens during the attract mode, which is skipped over if free play is enabled
+ - P1/P2 joystick inputs are multiplexed via $5004/5005 to allow 2P simultaneous play in "double command" mode
+ - no rack test switch
+ - different service mode inputs (bit 3 of DSW1 enables the test screen, bit 4 of IN1 just resets the game)
+ - different bonus life values and only two lives options
+ - difficulty switch is read, but has no effect. instead, higher difficulty is enabled in double command mode
+ - free play mode is bugged; game is supposed to set up pointers to $5080/50c0 in RAM for later,
+ but this only happens during the attract mode, which is skipped over if free play is enabled
*/
static INPUT_PORTS_START( clubpacm )
PORT_START("IN0")
diff --git a/src/mame/drivers/rfslotspcpent.cpp b/src/mame/drivers/rfslotspcpent.cpp
index 6263f7158d2..de1d9afaf58 100644
--- a/src/mame/drivers/rfslotspcpent.cpp
+++ b/src/mame/drivers/rfslotspcpent.cpp
@@ -155,14 +155,14 @@ ROM_START( rfsantafeg )
*/
ROM_LOAD("pic_luces_superior_11125c_2f05c0_pic18f4480-i-p.u2", 0x01800, 0x0800, NO_DUMP ) // 16K Flash
- /*
+ /*
PCB coinage (monedero-billetero-hopper) R.F. 53452303
-PIC18F448-I/P
-ULN2803A
-Xtal 12.000 MHz
-PCA82C251
-3xHC573A
- -74HC238D
+ -74HC238D
*/
ROM_LOAD("pic_monedero_billetero_hopper_09482b_0eda_pic18f448-i-p.u2", 0x02000, 0x0800, NO_DUMP ) // 16K Flash
diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp
index 0bbdd0c5a54..9fd8a90abe5 100644
--- a/src/mame/drivers/wheelfir.cpp
+++ b/src/mame/drivers/wheelfir.cpp
@@ -417,14 +417,14 @@ void wheelfir_state::wheelfir_blit_w(offs_t offset, uint16_t data, uint16_t mem_
{
vpage=LAYER_BG;
/*
- printf("%s bg -> %d %d %d %d %d %d @ %x\n",machine().describe_context().c_str(), dst_x0,dst_y0, dst_x1,dst_y1, dst_x1-dst_x0, dst_y1-dst_y0);
+ printf("%s bg -> %d %d %d %d %d %d @ %x\n",machine().describe_context().c_str(), dst_x0,dst_y0, dst_x1,dst_y1, dst_x1-dst_x0, dst_y1-dst_y0);
- for(int i=0;i<16;++i)
- {
- printf("%x = %.4x\n",i,m_blitter_data[i]);
- }
+ for(int i=0;i<16;++i)
+ {
+ printf("%x = %.4x\n",i,m_blitter_data[i]);
+ }
- printf("\n");
+ printf("\n");
*/
}
@@ -504,7 +504,7 @@ uint32_t wheelfir_state::screen_update_wheelfir(screen_device &screen, bitmap_in
copybitmap_trans(bitmap, *m_tmp_bitmap[LAYER_FG], 0, 0, 0, 0, cliprect, 0);
/*
- m_tmp_bitmap[LAYER_BG]->fill(0, screen.visible_area());
+ m_tmp_bitmap[LAYER_BG]->fill(0, screen.visible_area());
*/
return 0;
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 4906bf6f8bd..d61cba0da35 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -53,7 +53,7 @@ private:
required_shared_ptr<uint8_t> m_spriteram;
tilemap_t *m_bg_tilemap;
-
+
uint8_t m_mcu_p1;
uint8_t m_mcu_p2;
uint8_t m_mcu_p3;
diff --git a/src/mame/layout/dfs500.lay b/src/mame/layout/dfs500.lay
index 33f3087ec53..918492e7dbe 100644
--- a/src/mame/layout/dfs500.lay
+++ b/src/mame/layout/dfs500.lay
@@ -414,11 +414,11 @@ license:CC0
<element name="LD77" ref="multi_color_button"><!-- 3 --><bounds x="169" y="560" width="43" height="43" /></element>
<element name="LD78" ref="multi_color_button"><!-- 4 --><bounds x="214" y="560" width="43" height="43" /></element>
<element name="LD79" ref="multi_color_button"><!-- INT VIDEO --><bounds x="259" y="560" width="43" height="43" /></element>
-<!-- TODO: <text string="VTR A"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="VTR B"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="3"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="4"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="INT VIDEO"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="VTR A"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="VTR B"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="3"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="4"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="INT VIDEO"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
<!-- Foreground -->
<element name="LD70" ref="multi_color_button"><!-- VTR A --><bounds x="75" y="663" width="43" height="43" /></element>
@@ -426,11 +426,11 @@ license:CC0
<element name="LD72" ref="multi_color_button"><!-- 3 --><bounds x="165" y="663" width="43" height="43" /></element>
<element name="LD73" ref="multi_color_button"><!-- 4 --><bounds x="210" y="663" width="43" height="43" /></element>
<element name="LD74" ref="multi_color_button"><!-- INT VIDEO --><bounds x="255" y="663" width="43" height="43" /></element>
-<!-- TODO: <text string="VTR A"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="VTR B"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="3"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="4"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
-<!-- TODO: <text string="INT VIDEO"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="VTR A"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="VTR B"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="3"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="4"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
+<!-- TODO: <text string="INT VIDEO"><color red="0.1" green="0.1" blue="0.1" /><bounds x="..." y="..." width="..." height="..." /></text> -->
<!-- Int Video -->
<element name="LD82" ref="int_video_col_bkgd"><bounds x="321" y="578" width="52" height="12" /></element>
diff --git a/src/mame/machine/m6502_swap_op_d5_d6.cpp b/src/mame/machine/m6502_swap_op_d5_d6.cpp
index df832634684..dd23a1f6077 100644
--- a/src/mame/machine/m6502_swap_op_d5_d6.cpp
+++ b/src/mame/machine/m6502_swap_op_d5_d6.cpp
@@ -9,8 +9,8 @@
Seen on die marked VH2009, used on polmega, silv35
these are N2A03 derived CPUs used on VTxx systems
- VT1682 systems with this scrambling currently derive from M6502 type
- but this might be incorrect
+ VT1682 systems with this scrambling currently derive from M6502 type
+ but this might be incorrect
***************************************************************************/
diff --git a/src/mame/machine/nl_tank.cpp b/src/mame/machine/nl_tank.cpp
index 3885aa7a0fd..0518363ac0e 100644
--- a/src/mame/machine/nl_tank.cpp
+++ b/src/mame/machine/nl_tank.cpp
@@ -231,14 +231,14 @@ NETLIST_START(tank)
QBJT_EB(Q6, "2N3644")
QBJT_EB(Q7, "2N3644")
// Currently not used
-// QBJT_EB(Q27, "2N3643")
-// QBJT_EB(Q28, "2N3644")
-// QBJT_EB(Q29, "2N3643")
-// QBJT_EB(Q30, "2N3644")
-// QBJT_EB(Q31, "2N3643")
-// QBJT_EB(Q32, "2N3644")
-// QBJT_EB(Q33, "2N3643")
-// QBJT_EB(Q34, "2N3644")
+// QBJT_EB(Q27, "2N3643")
+// QBJT_EB(Q28, "2N3644")
+// QBJT_EB(Q29, "2N3643")
+// QBJT_EB(Q30, "2N3644")
+// QBJT_EB(Q31, "2N3643")
+// QBJT_EB(Q32, "2N3644")
+// QBJT_EB(Q33, "2N3643")
+// QBJT_EB(Q34, "2N3644")
TTL_7404_DIP(IC_H3)
TTL_7400_DIP(IC_B6)
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index e2782d5e993..96b9a9a8a62 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -16995,7 +16995,7 @@ wcbowl16 // (c) 1995 Incredible Technologies
wcbowl161 // (c) 1995 Incredible Technologies
wcbowl165 // (c) 1995 Incredible Technologies
wcbowldx // (c) 1999 Incredible Technologies
-shoottv // (c) 199? Incredible Technologies
+shoottv // (c) 199? Incredible Technologies
@source:itech8.cpp
arlingtn // (c) 1991 Strata/Incredible Technologies
diff --git a/src/mame/video/ms32.cpp b/src/mame/video/ms32.cpp
index a8f16d19a07..96d42e82e92 100644
--- a/src/mame/video/ms32.cpp
+++ b/src/mame/video/ms32.cpp
@@ -244,20 +244,20 @@ void ms32_state::draw_sprites(bitmap_ind16 &bitmap, bitmap_ind8 &bitmap_pri, con
void ms32_state::draw_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect,int priority)
{
// TODO: registers 0x40 / 0x44 and 0x50 / 0x54 are used, unknown meaning
- // Given how this works out it is most likely that 0x*0 controls X axis while 0x*4 Y,
- // nothing is known to diverge between settings so far (i.e. bbbxing sets 0xffff to 0x4* and 0x0000 to 0x5*).
- // 0x4* 0x5* ROZ should wrap?
- // bbbxing: 0xffff 0x0000 0 (match presentation)
- // gratia: 0x0000 0x0000 1 (sky in stage 2)
- // p47aces: 0xffff 0x0651 0 (title screen)
- // desertwr: 0xffff 0x0651 1 (any stage)
- // f1superb: 0xffff 0x0000 ?
- // suchie2: 0x0000 0x0000 0?
- // bnstars: 0x0000 0x0000 ?
- // hayaosi3: 0x0000 0x0000 ?
- // Maybe wrapping is done by limit boundaries rather than individual bits, so that bbbxing and p47aces abuses of this behaviour?
- // Are we missing a ROZ plane size as well?
-
+ // Given how this works out it is most likely that 0x*0 controls X axis while 0x*4 Y,
+ // nothing is known to diverge between settings so far (i.e. bbbxing sets 0xffff to 0x4* and 0x0000 to 0x5*).
+ // 0x4* 0x5* ROZ should wrap?
+ // bbbxing: 0xffff 0x0000 0 (match presentation)
+ // gratia: 0x0000 0x0000 1 (sky in stage 2)
+ // p47aces: 0xffff 0x0651 0 (title screen)
+ // desertwr: 0xffff 0x0651 1 (any stage)
+ // f1superb: 0xffff 0x0000 ?
+ // suchie2: 0x0000 0x0000 0?
+ // bnstars: 0x0000 0x0000 ?
+ // hayaosi3: 0x0000 0x0000 ?
+ // Maybe wrapping is done by limit boundaries rather than individual bits, so that bbbxing and p47aces abuses of this behaviour?
+ // Are we missing a ROZ plane size as well?
+
if (m_roz_ctrl[0x5c/4] & 1) /* "super" mode */
{
rectangle my_clip;