debugging for multiplexer

src/drivers/elphel/framepars.c

@@ -837,7 +837,7 @@ inline void _processParsSeq(int sensor_port,                   ///< sensor port
 {
 	unsigned long todo, mask, remain;
 	int job_ahead;                  // doing job "job_ahead" ahead of needed
-	int pars_ahead;                 // considering parameter "pars_ahead" of the (frame16+job_ahead) mod 8
+	int pars_ahead;                 // considering parameter "pars_ahead" of the (frame16+job_ahead) mod 16
 	int frame_proc;                 // current frame for which parameters are considered
 	struct framepars_t * procpars;
 	struct framepars_t * prevpars;  // maybe - drop calculation for each function, move it to pgm_* where needed?
@@ -968,7 +968,10 @@ void _processPars(int sensor_port, struct sensorproc_t * sensorproc, int frame16
         dev_dbg(g_devfp_ptr,"port= %d (after second _processParsASAP),  frame16=%d, maxahead=%d\n", sensor_port, frame16, maxahead);
     }
     dev_dbg(g_devfp_ptr,"port= %d (after second _processParsASAP),  frame16=%d, maxahead=%d\n", sensor_port, frame16, maxahead);
-    if (debug_flags)    debug_flags--;
+    if (debug_flags)   {
+        dev_dbg(g_devfp_ptr,"debug_flags= %d \n", debug_flags);
+        debug_flags--;
+    }
 
 }
 
@@ -1007,7 +1010,7 @@ int processPars(int sensor_port, struct sensorproc_t * sensorproc, int frame16,
     if (debug_flags) {
         MDP(DBGB_FPPT,sensor_port,"==from tasklet: frame16=%d, maxahead=%d\n",
                 frame16, maxahead)
-        dev_dbg(g_devfp_ptr,"==from tasklet: port= %d,  frame16=%d, maxahead=%d\n", sensor_port, frame16, maxahead);
+        dev_dbg(g_devfp_ptr,"==from tasklet: port= %d,  frame16=%d, maxahead=%d  now=0x%lx\n", sensor_port, frame16, maxahead, getThisFrameNumber(sensor_port));
     }
 
     dev_dbg(g_devfp_ptr,"port= %d,  frame16=%d, maxahead=%d\n", sensor_port, frame16, maxahead);
@@ -1021,13 +1024,12 @@ int processPars(int sensor_port, struct sensorproc_t * sensorproc, int frame16,
     if (debug_flags) {
         MDP(DBGB_FPPT,sensor_port,"==Done from tasklet: frame16=%d, maxahead=%d\n",
                 frame16, maxahead)
-        dev_dbg(g_devfp_ptr,"== Done from tasklet: port= %d,  frame16=%d, maxahead=%d\n", sensor_port, frame16, maxahead);
+        dev_dbg(g_devfp_ptr,"== Done from tasklet: port= %d,  frame16=%d, maxahead=%d now=0x%lx\n", sensor_port, frame16, maxahead, getThisFrameNumber(sensor_port));
     }
     return 0;
 }
 #endif
 
-
 /**
  * @brief schedule pgm_func to be executed for selected frame (frame16)
  * @param sensor_port sensor port number (0..3)

src/drivers/elphel/framepars.h

@@ -16,7 +16,7 @@ void init_framepars_ptr(int sensor_port);
 int  initSequencers    (int sensor_port); ///Move to sensorcommon? currently it is used through frameparsall file (lseek)
 void initGlobalPars    (int sensor_port); /// resets all global parameters but debug mask (if ELPHEL_DEBUG)
 int  initMultiPars     (int sensor_port); /// initialize structures for individual per-sensor parameters. Now only works for sensor registers using G_MULTI_REGSM. Should be called aftre/during sensor detection
-void initFramePars     (int sensor_port); ///initialize all parameters, set thisFrameNumber to frame8 (read from hardware, usually 0 after resetting i2c and cmd_seq)
+void initFramePars     (int sensor_port); ///initialize all parameters, set thisFrameNumber to frame16 (read from hardware, usually 0 after resetting i2c and cmd_seq)
 void resetFrameNumber  (int sensor_port, u32 aframe, int hreset); /// reset this frame number (called from initFramePars(), also can be used to avoid frame number integer overflow)
 
 unsigned long get_imageParamsFrame(int sensor_port, int n, int frame);

src/drivers/elphel/mt9x001.c

@@ -1989,8 +1989,8 @@ int mt9x001_pgm_triggermode        (int sensor_port,               ///< sensor p
     dev_dbg(g_dev_ptr,"{%d}  frame16=%d\n",sensor_port,frame16);
     if (frame16 >= PARS_FRAMES) return -1; // wrong frame
     newreg= (thispars->pars[P_SENSOR_REGS+P_MT9X001_RMODE1] & 0xfe7f) | // old value without snamshot and GRR bits
-            ((thispars->pars[P_TRIG] & 4)?0x100:0) |                    // snapshot mode for P_TRIG==4 or 5
-            ((thispars->pars[P_TRIG] & 1)?0x80:0);                      // GRR mode for P_TRIG==5 (no effect for 1
+            ((thispars->pars[P_TRIG] & 4)?0x100:0) |                    // snapshot mode for P_TRIG==4 or 20
+            ((thispars->pars[P_TRIG] & 0x10)?0x80:0);                   // GRR mode for P_TRIG==20
     if (newreg != thispars->pars[P_SENSOR_REGS+P_MT9X001_RMODE1]) {
         // turn off triggered mode immediately, turn on later (or should made at least before changing camsync parameters)
         if (!(thispars->pars[P_TRIG] & 4)){

src/drivers/elphel/pgm_functions.c

@@ -1441,7 +1441,7 @@ int pgm_sensorin   (int sensor_port,               ///< sensor port number (0..3
     x393_gamma_ctl_t      gamma_ctl =    {.d32=0};
     int bayer;
 
-    int n_scan_lines, n_ph_lines;
+    int n_scan_lines; //, n_ph_lines;
     int flips;
     int bayer_modified;
     x393_mcntrl_frame_start_dly_t start_dly ={.d32=0};
@@ -1529,8 +1529,8 @@ int pgm_sensorin   (int sensor_port,               ///< sensor port number (0..3
 
     if (FRAMEPAR_MODIFIED(P_MEMSENSOR_DLY) && ((start_dly.start_dly = thispars->pars[P_MEMSENSOR_DLY]))){
         X393_SEQ_SEND1 (sensor_port, frame16, x393_sens_mcntrl_scanline_start_delay, start_dly);
-        dev_dbg(g_dev_ptr,"{%d}  Setting sensor-to-memory frame sync delay  to %ld (0x%lx)\n",sensor_port, start_dly.start_dly,start_dly.start_dly);
-        MDP(DBGB_PADD, sensor_port,"Setting sensor-to-memory frame sync delay  to %ld (0x%lx)\n", start_dly.start_dly,start_dly.start_dly)
+        dev_dbg(g_dev_ptr,"{%d}  Setting sensor-to-memory frame sync delay  to %d (0x%x)\n",sensor_port, start_dly.start_dly,start_dly.start_dly);
+        MDP(DBGB_PADD, sensor_port,"Setting sensor-to-memory frame sync delay  to %d (0x%x)\n", start_dly.start_dly,start_dly.start_dly)
     }
 
 
@@ -2404,8 +2404,8 @@ int pgm_focusmode  (int sensor_port,               ///< sensor port number (0..3
 												   ///< be applied to,  negative - ASAP
 												   ///< @return OK - 0, <0 - error
 {
-    unsigned long flags;
-    int i;
+//    unsigned long flags;
+//    int i;
 //    x393_cmprs_table_addr_t table_addr;
     struct {
         short left;
@@ -2888,7 +2888,7 @@ int pgm_compstop   (int sensor_port,               ///< sensor port number (0..3
                                disable_need,
                                (frame16<0)? ASAP: ABSOLUTE,  // how to apply commands - directly or through channel sequencer
                                frame16);
-    dev_dbg(g_dev_ptr,"{%d}   X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, sensor_port, frame16, cmprs_mode.d32);
+    dev_dbg(g_dev_ptr,"{%d}@0x%lx: X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, getThisFrameNumber(sensor_port), sensor_port, frame16, cmprs_mode.d32);
     MDP(DBGB_PADD, sensor_port,"X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32)
     return 0;
 
@@ -2917,7 +2917,7 @@ int pgm_compctl    (int sensor_port,               ///< sensor port number (0..3
     int disable_need =  1; // TODO: Use some G_* parameter
     x393_cmprs_mode_t        cmprs_mode =        {.d32=0};
     int reset_frame = 0;
-    int just_started = 0;
+//    int just_started = 0;
     dev_dbg(g_dev_ptr,"{%d}  frame16=%d, prevpars->pars[P_COMPRESSOR_RUN]=%d, thispars->pars[P_COMPRESSOR_RUN]=%d \n",
             sensor_port,frame16, (int) prevpars->pars[P_COMPRESSOR_RUN], (int) thispars->pars[P_COMPRESSOR_RUN]);
     MDP(DBGB_PSFN, sensor_port,"frame16=%d, prevpars->pars[P_COMPRESSOR_RUN]=%d, thispars->pars[P_COMPRESSOR_RUN]=%d \n",
@@ -2962,7 +2962,8 @@ int pgm_compctl    (int sensor_port,               ///< sensor port number (0..3
         X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);
     }
 
-    dev_dbg(g_dev_ptr,"{%d}   X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, sensor_port, frame16, cmprs_mode.d32);
+    dev_dbg(g_dev_ptr,"{%d}@0x%lx: X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, getThisFrameNumber(sensor_port), sensor_port, frame16, cmprs_mode.d32);
+
     MDP(DBGB_PADD, sensor_port,"X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32)
     return 0;
 

src/include/uapi/elphel/c313a.h

@@ -303,7 +303,9 @@
 <li>                     bit 0  - "old" external mode (0 - internal, 1 - external )
 <li>                     bit 1 - enable(1) or disable(0) external trigger to stop clip
 <li>                     bit 2 - async (snapshot, ext trigger) mode, 0 - continuous NOTE: Only this bit is used now
-<li>                     bit 3 - no overlap,  single frames: program - acquire/compress same frame</ul>*/
+<li>                     bit 3 - no overlap,  single frames: program - acquire/compress same frame
+<li>                     bit 4 - global reset release (GRR) mode - (only when combined with bit 2)
+</ul>*/
 #define P_BGFRAME       16 ///< Background measurement mode - will use 16-bit mode and no FPN correction
 //#define P_IMGSZMEM      17 ///< image size in video memory (calculated when channel 0 is programmed) NC393: Not used ???
 //#define P_COMP_BAYER    17 ///< -> 119 derivative, readonly - calculated from P_BAYER and COMPMOD_BYRSH to separate sensor and compressor channels