converting sensor-related code (581d1d2f) · Commits · Elphel / linux-elphel

src/drivers/elphel/histograms.c

+56 −58

Original line number	Original line	Diff line number	Diff line
	/!*******************************************************************************		/*************************************************************************//
	*! FILE NAME : histograms.c		* @file histograms.c
	*! DESCRIPTION: Handles histograms storage, access and percentile calculation		* @brief Handles histograms storage, access and percentile calculation
	*! Copyright (C) 2008 Elphel, Inc.		* @copyright Copyright 2008-2016 (C) Elphel, Inc.
	! -----------------------------------------------------------------------------*		* @par <b>License</b>
	*!		* This program is free software: you can redistribute it and/or modify
	*! This program is free software: you can redistribute it and/or modify		* it under the terms of the GNU General Public License as published by
	*! it under the terms of the GNU General Public License as published by		* the Free Software Foundation, either version 2 of the License, or
	*! the Free Software Foundation, either version 3 of the License, or		* (at your option) any later version.
	*! (at your option) any later version.		* This program is distributed in the hope that it will be useful,
	*!		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	*! This program is distributed in the hope that it will be useful,		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	*! but WITHOUT ANY WARRANTY; without even the implied warranty of		* GNU General Public License for more details.
	*! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* You should have received a copy of the GNU General Public License
	*! GNU General Public License for more details.		* along with this program. If not, see <http://www.gnu.org/licenses/>.
	*!		*******************************************************************************/
	*! You should have received a copy of the GNU General Public License		/* -----------------------------------------------------------------------------**
	*! along with this program. If not, see <http://www.gnu.org/licenses/>.
	! -----------------------------------------------------------------------------*
	*! $Log: histograms.c,v $		*! $Log: histograms.c,v $
	*! Revision 1.3 2009/02/18 06:25:59 elphel		*! Revision 1.3 2009/02/18 06:25:59 elphel
	*! typo in format		*! typo in format
	@@ -77,8 +75,6 @@
	*!		*!
	*! Revision 1.1 2008/06/08 23:46:45 elphel		*! Revision 1.1 2008/06/08 23:46:45 elphel
	*! added drivers files for handling quantization tables, gamma tables and the histograms		*! added drivers files for handling quantization tables, gamma tables and the histograms
	*!
	*!
	*/		*/

	//copied from cxi2c.c - TODO:remove unneeded		//copied from cxi2c.c - TODO:remove unneeded
	@@ -133,42 +129,44 @@
	#define MDF21(x)		#define MDF21(x)
	#define MDF22(x)		#define MDF22(x)
	#endif		#endif
	//[SENSOR_PORTS]
	u32 (*fpga_hist_data)[SENSOR_PORTS][MAX_SENSORS][PARS_FRAMES][4][256];		u32 (*fpga_hist_data)[SENSOR_PORTS][MAX_SENSORS][PARS_FRAMES][4][256]; ///< Array of histogram data, mapped to the memory wheer FPGA sends data
	dma_addr_t fpga_hist_phys; // physical address of the start of the received histogram data		dma_addr_t fpga_hist_phys; // physical address of the start of the received histogram data
	//dma_buf_ptr = pElphel_buf->vaddr;
	//dma_handle = pElphel_buf->paddr;
	#define X3X3_HISTOGRAMS_DRIVER_NAME "Elphel (R) Model 353 Histograms device driver"		#define X3X3_HISTOGRAMS_DRIVER_NAME "Elphel (R) Model 353 Histograms device driver"

	///* for each port and possible sensor subchannel provides index in combine histogram data		/** for each port and possible sensor subchannel provides index in combine histogram data */
	int histograms_map[SENSOR_PORTS][MAX_SENSORS];		int histograms_map[SENSOR_PORTS][MAX_SENSORS];

			/** total number of sensors (on all ports) used */
	static int numHistChn = 0;		static int numHistChn = 0;

	/** Variable-length array (length is the total number of active sensors <=16), each being the same as in 353:		/** Variable-length array (length is the total number of active sensors <=16), each being the same as in 353:
	* consisting of SENSOR_PORTS histogram_stuct_t structures */		* consisting of SENSOR_PORTS histogram_stuct_t structures */
	struct histogram_stuct_t (*histograms)[HISTOGRAM_CACHE_NUMBER];		struct histogram_stuct_t (*histograms)[HISTOGRAM_CACHE_NUMBER];
	dma_addr_t histograms_phys; ///< likely not needed
	struct histogram_stuct_t * histograms_p; // to use with mmap



	/*		dma_addr_t histograms_phys; ///< likely not needed, saved during allocation
	static struct histogram_stuct_t histograms[HISTOGRAM_CACHE_NUMBER] __attribute__ ((aligned (PAGE_SIZE)));

	struct histogram_stuct_t * histograms_p; // to use with mmap		struct histogram_stuct_t * histograms_p; ///< alias of histogram_stuct_t

	*/


	wait_queue_head_t hist_y_wait_queue; // wait queue for the G1 histogram (used as Y)
	wait_queue_head_t hist_c_wait_queue; // wait queue for all the other (R,G2,B) histograms (color)

			wait_queue_head_t hist_y_wait_queue; ///< wait queue for the G1 histogram (used as Y)
			wait_queue_head_t hist_c_wait_queue; ///< wait queue for all the other (R,G2,B) histograms (color)

			/** File operations private data */
	struct histograms_pd {		struct histograms_pd {
	int minor;		int minor;
	unsigned long frame;		unsigned long frame; ///< absolute frame number requested
	int frame_index; ///< -1 if invalid		int frame_index; ///< histogram fame index (in cache and when accessing through mmap), -1 if invalid,
	int needed;		int needed; ///< bits specify what histograms (color, type) are requested
			///< each group of 4 bits covers 4 colors of the same type:
			///< - bits 0..3 - read raw histograms from the FPGA - normally called from IRQ/tasklet (use just 1 color for autoexposure to speed up?)
			///< - bits 4..7 - calculate cumulative histograms (sum of raw ones) - normally called from applications
			///< - bits 8..11 - calculate percentiles (reverse cumulative histograms) - normally called from applications
			///< "needed" for raw histograms should be specified explicitly (can not be read from FPGA later),
			///< "needed" for cumul_hist will be added automatically if percentiles are requested
	int wait_mode; ///< 0 - wait just for G1 histogram, 1 - wait for all histograms		int wait_mode; ///< 0 - wait just for G1 histogram, 1 - wait for all histograms
	int request_en; ///< enable requesting histogram for the specified frame (0 - rely on the available ones)		int request_en; ///< enable requesting histogram for the specified frame (0 - rely on the available ones)
	int port; ///< selected sensor port (0..3)		int port; ///< selected sensor port (0..3)
	@@ -178,6 +176,7 @@ struct histograms_pd {
	// something else to be added here?		// something else to be added here?
	};		};


	int histograms_open (struct inode inode, struct file file);		int histograms_open (struct inode inode, struct file file);
	int histograms_release(struct inode inode, struct file file);		int histograms_release(struct inode inode, struct file file);
	loff_t histograms_lseek (struct file * file, loff_t offset, int orig);		loff_t histograms_lseek (struct file * file, loff_t offset, int orig);
	@@ -220,8 +219,7 @@ void histograms_dma_ctrl(int mode) ///< 0 - reset, 1 - disable, 2 - enable
	}		}


	/** Initialize histograms data structures, should be called when active subchannels are known (maybe use DT)?		/** Initialize histograms data structures, should be called when active subchannels are known (maybe use DT)? */
	*/
	void init_histograms(int chn_mask) ///< combined subchannels and ports Save mask to global P-variable		void init_histograms(int chn_mask) ///< combined subchannels and ports Save mask to global P-variable
	{		{
	unsigned long flags;		unsigned long flags;
	@@ -246,7 +244,7 @@ void init_histograms(int chn_mask) ///< combined subchannels and ports Save mask
	// When device == NULL, dma_alloc_coherent just allocates notmal memory, page aligned, CMA if available		// When device == NULL, dma_alloc_coherent just allocates notmal memory, page aligned, CMA if available
	histograms = (struct histogram_stuct_t[HISTOGRAM_CACHE_NUMBER]) dma_alloc_coherent(NULL,(sz PAGE_SIZE),&histograms_phys,GFP_KERNEL);		histograms = (struct histogram_stuct_t[HISTOGRAM_CACHE_NUMBER]) dma_alloc_coherent(NULL,(sz PAGE_SIZE),&histograms_phys,GFP_KERNEL);
	BUG_ON(!histograms);		BUG_ON(!histograms);
	histograms_p=histograms;		histograms_p= (struct histogram_stuct_t *) histograms;
	MDF21(printk("\n"));		MDF21(printk("\n"));
	local_irq_save(flags);		local_irq_save(flags);
	for (s=0; s<numHistChn; s++) {		for (s=0; s<numHistChn; s++) {
	@@ -259,7 +257,7 @@ void init_histograms(int chn_mask) ///< combined subchannels and ports Save mask
	}		}
	/** Get histogram index for sensor port/channel, skipping unused ones */		/** Get histogram index for sensor port/channel, skipping unused ones */
	int get_hist_index (int sensor_port, ///< sensor port number (0..3)		int get_hist_index (int sensor_port, ///< sensor port number (0..3)
	int sensor_chn) ///< sensor subchannel (0 w/o multiplexer)		int sensor_chn) ///< sensor subchannel (0..3, 0 w/o multiplexer)
	///< @return index of used (active) histogram set (just skipping unused ports/subchannels		///< @return index of used (active) histogram set (just skipping unused ports/subchannels
	{		{
	return histograms_map[sensor_port][sensor_chn];		return histograms_map[sensor_port][sensor_chn];
	@@ -423,7 +421,7 @@ inline void histogram_calc_percentiles (unsigned long * cumul_hist, ///< [IN]
	}		}


	///======================================		//======================================
	// use G_SUBCHANNELS in userspace to re-calculate full histogram index		// use G_SUBCHANNELS in userspace to re-calculate full histogram index
	// File operations:		// File operations:
	// open, release - nop		// open, release - nop
	@@ -491,30 +489,30 @@ int histograms_release (struct inode *inode, ///< inode
	return res;		return res;
	}		}

	/**		/** Histograms driver LSEEK method (and execute commands)<ul>
	* @brief Histograms driver LSEEK method (and execute commands)		* <li>lseek <b>(SEEK_SET, value)</b> wait for histogram of the absolute frame 'value' (G1 or all depending on wait_mode
	* lseek (SEEK_SET, value) wait for histogram of the absolute frame 'value' (G1 or all depending on wait_mode
	* locate frame number value and set frame_index (and file pointer) to the result.		* locate frame number value and set frame_index (and file pointer) to the result.
	* Return error if frame can not be found, otherwise - histogram index (to use with mmap)		* Return error if frame can not be found, otherwise - histogram index (to use with mmap)
	* Calculate missing tables according to "needed" variable		* Calculate missing tables according to "needed" variable
	* lseek (SEEK_CUR, value) wait for histogram of the frame 'value' from the current one (G1 or all depending on wait_mode		* <li>lseek <b>(SEEK_CUR, value)</b> wait for histogram of the frame 'value' from the current one (G1 or all depending on wait_mode
	* locate frame number value and set frame_index (and file pointer) to the result.		* locate frame number value and set frame_index (and file pointer) to the result.
	* Return error if frame can not be found, otherwise - histogram index (to use with mmap)		* Return error if frame can not be found, otherwise - histogram index (to use with mmap)
	* Calculate missing tables according to "needed" variable		* Calculate missing tables according to "needed" variable
	* lseek (SEEK_CUR, 0) will wait for the histogram(s) for current frame		* lseek (SEEK_CUR, 0) will wait for the histogram(s) for current frame
	* lseek (SEEK_CUR, value) - ignore value, return frame_index (may be negative if error)		* <li> lseek <b>(SEEK_CUR, value)</b> - ignore value, return frame_index (may be negative if error)
	* lseek (SEEK_END, value < 0) - do nothing?, do not modify file pointer, return error		* <li> lseek <b>(SEEK_END, value < 0)</b> - do nothing?, do not modify file pointer, return error
	* lseek (SEEK_END, value = 0) - return HISTOGRAMS_FILE_SIZE		* <li> lseek <b>(SEEK_END, value = 0)</b> - return HISTOGRAMS_FILE_SIZE
	* lseek (SEEK_END, LSEEK_HIST_WAIT_Y) - set histogram waiting for the Y (actually G1) histogram (default after open)		* <li> lseek <b>(SEEK_END, LSEEK_HIST_WAIT_Y)</b> - set histogram waiting for the Y (actually G1) histogram (default after open)
	* lseek (SEEK_END, LSEEK_HIST_WAIT_C) - set histogram waiting for the C (actually R, G2, B) histograms to become available - implies G1 too		* <li> lseek <b>(SEEK_END, LSEEK_HIST_WAIT_C)</b> - set histogram waiting for the C (actually R, G2, B) histograms to become available - implies G1 too
	* ENXIO		* <li> lseek <b>(SEEK_END, LSEEK_HIST_SET_CHN +4*port+ subchannel)</b> - select sensor port and subchannel. Returns -ENXIO if port/subchannel does not
	* lseek (SEEK_END, LSEEK_HIST_NEEDED) // LSEEK_HIST_NEEDED \| (0..0xffff) set histogram "needed" bits		* match any active sensor.
	* lseek (SEEK_END, LSEEK_HIST_REQ_EN) - (default)enable histogram request when reading histogram (safer, but may be not desirable in HDR mode) - default after opening		* <li> lseek <b>(SEEK_END, LSEEK_HIST_NEEDED)</b> set histogram "needed" bits
	* lseek (SEEK_END, LSEEK_HIST_REQ_DIS) - disable histogram request when reading histogram - will read latest available relying it is available		* <li> lseek <b>(SEEK_END, LSEEK_HIST_REQ_EN)</b> - (default)enable histogram request when reading histogram (safer, but may be not desirable in HDR mode) - default after opening
			* <li> lseek <b>(SEEK_END, LSEEK_HIST_REQ_DIS</b>) - disable histogram request when reading histogram - will read latest available relying it is available </ul>
	* @param file		* @param file
	* @param offset		* @param offset
	* @param orig SEEK_SET, SEEK_CUR or SEEK_SET END		* @param orig SEEK_SET, SEEK_CUR or SEEK_SET END
	* @return file position (absolute frame number)		* @return file position (histogram frame index (combined frame index and channel))
	*/		*/
	// TODO: add flag that will allow driver to wakeup processes before the specified frame comes ?		// TODO: add flag that will allow driver to wakeup processes before the specified frame comes ?
	loff_t histograms_lseek (struct file * file,		loff_t histograms_lseek (struct file * file,

src/drivers/elphel/histograms.h

+19 −21

Original line number	Original line	Diff line number	Diff line
	//histograms.h		/*************************************************************************//
			* @file histograms.h
	/// These wait queues will be advanced each frame after the histogram data is transferred to the FPGA.		* @brief Handles histograms storage, access and percentile calculation
	/// It will happen even if the corresponding task is disabled, with the only exception:		* @copyright Copyright 2008-2016 (C) Elphel, Inc.
	/// hist_c_wait_queue will not be awaken in the current frame if it is too late (frame counter incremented while serving tasklet)		* @par <b>License</b>
			* This program is free software: you can redistribute it and/or modify
			* it under the terms of the GNU General Public License as published by
			* the Free Software Foundation, either version 2 of the License, or
			* (at your option) any later version.
			* This program is distributed in the hope that it will be useful,
			* but WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
			* GNU General Public License for more details.
			* You should have received a copy of the GNU General Public License
			* along with this program. If not, see <http://www.gnu.org/licenses/>.
			*******************************************************************************/
			// 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_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 hist_c_wait_queue; /// wait queue for all the other (R,G2,B) histograms (color)

	@@ -12,22 +26,6 @@ int get_hist_index (int sensor_port, int sensor_chn);

	int set_histograms (int sensor_port, int sensor_chn, unsigned long frame, int needed, unsigned long * gammaHash, unsigned long * framep);		int set_histograms (int sensor_port, int sensor_chn, unsigned long frame, int needed, unsigned long * gammaHash, unsigned long * framep);

	/**
	* @brief Get histograms from the FPGA (called as tasklet?) and/or calculate derivatives (if needed)
	* @param frame absolute frame number (Caller should match it to the hardware frame) frame==0xffffffff - find the latest available frame, don't wait
	* TODO: should it be one frame behind current?
	* @param needed bits specify what histograms (color, type) are requested
	* TODO: Add P_* parameter - what to read from tasklet, turn colors it off for high FPS/small window
	* each group of 4 bits covers 4 colors of the same type:
	* - bits 0..3 - read raw histograms from the FPGA - normally called from IRQ/tasklet (use just 1 color for autoexposure to speed up?)
	* - bits 4..7 - calculate cumulative histograms (sum of raw ones) - normally called from applications
	* - bits 8..11 - calculate percentiles (reverse cumulative histograms) - normally called from applications
	* "needed" for raw histograms should be specified explicitly (can not be read from FPGA later),
	* "needed" for cumul_hist will be added automatically if percentiles are requested
	* @return index of the histogram (>=0) if OK, otherwise:
	* - -1 not reading FPGA and frame number stored is different from the requested (too late - histogram buffer overrun?)
	* - -2 - not reading from FPGA, but some needed raw histograms are missing (should be requested/loaded earlier)
	*/
	int get_histograms (unsigned long frame, int needed);		int get_histograms (unsigned long frame, int needed);

	int histograms_init_hardware(void);		int histograms_init_hardware(void);

src/drivers/elphel/legacy_defines.h

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,10 @@
	#define CCAM_TRIG_INT		#define CCAM_TRIG_INT
	#define CCAM_MRST_OFF		#define CCAM_MRST_OFF
	#define CCAM_ARST_OFF		#define CCAM_ARST_OFF
			#define CCAM_ARST_ON
	#define CCAM_RESET_MCONTR_ON // Set mode that resets memory controller pointers after each frame sync. TODO: Later - make it work without?		#define CCAM_RESET_MCONTR_ON // Set mode that resets memory controller pointers after each frame sync. TODO: Later - make it work without?
	#define CCAM_ENDFRAMES_EN // Enable ending frame being compressed if no more data will be available (frame ended before specified number of blocks compressed)		#define CCAM_ENDFRAMES_EN // Enable ending frame being compressed if no more data will be available (frame ended before specified number of blocks compressed)
			#define CCAM_ARO_ON //set


	#define CCAM_DCLK_ON		#define CCAM_DCLK_ON
	@@ -37,6 +39,7 @@
	#define X3X3_SENSDCM_INC90		#define X3X3_SENSDCM_INC90
	#define X3X3_SENSDCM_DEC90		#define X3X3_SENSDCM_DEC90

			#define X3X3_SEQ_RUN

	#define COMPCMD_DEMOS(x) ((1<<13) \| (((x) & 0x0f) << 9))		#define COMPCMD_DEMOS(x) ((1<<13) \| (((x) & 0x0f) << 9))
	// 6 blocks output per macroblock:		// 6 blocks output per macroblock:
	@@ -73,6 +76,8 @@
	void x313_dma_stop() {}		void x313_dma_stop() {}
	void x313_dma_init() {}		void x313_dma_init() {}
	void reset_compressor() {}		void reset_compressor() {}
			void i2c_run(void) {}
			void i2c_stop_wait(void){}

	// if ((gtable= get_gamma_fpga(color))) fpga_table_write_nice (CX313_FPGA_TABLES_GAMMA + (color * 256), 256, gtable);		// if ((gtable= get_gamma_fpga(color))) fpga_table_write_nice (CX313_FPGA_TABLES_GAMMA + (color * 256), 256, gtable);

	@@ -81,6 +86,13 @@
	// X3X3_SEQ_SEND1(frame16, X313_WA_DCR0, X353_DCR0(SENSTRIGEN,async));		// X3X3_SEQ_SEND1(frame16, X313_WA_DCR0, X353_DCR0(SENSTRIGEN,async));

	#ifdef NC353		#ifdef NC353
			void i2c_reset_wait(void) {X3X3_I2C_RESET_WAIT;i2c_hardware_on=0;}
			void i2c_stop_wait(void) {X3X3_I2C_STOP_WAIT; i2c_hardware_on=0;}
			void i2c_run(void) {X3X3_I2C_RUN; i2c_hardware_on=1;}
			int i2s_running(void) {return i2c_hardware_on;}



	/// IRQ-safe "nice" FPGA table write and histogram read functions - they split the data in chunks of fixed size,		/// IRQ-safe "nice" FPGA table write and histogram read functions - they split the data in chunks of fixed size,
	/// disable IRQ, transfer a chunk, then reenable interrupt before proceedg to the next chunk		/// disable IRQ, transfer a chunk, then reenable interrupt before proceedg to the next chunk
	#define FPGA_TABLE_CHUNK 64 // up to 64 words to send to the table/from histogram on a single IRQ-off transfer		#define FPGA_TABLE_CHUNK 64 // up to 64 words to send to the table/from histogram on a single IRQ-off transfer