Debugging multi-sensor operation

src/drivers/elphel/circbuf.c

@@ -793,7 +793,8 @@ unsigned int circbuf_poll (struct file *file, poll_table *wait)
 	int rslt;
 	dev_dbg(g_dev_ptr, "minor = 0x%x\n", minor);
 
-	rslt = circbufValidPointer(&file->f_pos, &fp, chn);
+//	rslt = circbufValidPointer(&file->f_pos, &fp, chn);
+    rslt = circbufValidPointer(file->f_pos, &fp, chn);
 	if (rslt < 0) {
 		// not a valid read pointer, probable buffer overrun
 		dev_dbg(g_dev_ptr, "invalid pointer file->f_pos = 0x%llx\n", file->f_pos);

src/drivers/elphel/histograms.h

@@ -17,12 +17,12 @@
 #ifndef HISTOGRAMS_H
 #define HISTOGRAMS_H
 #undef ISR_HISTOGRAMS // to histograms-related disable code in ISR - not needed in NC393
-
+#include <uapi/elphel/c313a.h>
 // These wait queues will be advanced each frame after the histogram data is transferred to the FPGA.
 // It will happen even if the corresponding task is disabled, with the only exception:
 // hist_c_wait_queue will not be awaken in the current frame if it is too late (frame counter incremented while serving tasklet)
-extern wait_queue_head_t hist_y_wait_queue; /// wait queue for the G1 histogram (used as Y)
-extern wait_queue_head_t hist_c_wait_queue; /// wait queue for all the other (R,G2,B) histograms (color)
+extern wait_queue_head_t ahist_y_wait_queue[SENSOR_PORTS]; /// wait queue for the G1 histogram (used as Y)
+extern wait_queue_head_t ahist_c_wait_queue[SENSOR_PORTS]; /// wait queue for all the other (R,G2,B) histograms (color)
 
 // void init_histograms(int chn_mask);
 int histograms_check_init(void);

src/drivers/elphel/sensor_common.c

@@ -814,9 +814,9 @@ void tasklet_cmdseq_function(unsigned long arg)
 #endif // ifdef ISR_HISTOGRAMS
 #if HISTOGRAMS_WAKEUP_ALWAYS
     }
-    wake_up_interruptible(&hist_y_wait_queue);    // wait queue for the G1 histogram (used as Y)
+    wake_up_interruptible(&ahist_y_wait_queue[sensor_port]);    // wait queue for the G1 histogram (used as Y)
 #else
-    wake_up_interruptible(&hist_y_wait_queue);    // wait queue for the G1 histogram (used as Y)
+    wake_up_interruptible(&ahist_y_wait_queue[sensor_port]);    // wait queue for the G1 histogram (used as Y)
     }
 #endif
     // Process parameters
@@ -877,9 +877,9 @@ void tasklet_cmdseq_function(unsigned long arg)
 #endif // ifdef ISR_HISTOGRAMS
 #if HISTOGRAMS_WAKEUP_ALWAYS
     }
-    wake_up_interruptible(&hist_c_wait_queue);     // wait queue for all the other (R,G2,B) histograms (color)
+    wake_up_interruptible(&ahist_c_wait_queue[sensor_port]);     // wait queue for all the other (R,G2,B) histograms (color)
 #else
-        wake_up_interruptible(&hist_c_wait_queue);   // wait queue for all the other (R,G2,B) histograms (color)
+        wake_up_interruptible(&ahist_c_wait_queue[sensor_port]);   // wait queue for all the other (R,G2,B) histograms (color)
     }
 #endif
 }

src/drivers/elphel/x393_fpga_functions.c

