Merge branch 'master' of /home/wd/git/u-boot/lwmon5

[oweals/u-boot.git] / drivers / net / ax88796.h

diff --git a/drivers/net/ax88796.h b/drivers/net/ax88796.h
index 069ae80fa8c0355b72308b8ee71bdd5ebf915fae..0e6f8a201caebd6ff2b5196ebc96b5b070c66c0c 100644 (file)
--- a/drivers/net/ax88796.h
+++ b/drivers/net/ax88796.h
@@ -23,24 +23,24 @@
 #ifndef __DRIVERS_AX88796L_H__
 #define __DRIVERS_AX88796L_H__
 
-#define DP_DATA     (0x10 << 1)
-#define START_PG    0x40    /* First page of TX buffer */
-#define START_PG2   0x48
-#define STOP_PG     0x80    /* Last page +1 of RX ring */
-#define TX_PAGES    12
-#define RX_START    (START_PG+TX_PAGES)
-#define RX_END      STOP_PG
+#define DP_DATA                (0x10 << 1)
+#define START_PG       0x40    /* First page of TX buffer */
+#define START_PG2      0x48
+#define STOP_PG                0x80    /* Last page +1 of RX ring */
+#define TX_PAGES       12
+#define RX_START       (START_PG+TX_PAGES)
+#define RX_END         STOP_PG
 
 #define AX88796L_BASE_ADDRESS  CONFIG_DRIVER_NE2000_BASE
-#define AX88796L_BYTE_ACCESS    0x00001000
-#define AX88796L_OFFSET         0x00000400
-#define AX88796L_ADDRESS_BYTE   AX88796L_BASE_ADDRESS + \
+#define AX88796L_BYTE_ACCESS   0x00001000
+#define AX88796L_OFFSET                0x00000400
+#define AX88796L_ADDRESS_BYTE  AX88796L_BASE_ADDRESS + \
                AX88796L_BYTE_ACCESS + AX88796L_OFFSET
-#define AX88796L_REG_MEMR       AX88796L_ADDRESS_BYTE + (0x14<<1)
-#define AX88796L_REG_CR         AX88796L_ADDRESS_BYTE + (0x00<<1)
+#define AX88796L_REG_MEMR      AX88796L_ADDRESS_BYTE + (0x14<<1)
+#define AX88796L_REG_CR                AX88796L_ADDRESS_BYTE + (0x00<<1)
 
 #define AX88796L_CR            (*(vu_short *)(AX88796L_REG_CR))
-#define AX88796L_MEMR  (*(vu_short *)(AX88796L_REG_MEMR))
+#define AX88796L_MEMR          (*(vu_short *)(AX88796L_REG_MEMR))
 
 #define EECS_HIGH              (AX88796L_MEMR |= 0x10)
 #define EECS_LOW               (AX88796L_MEMR &= 0xef)
@@ -53,7 +53,7 @@
 #define PAGE0_SET              (AX88796L_CR &= 0x3f)
 #define PAGE1_SET              (AX88796L_CR = (AX88796L_CR & 0x3f) | 0x40)
 
-#define BIT_DUMMY              0
+#define BIT_DUMMY      0
 #define MAC_EEP_READ   1
 #define MAC_EEP_WRITE  2
 #define MAC_EEP_ERACE  3
@@ -62,20 +62,20 @@
 
 /* R7780MP Specific code */
 #if defined(CONFIG_R7780MP)
-#define ISA_OFFSET  0x1400
-#define DP_IN(_b_, _o_, _d_)  (_d_) = \
+#define ISA_OFFSET     0x1400
+#define DP_IN(_b_, _o_, _d_)   (_d_) = \
        *( (vu_short *) ((_b_) + ((_o_) * 2) + ISA_OFFSET))
 #define DP_OUT(_b_, _o_, _d_) \
        *((vu_short *)((_b_) + ((_o_) * 2) + ISA_OFFSET)) = (_d_)
-#define DP_IN_DATA(_b_, _d_)  (_d_) = *( (vu_short *) ((_b_) + ISA_OFFSET))
-#define DP_OUT_DATA(_b_, _d_) *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
+#define DP_IN_DATA(_b_, _d_)   (_d_) = *( (vu_short *) ((_b_) + ISA_OFFSET))
+#define DP_OUT_DATA(_b_, _d_)  *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
 #else
 /* Please change for your target boards */
-#define ISA_OFFSET  0x0000
-#define DP_IN(_b_, _o_, _d_)  (_d_) = *( (vu_short *)((_b_)+(_o_ )+ISA_OFFSET))
-#define DP_OUT(_b_, _o_, _d_) *((vu_short *)((_b_)+(_o_)+ISA_OFFSET)) = (_d_)
-#define DP_IN_DATA(_b_, _d_)  (_d_) = *( (vu_short *) ((_b_)+ISA_OFFSET))
-#define DP_OUT_DATA(_b_, _d_) *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
+#define ISA_OFFSET     0x0000
+#define DP_IN(_b_, _o_, _d_)   (_d_) = *( (vu_short *)((_b_)+(_o_ )+ISA_OFFSET))
+#define DP_OUT(_b_, _o_, _d_)  *((vu_short *)((_b_)+(_o_)+ISA_OFFSET)) = (_d_)
+#define DP_IN_DATA(_b_, _d_)   (_d_) = *( (vu_short *) ((_b_)+ISA_OFFSET))
+#define DP_OUT_DATA(_b_, _d_)  *( (vu_short *) ((_b_)+ISA_OFFSET)) = (_d_)
 #endif