more debugging

src/drivers/elphel/framepars.h

@@ -30,7 +30,7 @@ unsigned long get_globalParam     (int sensor_port, int n);
 void          set_globalParam     (int sensor_port, int n, unsigned long d);
 void          set_imageParamsR_all(int sensor_port, int n, unsigned long d);
 //Next 2 called from ISR
-void          updateInterFrame(int sensor_port, int frame16, struct interframe_params_t * interframe_pars);
+void          updateInterFrame(int sensor_port, u32 compressed_frame, struct interframe_params_t * interframe_pars);
 void          updateFramePars     (int sensor_port, int frame16);
 int           setFrameParsStatic  (int sensor_port, int numPars, struct frameparspair_t * pars);
 
@@ -40,28 +40,32 @@ unsigned long getThisFrameNumber  (int sensor_port); /// just return current thi
 /// Return - 0 if OK, -ERR_FRAMEPARS_TOOEARLY or -ERR_FRAMEPARS_TOOLATE if it is too early or too late to set parameters (numPars may be 0 to just test)
 ///
 /// NOTE: When writing parameter to P_SENSOR_RUN or P_COMPRESSOR_RUN "*_RUN_SINGLE", first write "*SENSOR_RUN_STOP" (it will propagate to all next frames) and then
-/// write "*_RUN_SINGLE", to (P_*_RUN | FRAMEPAIR_JUST_THIS) - then this *_RUN_SINGLE will not propagate to the next frames (they will stay stopped)
+// write "*_RUN_SINGLE", to (P_*_RUN | FRAMEPAIR_JUST_THIS) - then this *_RUN_SINGLE will not propagate to the next frames (they will stay stopped)
 
 
-/// TODO: Make (an "unlimited") future commands que based on lists and a tree frame index
+// TODO: Make (an "unlimited") future commands que based on lists and a tree frame index
 
 int setFrameParsAtomic            (int sensor_port, unsigned long frameno, int maxLatency, int numPars, struct frameparspair_t * pars);
 
-/// set output/calculated parameter and propagate changes - will not trigger any actions
+// set output/calculated parameter and propagate changes - will not trigger any actions
 int setFramePar                   (int sensor_port, struct framepars_t * this_framepars, unsigned long mindex, unsigned long val);
+// Same, but adds lock to call from user thread
+int setFrameParLocked             (int sensor_port, struct framepars_t * this_framepars, unsigned long mindex, unsigned long val);
+
 ///same for several pars at once
 int setFramePars                  (int sensor_port, struct framepars_t * this_framepars, int numPars, struct frameparspair_t * pars);
 /// schedule pgm_func to be executed for selected frame
 void schedule_pgm_func            (int sensor_port, int frame8, int func_num);
-/// schedule pgm_func to be executed for the current frame
+// schedule pgm_func to be executed for the current frame
 void schedule_this_pgm_func       (int sensor_port, struct framepars_t * this_framepars, int func_num);
   
-/// program acquisition, according to the parameters changed.
-/// maxahead - how many frames ahead of time (start with most urgent, then 1 ahead, ...)
-/// make maxahead - P_* parameter?
-/* 393: See if sesnor port is needed here */
-inline void processParsASAP      (int sensor_port, struct sensorproc_t * sensorproc, int frame8);
-inline void processParsSeq       (int sensor_port, struct sensorproc_t * sensorproc, int frame8, int maxahead);
+// program acquisition, according to the parameters changed.
+// maxahead - how many frames ahead of time (start with most urgent, then 1 ahead, ...)
+// make maxahead - P_* parameter?
+/* 393: See if sensor port is needed here */
+/* NC393: Removed, should not be called from outside the lock-ed processPars() */
+//inline void _processParsASAP      (int sensor_port, struct sensorproc_t * sensorproc, int frame8);
+//inline void _processParsSeq       (int sensor_port, struct sensorproc_t * sensorproc, int frame8, int maxahead);
 
 void        processPars          (int sensor_port, struct sensorproc_t * sensorproc, int frame8, int maxahead);
 ///*** TODO: Add option (flag?) to write "single" (like single compress, single sensor) so it will not make all the next frames "single"

src/drivers/elphel/gamma_tables.c

@@ -173,10 +173,7 @@ static DEFINE_SPINLOCK(gamma_lock_1); ///<
 static DEFINE_SPINLOCK(gamma_lock_2); ///<
 static DEFINE_SPINLOCK(gamma_lock_3); ///<
 /** Define array of pointers to locks - hardware allows concurrent writes to different ports tables */
-spinlock_t * gamma_locks[4] = {&gamma_lock_0,
-        &gamma_lock_1,
-        &gamma_lock_2,
-        &gamma_lock_3};
+spinlock_t * gamma_locks[4] = {&gamma_lock_0, &gamma_lock_1, &gamma_lock_2, &gamma_lock_3};
 
 static struct gamma_stuct_t gammas[GAMMA_CACHE_NUMBER] __attribute__ ((aligned (PAGE_SIZE)));
 struct gamma_stuct_t * gammas_p; // to use with mmap

src/drivers/elphel/histograms.c

@@ -622,11 +622,11 @@ loff_t histograms_lseek (struct file * file,
                 }
                 // request histogram(s)
                 //             setFramePar(&framepars[reqFrame & PARS_FRAMES_MASK], reqAddr, 1);
