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
c6a448b6
Commit
c6a448b6
authored
Apr 04, 2018
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed unused functions
parent
ea7a3dae
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
67 deletions
+6
-67
mt9f002.c
src/drivers/elphel/mt9f002.c
+6
-67
No files found.
src/drivers/elphel/mt9f002.c
View file @
c6a448b6
...
@@ -555,7 +555,7 @@ int mt9f002_pgm_initsensor (int sensor_port, ///< sensor port
...
@@ -555,7 +555,7 @@ int mt9f002_pgm_initsensor (int sensor_port, ///< sensor port
x393_sens_sync_mult_t
dis_sof
=
{.
d32
=
0
};
x393_sens_sync_mult_t
dis_sof
=
{.
d32
=
0
};
struct
frameparspair_t
pars_to_update
[
262
+
(
MAX_SENSORS
*
P_MULTI_NUMREGS
)];
// for all the sensor registers. Other P_* values will reuse the same ones
struct
frameparspair_t
pars_to_update
[
262
+
(
MAX_SENSORS
*
P_MULTI_NUMREGS
)];
// for all the sensor registers. Other P_* values will reuse the same ones
int
regaddr
,
regval
,
regnum
,
j
;
int
regaddr
,
regval
,
regnum
;
int
nupdate
=
0
;
int
nupdate
=
0
;
...
@@ -680,32 +680,7 @@ int mt9f002_pgm_sensorin (int sensor_port, ///< sensor port number
...
@@ -680,32 +680,7 @@ int mt9f002_pgm_sensorin (int sensor_port, ///< sensor port number
}
}
// also defines vertical blanking
// also defines vertical blanking
int
mt9f002_calc_frame_length_lines
(
struct
framepars_t
*
thispars
){
int
mt9f002_calc_frame_length_lines
(
int
y_addr_start
,
int
v0
;
int
y_addr_start
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_Y_ADDR_START
];
int
y_addr_end
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_Y_ADDR_END
];
int
min_frame_blanking_lines
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_MIN_FRAME_BLANKING_LINES
];
//int coarse_exposure = thispars->pars[P_VEXPOS];
// TODO: do
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
y_addr_start
,
int
y_addr_end
,
int
y_addr_end
,
int
min_frame_blanking_lines
){
int
min_frame_blanking_lines
){
...
@@ -726,43 +701,7 @@ int mt9f002_calc_frame_length_lines_2(int y_addr_start,
...
@@ -726,43 +701,7 @@ int mt9f002_calc_frame_length_lines_2(int y_addr_start,
}
}
// also defines horizontal blanking
// also defines horizontal blanking
int
mt9f002_calc_line_length_pck
(
struct
framepars_t
*
thispars
){
int
mt9f002_calc_line_length_pck
(
int
x_addr_start
,
int
v0
,
v1
,
v2
,
v3
;
int
x_addr_start
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_X_ADDR_START
];
int
x_addr_end
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_X_ADDR_END
];
int
x_odd_inc
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_X_ODD_INC
];
int
min_line_blanking_pck
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_MIN_LINE_BLANKING_PCK
];
int
x_output_size
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_X_OUTPUT_SIZE
];
// does not match with the power on default value
v0
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_MIN_LINE_LENGTH_PCK
];
// incorrect formula?
//v1 = (x_addr_end-x_addr_start+x_odd_inc)/(1+x_odd_inc)+min_line_blanking_pck;
v1
=
(
x_addr_end
-
x_addr_start
+
x_odd_inc
)
/
(
1
+
x_odd_inc
)
+
min_line_blanking_pck
/
2
;
//v1 = ((x_addr_end-x_addr_start+x_odd_inc)*2/(1+x_odd_inc)+min_line_blanking_pck)/2;
v2
=
MT9F002_VT_PIX_CLK
/
MT9F002_OP_PIX_CLK
*
x_output_size
/
4
+
0x5E
;
// what?!
//v3 = (x_addr_end-x_addr_start+1)+min_line_blanking_pck;
//pr_info("x_addr_end=0x%08x x_addr_start=0x%08x x_odd_inc=0x%08x min_line_blanking_pck=0x%08x\n",x_addr_end,x_addr_start,x_odd_inc,min_line_blanking_pck);
pr_info
(
"v0=0x%08x v1=0x%08x v2=0x%08x
\n
"
,
v0
,
v1
,
v2
);
if
(
v0
<
v1
)
v0
=
v1
;
if
(
v0
<
v2
)
v0
=
v2
;
//if (v0<v3) v0 = v3;
pr_info
(
"result = 0x%08x
\n
"
,
v0
);
return
v0
;
}
// also defines horizontal blanking
int
mt9f002_calc_line_length_pck_2
(
int
x_addr_start
,
int
x_addr_end
,
int
x_addr_end
,
int
x_odd_inc
,
int
x_odd_inc
,
int
x_output_size
,
int
x_output_size
,
...
@@ -977,7 +916,7 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port
...
@@ -977,7 +916,7 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port
// recalc something after this one?
// recalc something after this one?
//fll = mt9f002_calc_frame_length_lines(thispars);
//fll = mt9f002_calc_frame_length_lines(thispars);
fll
=
mt9f002_calc_frame_length_lines
_2
(
whs
,
whe
,
min_frame_blanking_lines
);
fll
=
mt9f002_calc_frame_length_lines
(
whs
,
whe
,
min_frame_blanking_lines
);
// this sets the vertical blanking
// this sets the vertical blanking
if
(
fll
!=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_FRAME_LENGTH_LINES
]){
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
"
,
dev_dbg
(
g_dev_ptr
,
"limit fps, old frame_length_lines=0x%08x, new frame_length_lines=0x%08x
\n
"
,
...
@@ -995,7 +934,7 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port
...
@@ -995,7 +934,7 @@ int mt9f002_pgm_window_common (int sensor_port, ///< sensor port
// recalc exposure after this one
// recalc exposure after this one
//llp = mt9f002_calc_line_length_pck(thispars);
//llp = mt9f002_calc_line_length_pck(thispars);
llp
=
mt9f002_calc_line_length_pck
_2
(
wws
,
wwe
,
ww_odd_inc
,
ww
,
min_line_blanking_pck
,
min_line_length_pck
);
llp
=
mt9f002_calc_line_length_pck
(
wws
,
wwe
,
ww_odd_inc
,
ww
,
min_line_blanking_pck
,
min_line_length_pck
);
if
(
llp
!=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
]){
if
(
llp
!=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
]){
SET_SENSOR_MBPAR_LUT
(
sensor_port
,
frame16
,
P_MT9F002_LINE_LENGTH_PCK
,
llp
);
SET_SENSOR_MBPAR_LUT
(
sensor_port
,
frame16
,
P_MT9F002_LINE_LENGTH_PCK
,
llp
);
}
}
...
@@ -1182,7 +1121,7 @@ int mt9f002_pgm_limitfps (int sensor_port, ///< sensor port numb
...
@@ -1182,7 +1121,7 @@ int mt9f002_pgm_limitfps (int sensor_port, ///< sensor port numb
//dev_dbg(g_dev_ptr,"{%d} hor_blank =%d(0x%x)\n",sensor_port,hor_blank,hor_blank);
//dev_dbg(g_dev_ptr,"{%d} hor_blank =%d(0x%x)\n",sensor_port,hor_blank,hor_blank);
row_time_in_pixels
=
2
*
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
];
row_time_in_pixels
=
2
*
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
];
// fps correction
// fps correction
for smaller window widths
if
(
ww
<
X_OUTPUT_BORDER_SIZE
){
if
(
ww
<
X_OUTPUT_BORDER_SIZE
){
row_time_in_pixels
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
];
row_time_in_pixels
=
thispars
->
pars
[
P_SENSOR_REGS
+
P_MT9F002_LINE_LENGTH_PCK
];
}
}
...
...
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