@@ -213,12 +213,12 @@ int          write_compressor_table(int chn,      // compressor channel (0..3)
                                     x393cmprs_tables_t type,     // table type (
                                     int index,
                                     int num_items,
-                                    u32 * data )
+                                    unsigned long * data )
 {
     x393_cmprs_table_addr_t table_addr;
     int i;
     table_addr.type = (int) type;
-    table_addr.addr32 = index * type*4;
+    table_addr.addr32 = index * num_items*4;
 //    dev_dbg(g_dev_ptr, "table_addr=0x%08x\n", table_addr.d32);
     x393_cmprs_tables_address(table_addr, chn);
     for (i = 0; i < num_items; i++) {

src/drivers/elphel/x393_fpga_functions.h

@@ -26,4 +26,4 @@ int compressor_dma_setup (int port_afi, int chn_mask, int reset, int status_mode
 sec_usec_t * get_fpga_rtc(sec_usec_t * ts);
 int          set_fpga_rtc (sec_usec_t ts);
 int          is_fpga_programmed(void);
-int          write_compressor_table(int chn, x393cmprs_tables_t type, int index, int num_items, u32 * data );
+int          write_compressor_table(int chn, x393cmprs_tables_t type, int index, int num_items, unsigned long * data );

src/include/uapi/elphel/c313a.h

@@ -1852,7 +1852,7 @@ struct gamma_stuct_t {
 };
 
 ///histograms related structure
-#define HISTOGRAM_CACHE_NUMBER 8 // number of frames histograms are kept after acquisition (should be 2^n)
+#define HISTOGRAM_CACHE_NUMBER 8 // 16   // Was 8 // number of frames histograms are kept after acquisition (should be 2^n)
 #define COLOR_RED            0
 #define COLOR_GREEN1         1
 #define COLOR_GREEN2         2 

src/include/uapi/elphel/x393_devices.h

@@ -80,7 +80,26 @@
 #define DEV393_HUFFMAN3       ("huffman3",          "circbuf",       135, 67, "0666", "c")  ///< Huffman table for channel 3
 
 #define DEV393_GAMMA          ("gamma_cache","gamma_tables_operations",137,17,"0666", "c")  ///< Cache for calculated gamma tables (common for all ports/channels/colors)
-#define DEV393_HISTOGRAM      ("histogram_cache","histograms_operations",138,18,"0666","c") ///< Access to acquired/calculated histograms for all ports/channels/colors
+#ifdef INDIVIDUAL_HISTOGRAMS
+#define DEV393_HISTOGRAM00    ("histogram_cache00","histograms_operations",138,80,"0666","c") ///< Access to acquired/calculated histograms for port 0 /subcchanne 0
+#define DEV393_HISTOGRAM01    ("histogram_cache01","histograms_operations",138,81,"0666","c") ///< Access to acquired/calculated histograms for port 0 /subcchanne 1
+#define DEV393_HISTOGRAM02    ("histogram_cache02","histograms_operations",138,82,"0666","c") ///< Access to acquired/calculated histograms for port 0 /subcchanne 2
+#define DEV393_HISTOGRAM03    ("histogram_cache03","histograms_operations",138,83,"0666","c") ///< Access to acquired/calculated histograms for port 0 /subcchanne 3
+#define DEV393_HISTOGRAM10    ("histogram_cache10","histograms_operations",138,84,"0666","c") ///< Access to acquired/calculated histograms for port 1 /subcchanne 0
+#define DEV393_HISTOGRAM11    ("histogram_cache11","histograms_operations",138,85,"0666","c") ///< Access to acquired/calculated histograms for port 1 /subcchanne 1
+#define DEV393_HISTOGRAM12    ("histogram_cache12","histograms_operations",138,86,"0666","c") ///< Access to acquired/calculated histograms for port 1 /subcchanne 2
+#define DEV393_HISTOGRAM13    ("histogram_cache13","histograms_operations",138,87,"0666","c") ///< Access to acquired/calculated histograms for port 1 /subcchanne 3
+#define DEV393_HISTOGRAM20    ("histogram_cache20","histograms_operations",138,88,"0666","c") ///< Access to acquired/calculated histograms for port 2 /subcchanne 0
+#define DEV393_HISTOGRAM21    ("histogram_cache21","histograms_operations",138,89,"0666","c") ///< Access to acquired/calculated histograms for port 2 /subcchanne 1
+#define DEV393_HISTOGRAM22    ("histogram_cache22","histograms_operations",138,90,"0666","c") ///< Access to acquired/calculated histograms for port 2 /subcchanne 2
+#define DEV393_HISTOGRAM23    ("histogram_cache23","histograms_operations",138,91,"0666","c") ///< Access to acquired/calculated histograms for port 2 /subcchanne 3
+#define DEV393_HISTOGRAM30    ("histogram_cache30","histograms_operations",138,92,"0666","c") ///< Access to acquired/calculated histograms for port 3 /subcchanne 0
+#define DEV393_HISTOGRAM31    ("histogram_cache31","histograms_operations",138,93,"0666","c") ///< Access to acquired/calculated histograms for port 3 /subcchanne 1
+#define DEV393_HISTOGRAM32    ("histogram_cache32","histograms_operations",138,94,"0666","c") ///< Access to acquired/calculated histograms for port 3 /subcchanne 2
+#define DEV393_HISTOGRAM33    ("histogram_cache33","histograms_operations",138,95,"0666","c") ///< Access to acquired/calculated histograms for port 3 /subcchanne 3
+#else
+#define DEV393_HISTOGRAM      ("histogram_cache","histograms_operations",138,18,"0666","c") ///< Access to acquired/calculated histograms for all ports/subchannels
+#endif
 
 #define DEV393_LOGGER         ("imu",               "imu_logger",    141,  1, "0666", "c")  ///< IMU/GPS/images logs data access
 #define DEV393_LOGGER_CTRL    ("imu_ctl",           "imu_logger",    141,  2, "0666", "c")  ///< IMU/GPS/images logger control