Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor 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
vesta
u-boot-2015.04
Commits
ea6f6689
Commit
ea6f6689
authored
16 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Patches
Plain Diff
post/board/lwmon5/sysmon.c: fix manual merge error.
Signed-off-by:
Wolfgang Denk
<
wd@denx.de
>
parent
70a0f814
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
post/board/lwmon5/sysmon.c
+3
-5
3 additions, 5 deletions
post/board/lwmon5/sysmon.c
with
3 additions
and
5 deletions
post/board/lwmon5/sysmon.c
+
3
−
5
View file @
ea6f6689
...
...
@@ -127,25 +127,23 @@ static sysmon_table_t sysmon_table[] =
1
,
1
,
-
32768
,
32767
,
0xFFFF
,
0x8000
+
TEMPERATURE_MIN
,
0x8000
+
TEMPERATURE_MAX
,
0
,
0x8000
+
TEMPERATURE_DISPLAY_MIN
,
0x8000
+
TEMPERATURE_DISPLAY_MAX
,
0
,
REG_TEMPERATURE
REG_TEMPERATURE
,
},
{
"+ 5 V"
,
"V"
,
&
sysmon_dspic
,
NULL
,
NULL
,
100
,
1000
,
-
0x8000
,
0x7FFF
,
0xFFFF
,
100
,
1000
,
0
,
0xFFFF
,
0xFFFF
,
VOLTAGE_5V_MIN
,
VOLTAGE_5V_MAX
,
0
,
VOLTAGE_5V_MIN
,
VOLTAGE_5V_MAX
,
0
,
REG_VOLTAGE_5V
REG_VOLTAGE_5V
,
},
{
"+ 5 V standby"
,
"V"
,
&
sysmon_dspic
,
NULL
,
NULL
,
100
,
1000
,
-
0x8000
,
0x7FFF
,
0xFFFF
,
100
,
1000
,
0
,
0xFFFF
,
0xFFFF
,
VOLTAGE_5V_STANDBY_MIN
,
VOLTAGE_5V_STANDBY_MAX
,
0
,
VOLTAGE_5V_STANDBY_MIN
,
VOLTAGE_5V_STANDBY_MAX
,
0
,
REG_VOLTAGE_5V_STANDBY
REG_VOLTAGE_5V_STANDBY
,
},
};
static
int
sysmon_table_size
=
sizeof
(
sysmon_table
)
/
sizeof
(
sysmon_table
[
0
]);
...
...
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