Index: /trunk/MultiChannelUSB/Paella.v
===================================================================
--- /trunk/MultiChannelUSB/Paella.v	(revision 165)
+++ /trunk/MultiChannelUSB/Paella.v	(revision 166)
@@ -205,6 +205,6 @@
 		begin : MUX_DATA
 			assign int_mux_data[j] = {
-				{4'd0, amp_flag[0+2*j][0], 7'd0},
-				amp_data[0+2*j],
+				{4'd0, amp_flag[0+j][0], 7'd0},
+				amp_data[0+j],
 				clp_data[j],
 				sys_data[j]};
@@ -401,7 +401,7 @@
 		.clock(sys_clock),
 		.frame(sys_frame),
-		.reset(cfg_bits[0][5]),
-		.hst_good((amp_mux_flag[0][0]) & (cnt_good[1]) & (cfg_bits[14][1])),
-		.hst_data(amp_mux_data[0]),
+		.reset(cfg_bits[0][6]),
+		.hst_good((amp_mux_flag[1][0]) & (cnt_good[1]) & (cfg_bits[14][1])),
+		.hst_data(amp_mux_data[1]),
 		.bus_ssel(bus_ssel[3]),
 		.bus_wren(bus_wren),
@@ -413,5 +413,5 @@
 	counter hst_counter_unit_2 (
 		.clock(sys_clock),
-		.frame((sys_frame) & (~amp_mux_flag[0][1])),
+		.frame((sys_frame) & (~amp_mux_flag[1][1])),
 //		.frame(sys_frame),
 		.reset(cfg_bits[0][8]),
@@ -431,5 +431,5 @@
 		.reset(cfg_bits[0][11]),
 		.hst_good((cnt_good[3]) & (~cnt_good[2])),
-		.hst_data(cnt_bits_wire),
+		.hst_data(cnt_bits_wire < 16'd9999 ? cnt_bits_wire[13:0] : 14'd9999),
 		.bus_ssel(bus_ssel[8]),
 		.bus_wren(bus_wren),
@@ -441,5 +441,5 @@
 	counter rmt_counter_1 (
 		.clock(sys_clock),
-		.frame((sys_frame) & (~amp_mux_flag[1][1])),
+		.frame((sys_frame) & (~amp_mux_flag[2][1])),
 //		.frame(sys_frame),
 		.reset(cfg_bits[0][12]),
@@ -475,5 +475,5 @@
 		.sclr(((sys_frame) & (cnt_good[3]) & (~cnt_good[2])) | (cfg_bits[0][11])),
 		.clock(sys_clock),
-		.cnt_en((sys_frame) & (amp_mux_flag[1][0]) & (cnt_good[2]) & (cnt_good[3]) & (cfg_bits[16][1])),
+		.cnt_en((sys_frame) & (amp_mux_flag[2][0]) & (cnt_good[2]) & (cnt_good[3]) & (cfg_bits[16][1])),
 		.q(cnt_bits_wire));