rtl8192e: create generic rtllib_debug.h
authorSean MacLennan <seanm@seanm.ca>
Tue, 29 Nov 2011 01:19:33 +0000 (20:19 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 30 Nov 2011 10:44:09 +0000 (19:44 +0900)
Rename rtl_debug.h to rtllib_debug.h. Source files should include
rtllib.h if they are generic and rtl_core.h if they are r8192e
specific. Files should never include both.

Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8192e/rtl819x_BAProc.c
drivers/staging/rtl8192e/rtl_core.h
drivers/staging/rtl8192e/rtl_debug.h [deleted file]
drivers/staging/rtl8192e/rtl_pci.h
drivers/staging/rtl8192e/rtl_ps.h
drivers/staging/rtl8192e/rtllib.h
drivers/staging/rtl8192e/rtllib_debug.h [new file with mode: 0644]
drivers/staging/rtl8192e/rtllib_module.c
drivers/staging/rtl8192e/rtllib_softmac.c
drivers/staging/rtl8192e/rtllib_softmac_wx.c

index 8b9d85c48be68f1dbfc181502686b01eacd83488..32fbbc9d0d92cf40534ee3d1464119b17d80e602 100644 (file)
@@ -18,7 +18,6 @@
 ******************************************************************************/
 #include "rtllib.h"
 #include "rtl819x_BA.h"
-#include "rtl_core.h"
 
 static void ActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA,
                            u16 Time)
index c8a7459d5ff603dd499d97ff26d52abbc8a16f22..46407efacc96eee2b6799464efc00a7abedf725f 100644 (file)
 #include <linux/random.h>
 #include <linux/version.h>
 #include <linux/io.h>
+
+/* Need this defined before including local include files */
+#define DRV_NAME "rtl819xE"
+
 #include "rtllib.h"
 
 #include "dot11d.h"
@@ -56,7 +60,6 @@
 #include "r8190P_def.h"
 #include "r8192E_dev.h"
 
-#include "rtl_debug.h"
 #include "rtl_eeprom.h"
 #include "rtl_ps.h"
 #include "rtl_pci.h"
@@ -67,8 +70,6 @@
 #define DRV_AUTHOR  "<wlanfae@realtek.com>"
 #define DRV_VERSION  "0014.0401.2010"
 
