Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
White Rabbit Switch - Software
Manage
Activity
Members
Labels
Plan
Issues
87
Issue boards
Milestones
Wiki
Code
Merge requests
4
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
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
Projects
White Rabbit Switch - Software
Commits
ee3fd196
Commit
ee3fd196
authored
9 years ago
by
Grzegorz Daniluk
Committed by
Adam Wujek
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wrsw_hal: cleanup in log messages - levels and content
parent
2d7a0a52
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
userspace/wrsw_hal/hal_exports.c
+1
-1
1 addition, 1 deletion
userspace/wrsw_hal/hal_exports.c
userspace/wrsw_hal/hal_main.c
+3
-4
3 additions, 4 deletions
userspace/wrsw_hal/hal_main.c
userspace/wrsw_hal/hal_ports.c
+2
-2
2 additions, 2 deletions
userspace/wrsw_hal/hal_ports.c
with
6 additions
and
7 deletions
userspace/wrsw_hal/hal_exports.c
+
1
−
1
View file @
ee3fd196
...
...
@@ -229,7 +229,7 @@ int hal_check_running()
struct
wrs_shm_head
*
hal_head
;
hal_head
=
wrs_shm_get
(
wrs_shm_hal
,
""
,
WRS_SHM_READ
);
if
(
!
hal_head
)
{
pr_
info
(
"Unable to open shm for HAL! Unable to check if there "
pr_
error
(
"Unable to open shm for HAL! Unable to check if there "
"is another HAL instance running. Error: %s
\n
"
,
strerror
(
errno
));
exit
(
-
1
);
...
...
This diff is collapsed.
Click to expand it.
userspace/wrsw_hal/hal_main.c
+
3
−
4
View file @
ee3fd196
...
...
@@ -50,7 +50,7 @@ static void call_cleanup_cbs(void)
{
int
i
;
pr_
info
(
"Cleaning up...
\n
"
);
pr_
debug
(
"Cleaning up...
\n
"
);
for
(
i
=
0
;
i
<
MAX_CLEANUP_CALLBACKS
;
i
++
)
if
(
cleanup_cb
[
i
])
cleanup_cb
[
i
]
();
...
...
@@ -82,7 +82,7 @@ static int hal_init(void)
//trace_log_stderr();
int
line
;
pr_
info
(
"initializing...
\n
"
);
pr_
debug
(
"initializing...
\n
"
);
memset
(
cleanup_cb
,
0
,
sizeof
(
cleanup_cb
));
...
...
@@ -220,8 +220,7 @@ int main(int argc, char *argv[])
wrs_msg_init
(
argc
,
argv
);
/* Print HAL's version */
wrs_msg
(
LOG_ALERT
,
"wrsw_hal. Commit %s, built on "
__DATE__
"
\n
"
,
__GIT_VER__
);
pr_info
(
"wrsw_hal. Commit %s, built on "
__DATE__
"
\n
"
,
__GIT_VER__
);
/* Prevent from running HAL twice - it will likely freeze the system */
if
(
hal_check_running
())
{
...
...
This diff is collapsed.
Click to expand it.
userspace/wrsw_hal/hal_ports.c
+
2
−
2
View file @
ee3fd196
...
...
@@ -161,7 +161,7 @@ static int hal_port_init(int index)
pr_error
(
"port index %i (%s): invalid role "
"
\"
%s
\"
specified
\n
"
,
index
,
name
,
s
);
pr_
info
(
"Port %s: mode %i
\n
"
,
p
->
name
,
val
);
pr_
debug
(
"Port %s: mode %i
\n
"
,
p
->
name
,
val
);
}
/* Get fiber type */
...
...
@@ -553,7 +553,7 @@ static void hal_port_poll_sfp(void)
if
(
ports
[
i
].
in_use
&&
(
mask
^
old_mask
)
&
(
1
<<
hw_index
))
{
int
insert
=
mask
&
(
1
<<
hw_index
);
pr_info
(
"Detected SFP %s "
pr_info
(
"
SFP Info:
Detected SFP %s "
"on port %s.
\n
"
,
insert
?
"insertion"
:
"removal"
,
ports
[
i
].
name
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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