Index: trunk/MultiChannelUSB/Paella.v
===================================================================
--- trunk/MultiChannelUSB/Paella.v	(revision 74)
+++ trunk/MultiChannelUSB/Paella.v	(revision 75)
@@ -280,6 +280,7 @@
 			assign osc_mux_sel[i] = cfg_memory[20+i][3:0];
 			assign trg_mux_sel[i] = cfg_memory[20+i][7:4];
-			assign hst_mux_sel[i] = cfg_memory[20+i][11:8];
-			assign bln_mux_sel[i] = cfg_memory[20+i][15:12];
+
+			assign hst_mux_sel[i] = cfg_memory[23+i][3:0];
+			assign bln_mux_sel[i] = cfg_memory[23+i][7:4];
 
 			adc_fifo adc_fifo_unit (
@@ -320,10 +321,11 @@
 
 			lpm_mux #(
-				.lpm_size(4),
+				.lpm_size(5),
 				.lpm_type("LPM_MUX"),
 				.lpm_width(12),
-				.lpm_widths(2)) osc_mux_unit (
-				.sel(osc_mux_sel[i][1:0]),
-				.data({	uwt_a3[i][20:9],
+				.lpm_widths(3)) osc_mux_unit (
+				.sel(osc_mux_sel[i][2:0]),
+				.data({	bln_baseline[i],
+						uwt_a3[i][20:9],
 						uwt_a2[i][17:6],
 						uwt_a1[i][14:3],
@@ -332,10 +334,11 @@
 
 			lpm_mux #(
-				.lpm_size(4),
+				.lpm_size(5),
 				.lpm_type("LPM_MUX"),
 				.lpm_width(12),
-				.lpm_widths(2)) trg_mux_unit (
-				.sel(trg_mux_sel[i][1:0]),
-				.data({	uwt_a3[i][20:9],
+				.lpm_widths(3)) trg_mux_unit (
+				.sel(trg_mux_sel[i][2:0]),
+				.data({	bln_baseline[i],
+						uwt_a3[i][20:9],
 						uwt_a2[i][17:6],
 						uwt_a1[i][14:3],