apex: Create both 8MB and 16MB apex binaries

[openwrt.git] / package / b43 / src / dma.h

diff --git a/package/b43/src/dma.h b/package/b43/src/dma.h
index 3eed185..c0d6b69 100644 (file)
--- a/package/b43/src/dma.h
+++ b/package/b43/src/dma.h
@@ -170,8 +170,6 @@ struct b43_dmadesc_generic {
 #define B43_DMA0_RX_BUFFERSIZE (2304 + 100)
 #define B43_DMA3_RX_BUFFERSIZE 16
 
 #define B43_DMA0_RX_BUFFERSIZE (2304 + 100)
 #define B43_DMA3_RX_BUFFERSIZE 16
 

-#ifdef CONFIG_B43_DMA
-

 struct sk_buff;
 struct b43_private;
 struct b43_txstatus;
 struct sk_buff;
 struct b43_private;
 struct b43_txstatus;


@@ -205,6 +203,12 @@ struct b43_dma_ops {
        void (*set_current_rxslot) (struct b43_dmaring * ring, int slot);
 };
 
        void (*set_current_rxslot) (struct b43_dmaring * ring, int slot);
 };
 

+enum b43_dmatype {
+       B43_DMA_30BIT   = 30,
+       B43_DMA_32BIT   = 32,
+       B43_DMA_64BIT   = 64,
+};
+

 struct b43_dmaring {
        /* Lowlevel DMA ops. */
        const struct b43_dma_ops *ops;
 struct b43_dmaring {
        /* Lowlevel DMA ops. */
        const struct b43_dma_ops *ops;


@@ -237,8 +241,8 @@ struct b43_dmaring {
        int index;
        /* Boolean. Is this a TX ring? */
        bool tx;
        int index;
        /* Boolean. Is this a TX ring? */
        bool tx;

-       /* Boolean. 64bit DMA if true, 32bit DMA otherwise. */
-       bool dma64;
+       /* The type of DMA engine used. */
+       enum b43_dmatype type;

        /* Boolean. Is this ring stopped at ieee80211 level? */
        bool stopped;
        /* Lock, only used for TX. */
        /* Boolean. Is this ring stopped at ieee80211 level? */
        bool stopped;
        /* Lock, only used for TX. */


@@ -257,8 +261,7 @@ static inline u32 b43_dma_read(struct b43_dmaring *ring, u16 offset)
        return b43_read32(ring->dev, ring->mmio_base + offset);
 }
 
        return b43_read32(ring->dev, ring->mmio_base + offset);
 }
 

-static inline
-    void b43_dma_write(struct b43_dmaring *ring, u16 offset, u32 value)
+static inline void b43_dma_write(struct b43_dmaring *ring, u16 offset, u32 value)

 {
        b43_write32(ring->dev, ring->mmio_base + offset, value);
 }
 {
        b43_write32(ring->dev, ring->mmio_base + offset, value);
 }


@@ -266,13 +269,6 @@ static inline
 int b43_dma_init(struct b43_wldev *dev);
 void b43_dma_free(struct b43_wldev *dev);
 
 int b43_dma_init(struct b43_wldev *dev);
 void b43_dma_free(struct b43_wldev *dev);
 

-int b43_dmacontroller_rx_reset(struct b43_wldev *dev,
-                              u16 dmacontroller_mmio_base, int dma64);
-int b43_dmacontroller_tx_reset(struct b43_wldev *dev,
-                              u16 dmacontroller_mmio_base, int dma64);
-
-u16 b43_dmacontroller_base(int dma64bit, int dmacontroller_idx);
-

 void b43_dma_tx_suspend(struct b43_wldev *dev);
 void b43_dma_tx_resume(struct b43_wldev *dev);
 
 void b43_dma_tx_suspend(struct b43_wldev *dev);
 void b43_dma_tx_resume(struct b43_wldev *dev);
 


@@ -286,52 +282,4 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
 
 void b43_dma_rx(struct b43_dmaring *ring);
 
 
 void b43_dma_rx(struct b43_dmaring *ring);
 

-#else /* CONFIG_B43_DMA */
-
-static inline int b43_dma_init(struct b43_wldev *dev)
-{
-       return 0;
-}
-static inline void b43_dma_free(struct b43_wldev *dev)
-{
-}
-static inline
-    int b43_dmacontroller_rx_reset(struct b43_wldev *dev,
-                                  u16 dmacontroller_mmio_base, int dma64)
-{
-       return 0;
-}
-static inline
-    int b43_dmacontroller_tx_reset(struct b43_wldev *dev,
-                                  u16 dmacontroller_mmio_base, int dma64)
-{
-       return 0;
-}
-static inline
-    void b43_dma_get_tx_stats(struct b43_wldev *dev,
-                             struct ieee80211_tx_queue_stats *stats)
-{
-}
-static inline
-    int b43_dma_tx(struct b43_wldev *dev,
-                  struct sk_buff *skb, struct ieee80211_tx_control *ctl)
-{
-       return 0;
-}
-static inline
-    void b43_dma_handle_txstatus(struct b43_wldev *dev,
-                                const struct b43_txstatus *status)
-{
-}
-static inline void b43_dma_rx(struct b43_dmaring *ring)
-{
-}
-static inline void b43_dma_tx_suspend(struct b43_wldev *dev)
-{
-}
-static inline void b43_dma_tx_resume(struct b43_wldev *dev)
-{
-}
-
-#endif /* CONFIG_B43_DMA */

 #endif /* B43_DMA_H_ */
 #endif /* B43_DMA_H_ */