Date: Fri, 6 Jan 2006 20:44:27 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 89295 for review Message-ID: <200601062044.k06KiR6f042547@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=89295 Change 89295 by imp@imp_Speedy on 2006/01/06 20:43:55 Minor tidy. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 edit .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 (text+ko) ==== @@ -161,7 +161,7 @@ static int at91rm92_probe(device_t dev) { - device_set_desc(dev, "AT91 CPU"); + device_set_desc(dev, "AT91RM9200 device bus"); return (0); } ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 (text+ko) ==== @@ -594,7 +594,7 @@ WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; - val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE; + val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE_MASK; return (val); } ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 (text+ko) ==== @@ -147,10 +147,10 @@ #define ETH_MAN_WRITE (1U << 28) #define ETH_MAN_PHYA_BIT 23 #define ETH_MAN_REGA_BIT 18 -#define ETH_MAN_VALUE 0xffffU +#define ETH_MAN_VALUE_MASK 0xffffU #define ETH_MAN_REG_WR(phy, reg, val) \ (ETH_MAN_BITS | ETH_MAN_WRITE | ((phy) << ETH_MAN_PHYA_BIT) | \ - ((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE)) + ((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE_MASK)) #define ETH_MAN_REG_RD(phy, reg) \ (ETH_MAN_BITS | ETH_MAN_READ | ((phy) << ETH_MAN_PHYA_BIT) | \ ((reg) << ETH_MAN_REGA_BIT))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601062044.k06KiR6f042547>