Commit d5af1f54 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

clean up

parent e1732d16

src/drivers/elphel/mt9f002.c

+27 −36
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ int mt9f002_pgm_limitfps (int sensor_port, struct sensor_t * sensor, struct 
int mt9f002_pgm_exposure     (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);

int mt9f002_pgm_gains        (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);

int mt9f002_pgm_triggermode  (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);

//int mt9f002_pgm_sensorregs   (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);

int mt9f002_pgm_sensorregs   (int sensor_port, struct sensor_t * sensor,  struct framepars_t * thispars, struct framepars_t * prevpars, int frame16);



/**

 * Detect and initialize sensor and related data structures
@@ -379,7 +379,7 @@ int mt9f002_pgm_detectsensor (int sensor_port, ///< sensor port 
    add_sensor_proc(sensor_port,onchange_limitfps,    &mt9f002_pgm_limitfps);     // check compressor will keep up, limit sensor FPS if needed

    add_sensor_proc(sensor_port,onchange_gains,       &mt9f002_pgm_gains);        // program analog gains

    add_sensor_proc(sensor_port,onchange_triggermode, &mt9f002_pgm_triggermode);  // program sensor trigger mode

    //add_sensor_proc(sensor_port,onchange_sensorregs,  &mt9x001_pgm_sensorregs);   // write sensor registers (only changed from outside the driver as they may have different latencies)?

    add_sensor_proc(sensor_port,onchange_sensorregs,  &mt9x001_pgm_sensorregs);   // write sensor registers (only changed from outside the driver as they may have different latencies)?



    setFramePar(sensor_port, thispars, P_SENSOR,  sensor->sensorType); // should cause other actions
@@ -740,43 +740,14 @@ int mt9f002_pgm_sensorin (int sensor_port, ///< sensor port number 
}



// also defines vertical blanking

int mt9f002_calc_frame_length_lines(int y_addr_start,

		                              int y_addr_end,

int mt9f002_calc_frame_length_lines(int height,

									int min_frame_blanking_lines){



	int v0;



	int subsampling_factor = 1;



	v0 = (y_addr_end - y_addr_start + 1)/subsampling_factor + min_frame_blanking_lines;



	/*

	if (coarse_exposure>(v0-1)){

		v0 = coarse_exposure + 1;

		pr_info("frame_length_lines will get extended\n");

	}

	*/



	return v0;

}



// also defines vertical blanking

