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
4ab41772
Commit
4ab41772
authored
Jan 11, 2018
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed image sizes
parent
24d7f26b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
x393_videomem.c
src/drivers/elphel/x393_videomem.c
+5
-3
No files found.
src/drivers/elphel/x393_videomem.c
View file @
4ab41772
...
@@ -676,7 +676,7 @@ static inline int membridge_is_busy(void){
...
@@ -676,7 +676,7 @@ static inline int membridge_is_busy(void){
int
membridge_start
(
int
sensor_port
,
unsigned
long
target_frame
){
int
membridge_start
(
int
sensor_port
,
unsigned
long
target_frame
){
int
p_color
,
p_pf_height
;
//
int p_color, p_pf_height;
int
width_marg
,
height_marg
,
width_bursts
;
int
width_marg
,
height_marg
,
width_bursts
;
dma_addr_t
phys_addr
;
dma_addr_t
phys_addr
;
...
@@ -723,9 +723,10 @@ int membridge_start(int sensor_port, unsigned long target_frame){
...
@@ -723,9 +723,10 @@ int membridge_start(int sensor_port, unsigned long target_frame){
width_marg
=
get_imageParamsThis
(
sensor_port
,
P_ACTUAL_WIDTH
);
width_marg
=
get_imageParamsThis
(
sensor_port
,
P_ACTUAL_WIDTH
);
height_marg
=
get_imageParamsThis
(
sensor_port
,
P_ACTUAL_HEIGHT
);
height_marg
=
get_imageParamsThis
(
sensor_port
,
P_ACTUAL_HEIGHT
);
p_color
=
get_imageParamsThis
(
sensor_port
,
P_COLOR
);
//
p_color = get_imageParamsThis(sensor_port,P_COLOR);
p_pf_height
=
get_imageParamsThis
(
sensor_port
,
P_PF_HEIGHT
);
//
p_pf_height = get_imageParamsThis(sensor_port,P_PF_HEIGHT);
/*
switch(p_color){
switch(p_color){
case COLORMODE_COLOR:
case COLORMODE_COLOR:
case COLORMODE_COLOR20:
case COLORMODE_COLOR20:
...
@@ -735,6 +736,7 @@ int membridge_start(int sensor_port, unsigned long target_frame){
...
@@ -735,6 +736,7 @@ int membridge_start(int sensor_port, unsigned long target_frame){
}
}
break;
break;
}
}
*/
width_bursts
=
(
width_marg
>>
4
)
+
((
width_marg
&
0xf
)
?
1
:
0
);
width_bursts
=
(
width_marg
>>
4
)
+
((
width_marg
&
0xf
)
?
1
:
0
);
setup_membridge_memory
(
sensor_port
,
///< sensor port number (0..3)
setup_membridge_memory
(
sensor_port
,
///< sensor port number (0..3)
...
...
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