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
9b882415
Commit
9b882415
authored
Sep 29, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Plain Diff
merged with framepars
parents
1275e922
ad3a93f0
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
317 additions
and
5 deletions
+317
-5
.gitignore
.gitignore
+3
-1
elphel393_eyesis_bottom2.dts
src/arch/arm/boot/dts/elphel393_eyesis_bottom2.dts
+303
-0
fpgajtag353.c
src/drivers/elphel/fpgajtag353.c
+2
-2
pgm_functions.c
src/drivers/elphel/pgm_functions.c
+9
-2
No files found.
.gitignore
View file @
9b882415
...
@@ -23,3 +23,5 @@ excluding.lst
...
@@ -23,3 +23,5 @@ excluding.lst
attic
attic
board_elphel393
board_elphel393
scp
scp
bitbake-logs
device-tree-logs
src/arch/arm/boot/dts/elphel393_eyesis_bottom2.dts
0 → 100644
View file @
9b882415
This diff is collapsed.
Click to expand it.
src/drivers/elphel/fpgajtag353.c
View file @
9b882415
...
@@ -453,8 +453,8 @@ static int fpga_jtag_release(struct inode *inode, struct file *filp) {
...
@@ -453,8 +453,8 @@ static int fpga_jtag_release(struct inode *inode, struct file *filp) {
minors
[
p
]
=
0
;
minors
[
p
]
=
0
;
JTAG_channels
[
chn
].
mode
=
JTAG_MODE_CLOSED
;
JTAG_channels
[
chn
].
mode
=
JTAG_MODE_CLOSED
;
//D(printk("fpga_jtag_release: done\r\n"));
//D(printk("fpga_jtag_release: done\r\n"));
dev_dbg
(
NULL
,
"fpga_jtag_release: done
\r\n
"
);
dev_dbg
(
NULL
,
"fpga_jtag_release: done
, res= %d
\n
"
,
res
);
dev_info
(
NULL
,
"fpga_jtag_release: done, res= %d
\n
"
,
res
);
//
dev_info(NULL, "fpga_jtag_release: done, res= %d\n",res);
return
(
res
<
0
)
?
res
:
0
;
return
(
res
<
0
)
?
res
:
0
;
}
}
...
...
src/drivers/elphel/pgm_functions.c
View file @
9b882415
...
@@ -1432,6 +1432,10 @@ int pgm_triggermode(int sensor_port, ///< sensor port number (0..3
...
@@ -1432,6 +1432,10 @@ int pgm_triggermode(int sensor_port, ///< sensor port number (0..3
if
(
camsync_mode
.
trig
)
{
// if trigger mode, enable camsync module, if off - do nothing
if
(
camsync_mode
.
trig
)
{
// if trigger mode, enable camsync module, if off - do nothing
camsync_mode
.
en
=
1
;
camsync_mode
.
en
=
1
;
camsync_mode
.
en_set
=
1
;
camsync_mode
.
en_set
=
1
;
//When does it need to be disabled?
// camsync_mode.ts_chns = (thispars->pars[P_EXTERN_TIMESTAMP]?1:0) << sensor_port;
camsync_mode
.
ts_chns
=
1
<<
sensor_port
;
camsync_mode
.
ts_chns_set
=
1
<<
sensor_port
;
}
}
camsync_mode
.
trig_set
=
1
;
camsync_mode
.
trig_set
=
1
;
// set directly, bypassing sequencer as it may fail with wrong trigger
// set directly, bypassing sequencer as it may fail with wrong trigger
...
@@ -2626,8 +2630,11 @@ int pgm_trigseq (int sensor_port, ///< sensor port number (0..3
...
@@ -2626,8 +2630,11 @@ int pgm_trigseq (int sensor_port, ///< sensor port number (0..3
}
}
// P_XMIT_TIMESTAMP changed? (0 - internal sequencer)
// P_XMIT_TIMESTAMP changed? (0 - internal sequencer)
if
(
FRAMEPAR_MODIFIED
(
P_XMIT_TIMESTAMP
))
{
if
(
FRAMEPAR_MODIFIED
(
P_XMIT_TIMESTAMP
))
{
camsync_mode
.
ts_chns
=
(
thispars
->
pars
[
P_EXTERN_TIMESTAMP
]
?
1
:
0
)
<<
sensor_port
;
camsync_mode
.
en_snd
=
(
thispars
->
pars
[
P_XMIT_TIMESTAMP
]
?
1
:
0
);
camsync_mode
.
ts_chns_set
=
1
<<
sensor_port
;
camsync_mode
.
en_snd_set
=
1
;
// camsync_mode.ts_chns = (thispars->pars[P_EXTERN_TIMESTAMP]?1:0) << sensor_port;
// camsync_mode.ts_chns_set = 1 << sensor_port;
}
}
if
(
update_master_channel
){
if
(
update_master_channel
){
camsync_mode
.
master_chn
=
sensor_port
;
camsync_mode
.
master_chn
=
sensor_port
;
...
...
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