int mt9f002_calc_frame_length_lines_2(int height,

									  int min_frame_blanking_lines){



	int v0;



	int subsampling_factor = 1;



	v0 = height/subsampling_factor + min_frame_blanking_lines;



	/*

	if (coarse_exposure>(v0-1)){

		v0 = coarse_exposure + 1;

		pr_info("frame_length_lines will get extended\n");

	}

	*/



	return v0;

}
@@ -1006,9 +977,9 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port 
    }



    /*

    // this is NOT needed when woi sizes change

    // this is NOT needed when woi sizes change ?

    //fll = mt9f002_calc_frame_length_lines(thispars);

    fll = mt9f002_calc_frame_length_lines(whs,whe,min_frame_blanking_lines);

    fll = mt9f002_calc_frame_length_lines(wh,min_frame_blanking_lines);

    // this sets the vertical blanking

    if (fll!=thispars->pars[P_SENSOR_REGS+P_MT9F002_FRAME_LENGTH_LINES]){

    	dev_dbg(g_dev_ptr,"limit fps, old frame_length_lines=0x%08x, new frame_length_lines=0x%08x\n",
@@ -1017,6 +988,7 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port 
    }

    */





    // need this fix for max possible fps

    if (ww >= X_OUTPUT_BORDER_SIZE){

    	min_line_length_pck = MIN_LINE_LENGTH_PCK_FROM_DATASHEET;
@@ -1285,7 +1257,7 @@ int mt9f002_pgm_limitfps (int sensor_port, ///< sensor port numb 
    //virt_height = mt9f002_calc_frame_length_lines(thispars);



    // this is allowed minimum

    virt_height_min = mt9f002_calc_frame_length_lines_2(wh,thispars->pars[P_SENSOR_REGS+P_MT9F002_MIN_FRAME_BLANKING_LINES]);

    virt_height_min = mt9f002_calc_frame_length_lines(wh,thispars->pars[P_SENSOR_REGS+P_MT9F002_MIN_FRAME_BLANKING_LINES]);

    // this is current setting

    virt_height = thispars->pars[P_SENSOR_REGS+P_MT9F002_FRAME_LENGTH_LINES];
@@ -2186,6 +2158,25 @@ int mt9f002_pgm_triggermode (int sensor_port, ///< sensor p 
}





/** Program sensor registers (probably just those that are manually set)

 * NOTE: all modes but ASAP are limited to 64 registers/frame, no overflow checks are performed! */

int mt9f002_pgm_sensorregs     (int sensor_port,               ///< sensor port number (0..3)

                                struct sensor_t * sensor,      ///< sensor static parameters (capabilities)

                                struct framepars_t * thispars, ///< sensor current parameters

                                struct framepars_t * prevpars, ///< sensor previous parameters (not used here)

                                int frame16)                   ///< 4-bit (hardware) frame number parameters should

                                                               ///< be applied to,  negative - ASAP

                                                               ///< @return 0 - OK, negative - error



{



    dev_dbg(g_dev_ptr,"{%d}  frame16=%d\n",sensor_port,frame16);

    if (frame16 >= PARS_FRAMES) return -1; // wrong frame



    pr_info("pgm_sensorregs call\n");



    return 0;

}





// SysFS interface to mt9f002

src/drivers/elphel/pgm_functions.c

+8 −2
Original line number Diff line number Diff line
@@ -2905,7 +2905,9 @@ int pgm_comprestart(int sensor_port, ///< sensor port number (0..3 
        break;

    }

    cmprs_mode.run_set = 1;

    if (thispars->pars[P_COMPRESSOR_RUN] == COMPRESSOR_RUN_STOP) { // turn comressor off first



    // turn comressor off first

    if (thispars->pars[P_COMPRESSOR_RUN] == COMPRESSOR_RUN_STOP) {

        X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);

    }

    // enable memory after the compressor, same latency
@@ -2916,9 +2918,12 @@ int pgm_comprestart(int sensor_port, ///< sensor port number (0..3 
                               disable_need,

                               (frame16<0)? ASAP: ABSOLUTE,  // how to apply commands - directly or through channel sequencer

                               frame16);

    if (thispars->pars[P_COMPRESSOR_RUN] != COMPRESSOR_RUN_STOP) { // turn comressor on after memory



    // turn comressor on after memory

    if (thispars->pars[P_COMPRESSOR_RUN] != COMPRESSOR_RUN_STOP) {

        X393_SEQ_SEND1 (sensor_port, frame16, x393_cmprs_control_reg, cmprs_mode);

    }



    dev_dbg(g_dev_ptr,"{%d}   X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, sensor_port, frame16, cmprs_mode.d32);

    MDP(DBGB_PADD, sensor_port,"X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, frame16, cmprs_mode.d32)
@@ -2990,6 +2995,7 @@ int pgm_compstop (int sensor_port, ///< sensor port number (0..3 
                               disable_need,

                               (frame16<0)? ASAP: ABSOLUTE,  // how to apply commands - directly or through channel sequencer

                               frame16);



    dev_dbg(g_dev_ptr,"{%d}@0x%lx: X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n",sensor_port, getThisFrameNumber(sensor_port), sensor_port, frame16, cmprs_mode.d32);

    MDP(DBGB_PADD, sensor_port,"X393_SEQ_SEND1(0x%x, 0x%x, x393_cmprs_control_reg, 0x%x)\n", sensor_port, frame16, cmprs_mode.d32)

    return 0;