Commit 3d5fc460 authored by Andrey Filippov's avatar Andrey Filippov

merged with framepars - 3 bits for hact quandrant phase adjust

parents 5abbb5ae 6ea28cb0
...@@ -1692,7 +1692,9 @@ loff_t framepars_lseek(struct file * file, loff_t offset, int orig) ...@@ -1692,7 +1692,9 @@ loff_t framepars_lseek(struct file * file, loff_t offset, int orig)
else target_frame = getThisFrameNumber(sensor_port) + offset - LSEEK_FRAME_WAIT_REL; else target_frame = getThisFrameNumber(sensor_port) + offset - LSEEK_FRAME_WAIT_REL;
// Skip 0..255 frames // Skip 0..255 frames
// wait_event_interruptible (framepars_wait_queue, getThisFrameNumber()>=target_frame); // wait_event_interruptible (framepars_wait_queue, getThisFrameNumber()>=target_frame);
dev_dbg(g_devfp_ptr, "getThisFrameNumber(%d) == 0x%x, target_frame = 0x%x\n", sensor_port, (int) getThisFrameNumber(sensor_port), (int)target_frame);
wait_event_interruptible(aframepars_wait_queue[sensor_port], getThisFrameNumber(sensor_port) >= target_frame); wait_event_interruptible(aframepars_wait_queue[sensor_port], getThisFrameNumber(sensor_port) >= target_frame);
dev_dbg(g_devfp_ptr, "getThisFrameNumber(%d) == 0x%x\n", sensor_port, (int) getThisFrameNumber(sensor_port));
// if (getThisFrameNumber()<target_frame) wait_event_interruptible (framepars_wait_queue,getThisFrameNumber()>=target_frame); // if (getThisFrameNumber()<target_frame) wait_event_interruptible (framepars_wait_queue,getThisFrameNumber()>=target_frame);
return getThisFrameNumber(sensor_port); // Does not modify current frame pointer? lseek (,0,SEEK_CUR) anyway returns getThisFrameNumber() return getThisFrameNumber(sensor_port); // Does not modify current frame pointer? lseek (,0,SEEK_CUR) anyway returns getThisFrameNumber()
......
...@@ -749,8 +749,8 @@ int pgm_sensorphase (int sensor_port, ///< sensor port number ( ...@@ -749,8 +749,8 @@ int pgm_sensorphase (int sensor_port, ///< sensor port number (
} }
if (get_port_interface(sensor_port) == PARALLEL12){ if (get_port_interface(sensor_port) == PARALLEL12){
if (FRAMEPAR_MODIFIED(P_SENSOR_PHASE)) { // for parallel sensor it means quadrants: 90-degree shifts for data [1:0], hact [3:2] and vact [5:4] if (FRAMEPAR_MODIFIED(P_SENSOR_PHASE)) { // for parallel sensor it means quadrants: 90-degree shifts for data [1:0], hact [6,3:2] and vact [5:4]
sensio_ctl.quadrants = thispars->pars[P_SENSOR_PHASE] & 0x3f; sensio_ctl.quadrants = thispars->pars[P_SENSOR_PHASE] & 0x7f;
sensio_ctl.quadrants_set = 1; sensio_ctl.quadrants_set = 1;
} }
if (sensio_ctl.d32) { if (sensio_ctl.d32) {
...@@ -2448,7 +2448,7 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3 ...@@ -2448,7 +2448,7 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3
* P_TRIG_OUT (outputs): * P_TRIG_OUT (outputs):
* off: 0x00000 * off: 0x00000
* external: 0x02000 * external: 0x02000
* internal: 0x00000 * internal: 0x20000
* both: 0x22000 * both: 0x22000
* P_TRIG_IN (inputs): * P_TRIG_IN (inputs):
* off: 0x00000 * off: 0x00000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment