[Acx100-devel] [PATCH 13/19] refactor for USB-only builds

[Jim C. <jim...@gm...>]

Add ifdef wrapper on body of merge.c; it has MANY refs to acx_device
fields which are not defined in USB-only builds, this is easiest way,
and apparently correct.

There are a number of stubs now needed, and a few functions are
actually called; will fix next.

Signed-off-by: Jim Cromie <jim...@gm...>
---
 merge.c |  3 +++
 merge.h | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/merge.c b/merge.c
index dd6f95d..ed4b3cd 100644
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,6 @@
 
+#if defined CONFIG_ACX_MAC80211_PCI || defined CONFIG_ACX_MAC80211_MEM
+
 #define pr_fmt(fmt) "acx.%s: " fmt, __func__
 #include "acx_debug.h"
 
@@ -5027,3 +5029,4 @@ MODULE_DESCRIPTION( "ACX Slave Memory Driver" );
 MODULE_LICENSE( "GPL" );
 
 #endif // til-end
+#endif /* defined CONFIG_ACX_MAC80211_PCI || defined CONFIG_ACX_MAC80211_MEM */
diff --git a/merge.h b/merge.h
index 28723fa..8e529b0 100644
--- a/merge.h
+++ b/merge.h
@@ -26,6 +26,8 @@ static int __init acx_debugfs_init(void)  { return 0; }
 static void __exit acx_debugfs_exit(void) { }
 #endif /* defined CONFIG_DEBUG_FS */
 
+#if defined CONFIG_ACX_MAC80211_PCI || defined CONFIG_ACX_MAC80211_MEM
+
 #include <linux/interrupt.h>
 
 irqreturn_t acx_interrupt(int irq, void *dev_id);
@@ -91,8 +93,7 @@ int acxpci_upload_radio(acx_device_t *adev);
 void acx_power_led(acx_device_t * adev, int enable);
 
 
-#if defined(CONFIG_ACX_MAC80211_PCI) \
- || defined(CONFIG_ACX_MAC80211_MEM)
+// #if !(defined CONFIG_ACX_MAC80211_PCI || defined CONFIG_ACX_MAC80211_MEM)
 
 
 void acxmem_update_queue_indicator(acx_device_t *adev, int txqueue);
@@ -112,6 +113,10 @@ static inline txdesc_t* acx_advance_txdesc(acx_device_t *adev,
 
 #else /* !(CONFIG_ACX_MAC80211_PCI || CONFIG_ACX_MAC80211_MEM) */
 
+static inline void acx_create_desc_queues(acx_device_t *adev,
+			u32 tx_queue_start, u32 rx_queue_start)
+{ }
+
 static inline void acxmem_update_queue_indicator(acx_device_t *adev,
 			int txqueue)
 { }
@@ -124,5 +129,4 @@ static inline txdesc_t* acx_advance_txdesc(acx_device_t *adev,
 #define ACX_FREE_QUEUES(adev, _dir_)
 
 #endif /* !(CONFIG_ACX_MAC80211_PCI || CONFIG_ACX_MAC80211_MEM) */
-
 #endif /* _MERGE_H_ */
-- 
1.7.10.1.487.ga3935e6