summaryrefslogtreecommitdiff
path: root/device-functions.c
diff options
context:
space:
mode:
authorMike <mjc@avtechpulse.com>2000-01-01 01:06:00 +0900
committerMike <mjc@avtechpulse.com>2000-01-01 01:06:00 +0900
commit75b3c18090031d73c1dd6d031ee6b752497c239e (patch)
tree8523fd49e6caf87ac1ac186e80e657ef02a4c17c /device-functions.c
parent82db18314efe170471f1675d40fbf1416fbb95e8 (diff)
remove broken CH2 TTL/ECL logic code, not used in any instruments now
Diffstat (limited to 'device-functions.c')
-rw-r--r--device-functions.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/device-functions.c b/device-functions.c
index d9f4664..ed57c96 100644
--- a/device-functions.c
+++ b/device-functions.c
@@ -1800,16 +1800,7 @@ int Set_Logic_Level(int channel,int mode)
}
}
- /* second channel uses xtra-rly3 */
- if (channel==1) {
- if (mode==logic_ecl) {
- /* TODO FIXME: is this right? should be SR_2? */
- set_shiftreg_bits(SR_3, XTR_POS + 3, ONE_BIT, BIT_HIGH);
- } else {
- /* TODO FIXME: is this right? should be SR_2? */
- set_shiftreg_bits(SR_3, XTR_POS + 3, ONE_BIT, BIT_LOW);
- }
- }
+ // channel 2 not implemented currently
globals.ChannelState[channel].logic_level=mode;
Set_Update_Chans();
@@ -4922,7 +4913,7 @@ static void set_shiftreg_bits(int shiftreg, int start_at_bit, int numbits, int v
long shift_value = (value & used_bits) << start_at_bit;
long masked_reg = globals.Registers.shift_reg_out[shiftreg] & mask;
- g_print_debug(": shiftreg %d, start_at_bit %d, numbits %d, value %x\n",shiftreg,start_at_bit,numbits,value);
+ g_print_debug(": shiftreg %d, mask %x, start_at_bit %d, numbits %d, value %x\n", shiftreg, mask, start_at_bit, numbits, value);
globals.Registers.shift_reg_out[shiftreg] = masked_reg | shift_value;
}