Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
83
Issues
83
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
e4f7934c
Commit
e4f7934c
authored
Aug 01, 2013
by
Benoit Rat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
userspace: improve TRACE messages
parent
f458ae79
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
fan.c
userspace/libswitchhw/fan.c
+1
-2
i2c_bitbang.c
userspace/libswitchhw/i2c_bitbang.c
+1
-2
i2c_io.c
userspace/libswitchhw/i2c_io.c
+1
-1
shw_io.c
userspace/libswitchhw/shw_io.c
+1
-2
No files found.
userspace/libswitchhw/fan.c
View file @
e4f7934c
...
...
@@ -215,11 +215,10 @@ int shw_init_fans()
if
(
shw_get_hw_ver
()
<
330
)
is_cpu_pwn
=
1
;
else
is_cpu_pwn
=
0
;
TRACE
(
TRACE_INFO
,
"Configuring %s PWMs for fans (desired temperature = %.1f degC)...
%d"
,
is_cpu_pwn
?
"CPU"
:
"FPGA"
);
TRACE
(
TRACE_INFO
,
"Configuring %s PWMs for fans (desired temperature = %.1f degC)...
"
,
is_cpu_pwn
?
"CPU"
:
"FPGA"
,
DESIRED_TEMPERATURE
);
if
(
is_cpu_pwn
)
{
pwm_fd
=
open
(
"/dev/at91_softpwm"
,
O_RDWR
);
if
(
pwm_fd
<
0
)
{
...
...
userspace/libswitchhw/i2c_bitbang.c
View file @
e4f7934c
...
...
@@ -20,9 +20,8 @@ int i2c_bitbang_init_bus(struct i2c_bus *bus)
priv
=
(
struct
i2c_bitbang
*
)
bus
->
type_specific
;
TRACE
(
TRACE_INFO
,
"%s (0x%x) "
,
bus
->
name
,
bus
);
TRACE
(
TRACE_INFO
,
"
init:
%s (0x%x) "
,
bus
->
name
,
bus
);
shw_pio_configure
(
priv
->
scl
);
TRACE
(
TRACE_INFO
,
"%s (0x%x) "
,
bus
->
name
,
bus
);
shw_pio_configure
(
priv
->
sda
);
shw_pio_setdir
(
priv
->
scl
,
0
);
shw_pio_setdir
(
priv
->
sda
,
0
);
...
...
userspace/libswitchhw/i2c_io.c
View file @
e4f7934c
...
...
@@ -138,7 +138,7 @@ uint8_t shw_get_fpga_type()
if
(
bus
&&
bus
->
scan
(
bus
,
I2C_SCB_VER_ADDR
))
{
//The 0b0000
1110 bits are used for SCB HW version
//The 0b0000
0001 bit is used for FPGA type
if
(
wrswhw_pca9554_get_input
(
bus
,
I2C_SCB_VER_ADDR
)
&
0x1
)
return
SHW_FPGA_LX240T
;
}
...
...
userspace/libswitchhw/shw_io.c
View file @
e4f7934c
...
...
@@ -95,7 +95,6 @@ int shw_io_init()
IOARR_SET_GPIO
(
shw_io_led_cpu2
);
IOARR_SET_GPIO
(
shw_io_arm_boot_sel
);
IOARR_SET_GPIO
(
shw_io_arm_gen_but
);
TRACE
(
TRACE_INFO
,
"version=%f %d %d %d"
,
ver
,
ver
>=
3
.
3
f
,
ver
<
3
.
3
f
,
ver
==
3
.
3
f
);
}
else
{
...
...
@@ -108,7 +107,7 @@ int shw_io_init()
IOARR_SET_IO
(
shw_io_led_state_o
,
SHW_I2C
,
I2C_shw_io_led_state_o
);
}
TRACE
(
TRACE_INFO
,
"version=%
g"
,
ver
);
TRACE
(
TRACE_INFO
,
"version=%
d (CPUPWN=%d)"
,
ver
,
ver
<
330
);
return
0
;
}
...
...
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