subject:"\[U\-Boot\] \[PATCH\] macb\: make checkpatch clean"

Re: [U-Boot] [PATCH] macb: make checkpatch clean

2014-06-12 Thread Andreas Bießmann

Hi Tom,

On 06/11/2014 05:26 PM, Tom Rini wrote:
 On Tue, May 27, 2014 at 04:07:30PM +0800, Josh Wu wrote:
 
 Hi, Dear Andreas

 On 5/27/2014 4:55 AM, Andreas Bießmann wrote:
 This also renames the CONFIG_SYS_MACB_xx defines. They are used just local 
 and
 therefore don't need the CONFIG_SYS_ prefix.

 Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com

 This patch looks good to me.
 Reviewed-by: Josh Wu josh...@atmel.com
 
 For clarity, I'm fine with this coming via u-boot-atmel..

me too, I just haven't had time to process these. Will do until this
weekend.

Regards,

Andreas Bießmann

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] macb: make checkpatch clean

2014-06-11 Thread Tom Rini

On Tue, May 27, 2014 at 04:07:30PM +0800, Josh Wu wrote:

 Hi, Dear Andreas
 
 On 5/27/2014 4:55 AM, Andreas Bießmann wrote:
 This also renames the CONFIG_SYS_MACB_xx defines. They are used just local 
 and
 therefore don't need the CONFIG_SYS_ prefix.
 
 Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com
 
 This patch looks good to me.
 Reviewed-by: Josh Wu josh...@atmel.com

For clarity, I'm fine with this coming via u-boot-atmel..

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH] macb: make checkpatch clean

2014-05-27 Thread Josh Wu


Hi, Dear Andreas

On 5/27/2014 4:55 AM, Andreas Bießmann wrote:

This also renames the CONFIG_SYS_MACB_xx defines. They are used just local and
therefore don't need the CONFIG_SYS_ prefix.

Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com


This patch looks good to me.
Reviewed-by: Josh Wu josh...@atmel.com

Best Regards,
Josh Wu


---

  drivers/net/macb.c |   56 +++-
  1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 781a272..750331d 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -40,11 +40,11 @@
  
  #include macb.h
  
-#define CONFIG_SYS_MACB_RX_BUFFER_SIZE		4096

