Commit 406266d1 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

just debugging

parent 9f42f3da

src/drivers/elphel/circbuf.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -706,7 +706,18 @@ loff_t circbuf_lseek(struct file *file, loff_t offset, int orig) 
			case LSEEK_CIRC_UTIME:

			case LSEEK_CIRC_UTIME:

				return get_rtc_usec();

				return get_rtc_usec();

				break;

				break;

			default:



// New in NC393 - separate comressor interrupts

            case LSEEK_INTERRUPT_OFF: // disable camera interrupts

                dev_dbg(g_dev_ptr, "LSEEK_INTERRUPT_OFF\n");

                compressor_interrupts(0,chn);

                break;

            case LSEEK_INTERRUPT_ON: // enable camera interrupts

                dev_dbg(g_dev_ptr, "LSEEK_INTERRUPT_ON\n");

                compressor_interrupts(1,chn);

                break;



			default: // offset >=32

				if ((offset & ~0x1f)==LSEEK_DAEMON_CIRCBUF) {

				if ((offset & ~0x1f)==LSEEK_DAEMON_CIRCBUF) {

					wait_event_interruptible(circbuf_wait_queue, get_imageParamsThis(chn, P_DAEMON_EN) & (1<<(offset & 0x1f)));

					wait_event_interruptible(circbuf_wait_queue, get_imageParamsThis(chn, P_DAEMON_EN) & (1<<(offset & 0x1f)));

				}

				}

src/drivers/elphel/detect_sensors.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -153,7 +153,7 @@ int get_detected_sensor_code(int port, ///< Sensor port number (0..3) 
    return SENSOR_NONE;

    return SENSOR_NONE;

}

}





/** Gert configured  sensorport subchannels */

/** Get configured  sensor port subchannels */

int get_subchannels(int port) ///< Sensor port

int get_subchannels(int port) ///< Sensor port

                              ///< @return bitmask of available channels

                              ///< @return bitmask of available channels

{

{

src/drivers/elphel/framepars.c

+359 −150

File changed.

Preview size limit exceeded, changes collapsed.

src/drivers/elphel/framepars.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ void initSequencers (int sensor_port); ///Move to sensorcommon? currently it 
void initGlobalPars    (int sensor_port); /// resets all global parameters but debug mask (if ELPHEL_DEBUG)

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

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 frame8 (read from hardware, usually 0 after resetting i2c and cmd_seq)

void resetFrameNumber  (int sensor_port); /// reset this frame number (called from initFramePars(), also can be used to avoid frame number integer overflow)

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_imageParamsThis (int sensor_port, int n);

unsigned long get_imageParamsThis (int sensor_port, int n);

unsigned long get_imageParamsPrev (int sensor_port, int n);

unsigned long get_imageParamsPrev (int sensor_port, int n);
@@ -29,9 +29,9 @@ unsigned long get_globalParam (int sensor_port, int n); 




void          set_globalParam     (int sensor_port, int n, unsigned long d);

void          set_globalParam     (int sensor_port, int n, unsigned long d);

void          set_imageParamsR_all(int sensor_port, int n, unsigned long d);

void          set_imageParamsR_all(int sensor_port, int n, unsigned long d);

void          updateFramePars     (int sensor_port, int frame8, struct interframe_params_t * frame_pars); /// called from ISR - advance thisFrameNumber to match hardware frame8, copy parameters as needed.

//Next 2 called from ISR

                                   /// frame8 usually is just next after thisFrameNumber

void          updateInterFrame(int sensor_port, int frame16, struct interframe_params_t * interframe_pars);

                                   /// frame_pars - pointer to structure (between frames in the frame buffer) to save a pointer to past parameters

void          updateFramePars     (int sensor_port, int frame16);

int           setFrameParsStatic  (int sensor_port, int numPars, struct frameparspair_t * pars);

int           setFrameParsStatic  (int sensor_port, int numPars, struct frameparspair_t * pars);





unsigned long getThisFrameNumber  (int sensor_port); /// just return current thisFrameNumber

unsigned long getThisFrameNumber  (int sensor_port); /// just return current thisFrameNumber

src/drivers/elphel/gamma_tables.c

+539 −494

File changed.

Preview size limit exceeded, changes collapsed.