-                setFramePar(privData->port, &aframepars[privData->port][reqFrame & PARS_FRAMES_MASK], reqAddr, 1);
+                setFrameParLocked(privData->port, &aframepars[privData->port][reqFrame & PARS_FRAMES_MASK], reqAddr, 1);
                 // make sure (harmful) interrupt did not happen since getThisFrameNumber()
                 if (reqFrame < getThisFrameNumber(privData->port)) {
                     //               setFramePar(&framepars[getThisFrameNumber() & PARS_FRAMES_MASK], reqAddr, 1);
-                    setFramePar(privData->port, &aframepars[privData->port][getThisFrameNumber(privData->port) & PARS_FRAMES_MASK], reqAddr, 1);
+                    setFrameParLocked(privData->port, &aframepars[privData->port][getThisFrameNumber(privData->port) & PARS_FRAMES_MASK], reqAddr, 1);
 
                 }
             }

src/drivers/elphel/multi10359.h

@@ -131,11 +131,3 @@ each dibit:
 //#define I2C359_CLK_NUMBER         4 // system clock number for the 10359A on-board clock generator
 void multi10359_set_device(struct device *dev);
 int multisensor_pgm_detectsensor   (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);
-//int legacy_i2c  (int ports);
-/*
-  struct frameparspair_t  pars_to_update[8];
-  int nupdate=0;
-...
-   if (nupdate)  setFramePars(thispars, nupdate, pars_to_update);  /// save changes to sensor register shadows
-
-*/

src/drivers/elphel/pgm_functions.c

@@ -391,7 +391,7 @@ int pgm_detectsensor   (int sensor_port,               ///< sensor port number (
     dev_dbg(g_dev_ptr,"Setting i2c drive mode for port %d\n",sensor_port);
     i2c_drive_mode          (sensor_port, SDA_DRIVE_HIGH, SDA_RELEASE);
     i2c_stop_run_reset      (sensor_port, I2C_CMD_RUN); // also programs status update
-
+    legacy_i2c(1<<sensor_port);// Setup i2c pages for legacy i2c commands. TODO NC393: update for compatibility with 14MPix
     camsync_mode.trig =     0;
     camsync_mode.trig_set = 1;
     camsync_mode.ext =      1; // use external timestamp (default)

src/drivers/elphel/sensor_i2c.h

@@ -34,7 +34,7 @@ typedef struct{
 	      u8                           data_bytes;    ///< Number of data bytes (1..10), for writes it includes register address bytes
 	      int                          scl_khz;       ///< maximal SCL frequency in KHz (currently limited by 200KHz slowest)
 } x393_i2c_device_t;
-
+void i2c_page_alloc_init( int chn); // reset page allocation for selscted channel
 int i2c_stop_run_reset(int chn, int cmd);
 int i2c_drive_mode    (int chn, int sda_drive_high, int sda_release);
 int read_xi2c_frame   (int chn);

src/drivers/elphel/x393_videomem.c

@@ -79,6 +79,9 @@ int  setup_sensor_memory (int num_sensor,       ///< sensor port number (0..3)
    window_width_height.height =           window_height;
    window_left_top.left =                 window_left;
    window_left_top.top =                  window_top;
+   dev_dbg(g_dev_ptr,"{%d}  frame16=%d, command=%d\n",num_sensor,frame16, (int) x393cmd);
+   dev_dbg(g_dev_ptr,"sa=0x%08x sa_inc=0x%08x lfn=0x%08x fw=0x%08x wh=0x%08x lt=0x%08x\n",
+           window_frame_sa.d32,window_frame_sa_inc.d32, window_last_frame_num, window_full_width.d32,window_width_height.d32,window_left_top.d32);
 
    switch (x393cmd){
    case ASAP:
@@ -210,6 +213,10 @@ int setup_compressor_memory (int num_sensor,       ///< sensor port number (0..3
    window_tile_whs.vert_step =            tile_vstep;
    window_tile_whs.tile_height =          tile_height;
 
+   dev_dbg(g_dev_ptr,"{%d}  frame16=%d, command=%d\n",num_sensor,frame16, (int) x393cmd);
+   dev_dbg(g_dev_ptr,"sa=0x%08x sa_inc=0x%08x lfn=0x%08x fw=0x%08x wh=0x%08x lt=0x%08x whs=0x%08x\n",
+           window_frame_sa.d32,window_frame_sa_inc.d32, window_last_frame_num.d32, window_full_width.d32,window_width_height.d32,window_left_top.d32, window_tile_whs.d32);
+
    switch (x393cmd){
    case ASAP:
        frame16 = 0;

src/include/uapi/elphel/x393_devices.h

@@ -90,6 +90,7 @@
 
 #define DEV393_DETECT_SENSORS ("detect_sensors",    "detect_sensors",143,  1, "0666", "c")  ///< Probably not needed, only sysfs is used
 #define DEV393_I2C_SENSORS    ("",            "elphel393-sensor-i2c",-1,  -1, "0666", "c")  ///< Used only in sysfs, no character device (yet?)
+#define DEV393_MT9X001        ("",            "elphel393-mt9x001",   -1,  -1, "0666", "c")  ///< Used only in sysfs, no character device (yet?)
 
 
 #define _DEV393_PATH(n, ...) "/dev/"n