From 57674ef62e38b6c5566ea4c47fcd616aadb3ee5b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 17 Dec 2009 20:35:40 +0000 Subject: 2009-12-17 Joel Sherrill * libchip/network/greth.c: Eliminate unused type rtems_clock_time_value. --- c/src/ChangeLog | 5 +++++ c/src/libchip/network/greth.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index c0438e7208..2c12b55411 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2009-12-17 Joel Sherrill + + * libchip/network/greth.c: Eliminate unused type + rtems_clock_time_value. + 2009-12-11 Ralf Corsépius * libchip/network/dec21140.c: Warning elimination diff --git a/c/src/libchip/network/greth.c b/c/src/libchip/network/greth.c index de0a9988f8..d33cb07e85 100644 --- a/c/src/libchip/network/greth.c +++ b/c/src/libchip/network/greth.c @@ -265,7 +265,7 @@ greth_initialize_hardware (struct greth_softc *sc) int tmp1; int tmp2; unsigned int msecs; - rtems_clock_time_value tstart, tnow; + struct timeval tstart, tnow; greth_regs *regs; @@ -305,7 +305,7 @@ greth_initialize_hardware (struct greth_softc *sc) /*wait for auto negotiation to complete*/ msecs = 0; sc->auto_neg = 1; - if ( rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&tstart) == RTEMS_NOT_DEFINED){ + if ( rtems_clock_get_tod_timeval(&tstart) == RTEMS_NOT_DEFINED){ /* Not inited, set to epoch */ rtems_time_of_day time; time.year = 1988; @@ -317,14 +317,14 @@ greth_initialize_hardware (struct greth_softc *sc) time.ticks = 0; rtems_clock_set(&time); - tstart.seconds = 0; - tstart.microseconds = 0; - rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&tstart); + tstart.tv_sec = 0; + tstart.tv_usec = 0; + rtems_clock_get_tod_timeval(&tstart); } while (!(((phystatus = read_mii(phyaddr, 1)) >> 5) & 1)) { - if ( rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&tnow) != RTEMS_SUCCESSFUL ) - printk("rtems_clock_get failed\n\r"); - msecs = (tnow.seconds-tstart.seconds)*1000+(tnow.microseconds-tstart.microseconds)/1000; + if ( rtems_clock_get_tod_timeval(&tnow) != RTEMS_SUCCESSFUL ) + printk("rtems_clock_get_tod_timeval failed\n\r"); + msecs = (tnow.tv_sec-tstart.tv_sec)*1000+(tnow.tv_usec-tstart.tv_usec)/1000; if ( msecs > GRETH_AUTONEGO_TIMEOUT_MS ){ sc->auto_neg_time = msecs; printk("Auto negotiation timed out. Selecting default config\n\r"); -- cgit v1.2.3