Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jack Humbert
reform-boundary-uboot
Commits
fe672d60
Commit
fe672d60
authored
16 years ago
by
Ladislav Michl
Committed by
Jean-Christophe PLAGNIOL-VILLARD
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
OMAP: reindent timer code
Signed-off-by:
Ladislav Michl
<
ladis@linux-mips.org
>
parent
b3f66b0b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cpu/arm925t/interrupts.c
+8
-11
8 additions, 11 deletions
cpu/arm925t/interrupts.c
with
8 additions
and
11 deletions
cpu/arm925t/interrupts.c
+
8
−
11
View file @
fe672d60
...
@@ -57,7 +57,7 @@ int interrupt_init (void)
...
@@ -57,7 +57,7 @@ int interrupt_init (void)
/* init the timestamp and lastdec value */
/* init the timestamp and lastdec value */
reset_timer_masked
();
reset_timer_masked
();
return
(
0
)
;
return
0
;
}
}
/*
/*
...
@@ -84,17 +84,17 @@ void udelay (unsigned long usec)
...
@@ -84,17 +84,17 @@ void udelay (unsigned long usec)
{
{
ulong
tmo
,
tmp
;
ulong
tmo
,
tmp
;
if
(
usec
>=
1000
){
/* if "big" number, spread normalization to seconds */
if
(
usec
>=
1000
)
{
/* if "big" number, spread normalization to seconds */
tmo
=
usec
/
1000
;
/* start to normalize for usec to ticks per sec */
tmo
=
usec
/
1000
;
/* start to normalize for usec to ticks per sec */
tmo
*=
CONFIG_SYS_HZ
;
/* find number of "ticks" to wait to achieve target */
tmo
*=
CONFIG_SYS_HZ
;
/* find number of "ticks" to wait to achieve target */
tmo
/=
1000
;
/* finish normalize. */
tmo
/=
1000
;
/* finish normalize. */
}
else
{
/* else small number, don't kill it prior to HZ multiply */
}
else
{
/* else small number, don't kill it prior to HZ multiply */
tmo
=
usec
*
CONFIG_SYS_HZ
;
tmo
=
usec
*
CONFIG_SYS_HZ
;
tmo
/=
(
1000
*
1000
);
tmo
/=
(
1000
*
1000
);
}
}
tmp
=
get_timer
(
0
);
/* get current timestamp */
tmp
=
get_timer
(
0
);
/* get current timestamp */
if
(
(
tmo
+
tmp
+
1
)
<
tmp
)
/* if setting this fordward will roll time stamp */
if
(
(
tmo
+
tmp
+
1
)
<
tmp
)
/* if setting this fordward will roll time stamp */
reset_timer_masked
();
/* reset "advancing" timestamp to 0, set lastdec value */
reset_timer_masked
();
/* reset "advancing" timestamp to 0, set lastdec value */
else
else
tmo
+=
tmp
;
/* else, set advancing stamp wake up time */
tmo
+=
tmp
;
/* else, set advancing stamp wake up time */
...
@@ -136,7 +136,7 @@ void udelay_masked (unsigned long usec)
...
@@ -136,7 +136,7 @@ void udelay_masked (unsigned long usec)
#ifdef CONFIG_INNOVATOROMAP1510
#ifdef CONFIG_INNOVATOROMAP1510
#define LOOPS_PER_MSEC 60
/* tuned on omap1510 */
#define LOOPS_PER_MSEC 60
/* tuned on omap1510 */
volatile
int
i
,
time_remaining
=
LOOPS_PER_MSEC
*
usec
;
volatile
int
i
,
time_remaining
=
LOOPS_PER_MSEC
*
usec
;
for
(
i
=
time_remaining
;
i
>
0
;
i
--
)
{
}
for
(
i
=
time_remaining
;
i
>
0
;
i
--
)
{
}
#else
#else
ulong
tmo
;
ulong
tmo
;
...
@@ -145,7 +145,7 @@ void udelay_masked (unsigned long usec)
...
@@ -145,7 +145,7 @@ void udelay_masked (unsigned long usec)
if
(
usec
>=
1000
)
{
/* if "big" number, spread normalization to seconds */
if
(
usec
>=
1000
)
{
/* if "big" number, spread normalization to seconds */
tmo
=
usec
/
1000
;
/* start to normalize for usec to ticks per sec */
tmo
=
usec
/
1000
;
/* start to normalize for usec to ticks per sec */
tmo
*=
CONFIG_SYS_HZ
;
/* find number of "ticks" to wait to achieve target */
tmo
*=
CONFIG_SYS_HZ
;
/* find number of "ticks" to wait to achieve target */
tmo
/=
1000
;
/* finish normalize. */
tmo
/=
1000
;
/* finish normalize. */
}
else
{
/* else small number, don't kill it prior to HZ multiply */
}
else
{
/* else small number, don't kill it prior to HZ multiply */
tmo
=
usec
*
CONFIG_SYS_HZ
;
tmo
=
usec
*
CONFIG_SYS_HZ
;
...
@@ -176,8 +176,5 @@ unsigned long long get_ticks(void)
...
@@ -176,8 +176,5 @@ unsigned long long get_ticks(void)
*/
*/
ulong
get_tbclk
(
void
)
ulong
get_tbclk
(
void
)
{
{
ulong
tbclk
;
return
CONFIG_SYS_HZ
;
tbclk
=
CONFIG_SYS_HZ
;
return
tbclk
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment