More editing (cf4af6f5) · Commits · Elphel / linux-elphel

src/drivers/elphel/circbuf-jtag.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@
		/** Wait queue for the processes waiting for a new frame to appear in the circular buffer */
		wait_queue_head_t circbuf_wait_queue;

		struct circbuf_priv_t circbuf_priv[IMAGE_CHN_NUM];
		struct circbuf_priv_t circbuf_priv[SENSOR_PORTS];
		struct circbuf_priv_t *circbuf_priv_ptr = circbuf_priv;

		static struct device *g_dev_ptr;
		@@ -109,7 +109,7 @@ int init_ccam_dma_buf_ptr(struct platform_device *pdev)
		// set circular buffer size in bytes
		set_globalParam(G_CIRCBUFSIZE, CCAM_DMA_SIZE);

		for (i = 0; i < IMAGE_CHN_NUM; i++) {
		for (i = 0; i < SENSOR_PORTS; i++) {
		circbuf_priv[i].buf_ptr = ccam_dma_buf_ptr + BYTE2DW(CIRCBUF_START_OFFSET + i * CCAM_DMA_SIZE);
		circbuf_priv[i].phys_addr = dma_handle + CIRCBUF_START_OFFSET + i * CCAM_DMA_SIZE;
		}
		@@ -572,10 +572,10 @@ ssize_t circbuf_write(struct file file, const char buf, size_t count, loff_t *
		/* debug code follows*/
		switch (buf[0] - 0x30) {
		case 0:
		camera_interrupts(0);
		compressor_interrupts(0,chn);
		break;
		case 1:
		camera_interrupts(1);
		compressor_interrupts(1,chn);
		break;
		}
		/* debug code end */

src/drivers/elphel/circbuf.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -753,10 +753,10 @@ ssize_t circbuf_write(struct file file, const char buf, size_t count, loff_t *
		/* debug code follows*/
		switch (buf[0] - 0x30) {
		case 0:
		camera_interrupts(0);
		compressor_interrupts(0,chn);
		break;
		case 1:
		camera_interrupts(1);
		compressor_interrupts(1,chn);
		break;
		case 3:
		/* update image quality */

src/drivers/elphel/detect_sensors.c

+87 −20

Original line number	Diff line number	Diff line
		@@ -60,25 +60,29 @@ struct sensor_name_t {
		const char * name;
		u32 code;
		int type; ///< +1 - applicable to sensors, +2 - applicable to multiplexers
		sens_iface_t iface;
		};
		//typedef enum {NONE,PARALLEL12,HISPI} sens_iface_t; ///< Sensor port interface type

		const struct sensor_name_t sensor_names[] ={
		{.name="detect", .type=3, .code = 0}, // to be automatically detected
		{.name="none", .type=3, .code = SENSOR_NONE}, // no device attached
		{.name="mux10359", .type=2, .code = SENSOR_MUX_10359}, // no device attached
		{.name="zr32112", .type=1, .code = SENSOR_ZR32112}, // Zoran ZR32112
		{.name="zr32212", .type=1, .code = SENSOR_ZR32212}, // Zoran ZR32212
		{.name="kac1310", .type=1, .code = SENSOR_KAC1310}, // Kodak KAC1310
		{.name="kac5000", .type=1, .code = SENSOR_KAC5000}, // Kodak KAC5000
		{.name="mi1300", .type=1, .code = SENSOR_MI1300}, // Micron MI1300
		{.name="mt9m001", .type=1, .code = SENSOR_MT9M001}, // MT9M001
		{.name="mt9d001", .type=1, .code = SENSOR_MT9D001}, // MT9D001
		{.name="mt9t001", .type=1, .code = SENSOR_MT9T001}, // MT9T001
		{.name="mt9p006", .type=1, .code = SENSOR_MT9P006}, // MT9P006
		{.name="mt9f002", .type=1, .code = SENSOR_MT9F002}, // MT9F002
		{.name="ibis51300", .type=1, .code = SENSOR_IBIS51300}, // FillFactory IBIS51300
		{.name="kai11002", .type=1, .code = SENSOR_KAI11000}, // Kodak KAI11002
		{.name=NULL, .type=0, .code = 0} // end of list
		{.name="detect", .type=3, .iface=NONE, .code = 0}, // to be automatically detected
		{.name="none", .type=3, .iface=NONE, .code = SENSOR_NONE}, // no device attached
		{.name="mux10359", .type=2, .iface=PARALLEL12, .code = SENSOR_MUX_10359}, // no device attached
		{.name="zr32112", .type=1, .iface=PARALLEL12, .code = SENSOR_ZR32112}, // Zoran ZR32112
		{.name="zr32212", .type=1, .iface=PARALLEL12, .code = SENSOR_ZR32212}, // Zoran ZR32212
		{.name="kac1310", .type=1, .iface=PARALLEL12, .code = SENSOR_KAC1310}, // Kodak KAC1310
		{.name="kac5000", .type=1, .iface=PARALLEL12, .code = SENSOR_KAC5000}, // Kodak KAC5000
		{.name="mi1300", .type=1, .iface=PARALLEL12, .code = SENSOR_MI1300}, // Micron MI1300
		{.name="mt9m001", .type=1, .iface=PARALLEL12, .code = SENSOR_MT9M001}, // MT9M001
		{.name="mt9d001", .type=1, .iface=PARALLEL12, .code = SENSOR_MT9D001}, // MT9D001
		{.name="mt9t001", .type=1, .iface=PARALLEL12, .code = SENSOR_MT9T001}, // MT9T001
		{.name="mt9p006", .type=1, .iface=PARALLEL12, .code = SENSOR_MT9P006}, // MT9P006
		{.name="mt9f002", .type=1, .iface=HISPI4, .code = SENSOR_MT9F002}, // MT9F002
		{.name="ibis51300", .type=1, .iface=PARALLEL12, .code = SENSOR_IBIS51300}, // FillFactory IBIS51300
		{.name="kai11002", .type=1, .iface=PARALLEL12, .code = SENSOR_KAI11000}, // Kodak KAI11002
		{.name=NULL, .type=0, .iface=NONE, .code = 0} // end of list
		};
		static sens_iface_t port_iface[SENSOR_PORTS];
		//#define DETECT_SENSOR 1 ///< Include sensors, May be OR-ed when looking for sensor/multiplexer code/name
		//#define DETECT_MUX 2 ///< Include multiplexers, May be OR-ed when looking for sensor/multiplexer code/name

		@@ -111,6 +115,20 @@ const char * get_name_by_code(int code, ///< sensor code
		return NULL;
		}

		/** Get sensor/multiplexer interface type by code */
		sens_iface_t get_iface_by_code(int code, ///< sensor code
		int type) ///< valid type [DETECT_SENSOR]\|[DETECT_MUX]
		///< @return sensor name or NULL for invalid code
		{
		int i;
		for (i = 0; sensor_names[i].name; i++){
		if ((sensor_names[i].type & type) && (sensor_names[i].code == code)){
		return sensor_names[i].iface;
		}
		}
		return NONE;
		}


		/** Get sensor port multiplexer type */
		int get_detected_mux_code(int port) ///< Sensor port number (0..3)
		@@ -120,12 +138,59 @@ int get_detected_mux_code(int port) ///< Sensor port number (0..3)
		}
		/** Get sensor type */
		int get_detected_sensor_code(int port, ///< Sensor port number (0..3)
		int sub_chn) ///< Sensor subchannel (0..3)
		int sub_chn) ///< Sensor subchannel (0..3), -1 - use first defined sub channel
		///< @return sensor code (SENSOR_DETECT, SENSOR_NONE, or SENSOR_*)
		{
		return sensorPortConfig[port&3].sensor[sub_chn & 3];
		int nchn,code;
		port &= 3;
		if (sub_chn >= 0)
		return sensorPortConfig[port].sensor[sub_chn & 3];
		// Negative sensor - find first defined
		nchn = (get_detected_mux_code(port) == SENSOR_NONE)? 1: MAX_SENSORS;
		for (sub_chn = 0; sub_chn < nchn; sub_chn++){
		code = sensorPortConfig[port].sensor[sub_chn];
		if ((code != SENSOR_DETECT) && (code != SENSOR_NONE))
		return code;
		}
		return SENSOR_NONE;
		}

		/** Gert configured sensorport subchannels */
		int get_subchannels(int port) ///< Sensor port
		///< @return bitmask of available channels
		{
		int sub_chn, chn_mask = 0;
		int nchn = (get_detected_mux_code(port) == SENSOR_NONE)? 1: MAX_SENSORS;
		for (sub_chn = 0; sub_chn < nchn; sub_chn++){
		if ((sensorPortConfig[port].sensor[sub_chn]!= SENSOR_DETECT) && (sensorPortConfig[port].sensor[sub_chn] != SENSOR_NONE)) {
		chn_mask \|= 1 << sub_chn;
		}
		}
		return chn_mask;

		}


		/** Update per-port interface type after changing sensor/multiplexer */
		void update_port_iface(int port) ///< Sensor port number (0..3)
		{
		sens_iface_t iface = get_iface_by_code(get_detected_mux_code(port), DETECT_MUX);
		if (iface != NONE) {
		port_iface[port] = iface;
		return;
		}
		port_iface[port] = get_iface_by_code(get_detected_sensor_code(port,-1), DETECT_MUX); // '-1' - any subchannel
		}

		/** Get per-port interface type */
		sens_iface_t get_port_interface(int port) ///< Sensor port number (0..3)
		///< @ return interface type (none, parallel12, hispi4
		{
		return port_iface[port];
		}



		/** Set sensor port multiplexer type */
		int set_detected_mux_code(int port, ///< Sensor port number (0..3)
		int mux_type) ///< Sensor multiplexer type (SENSOR_DETECT, SENSOR_MUX_10359 or SENSOR_NONE)
		@@ -138,6 +203,7 @@ int set_detected_mux_code(int port, ///< Sensor port number (0..3)
		return -EINVAL;
		}
		sensorPortConfig[port & 3].mux = mux_type;
		update_port_iface(port);
		return 0;
		}

		@@ -154,6 +220,7 @@ int set_detected_sensor_code(int port, ///< Sensor port number (0..3)
		return -EINVAL;
		}
		sensorPortConfig[port & 3].sensor[sub_chn] = sens_type;
		update_port_iface(port);
		return 0;
		}

		@@ -182,7 +249,7 @@ static int get_channel_sub_from_name(struct device_attribute *attr) ///< Linux k
		static ssize_t show_port_mux(struct device dev, struct device_attribute attr, char *buf)
		{
		int i;
		const char * name = get_name_by_code(sensorPortConfig[get_channel_from_name(attr)].mux, DETECT_MUX);
		const char * name = get_name_by_code(get_detected_mux_code(get_channel_from_name(attr)), DETECT_MUX);
		if (name) return sprintf(buf,"%s\n", name);
		// Should never get here
		return sprintf(buf,"0x%x\n", sensorPortConfig[get_channel_from_name(attr)].mux);
		@@ -193,7 +260,7 @@ static ssize_t show_sensor(struct device dev, struct device_attribute attr, ch
		int psch = get_channel_sub_from_name(attr);
		int port = (psch>>4) &3;
		int sub_chn = psch &3;
		const char * name = get_name_by_code(sensorPortConfig[port].sensor[sub_chn], DETECT_SENSOR);
		const char * name = get_name_by_code(get_detected_sensor_code(port,sub_chn), DETECT_SENSOR);
		if (name) return sprintf(buf,"%s\n", name);
		// Should never get here
		return sprintf(buf,"0x%x\n", sensorPortConfig[(psch>>4) & 3].sensor[psch & 3]);

src/drivers/elphel/detect_sensors.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,9 +20,15 @@
		#define DETECT_SENSOR 1 ///< Include sensors, May be OR-ed when looking for sensor/multiplexer code/name
		#define DETECT_MUX 2 ///< Include multiplexers, May be OR-ed when looking for sensor/multiplexer code/name

		typedef enum {NONE,PARALLEL12,HISPI4} sens_iface_t; ///< Sensor port interface type

		int get_code_by_name(const char * name, int type);
		const char * get_name_by_code(int code, int type);
		sens_iface_t get_iface_by_code(int code, int type);

		int get_detected_mux_code(int port);
		int get_detected_sensor_code(int port, int sub_chn);
		int get_subchannels(int port);
		int set_detected_mux_code(int port, int mux_type);
		int set_detected_sensor_code(int port, int sub_chn, int mux_type);
		sens_iface_t get_port_interface(int port);

src/drivers/elphel/framepars.c

+15 −4

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ wait_queue_head_t aframepars_wait_queue[SENSOR_PORTS];// used to wait for

		/* Remove after compilation OK */
		struct sensorproc_t * sensorproc = NULL;
		//void camera_interrupts (int on) {}
		//void compressor_interrupts (int on) {}
		#if 0
		#define wait_event_interruptible(wq, condition) \
		({ \
		@@ -353,6 +353,16 @@ inline unsigned long get_imageParamsPrev(int sensor_port, int n)
		return aframepars[sensor_port][(thisFrameNumber(sensor_port) - 1) & PARS_FRAMES_MASK].pars[n];
		}

		/** Reads past parameters (small subset of all) fro absolute frame number */
		inline unsigned long get_imageParamsPast(int sensor_port, ///< sensor port (0..3)
		int n, ///< parameter index (should be 128..143)
		int frame) ///< absolute frame number
		{
		return apastpars[sensor_port][frame & PASTPARS_SAVE_ENTRIES_MASK].past_pars[n-PARS_SAVE_FROM];
		}



		/**
		* @brief writes read-only parameter to the current frame (does not propagate to next frames as setFramePar() does)
		* In most cases you really need to use setFramePar() instead;
		@@ -1181,11 +1191,12 @@ loff_t framepars_lseek(struct file * file, loff_t offset, int orig)
		break;
		case LSEEK_INTERRUPT_OFF: // disable camera interrupts
		MDF2(printk("LSEEK_INTERRUPT_OFF\n"));
		camera_interrupts(0);
		// compressor_interrupts(0,sensor_port);
		sensor_interrupts(0,sensor_port);
		break;
		case LSEEK_INTERRUPT_ON: // enable camera interrupts
		MDF2(printk("LSEEK_INTERRUPT_ON\n"));
		camera_interrupts(1);
		// MDF2(printk("LSEEK_INTERRUPT_ON\n"));
		sensor_interrupts(1,sensor_port);
		break;
		}
		}

Admin message