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

bsps: Fix warnings in greth

Browse Source
This commit is contained in:
Sebastian Huber
2019-05-27 07:35:07 +02:00
parent 10251b3a8f
commit 20bd667d8a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bsps/shared/grlib/net/greth.c
View File

@@ -520,7 +520,7 @@ greth_initialize_hardware (struct greth_softc *sc)
sc->fd = 0; sc->fd = 0;
sc->sp = 0; sc->sp = 0;
sc->auto_neg = 0; sc->auto_neg = 0;
_Timespec_Set_to_zero(&sc->auto_neg_time); timespecclear(&sc->auto_neg_time);
if ((phyctrl >> 12) & 1) { if ((phyctrl >> 12) & 1) {
/*wait for auto negotiation to complete*/ /*wait for auto negotiation to complete*/
sc->auto_neg = 1; sc->auto_neg = 1;
@@ -529,8 +529,8 @@ greth_initialize_hardware (struct greth_softc *sc)
while (!(((phystatus = read_mii(sc, phyaddr, 1)) >> 5) & 1)) { while (!(((phystatus = read_mii(sc, phyaddr, 1)) >> 5) & 1)) {
if (rtems_clock_get_uptime(&tnow) != RTEMS_SUCCESSFUL) if (rtems_clock_get_uptime(&tnow) != RTEMS_SUCCESSFUL)
printk("rtems_clock_get_uptime failed\n"); printk("rtems_clock_get_uptime failed\n");
_Timespec_Subtract(&tstart, &tnow, &sc->auto_neg_time); timespecsub(&tnow, &tstart, &sc->auto_neg_time);
if (_Timespec_Greater_than(&sc->auto_neg_time, &greth_tan)) { if (timespeccmp(&sc->auto_neg_time, &greth_tan, >)) {
sc->auto_neg = -1; /* Failed */ sc->auto_neg = -1; /* Failed */
tmp1 = read_mii(sc, phyaddr, 0); tmp1 = read_mii(sc, phyaddr, 0);
sc->gb = ((phyctrl >> 6) & 1) && !((phyctrl >> 13) & 1); sc->gb = ((phyctrl >> 6) & 1) && !((phyctrl >> 13) & 1);

8
bsps/shared/net/greth2.c
View File

@@ -260,7 +260,7 @@ static void print_init_info(struct greth_softc *sc)
} }
#ifdef GRETH_AUTONEGO_PRINT_TIME #ifdef GRETH_AUTONEGO_PRINT_TIME
if ( sc->auto_neg ) { if ( sc->auto_neg ) {
printf("Autonegotiation Time: %ldms\n", sc->auto_neg_time.tv_sec*1000 + printf("Autonegotiation Time: %lldms\n", sc->auto_neg_time.tv_sec*1000 +
sc->auto_neg_time.tv_nsec/1000000); sc->auto_neg_time.tv_nsec/1000000);
} }
#endif #endif
@@ -326,7 +326,7 @@ greth_initialize_hardware (struct greth_softc *sc)
sc->fd = 0; sc->fd = 0;
sc->sp = 0; sc->sp = 0;
sc->auto_neg = 0; sc->auto_neg = 0;
_Timespec_Set_to_zero(&sc->auto_neg_time); timespecclear(&sc->auto_neg_time);
if ((phyctrl >> 12) & 1) { if ((phyctrl >> 12) & 1) {
/*wait for auto negotiation to complete*/ /*wait for auto negotiation to complete*/
sc->auto_neg = 1; sc->auto_neg = 1;
@@ -335,8 +335,8 @@ greth_initialize_hardware (struct greth_softc *sc)
while (!(((phystatus = read_mii(phyaddr, 1)) >> 5) & 1)) { while (!(((phystatus = read_mii(phyaddr, 1)) >> 5) & 1)) {
if (rtems_clock_get_uptime(&tnow) != RTEMS_SUCCESSFUL) if (rtems_clock_get_uptime(&tnow) != RTEMS_SUCCESSFUL)
printk("rtems_clock_get_uptime failed\n"); printk("rtems_clock_get_uptime failed\n");
_Timespec_Subtract(&tstart, &tnow, &sc->auto_neg_time); timespecsub(&tnow, &tstart, &sc->auto_neg_time);
if (_Timespec_Greater_than(&sc->auto_neg_time, &greth_tan)) { if (timespeccmp(&sc->auto_neg_time, &greth_tan, >)) {
sc->auto_neg = -1; /* Failed */ sc->auto_neg = -1; /* Failed */
tmp1 = read_mii(phyaddr, 0); tmp1 = read_mii(phyaddr, 0);
sc->gb = ((phyctrl >> 6) & 1) && !((phyctrl >> 13) & 1); sc->gb = ((phyctrl >> 6) & 1) && !((phyctrl >> 13) & 1);