Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
magic-lantern
magic-lantern
Commits
a85c859b2536
Commit
b36fb26f
authored
Jun 30, 2018
by
alex@thinkpad
Browse files
crop_rec: fix off-by-one error when reading FPS timer B
(minor, no obvious side effects noticed) --HG-- branch : crop_rec_4k
parent
5ec333c896ff
Changes
1
Show whitespace changes
Inline
Side-by-side
modules/crop_rec/crop_rec.c
View file @
a85c859b
...
...
@@ -662,7 +662,7 @@ static int adjust_shutter_blanking(int old)
});
/* what value is actually used for timer B? (possibly after our overrides) */
int
fps_timer_b
=
shamem_read
(
0xC0F06014
)
&
0xFFFF
;
int
fps_timer_b
=
(
shamem_read
(
0xC0F06014
)
&
0xFFFF
)
+
1
;
dbg_printf
(
"Timer B %d->%d
\n
"
,
fps_timer_b_orig
,
fps_timer_b
);
...
...
@@ -813,7 +813,7 @@ static void FAST adtg_hook(uint32_t* regs, uint32_t* stack, uint32_t pc)
case
CROP_PRESET_40_FPS
:
{
/* assuming FPS timer B was overridden before this */
int
fps_timer_b
=
shamem_read
(
0xC0F06014
)
&
0xFFFF
;
int
fps_timer_b
=
(
shamem_read
(
0xC0F06014
)
&
0xFFFF
)
+
1
;
int
readout_end
=
shamem_read
(
0xC0F06804
)
>>
16
;
/* fixme: D5 only */
/* PowerSaveTiming registers */
...
...
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