From 88c74ab115b5135d4d93050596905d6ee573dd1e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 25 Jul 2013 15:10:11 +0200 Subject: score: Merge tod implementation into one file Delete TOD_MICROSECONDS_PER_SECOND, TOD_MICROSECONDS_TO_TICKS() and TOD_MILLISECONDS_TO_TICKS(). --- c/src/libchip/network/cs8900.c | 8 ++++---- c/src/libchip/network/open_eth.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'c/src/libchip/network') diff --git a/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c index 8cd907eecc..6d40fa78aa 100644 --- a/c/src/libchip/network/cs8900.c +++ b/c/src/libchip/network/cs8900.c @@ -258,7 +258,7 @@ cs8900_hardware_init (cs8900_device *cs) io_pp_bit_set_reg_16 (cs, CS8900_PP_SelfCTL, CS8900_SELF_CTRL_RESET); - rtems_task_wake_after (TOD_MILLISECONDS_TO_TICKS (20)); + rtems_task_wake_after (RTEMS_MILLISECONDS_TO_TICKS (20)); status = io_pp_get_reg_16 (cs, CS8900_PP_SelfST); if (status == 0) { @@ -660,7 +660,7 @@ cs8900_rx_task (void *arg) sc = rtems_bsdnet_event_receive (CS8900_RX_OK_EVENT, RTEMS_WAIT | RTEMS_EVENT_ANY, - TOD_MILLISECONDS_TO_TICKS (250), + RTEMS_MILLISECONDS_TO_TICKS (250), &events); cs8900_rx_refill_queue (cs); @@ -749,7 +749,7 @@ cs8900_tx_task (void *arg) * Wait for the link to come up. */ - rtems_task_wake_after (TOD_MILLISECONDS_TO_TICKS (750)); + rtems_task_wake_after (RTEMS_MILLISECONDS_TO_TICKS (750)); /* * Loop processing the tx queue. @@ -815,7 +815,7 @@ cs8900_tx_task (void *arg) cs->eth_stats.tx_wait_for_rdy4tx++; sc = rtems_bsdnet_event_receive (CS8900_TX_WAIT_EVENT, RTEMS_WAIT | RTEMS_EVENT_ANY, - TOD_MILLISECONDS_TO_TICKS (750), + RTEMS_MILLISECONDS_TO_TICKS (750), &events); if (sc == RTEMS_TIMEOUT) { diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index d7c0b05dc4..b311080215 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -459,7 +459,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m) rtems_event_set events; rtems_bsdnet_event_receive (OPEN_ETH_TX_WAIT_EVENT, RTEMS_WAIT | RTEMS_EVENT_ANY, - TOD_MILLISECONDS_TO_TICKS(500), &events); + RTEMS_MILLISECONDS_TO_TICKS(500), &events); #endif } -- cgit v1.2.3