-#define CONFIG_SYS_MACB_RX_RING_SIZE   (CONFIG_SYS_MACB_RX_BUFFER_SIZE 
/ 128)
-#define CONFIG_SYS_MACB_TX_RING_SIZE   16
-#define CONFIG_SYS_MACB_TX_TIMEOUT 1000
-#define CONFIG_SYS_MACB_AUTONEG_TIMEOUT500
+#define MACB_RX_BUFFER_SIZE4096
+#define MACB_RX_RING_SIZE  (MACB_RX_BUFFER_SIZE / 128)
+#define MACB_TX_RING_SIZE  16
+#define MACB_TX_TIMEOUT1000
+#define MACB_AUTONEG_TIMEOUT   500
  
  struct macb_dma_desc {

u32 addr;
@@ -170,7 +170,7 @@ int macb_miiphy_read(const char *devname, u8 phy_adr, u8 
reg, u16 *value)
struct eth_device *dev = eth_get_dev_by_name(devname);
struct macb_device *macb = to_macb(dev);
  
-	if ( macb-phy_addr != phy_adr )

+   if (macb-phy_addr != phy_adr)
return -1;
  
  	arch_get_mdio_control(devname);

@@ -184,7 +184,7 @@ int macb_miiphy_write(const char *devname, u8 phy_adr, u8 
reg, u16 value)
struct eth_device *dev = eth_get_dev_by_name(devname);
struct macb_device *macb = to_macb(dev);
  
-	if ( macb-phy_addr != phy_adr )

+   if (macb-phy_addr != phy_adr)
return -1;
  
  	arch_get_mdio_control(devname);

@@ -208,11 +208,12 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
  
  	ctrl = length  TXBUF_FRMLEN_MASK;

ctrl |= TXBUF_FRAME_END;
-   if (tx_head == (CONFIG_SYS_MACB_TX_RING_SIZE - 1)) {
+   if (tx_head == (MACB_TX_RING_SIZE - 1)) {
ctrl |= TXBUF_WRAP;
macb-tx_head = 0;
-   } else
+   } else {
macb-tx_head++;
+   }
  
  	macb-tx_ring[tx_head].ctrl = ctrl;

macb-tx_ring[tx_head].addr = paddr;
@@ -223,7 +224,7 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
 * I guess this is necessary because the networking core may
 * re-use the transmit buffer as soon as we return...
 */
-   for (i = 0; i = CONFIG_SYS_MACB_TX_TIMEOUT; i++) {
+   for (i = 0; i = MACB_TX_TIMEOUT; i++) {
barrier();
ctrl = macb-tx_ring[tx_head].ctrl;
if (ctrl  TXBUF_USED)
@@ -233,7 +234,7 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
  
  	dma_unmap_single(packet, length, paddr);
  
-	if (i = CONFIG_SYS_MACB_TX_TIMEOUT) {

+   if (i = MACB_TX_TIMEOUT) {
if (ctrl  TXBUF_UNDERRUN)
printf(%s: TX underrun\n, netdev-name);
if (ctrl  TXBUF_EXHAUSTED)
@@ -256,7 +257,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,
while (i  new_tail) {
macb-rx_ring[i].addr = ~RXADDR_USED;
i++;
-   if (i  CONFIG_SYS_MACB_RX_RING_SIZE)
+   if (i  MACB_RX_RING_SIZE)
i = 0;
}
  
@@ -295,7 +296,7 @@ static int macb_recv(struct eth_device *netdev)

if (wrapped) {
unsigned int headlen, taillen;
  
-headlen = 128 * (CONFIG_SYS_MACB_RX_RING_SIZE

+   headlen = 128 * (MACB_RX_RING_SIZE
 - macb-rx_tail);
taillen = length - headlen;
memcpy((void *)NetRxPackets[0],
@@ -306,11 +307,11 @@ static int macb_recv(struct eth_device *netdev)
}
  
  			NetReceive(buffer, length);

-   if (++rx_tail = CONFIG_SYS_MACB_RX_RING_SIZE)
+   if (++rx_tail = MACB_RX_RING_SIZE)
rx_tail = 0;
reclaim_rx_buffers(macb, rx_tail);
} else {
-   if (++rx_tail = CONFIG_SYS_MACB_RX_RING_SIZE) {
+   if (++rx_tail = MACB_RX_RING_SIZE) {
wrapped = 1;
rx_tail = 0;
}
@@ -333,7 +334,7 @@ static void macb_phy_reset(struct macb_device *macb)
macb_mdio_write(macb, MII_BMCR, (BMCR_ANENABLE
 | BMCR_ANRESTART));
  
-	for (i = 0; i  CONFIG_SYS_MACB_AUTONEG_TIMEOUT / 100; i++) {

+

[U-Boot] [PATCH] macb: make checkpatch clean

2014-05-26 Thread Andreas Bießmann

This also renames the CONFIG_SYS_MACB_xx defines. They are used just local and
therefore don't need the CONFIG_SYS_ prefix.

Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com
---

 drivers/net/macb.c |   56 +++-
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 781a272..750331d 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -40,11 +40,11 @@
 
 #include macb.h
 
-#define CONFIG_SYS_MACB_RX_BUFFER_SIZE 4096
-#define CONFIG_SYS_MACB_RX_RING_SIZE   (CONFIG_SYS_MACB_RX_BUFFER_SIZE 
/ 128)
-#define CONFIG_SYS_MACB_TX_RING_SIZE   16
-#define CONFIG_SYS_MACB_TX_TIMEOUT 1000
-#define CONFIG_SYS_MACB_AUTONEG_TIMEOUT500
+#define MACB_RX_BUFFER_SIZE4096
+#define MACB_RX_RING_SIZE  (MACB_RX_BUFFER_SIZE / 128)
+#define MACB_TX_RING_SIZE  16
+#define MACB_TX_TIMEOUT1000
+#define MACB_AUTONEG_TIMEOUT   500
 
 struct macb_dma_desc {
u32 addr;
@@ -170,7 +170,7 @@ int macb_miiphy_read(const char *devname, u8 phy_adr, u8 
reg, u16 *value)
struct eth_device *dev = eth_get_dev_by_name(devname);
struct macb_device *macb = to_macb(dev);
 
-   if ( macb-phy_addr != phy_adr )
+   if (macb-phy_addr != phy_adr)
return -1;
 
arch_get_mdio_control(devname);
@@ -184,7 +184,7 @@ int macb_miiphy_write(const char *devname, u8 phy_adr, u8 
reg, u16 value)
struct eth_device *dev = eth_get_dev_by_name(devname);
struct macb_device *macb = to_macb(dev);
 
-   if ( macb-phy_addr != phy_adr )
+   if (macb-phy_addr != phy_adr)
return -1;
 
arch_get_mdio_control(devname);
@@ -208,11 +208,12 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
 
ctrl = length  TXBUF_FRMLEN_MASK;
ctrl |= TXBUF_FRAME_END;
-   if (tx_head == (CONFIG_SYS_MACB_TX_RING_SIZE - 1)) {
+   if (tx_head == (MACB_TX_RING_SIZE - 1)) {
ctrl |= TXBUF_WRAP;
macb-tx_head = 0;
-   } else
+   } else {
macb-tx_head++;
+   }
 
macb-tx_ring[tx_head].ctrl = ctrl;
macb-tx_ring[tx_head].addr = paddr;
@@ -223,7 +224,7 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
 * I guess this is necessary because the networking core may
 * re-use the transmit buffer as soon as we return...
 */
-   for (i = 0; i = CONFIG_SYS_MACB_TX_TIMEOUT; i++) {
+   for (i = 0; i = MACB_TX_TIMEOUT; i++) {
barrier();
ctrl = macb-tx_ring[tx_head].ctrl;
if (ctrl  TXBUF_USED)
@@ -233,7 +234,7 @@ static int macb_send(struct eth_device *netdev, void 
*packet, int length)
 
dma_unmap_single(packet, length, paddr);
 
-   if (i = CONFIG_SYS_MACB_TX_TIMEOUT) {
+   if (i = MACB_TX_TIMEOUT) {
if (ctrl  TXBUF_UNDERRUN)
printf(%s: TX underrun\n, netdev-name);
if (ctrl  TXBUF_EXHAUSTED)
@@ -256,7 +257,7 @@ static void reclaim_rx_buffers(struct macb_device *macb,
while (i  new_tail) {
macb-rx_ring[i].addr = ~RXADDR_USED;
i++;
-   if (i  CONFIG_SYS_MACB_RX_RING_SIZE)
+   if (i  MACB_RX_RING_SIZE)
i = 0;
}
 
@@ -295,7 +296,7 @@ static int macb_recv(struct eth_device *netdev)
if (wrapped) {
unsigned int headlen, taillen;
 
-   headlen = 128 * (CONFIG_SYS_MACB_RX_RING_SIZE
+   headlen = 128 * (MACB_RX_RING_SIZE
 - macb-rx_tail);
taillen = length - headlen;
memcpy((void *)NetRxPackets[0],
@@ -306,11 +307,11 @@ static int macb_recv(struct eth_device *netdev)
}
 
NetReceive(buffer, length);
-   if (++rx_tail = CONFIG_SYS_MACB_RX_RING_SIZE)
+   if (++rx_tail = MACB_RX_RING_SIZE)
rx_tail = 0;
reclaim_rx_buffers(macb, rx_tail);
} else {
-   if (++rx_tail = CONFIG_SYS_MACB_RX_RING_SIZE) {
+   if (++rx_tail = MACB_RX_RING_SIZE) {
wrapped = 1;
rx_tail = 0;
}
@@ -333,7 +334,7 @@ static void macb_phy_reset(struct macb_device *macb)
macb_mdio_write(macb, MII_BMCR, (BMCR_ANENABLE
 | BMCR_ANRESTART));
 
-   for (i = 0; i  CONFIG_SYS_MACB_AUTONEG_TIMEOUT / 100; i++) {
+   for (i = 0; i  MACB_AUTONEG_TIMEOUT / 100; i++) {
status =

Re: [U-Boot] [PATCH] macb: make checkpatch clean

Re: [U-Boot] [PATCH] macb: make checkpatch clean

Re: [U-Boot] [PATCH] macb: make checkpatch clean

[U-Boot] [PATCH] macb: make checkpatch clean

4 matches

Site Navigation

Mail list logo

Footer information