summaryrefslogtreecommitdiff
path: root/cesar/hal
diff options
context:
space:
mode:
authorThierry Carré2013-02-14 18:24:15 +0100
committerThierry Carré2013-02-22 16:43:25 +0100
commit168549f4c09c40e2b1841b1c7570899e259b1b6d (patch)
treede94e11e5a0d94791eabf64bfc31db4179f60993 /cesar/hal
parent534f7b98f1f654644224b8e57c7de1bd1088c5a4 (diff)
cesar/{host, hal}: erase dead code linked to STATION_SOCK, refs #2979
Diffstat (limited to 'cesar/hal')
-rw-r--r--cesar/hal/ipmbox/maximus/test/src/test_maximus_hal.c6
-rw-r--r--cesar/hal/leon/maximus/test/src/test_maximus_timer.c10
-rw-r--r--cesar/hal/phy/maximus/test/src/test_phy_maximus.c10
3 files changed, 4 insertions, 22 deletions
diff --git a/cesar/hal/ipmbox/maximus/test/src/test_maximus_hal.c b/cesar/hal/ipmbox/maximus/test/src/test_maximus_hal.c
index 2a30eb074b..302c61be9d 100644
--- a/cesar/hal/ipmbox/maximus/test/src/test_maximus_hal.c
+++ b/cesar/hal/ipmbox/maximus/test/src/test_maximus_hal.c
@@ -54,11 +54,7 @@ maximus_ether_open (station_ctx_t *station)
{
int fd;
-#ifdef STATION_SOCK
- fd = station->sock_pair_fd;
-#else /* STATION_SOCK */
fd = open (station->pipe_out_name, O_RDONLY);
-#endif /* STATION_SOCK */
return fd;
}
@@ -66,9 +62,7 @@ maximus_ether_open (station_ctx_t *station)
void
maximus_ether_close (int fd)
{
-#ifndef STATION_SOCK
close (fd);
-#endif /* !STATION_SOCK */
}
int
diff --git a/cesar/hal/leon/maximus/test/src/test_maximus_timer.c b/cesar/hal/leon/maximus/test/src/test_maximus_timer.c
index 36607c4275..07971ccc90 100644
--- a/cesar/hal/leon/maximus/test/src/test_maximus_timer.c
+++ b/cesar/hal/leon/maximus/test/src/test_maximus_timer.c
@@ -45,11 +45,7 @@ maximus_timer_open (station_ctx_t *station)
{
int fd;
- #ifdef STATION_SOCK
- fd = station->sock_pair_fd;
- #else /* STATION_SOCK */
- fd = open(station->pipe_out_name, O_RDONLY);
- #endif /* STATION_SOCK */
+ fd = open(station->pipe_out_name, O_RDONLY);
return fd;
}
@@ -57,9 +53,7 @@ maximus_timer_open (station_ctx_t *station)
void
maximus_timer_close (int fd)
{
- #ifndef STATION_SOCK
- close(fd);
- #endif /* !STATION_SOCK */
+ close(fd);
}
void
diff --git a/cesar/hal/phy/maximus/test/src/test_phy_maximus.c b/cesar/hal/phy/maximus/test/src/test_phy_maximus.c
index c898ecd70e..44ee024083 100644
--- a/cesar/hal/phy/maximus/test/src/test_phy_maximus.c
+++ b/cesar/hal/phy/maximus/test/src/test_phy_maximus.c
@@ -72,11 +72,7 @@ maximus_phy_open (station_ctx_t *station)
{
int fd;
- #ifdef STATION_SOCK
- fd = station->sock_pair_fd;
- #else /* STATION_SOCK */
- fd = open(station->pipe_out_name, O_RDONLY);
- #endif /* STATION_SOCK */
+ fd = open(station->pipe_out_name, O_RDONLY);
return fd;
}
@@ -84,9 +80,7 @@ maximus_phy_open (station_ctx_t *station)
void
maximus_phy_close (int fd)
{
- #ifndef STATION_SOCK
- close(fd);
- #endif /* !STATION_SOCK */
+ close(fd);
}
int