Import jme 1.0.5-backport source

[jme.git] / jme.h

diff --git a/jme.h b/jme.h
index 7eb2d978349d50306eddba63298b4badc443726a..c7a4b19a6c8d58c1421b0b86a00dec88f34b1d58 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -25,7 +25,7 @@
 #define __JME_H_INCLUDED__
 
 #define DRV_NAME       "jme"
 #define __JME_H_INCLUDED__
 
 #define DRV_NAME       "jme"

-#define DRV_VERSION    "1.0.4"
+#define DRV_VERSION    "1.0.5"

 #define PFX            DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250   0x0250
 #define PFX            DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250   0x0250


@@ -247,7 +247,7 @@ enum jme_txdesc_flags_bits {
 };
 
 #define TXDESC_MSS_SHIFT       2
 };
 
 #define TXDESC_MSS_SHIFT       2

-enum jme_rxdescwb_flags_bits {
+enum jme_txwbdesc_flags_bits {

        TXWBFLAG_OWN    = 0x80,
        TXWBFLAG_INT    = 0x40,
        TXWBFLAG_TMOUT  = 0x20,
        TXWBFLAG_OWN    = 0x80,
        TXWBFLAG_INT    = 0x40,
        TXWBFLAG_TMOUT  = 0x20,


@@ -372,13 +372,6 @@ struct jme_buffer_info {
 /*
  * The structure holding buffer information and ring descriptors all together.
  */
 /*
  * The structure holding buffer information and ring descriptors all together.
  */

-#include <linux/version.h>
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
-#define MAX_RING_DESC_NR       512
-#else
-#define MAX_RING_DESC_NR       1024
-#endif
-

 struct jme_ring {
        void *alloc;            /* pointer to allocated memory */
        void *desc;             /* pointer to ring memory  */
 struct jme_ring {
        void *alloc;            /* pointer to allocated memory */
        void *desc;             /* pointer to ring memory  */


@@ -386,13 +379,14 @@ struct jme_ring {
        dma_addr_t dma;         /* phys address for ring dma */
 
        /* Buffer information corresponding to each descriptor */
        dma_addr_t dma;         /* phys address for ring dma */
 
        /* Buffer information corresponding to each descriptor */

-       struct jme_buffer_info bufinf[MAX_RING_DESC_NR];
+       struct jme_buffer_info *bufinf;

 
        int next_to_use;
        atomic_t next_to_clean;
        atomic_t nr_free;
 };
 
 
        int next_to_use;
        atomic_t next_to_clean;
        atomic_t nr_free;
 };
 

+#include <linux/version.h>

 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
 #define false 0
 #define true 0
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
 #define false 0
 #define true 0


@@ -426,7 +420,7 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
        return skb->h.th;
 }
 #else
        return skb->h.th;
 }
 #else

-#define NET_STAT(priv) priv->dev->stats
+#define NET_STAT(priv) (priv->dev->stats)

 #define NETDEV_GET_STATS(netdev, fun_ptr)
 #define DECLARE_NET_DEVICE_STATS
 #endif
 #define NETDEV_GET_STATS(netdev, fun_ptr)
 #define DECLARE_NET_DEVICE_STATS
 #endif


@@ -448,7 +442,7 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
        netif_rx_schedule_prep(priv->dev)
 #define JME_RX_SCHEDULE(priv) \
        __netif_rx_schedule(priv->dev);
        netif_rx_schedule_prep(priv->dev)
 #define JME_RX_SCHEDULE(priv) \
        __netif_rx_schedule(priv->dev);

-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28)
+#else

 #define DECLARE_NAPI_STRUCT struct napi_struct napi;
 #define NETIF_NAPI_SET(dev, napis, pollfn, q) \
        netif_napi_add(dev, napis, pollfn, q);
 #define DECLARE_NAPI_STRUCT struct napi_struct napi;
 #define NETIF_NAPI_SET(dev, napis, pollfn, q) \
        netif_napi_add(dev, napis, pollfn, q);


@@ -466,36 +460,15 @@ static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb)
        napi_schedule_prep(&priv->napi)
 #define JME_RX_SCHEDULE(priv) \
        __napi_schedule(&priv->napi);
        napi_schedule_prep(&priv->napi)
 #define JME_RX_SCHEDULE(priv) \
        __napi_schedule(&priv->napi);

-#else
-#define DECLARE_NAPI_STRUCT struct napi_struct napi;
-#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
-       netif_napi_add(dev, napis, pollfn, q);
-#define JME_NAPI_HOLDER(holder) struct napi_struct *holder
-#define JME_NAPI_WEIGHT(w) int w
-#define JME_NAPI_WEIGHT_VAL(w) w
-#define JME_NAPI_WEIGHT_SET(w, r)
-#define DECLARE_NETDEV struct net_device *netdev = jme->dev;
-#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis)
-#define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi);
-#define JME_NAPI_DISABLE(priv) \
-       if (!napi_disable_pending(&priv->napi)) \
-               napi_disable(&priv->napi);
-#define JME_RX_SCHEDULE_PREP(priv) \
-       netif_rx_schedule_prep(priv->dev, &priv->napi)
-#define JME_RX_SCHEDULE(priv) \
-       __netif_rx_schedule(priv->dev, &priv->napi);

 #endif
 
 /*
  * Jmac Adapter Private data
  */
 #endif
 
 /*
  * Jmac Adapter Private data
  */

-#define SHADOW_REG_NR 8

 struct jme_adapter {
        struct pci_dev          *pdev;
        struct net_device       *dev;
        void __iomem            *regs;
 struct jme_adapter {
        struct pci_dev          *pdev;
        struct net_device       *dev;
        void __iomem            *regs;

-       dma_addr_t              shadow_dma;
-       u32                     *shadow_regs;

        struct mii_if_info      mii_if;
        struct jme_ring         rxring[RX_RING_NR];
        struct jme_ring         txring[TX_RING_NR];
        struct mii_if_info      mii_if;
        struct jme_ring         rxring[RX_RING_NR];
        struct jme_ring         txring[TX_RING_NR];


@@ -551,10 +524,6 @@ jme_get_stats(struct net_device *netdev)
 }
 #endif
 
 }
 #endif
 

-enum shadow_reg_val {
-       SHADOW_IEVE = 0,
-};
-

 enum jme_flags_bits {
        JME_FLAG_MSI            = 1,
        JME_FLAG_SSET           = 2,
 enum jme_flags_bits {
        JME_FLAG_MSI            = 1,
        JME_FLAG_SSET           = 2,


@@ -1200,13 +1169,6 @@ enum jme_chipmode_shifts {
        CM_CHIPREV_SHIFT        = 8,
 };
 
        CM_CHIPREV_SHIFT        = 8,
 };
 

-/*
- * Shadow base address register bits
- */
-enum jme_shadow_base_address_bits {
-       SHBA_POSTEN     = 0x1,
-};
-

 /*
  * Aggressive Power Mode Control
  */
 /*
  * Aggressive Power Mode Control
  */