RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* libchip/network/greth.c: Eliminate unused type
	rtems_clock_time_value.
This commit is contained in:
Joel Sherrill
2009-12-17 20:35:40 +00:00
parent 3372dc8242
commit 57674ef62e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-12-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libchip/network/greth.c: Eliminate unused type
rtems_clock_time_value.
2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org> 2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/network/dec21140.c: Warning elimination * libchip/network/dec21140.c: Warning elimination

16
c/src/libchip/network/greth.c
View File

@@ -265,7 +265,7 @@ greth_initialize_hardware (struct greth_softc *sc)
int tmp1; int tmp1;
int tmp2; int tmp2;
unsigned int msecs; unsigned int msecs;
rtems_clock_time_value tstart, tnow; struct timeval tstart, tnow;
greth_regs *regs; greth_regs *regs;
@@ -305,7 +305,7 @@ greth_initialize_hardware (struct greth_softc *sc)
/*wait for auto negotiation to complete*/ /*wait for auto negotiation to complete*/
msecs = 0; msecs = 0;
sc->auto_neg = 1; 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 */ /* Not inited, set to epoch */
rtems_time_of_day time; rtems_time_of_day time;
time.year = 1988; time.year = 1988;
@@ -317,14 +317,14 @@ greth_initialize_hardware (struct greth_softc *sc)
time.ticks = 0; time.ticks = 0;
rtems_clock_set(&time); rtems_clock_set(&time);
tstart.seconds = 0; tstart.tv_sec = 0;
tstart.microseconds = 0; tstart.tv_usec = 0;
rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&tstart); rtems_clock_get_tod_timeval(&tstart);
} }
while (!(((phystatus = read_mii(phyaddr, 1)) >> 5) & 1)) { while (!(((phystatus = read_mii(phyaddr, 1)) >> 5) & 1)) {
if ( rtems_clock_get(RTEMS_CLOCK_GET_TIME_VALUE,&tnow) != RTEMS_SUCCESSFUL ) if ( rtems_clock_get_tod_timeval(&tnow) != RTEMS_SUCCESSFUL )
printk("rtems_clock_get failed\n\r"); printk("rtems_clock_get_tod_timeval failed\n\r");
msecs = (tnow.seconds-tstart.seconds)*1000+(tnow.microseconds-tstart.microseconds)/1000; msecs = (tnow.tv_sec-tstart.tv_sec)*1000+(tnow.tv_usec-tstart.tv_usec)/1000;
if ( msecs > GRETH_AUTONEGO_TIMEOUT_MS ){ if ( msecs > GRETH_AUTONEGO_TIMEOUT_MS ){
sc->auto_neg_time = msecs; sc->auto_neg_time = msecs;
printk("Auto negotiation timed out. Selecting default config\n\r"); printk("Auto negotiation timed out. Selecting default config\n\r");