Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
linux-elphel
Commits
ab3b8962
Commit
ab3b8962
authored
Nov 26, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added extra bit to phase configuration
parent
f529fd52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
framepars.c
src/drivers/elphel/framepars.c
+2
-0
pgm_functions.c
src/drivers/elphel/pgm_functions.c
+3
-3
No files found.
src/drivers/elphel/framepars.c
View file @
ab3b8962
...
@@ -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()
...
...
src/drivers/elphel/pgm_functions.c
View file @
ab3b8962
...
@@ -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
]
&
0x
3
f
;
sensio_ctl
.
quadrants
=
thispars
->
pars
[
P_SENSOR_PHASE
]
&
0x
7
f
;
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: 0x
0
0000
* internal: 0x
2
0000
* both: 0x22000
* both: 0x22000
* P_TRIG_IN (inputs):
* P_TRIG_IN (inputs):
* off: 0x00000
* off: 0x00000
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment