Import jme 0.9e source

[jme.git] / jme.h

diff --git a/jme.h b/jme.h
index 57a270bb57e1c8d86793833effd1b2311c8ac7fd..043fb17a8bc50ba5dced2136ff23aad21ae6d8c8 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -24,9 +24,12 @@
 #include <linux/version.h>
 
 #define DRV_NAME       "jme"
-#define DRV_VERSION    "0.9c"
+#define DRV_VERSION    "0.9e"
 #define PFX DRV_NAME   ": "
 
+#define JME_GE_DEVICE 0x250
+#define JME_FE_DEVICE 0x260
+
 #ifdef DEBUG
 #define dprintk(devname, fmt, args...) \
         printk(KERN_DEBUG "%s: " fmt, devname, ## args)
@@ -121,7 +124,7 @@ struct dynpcc_info {
 #define PCC_P3_THRESHOLD 2*1024*1024
 #define PCC_P2_THRESHOLD 800
 #define PCC_INTR_THRESHOLD 800
-#define PCC_TX_TO 333
+#define PCC_TX_TO 1000
 #define PCC_TX_CNT 8
 
 /*
@@ -774,7 +777,7 @@ __always_inline __u32 smi_phy_addr(int x)
 {
         return (((x) << SMI_PHY_ADDR_SHIFT) & SMI_PHY_ADDR_MASK);
 }
-#define JME_PHY_TIMEOUT 1000 /* 1000 msec */
+#define JME_PHY_TIMEOUT 100 /* 100 msec */
 #define JME_PHY_REG_NR 32
 
 /*
@@ -918,7 +921,7 @@ enum jme_gpreg0_vals {
        GPREG0_PHYADDR_1        = 0x00000001,
 
        GPREG0_DEFAULT          = GPREG0_PCIRLMT_4 |
-                                 GPREG0_PCCNOMUTCLR |
+//                               GPREG0_PCCNOMUTCLR |
                                  GPREG0_PCCTMR_1us |
                                  GPREG0_PHYADDR_1,
 };
@@ -1056,7 +1059,7 @@ enum jme_phy_reg17_vals {
        PREG17_SPEED_100M       = 0x4000,
        PREG17_SPEED_1000M      = 0x8000,
 };
-#define BMCR_ANCOMP               0x0020
+#define BMSR_ANCOMP               0x0020
 
 /*
  * Function prototypes for ethtool