diff options
author | Aaron Giles <aaron@aarongiles.com> | 2021-03-26 09:32:04 -0700 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2021-03-26 09:32:04 -0700 |
commit | 2f4e81dd5ee8172d7176fe4fc48903082391147b (patch) | |
tree | 1e5b286410cf9e06d3f57cfd25ffa6e49e1b2c25 | |
parent | 647b22f835a54ff567b36b750d48067a9275e2ac (diff) |
Fixes to mingw build.
-rw-r--r-- | src/emu/schedule.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/turbo.cpp | 133 |
2 files changed, 1 insertions, 134 deletions
diff --git a/src/emu/schedule.cpp b/src/emu/schedule.cpp index c383f7fd048..08dca3e0746 100644 --- a/src/emu/schedule.cpp +++ b/src/emu/schedule.cpp @@ -187,7 +187,7 @@ timer_instance::~timer_instance() // be saved and start off in a disabled state //------------------------------------------------- -inline timer_instance &timer_instance::init_persistent(timer_callback &callback) +timer_instance &timer_instance::init_persistent(timer_callback &callback) { // ensure the entire timer state is clean m_start = callback.m_scheduler->time(); diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index f7225dcd83b..25a1db15d2c 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -536,136 +536,3 @@ void turbo_state::buckrog_samples(machine_config &config) m_samples->set_samples_names(buckrog_sample_names); m_samples->add_route(ALL_OUTPUTS, "mono", 0.25); } - - - -/************************************* - * - * Discrete test code - * - *************************************/ - -#if (DISCRETE_TEST) - -/* Nodes - Inputs */ -#define TURBO_CRASH_EN NODE_01 -#define TURBO_TRIG1_INV NODE_02 -#define TURBO_TRIG2_INV NODE_03 -#define TURBO_TRIG3_INV NODE_04 -#define TURBO_TRIG4_INV NODE_05 -#define TURBO_SLIP_EN NODE_06 -#define TURBO_CRASHL_EN NODE_07 -#define TURBO_ACC_VAL NODE_08 -#define TURBO_AMBU_EN NODE_09 -#define TURBO_SPIN_EN NODE_10 -#define TURBO_OSEL_VAL NODE_11 -#define TURBO_BSEL_VAL NODE_12 - -/* Nodes - Sounds */ -#define FIRETRUCK_NOISE NODE_20 - -static const discrete_555_desc turbo_alarm_555 = -{ - DISC_555_OUT_SQW | DISC_555_OUT_DC, - 5, // B+ voltage of 555 - DEFAULT_555_VALUES, -}; - -DISCRETE_SOUND_START(turbo_discrete) - /************************************************/ - /* Input register mapping for turbo */ - /************************************************/ - /* NODE ADDR MASK GAIN OFFSET INIT */ - DISCRETE_INPUT(TURBO_CRASH_EN ,0x00,0x001f, 0.0) - DISCRETE_INPUT(TURBO_TRIG1_INV ,0x01,0x001f, 1.0) - DISCRETE_INPUT(TURBO_TRIG2_INV ,0x02,0x001f, 1.0) - DISCRETE_INPUT(TURBO_TRIG3_INV ,0x03,0x001f, 1.0) - DISCRETE_INPUT(TURBO_TRIG4_INV ,0x04,0x001f, 1.0) - DISCRETE_INPUT(TURBO_SLIP_EN ,0x05,0x001f, 0.0) - DISCRETE_INPUT(TURBO_CRASHL_EN ,0x06,0x001f, 0.0) - DISCRETE_INPUT(TURBO_ACC_VAL ,0x07,0x001f, 0.0) - DISCRETE_INPUT(TURBO_AMBU_EN ,0x08,0x001f, 0.0) - DISCRETE_INPUT(TURBO_SPIN_EN ,0x09,0x001f, 0.0) - DISCRETE_INPUT(TURBO_OSEL_VAL ,0x0a,0x001f, 0.0) - DISCRETE_INPUT(TURBO_BSEL_VAL ,0x0b,0x001f, 0.0) - - /************************************************/ - /* Alarm sounds */ - /************************************************/ - - // 5-5-5 counter provides the input clock - DISCRETE_555_ASTABLE(NODE_50,1,470,120,0.1e-6,&turbo_alarm_555) - // which clocks a 74393 dual 4-bit counter, clocked on the falling edge - DISCRETE_COUNTER(NODE_51,1,0,NODE_50,0,15,1,0,DISC_CLK_ON_F_EDGE) - // the high bit of this counter - DISCRETE_TRANSFORM2(NODE_52,NODE_51,8,"01/") - // clocks the other half of the 74393 - DISCRETE_COUNTER(NODE_53,1,0,NODE_52,0,15,1,0,DISC_CLK_ON_F_EDGE) - - // trig1 triggers a LS123 retriggerable multivibrator - DISCRETE_ONESHOT(NODE_60,TURBO_TRIG1_INV,5.0,(0.33e-9)*47*1e6, DISC_ONESHOT_FEDGE|DISC_ONESHOT_RETRIG|DISC_OUT_ACTIVE_HIGH) - // which interacts with bit 0 of the second counter - DISCRETE_TRANSFORM2(NODE_61,NODE_53,1,"01&") - // via a NAND - DISCRETE_LOGIC_NAND(NODE_62,1,NODE_60,NODE_61) - - // trig2 triggers a LS123 retriggerable multivibrator - DISCRETE_ONESHOT(NODE_65,TURBO_TRIG2_INV,5.0,(0.33e-9)*47*10e6,DISC_ONESHOT_FEDGE|DISC_ONESHOT_RETRIG|DISC_OUT_ACTIVE_HIGH) - // which interacts with bit 3 of the first counter via a NAND - DISCRETE_LOGIC_NAND(NODE_66,1,NODE_65,NODE_52) - - // trig3 triggers a LS123 retriggerable multivibrator - DISCRETE_ONESHOT(NODE_70,TURBO_TRIG3_INV,5.0,(0.33e-9)*47*33e6,DISC_ONESHOT_FEDGE|DISC_ONESHOT_RETRIG|DISC_OUT_ACTIVE_HIGH) - // which interacts with bit 2 of the first counter - DISCRETE_TRANSFORM3(NODE_71,NODE_51,4,1,"01/2&") - // via a NAND - DISCRETE_LOGIC_NAND(NODE_72,1,NODE_70,NODE_71) - - // trig4 triggers a LS123 retriggerable multivibrator - DISCRETE_ONESHOT(NODE_75,TURBO_TRIG4_INV,5.0,(0.33e-9)*47*10e6,DISC_ONESHOT_FEDGE|DISC_ONESHOT_RETRIG|DISC_OUT_ACTIVE_HIGH) - // which interacts with bit 1 of the first counter - DISCRETE_TRANSFORM3(NODE_76,NODE_51,2,1,"01/2&") - // via a NAND - DISCRETE_LOGIC_NAND(NODE_77,1,NODE_75,NODE_76) - - // everything is effectively NANDed together - DISCRETE_LOGIC_NAND4(NODE_80,1,NODE_62,NODE_66,NODE_72,NODE_77) - -/* - - the rest of the circuit looks like this: - - +5V +12V +---+ - ^ ^ +--------+ 1K v | - | | | |\ | +---NNN--NNN--+ - Z 1K 10K Z | | \ | | |\ 20K | +--|(----> ALARM_M - Z Z +-|- \ | | | \ | | 4.7u - | | | >--+---NNNN----+-|- \ | +--|(----> ALARM_F - +--NNNN--|(----+-----|+ / 22K | >-------+---+ 4.7u - +-\ | 5.1K 4.7u | | / +6V--|+ / +--|(----> ALARM_R - | >o---(NODE_62)--+ Z |/ | / | 4.7u - +-/ | 10K Z |/ +--|(----> ALARM_L - | | 4.7u - +-\ | v - | >o---(NODE_66)--+ GND - +-/ | - | - +-\ | - | >o---(NODE_72)--+ - +-/ | - | - +-\ | - | >o---(NODE_77)--+ - +-/ - - -*/ - - /************************************************/ - /* Combine all 7 sound sources. */ - /************************************************/ - - DISCRETE_OUTPUT(NODE_80, 16000) -DISCRETE_SOUND_END - -#endif |