]> rtime.felk.cvut.cz Git - fpga/lx-cpu1/lx-rocon.git/commitdiff
RoCoN: correct computation of channel location for case with multiple LXPWR slaves.
authorPavel Pisa <ppisa@pikron.com>
Mon, 24 Nov 2014 21:28:39 +0000 (22:28 +0100)
committerPavel Pisa <ppisa@pikron.com>
Mon, 24 Nov 2014 21:28:39 +0000 (22:28 +0100)
Signed-off-by: Pavel Pisa <ppisa@pikron.com>
sw/app/rocon/appl_pxmc.c

index 02d85b7b8b3b2cfa6946a6778c7082a346a0d979..7d35393b20da1a78f1490ae8d2feccb578528b63 100644 (file)
@@ -236,7 +236,7 @@ pxmc_rocon_receiver_chan2reg(unsigned chan)
   rec_reg = fpga_lx_master_receiver_base;
 
  #ifdef LXPWR_WITH_SIROLADC
-  rec_reg += LX_MASTER_DATA_OFFS + 1 + (chan >> 8) * 3 + chan * 2;
+  rec_reg += LX_MASTER_DATA_OFFS + 1 + (chan >> 3) * 3 + chan * 2;
  #else /*LXPWR_WITH_SIROLADC*/
   rec_reg += LX_MASTER_DATA_OFFS + chan;
  #endif /*LXPWR_WITH_SIROLADC*/
@@ -309,7 +309,7 @@ pxmc_rocon_pwm_chan2reg(unsigned chan)
   pwm_reg = fpga_lx_master_transmitter_base;
 
  #ifdef LXPWR_WITH_SIROLADC
-  pwm_reg += LX_MASTER_DATA_OFFS + 1 + (chan >> 8) + chan;
+  pwm_reg += LX_MASTER_DATA_OFFS + 1 + (chan >> 3) + chan;
  #else /*LXPWR_WITH_SIROLADC*/
   pwm_reg += LX_MASTER_DATA_OFFS + chan;
  #endif /*LXPWR_WITH_SIROLADC*/