Merge branch 'framepars'

src/drivers/elphel/pgm_functions.h

@@ -87,7 +87,7 @@ int add_sensor_proc(int port, int index, int (*sens_func)(int sensor_port, struc
 #define SET_SENSOR_MBPAR(p,f,s,r,v)  { pars_to_update[nupdate  ].num= P_SENSOR_REGS+(r) ;\
                                        pars_to_update[nupdate++].val=(v);\
                                        X3X3_I2C_SEND2((p), (f), (s), (r), (v)); \
-                                       int _MINDEX= MULTIREG(p,P_SENSOR_REGS+(r),0); \
+                                       {int _MINDEX= MULTIREG(p,P_SENSOR_REGS+(r),0); \
                                          if (_MINDEX) { \
                        EDBG(if (GLOBALPARS(G_DEBUG) & (1 <<4)) printk("%s:%d:%s _MINDEX=0x%x, v=0x%x, FRAMEPAR_MODIFIED(_MINDEX)=0x%x\n",__FILE__,__LINE__,__FUNCTION__, _MINDEX, (int) (v), (int) FRAMEPAR_MODIFIED(_MINDEX) ));\
                                            if (!FRAMEPAR_MODIFIED(_MINDEX)) { \
@@ -107,6 +107,7 @@ int add_sensor_proc(int port, int index, int (*sens_func)(int sensor_port, struc
                                              pars_to_update[nupdate++].val=(v);\
                                            } \
                                          } \
+                                       } \
                                      }
 /**Set parameter for the same register in multiple multiplexed sensors and send to hardware i2c sequencer
  * Similar to SET_SENSOR_MBPAR, but it does not update "parent" parameter, only individual ones.
@@ -120,6 +121,7 @@ int add_sensor_proc(int port, int index, int (*sens_func)(int sensor_port, struc
  * @param v value to set (16 bits)
  * @see SET_SENSOR_MBPAR */
 #define SET_SENSOR_MBOPAR(p,f,s,r,v)  { X3X3_I2C_SEND2((p), (f), (s), (r), (v)); \
+                                        { \
                                           int _MINDEX= MULTIREG(p,P_SENSOR_REGS+(r),0); \
                        EDBG(if (GLOBALPARS(G_DEBUG) & (1 <<4)) printk("%s:%d:%s _MINDEX=0x%x, v=0x%x, FRAMEPAR_MODIFIED(_MINDEX)=0x%x\n",__FILE__,__LINE__,__FUNCTION__, _MINDEX, (int) (v), (int) FRAMEPAR_MODIFIED(_MINDEX) ));\
                                           if (_MINDEX) { \
@@ -140,10 +142,10 @@ int add_sensor_proc(int port, int index, int (*sens_func)(int sensor_port, struc
                                               pars_to_update[nupdate++].val=(v);\
                                             } \
                                           } \
+                                        } \
                                      }
 
 
-
 /**Set individual (multiplexed) sensor parameter (and send to hardware i2c sequencer)
  * Do nothing if there is no individual parameter reserved
  * @param p Sensor port number