patch-2.3.99-pre3 linux/drivers/atm/fore200e.h

• Lines: 61
• Date: Wed Mar 22 22:22:05 2000
• Orig file: v2.3.99-pre2/linux/drivers/atm/fore200e.h
• Orig date: Sat Feb 26 22:31:43 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/atm/fore200e.h linux/drivers/atm/fore200e.h
@@ -2,6 +2,7 @@
 #define _FORE200E_H
 
 #ifdef __KERNEL__
+#include <linux/config.h>
 
 /* rx buffer sizes */
 
@@ -559,6 +560,7 @@
     void* alloc_addr;    /* base address of allocated chunk */
     void* align_addr;    /* base address of aligned chunk   */
     u32   dma_addr;      /* DMA address of aligned chunk    */
+    int   direction;     /* direction of DMA mapping        */
     u32   alloc_size;    /* length of allocated chunk       */
     u32   align_size;    /* length of aligned chunk         */
 } chunk_t;
@@ -796,9 +798,9 @@
     const unsigned int*  fw_size;             /* address of firmware data size          */
     u32                  (*read)(volatile u32*);
     void                 (*write)(u32, volatile u32*);
-    u32                  (*dma_map)(struct fore200e*, void*, int);
-    void                 (*dma_unmap)(struct fore200e*, u32, int);
-    void                 (*dma_sync)(struct fore200e*, u32, int);
+    u32                  (*dma_map)(struct fore200e*, void*, int, int);
+    void                 (*dma_unmap)(struct fore200e*, u32, int, int);
+    void                 (*dma_sync)(struct fore200e*, u32, int, int);
     int                  (*dma_chunk_alloc)(struct fore200e*, struct chunk*, int, int, int);
     void                 (*dma_chunk_free)(struct fore200e*, struct chunk*);
     struct fore200e*     (*detect)(const struct fore200e_bus*, int);
@@ -812,6 +814,31 @@
     void                 (*irq_ack)(struct fore200e*);
     int                  (*proc_read)(struct fore200e*, char*);
 } fore200e_bus_t;
+
+
+#if defined(CONFIG_ATM_FORE200E_SBA)
+#  if defined(CONFIG_ATM_FORE200E_PCA)
+#    if (PCI_DMA_BIDIRECTIONAL == SBUS_DMA_BIDIRECTIONAL) && \
+        (PCI_DMA_TODEVICE      == SBUS_DMA_TODEVICE)      && \
+        (PCI_DMA_FROMDEVICE    == SBUS_DMA_FROMDEVICE)
+#      define FORE200E_DMA_BIDIRECTIONAL PCI_DMA_BIDIRECTIONAL
+#      define FORE200E_DMA_TODEVICE      PCI_DMA_TODEVICE
+#      define FORE200E_DMA_FROMDEVICE    PCI_DMA_FROMDEVICE
+#    else
+       /* in that case, we'll need to add an extra indirection, e.g.
+	  fore200e->bus->dma_direction[ fore200e_dma_direction ] */
+#      error PCI and SBUS DMA direction flags differ!
+#    endif
+#  else
+#    define FORE200E_DMA_BIDIRECTIONAL SBA_DMA_BIDIRECTIONAL
+#    define FORE200E_DMA_TODEVICE      SBA_DMA_TODEVICE
+#    define FORE200E_DMA_FROMDEVICE    SBA_DMA_FROMDEVICE
+#  endif
+#else
+#  define FORE200E_DMA_BIDIRECTIONAL PCI_DMA_BIDIRECTIONAL
+#  define FORE200E_DMA_TODEVICE      PCI_DMA_TODEVICE
+#  define FORE200E_DMA_FROMDEVICE    PCI_DMA_FROMDEVICE
+#endif
 
 
 /* per-device data */