-#define DRV_NAME "rtl819xE"
-
 #define IS_HARDWARE_TYPE_819xP(_priv)          \
        ((((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8190P) || \
        (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192E))
diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h
deleted file mode 100644 (file)
index b376b6b..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
- *
- * Based on the r8180 driver, which is:
- * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
-#ifndef _RTL_DEBUG_H
-#define _RTL_DEBUG_H
-
-#define DMESG(x, a...)
-
-extern u32 rt_global_debug_component;
-
-/* These are the defines for rt_global_debug_component */
-enum RTL_DEBUG {
-       COMP_TRACE              = (1 << 0),
-       COMP_DBG                = (1 << 1),
-       COMP_INIT               = (1 << 2),
-       COMP_RECV               = (1 << 3),
-       COMP_SEND               = (1 << 4),
-       COMP_CMD                = (1 << 5),
-       COMP_POWER              = (1 << 6),
-       COMP_EPROM              = (1 << 7),
-       COMP_SWBW               = (1 << 8),
-       COMP_SEC                = (1 << 9),
-       COMP_LPS                = (1 << 10),
-       COMP_QOS                = (1 << 11),
-       COMP_RATE               = (1 << 12),
-       COMP_RXDESC             = (1 << 13),
-       COMP_PHY                = (1 << 14),
-       COMP_DIG                = (1 << 15),
-       COMP_TXAGC              = (1 << 16),
-       COMP_HALDM              = (1 << 17),
-       COMP_POWER_TRACKING     = (1 << 18),
-       COMP_CH                 = (1 << 19),
-       COMP_RF                 = (1 << 20),
-       COMP_FIRMWARE           = (1 << 21),
-       COMP_HT                 = (1 << 22),
-       COMP_RESET              = (1 << 23),
-       COMP_CMDPKT             = (1 << 24),
-       COMP_SCAN               = (1 << 25),
-       COMP_PS                 = (1 << 26),
-       COMP_DOWN               = (1 << 27),
-       COMP_INTR               = (1 << 28),
-       COMP_LED                = (1 << 29),
-       COMP_MLME               = (1 << 30),
-       COMP_ERR                = (1 << 31)
-};
-
-#define RT_TRACE(component, x, args...)                \
-do {                   \
-       if (rt_global_debug_component & component) \
-               printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
-                      ##args);\
-} while (0);
-
-#define assert(expr) \
-       if (!(expr)) {                            \
-               printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
-               #expr, __FILE__, __func__, __LINE__);     \
-       }
-
-#endif
index 7ea5a47dfd2b45c8f987d1fed0706b6c44f2bddc..28c7da677a80af8df9180ec9475fb8ef2a11b825 100644 (file)
@@ -27,7 +27,6 @@
 
 #include <linux/types.h>
 #include <linux/pci.h>
-#include "rtllib.h"
 
 static inline void NdisRawWritePortUlong(u32 port,  u32 val)
 {
index a9c2d799c08ff283d466d20dd988f5d0e29c9eb7..df79d6c4ca03ef6fa65a731e71b52159014c6102 100644 (file)
@@ -26,7 +26,7 @@
 #define _RTL_PS_H
 
 #include <linux/types.h>
-#include "rtllib.h"
+
 struct net_device;
 
 #define RT_CHECK_FOR_HANG_PERIOD 2
index 3a52120657155beb9819c8576b550507d8744c4a..3228d368a3fa2b55f663ffd95ae1103be7a51337 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/wireless.h>
 
+#include "rtllib_debug.h"
 #include "rtl819x_HT.h"
 #include "rtl819x_BA.h"
 #include "rtl819x_TS.h"
diff --git a/drivers/staging/rtl8192e/rtllib_debug.h b/drivers/staging/rtl8192e/rtllib_debug.h
new file mode 100644 (file)
index 0000000..2bfc115
--- /dev/null
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
+ *
+ * Based on the r8180 driver, which is:
+ * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+******************************************************************************/
+#ifndef _RTL_DEBUG_H
+#define _RTL_DEBUG_H
+
+/* Allow files to override DRV_NAME */
+#ifndef DRV_NAME
+#define DRV_NAME "rtllib_92e"
+#endif
+
+#define DMESG(x, a...)
+
+extern u32 rt_global_debug_component;
+
+/* These are the defines for rt_global_debug_component */
+enum RTL_DEBUG {
+       COMP_TRACE              = (1 << 0),
+       COMP_DBG                = (1 << 1),
+       COMP_INIT               = (1 << 2),
+       COMP_RECV               = (1 << 3),
+       COMP_SEND               = (1 << 4),
+       COMP_CMD                = (1 << 5),
+       COMP_POWER              = (1 << 6),
+       COMP_EPROM              = (1 << 7),
+       COMP_SWBW               = (1 << 8),
+       COMP_SEC                = (1 << 9),
+       COMP_LPS                = (1 << 10),
+       COMP_QOS                = (1 << 11),
+       COMP_RATE               = (1 << 12),
+       COMP_RXDESC             = (1 << 13),
+       COMP_PHY                = (1 << 14),
+       COMP_DIG                = (1 << 15),
+       COMP_TXAGC              = (1 << 16),
+       COMP_HALDM              = (1 << 17),
+       COMP_POWER_TRACKING     = (1 << 18),
+       COMP_CH                 = (1 << 19),
+       COMP_RF                 = (1 << 20),
+       COMP_FIRMWARE           = (1 << 21),
+       COMP_HT                 = (1 << 22),
+       COMP_RESET              = (1 << 23),
+       COMP_CMDPKT             = (1 << 24),
+       COMP_SCAN               = (1 << 25),
+       COMP_PS                 = (1 << 26),
+       COMP_DOWN               = (1 << 27),
+       COMP_INTR               = (1 << 28),
+       COMP_LED                = (1 << 29),
+       COMP_MLME               = (1 << 30),
+       COMP_ERR                = (1 << 31)
+};
+
+#define RT_TRACE(component, x, args...)                \
+do {                   \
+       if (rt_global_debug_component & component) \
+               printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
+                      ##args);\
+} while (0);
+
+#define assert(expr) \
+       if (!(expr)) {                            \
+               printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
+               #expr, __FILE__, __func__, __LINE__);     \
+       }
+
+#endif
index c36a140a4568534320dc65e8c1b895f82d29bdb8..a995cd050af324ee2fc7f9969d2426839b40ee3a 100644 (file)
@@ -54,8 +54,6 @@
 #include "rtllib.h"
 
 
-#define DRV_NAME "rtllib_92e"
-
 void _setup_timer(struct timer_list *ptimer, void *fun, unsigned long data)
 {
        ptimer->function = fun;
index a326880888f796d5e7a4a2f214c59a53f4ff697d..4ed65dc8933c32cac9e0dc78ad581f7c2dade9ba 100644 (file)
@@ -15,7 +15,6 @@
 
 
 #include "rtllib.h"
-#include "rtl_core.h"
 
 #include <linux/random.h>
 #include <linux/delay.h>
index 22988fbd444babc9d8d4ee15f331ad8ea01b5430..5bd76268dceffa9dafb6eb0005c47141ed98ca65 100644 (file)
@@ -15,7 +15,6 @@
 
 
 #include "rtllib.h"
-#include "rtl_core.h"
 #include "dot11d.h"
 /* FIXME: add A freqs */