patch-2.4.9 linux/drivers/ieee1394/pcilynx.h

• Lines: 158
• Date: Sun Aug 12 12:39:02 2001
• Orig file: v2.4.8/linux/drivers/ieee1394/pcilynx.h
• Orig date: Sun Feb 4 21:34:18 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/ieee1394/pcilynx.h linux/drivers/ieee1394/pcilynx.h
@@ -40,7 +40,7 @@
                 u32 product;
         } phyic;
 
-        enum { clear, have_intr, have_aux_buf, have_pcl_mem,
+        enum { clear, have_host_struct,  have_intr, have_aux_buf, have_pcl_mem,
                have_1394_buffers, have_iomappings } state;
         
         /* remapped memory spaces */
@@ -106,7 +106,7 @@
                 pcl_t pcl_start;
                 int chan_count;
                 int next, last, used, running;
-                struct tq_struct tq;
+                struct tasklet_struct tq;
                 spinlock_t lock;
         } iso_rcv;
 };
@@ -125,23 +125,23 @@
 /*
  * Register read and write helper functions.
  */
-inline static void reg_write(const struct ti_lynx *lynx, int offset, u32 data)
+static inline void reg_write(const struct ti_lynx *lynx, int offset, u32 data)
 {
         writel(data, lynx->registers + offset);
 }
 
-inline static u32 reg_read(const struct ti_lynx *lynx, int offset)
+static inline u32 reg_read(const struct ti_lynx *lynx, int offset)
 {
         return readl(lynx->registers + offset);
 }
 
-inline static void reg_set_bits(const struct ti_lynx *lynx, int offset,
+static inline void reg_set_bits(const struct ti_lynx *lynx, int offset,
                                 u32 mask)
 {
         reg_write(lynx, offset, (reg_read(lynx, offset) | mask));
 }
 
-inline static void reg_clear_bits(const struct ti_lynx *lynx, int offset,
+static inline void reg_clear_bits(const struct ti_lynx *lynx, int offset,
                                   u32 mask)
 {
         reg_write(lynx, offset, (reg_read(lynx, offset) & ~mask));
@@ -370,7 +370,7 @@
 
 #ifdef CONFIG_IEEE1394_PCILYNX_LOCALRAM
 
-inline static void put_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void put_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                            const struct ti_pcl *pcl)
 {
         int i;
@@ -378,11 +378,11 @@
         u32 *out = (u32 *)(lynx->local_ram + pclid * sizeof(struct ti_pcl));
 
         for (i = 0; i < 32; i++, out++, in++) {
-                writel(cpu_to_le32(*in), out);
+                writel(*in, out);
         }
 }
 
-inline static void get_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void get_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                            struct ti_pcl *pcl)
 {
         int i;
@@ -390,25 +390,25 @@
         u32 *in = (u32 *)(lynx->local_ram + pclid * sizeof(struct ti_pcl));
 
         for (i = 0; i < 32; i++, out++, in++) {
-                *out = le32_to_cpu(readl(in));
+                *out = readl(in);
         }
 }
 
-inline static u32 pcl_bus(const struct ti_lynx *lynx, pcl_t pclid)
+static inline u32 pcl_bus(const struct ti_lynx *lynx, pcl_t pclid)
 {
         return pci_resource_start(lynx->dev, 1) + pclid * sizeof(struct ti_pcl);
 }
 
 #else /* CONFIG_IEEE1394_PCILYNX_LOCALRAM */
 
-inline static void put_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void put_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                            const struct ti_pcl *pcl)
 {
         memcpy_le32((u32 *)(lynx->pcl_mem + pclid * sizeof(struct ti_pcl)),
                     (u32 *)pcl, sizeof(struct ti_pcl));
 }
 
-inline static void get_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void get_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                            struct ti_pcl *pcl)
 {
         memcpy_le32((u32 *)pcl,
@@ -416,7 +416,7 @@
                     sizeof(struct ti_pcl));
 }
 
-inline static u32 pcl_bus(const struct ti_lynx *lynx, pcl_t pclid)
+static inline u32 pcl_bus(const struct ti_lynx *lynx, pcl_t pclid)
 {
         return lynx->pcl_mem_dma + pclid * sizeof(struct ti_pcl);
 }
@@ -427,14 +427,14 @@
 #if defined (CONFIG_IEEE1394_PCILYNX_LOCALRAM) || defined (__BIG_ENDIAN)
 typedef struct ti_pcl pcltmp_t;
 
-inline static struct ti_pcl *edit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline struct ti_pcl *edit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                                       pcltmp_t *tmp)
 {
         get_pcl(lynx, pclid, tmp);
         return tmp;
 }
 
-inline static void commit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void commit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                               pcltmp_t *tmp)
 {
         put_pcl(lynx, pclid, tmp);
@@ -443,20 +443,20 @@
 #else
 typedef int pcltmp_t; /* just a dummy */
 
-inline static struct ti_pcl *edit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline struct ti_pcl *edit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                                       pcltmp_t *tmp)
 {
         return lynx->pcl_mem + pclid * sizeof(struct ti_pcl);
 }
 
-inline static void commit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
+static inline void commit_pcl(const struct ti_lynx *lynx, pcl_t pclid,
                               pcltmp_t *tmp)
 {
 }
 #endif
 
 
-inline static void run_sub_pcl(const struct ti_lynx *lynx, pcl_t pclid, int idx,
+static inline void run_sub_pcl(const struct ti_lynx *lynx, pcl_t pclid, int idx,
                                int dmachan)
 {
         reg_write(lynx, DMA0_CURRENT_PCL + dmachan * 0x20,
@@ -465,7 +465,7 @@
                   DMA_CHAN_CTRL_ENABLE | DMA_CHAN_CTRL_LINK);
 }
 
-inline static void run_pcl(const struct ti_lynx *lynx, pcl_t pclid, int dmachan)
+static inline void run_pcl(const struct ti_lynx *lynx, pcl_t pclid, int dmachan)
 {
         run_sub_pcl(lynx, pclid, 0, dmachan);
 }