Put the init flag in the structure

[openwrt.git] / target / linux / adm5120-2.6 / files / drivers / net / adm5120sw.h

diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
index 09ef9fe..4d32f91 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
@@ -12,16 +12,18 @@
 
 #define SW_BASE        KSEG1ADDR(0x12000000)
 #define SW_DEVS        6
 
 #define SW_BASE        KSEG1ADDR(0x12000000)
 #define SW_DEVS        6

-#define SW_IRQ         9

 
 

-#define ETH_TX_TIMEOUT HZ/4
+#define ETH_TX_TIMEOUT         HZ*400

 #define ETH_FCS 4;
 
 #define ADM5120_CODE           0x00            /* CPU description */
 #define ADM5120_CODE_PQFP      0x20000000      /* package type */
 #define ETH_FCS 4;
 
 #define ADM5120_CODE           0x00            /* CPU description */
 #define ADM5120_CODE_PQFP      0x20000000      /* package type */

+#define ADM5120_SW_CONF                0x20            /* Switch configuration register */
+#define ADM5120_SW_CONF_BPM    0x00300000      /* Mask for backpressure mode */

 #define ADM5120_CPUP_CONF      0x24            /* CPU port config */
 #define ADM5120_DISCCPUPORT    0x00000001      /* disable cpu port */
 #define ADM5120_CRC_PADDING    0x00000002      /* software crc */
 #define ADM5120_CPUP_CONF      0x24            /* CPU port config */
 #define ADM5120_DISCCPUPORT    0x00000001      /* disable cpu port */
 #define ADM5120_CRC_PADDING    0x00000002      /* software crc */

+#define ADM5120_BTM            0x00000004      /* bridge test mode */

 #define ADM5120_DISUNSHIFT     9
 #define ADM5120_DISUNALL       0x00007e00      /* disable unknown from all */
 #define ADM5120_DISMCSHIFT     16
 #define ADM5120_DISUNSHIFT     9
 #define ADM5120_DISUNALL       0x00007e00      /* disable unknown from all */
 #define ADM5120_DISMCSHIFT     16


@@ -29,6 +31,7 @@
 #define ADM5120_PORT_CONF0     0x28
 #define ADM5120_ENMC           0x00003f00      /* Enable MC routing (ex cpu) */
 #define ADM5120_ENBP           0x003f0000      /* Enable Back Pressure */
 #define ADM5120_PORT_CONF0     0x28
 #define ADM5120_ENMC           0x00003f00      /* Enable MC routing (ex cpu) */
 #define ADM5120_ENBP           0x003f0000      /* Enable Back Pressure */

+#define ADM5120_PORTDISALL             0x0000003F

 #define ADM5120_VLAN_GI                0x40            /* VLAN settings */
 #define ADM5120_VLAN_GII       0x44
 #define ADM5120_SEND_TRIG      0x48
 #define ADM5120_VLAN_GI                0x40            /* VLAN settings */
 #define ADM5120_VLAN_GII       0x44
 #define ADM5120_SEND_TRIG      0x48


@@ -39,6 +42,8 @@
 #define ADM5120_MAC_WRITE_DONE 0x00000002
 #define ADM5120_VLAN_EN                0x00000040
 #define ADM5120_MAC_WT1                0x5c
 #define ADM5120_MAC_WRITE_DONE 0x00000002
 #define ADM5120_VLAN_EN                0x00000040
 #define ADM5120_MAC_WT1                0x5c

+#define ADM5120_BW_CTL0                0x60            /* Bandwidth control 0 */
+#define ADM5120_BW_CTL1                0x64            /* Bandwidth control 1 */

 #define ADM5120_PHY_CNTL2      0x7c
 #define ADM5120_AUTONEG                0x0000001f      /* Auto negotiate */
 #define ADM5120_NORMAL         0x01f00000      /* PHY normal mode */
 #define ADM5120_PHY_CNTL2      0x7c
 #define ADM5120_AUTONEG                0x0000001f      /* Auto negotiate */
 #define ADM5120_NORMAL         0x01f00000      /* PHY normal mode */


@@ -69,7 +74,7 @@ struct adm5120_dma {
        u32 status;
 } __attribute__ ((packed));
 
        u32 status;
 } __attribute__ ((packed));
 

-#define        ADM5120_DMA_MASK        0x00ffffff
+#define        ADM5120_DMA_MASK        0x01ffffff

 #define ADM5120_DMA_OWN                0x80000000      /* buffer owner */
 #define ADM5120_DMA_RINGEND    0x10000000      /* Last in DMA ring */
 
 #define ADM5120_DMA_OWN                0x80000000      /* buffer owner */
 #define ADM5120_DMA_RINGEND    0x10000000      /* Last in DMA ring */
 


@@ -80,10 +85,10 @@ struct adm5120_dma {
 #define ADM5120_DMA_LENSHIFT   16
 #define ADM5120_DMA_FCSERR     0x00000008
 
 #define ADM5120_DMA_LENSHIFT   16
 #define ADM5120_DMA_FCSERR     0x00000008
 

-#define ADM5120_DMA_TXH                16
+#define ADM5120_DMA_TXH                2

 #define ADM5120_DMA_TXL                64
 #define ADM5120_DMA_TXL                64

-#define ADM5120_DMA_RXH                16
-#define ADM5120_DMA_RXL                8
+#define ADM5120_DMA_RXH                2
+#define ADM5120_DMA_RXL                64

 
 #define ADM5120_DMA_RXSIZE     1550
 #define ADM5120_DMA_EXTRA      20
 
 #define ADM5120_DMA_RXSIZE     1550
 #define ADM5120_DMA_EXTRA      20


@@ -96,6 +101,8 @@ struct adm5120_sw {
 #define SIOCSMATRIX    SIOCDEVPRIVATE
 #define SIOCGMATRIX    SIOCDEVPRIVATE+1
 #define SIOCGADMINFO   SIOCDEVPRIVATE+2
 #define SIOCSMATRIX    SIOCDEVPRIVATE
 #define SIOCGMATRIX    SIOCDEVPRIVATE+1
 #define SIOCGADMINFO   SIOCDEVPRIVATE+2

+#define SIOCGETBW      SIOCDEVPRIVATE+3
+#define SIOCSETBW      SIOCDEVPRIVATE+4

 
 struct adm5120_sw_info {
        u16     magic;
 
 struct adm5120_sw_info {
        u16     magic;