w35und: Merge wbhal_f.h to wbhal_s.h
PATCH 1/2 w35und: Merge wbhal_f.h to wbhal_s.h
This patch merges HAL struct and function definitions into one header file.
Cc Pavel Machek <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
--- drivers/staging/winbond/mds.c | 3 +- drivers/staging/winbond/mto.c | 4 +- drivers/staging/winbond/phy_calibration.c | 4 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 4 +- drivers/staging/winbond/wb35reg_s.h | 74 ++++++++++++++++++++++++++ drivers/staging/winbond/wb35tx_f.h | 1 - drivers/staging/winbond/wbhal_f.h | 81 ----------------------------- drivers/staging/winbond/wbusb.c | 5 ++- 9 files changed, 90 insertions(+), 88 deletions(-) delete mode 100644 drivers/staging/winbond/wbhal_f.h
drivers/staging/winbond/mds.c +2 -1
@@ -2,8 +2,9 @@#include "mlmetxrx_f.h" #include "mto.h" #include "sysdef.h" -#include "wbhal_f.h" +#include "wbhal_s.h" #include "wblinux_f.h" +#include "wb35tx_f.h" unsigned char Mds_initial (struct wbsoft_priv *adapter)
drivers/staging/winbond/mto.c +3 -1
@@ -19,7 +19,9 @@#include "sysdef.h" #include "sme_api.h" -#include "wbhal_f.h" +#include "wbhal_s.h" +#include "wb35reg_f.h" +#include "core.h" /* Declare SQ3 to rate and fragmentation threshold table */ /* Declare fragmentation thresholds table */
drivers/staging/winbond/phy_calibration.c +3 -1
@@ -12,7 +12,9 @@/****************** INCLUDE FILES SECTION ***********************************/ #include "sysdef.h" #include "phy_calibration.h" -#include "wbhal_f.h" +#include "wbhal_s.h" +#include "wb35reg_f.h" +#include "core.h" /****************** DEBUG CONSTANT AND MACRO SECTION ************************/
drivers/staging/winbond/phy_calibration.h +1 -1
@@ -1,7 +1,7 @@#ifndef __WINBOND_PHY_CALIBRATION_H#define __WINBOND_PHY_CALIBRATION_H -#include "wbhal_f.h" +#include "wbhal_s.h" #define REG_AGC_CTRL1 0x1000#define REG_AGC_CTRL2 0x1004
drivers/staging/winbond/reg.c +3 -1
@@ -1,5 +1,7 @@#include "sysdef.h" -#include "wbhal_f.h" +#include "wbhal_s.h" +#include "wb35reg_f.h" +#include "core.h" /* * ====================================================
drivers/staging/winbond/wb35reg_s.h +74 -0
84 lines not on this page · raw message
drivers/staging/winbond/wb35tx_f.h +0 -1
@@ -2,7 +2,6 @@#define __WINBOND_WB35TX_F_H#include "core.h" -#include "wbhal_f.h" /* * ====================================
drivers/staging/winbond/wbhal_f.h deleted +0 -81
81 lines not on this page · raw message
drivers/staging/winbond/wbusb.c +4 -1
@@ -16,7 +16,10 @@#include "mds_f.h" #include "mlmetxrx_f.h" #include "mto.h" -#include "wbhal_f.h" +#include "wbhal_s.h" +#include "wb35reg_f.h" +#include "wb35tx_f.h" +#include "wb35rx_f.h" #include "wblinux_f.h" MODULE_DESCRIPTION ("IS89C35 802.11bg WLAN USB Driver" );
Signature · 1 line
1.7.0.4
PATCH 2/2 w35und: Rename wbhal_s.h to wbhal.h
This patch renames the wbhal_s.h header file to wbhal.h now that it contains both structure and function definitions.
Cc Pavel Machek <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
---
drivers/staging/winbond/core.h | 2 +-
drivers/staging/winbond/mds.c | 2 +-
drivers/staging/winbond/mds_f.h | 2 +-
drivers/staging/winbond/mto.c | 2 +-
drivers/staging/winbond/phy_calibration.c | 2 +-
drivers/staging/winbond/phy_calibration.h | 2 +-
drivers/staging/winbond/reg.c | 2 +-
drivers/staging/winbond/wb35reg_f.h | 2 +-
drivers/staging/winbond/wb35rx_f.h | 2 +-
drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 0
drivers/staging/winbond/wbusb.c | 2 +-
11 files changed, 10 insertions(+), 10 deletions(-)
rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (100%)drivers/staging/winbond/core.h +1 -1
@@ -4,7 +4,7 @@#include <linux/wireless.h> #include <linux/types.h> -#include "wbhal_s.h" +#include "wbhal.h" #include "mto.h" #include "mac_structures.h"
drivers/staging/winbond/mds.c +1 -1
@@ -2,7 +2,7 @@#include "mlmetxrx_f.h" #include "mto.h" #include "sysdef.h" -#include "wbhal_s.h" +#include "wbhal.h" #include "wblinux_f.h" #include "wb35tx_f.h"
drivers/staging/winbond/mds_f.h +1 -1
@@ -1,7 +1,7 @@#ifndef __WINBOND_MDS_F_H#define __WINBOND_MDS_F_H -#include "wbhal_s.h" +#include "wbhal.h" #include "core.h" unsigned char Mds_initial (struct wbsoft_priv *adapter);
drivers/staging/winbond/mto.c +1 -1
@@ -19,7 +19,7 @@#include "sysdef.h" #include "sme_api.h" -#include "wbhal_s.h" +#include "wbhal.h" #include "wb35reg_f.h" #include "core.h"
drivers/staging/winbond/phy_calibration.c +1 -1
@@ -12,7 +12,7 @@/****************** INCLUDE FILES SECTION ***********************************/ #include "sysdef.h" #include "phy_calibration.h" -#include "wbhal_s.h" +#include "wbhal.h" #include "wb35reg_f.h" #include "core.h"
drivers/staging/winbond/phy_calibration.h +1 -1
@@ -1,7 +1,7 @@#ifndef __WINBOND_PHY_CALIBRATION_H#define __WINBOND_PHY_CALIBRATION_H -#include "wbhal_s.h" +#include "wbhal.h" #define REG_AGC_CTRL1 0x1000#define REG_AGC_CTRL2 0x1004
drivers/staging/winbond/reg.c +1 -1
@@ -1,5 +1,5 @@#include "sysdef.h" -#include "wbhal_s.h" +#include "wbhal.h" #include "wb35reg_f.h" #include "core.h"
drivers/staging/winbond/wb35reg_f.h +1 -1
@@ -1,7 +1,7 @@#ifndef __WINBOND_WB35REG_F_H#define __WINBOND_WB35REG_F_H -#include "wbhal_s.h" +#include "wbhal.h" /* * ====================================
drivers/staging/winbond/wb35rx_f.h +1 -1
@@ -2,7 +2,7 @@#define __WINBOND_WB35RX_F_H#include <net/mac80211.h> -#include "wbhal_s.h" +#include "wbhal.h" //==================================== // Interface function declare
drivers/staging/winbond/wbhal.h renamed from drivers/staging/winbond/wbhal_s.h +0 -0
drivers/staging/winbond/wbusb.c +1 -1
@@ -16,7 +16,7 @@#include "mds_f.h" #include "mlmetxrx_f.h" #include "mto.h" -#include "wbhal_s.h" +#include "wbhal.h" #include "wb35reg_f.h" #include "wb35tx_f.h" #include "wb35rx_f.h"
Signature · 1 line
1.7.0.4
Re: [PATCH 2/2] w35und: Rename wbhal_s.h to wbhal.h
Quoted 5 lines · Pekka Enberg
This patch renames the
wbhal_s.hheader file towbhal.hnow that it contains both structure and function definitions.Cc Pavel Machek <[email protected]>Signed-off-by Pekka Enberg <[email protected]>
ACK.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 4 lines · Pekka Enberg
This patch merges HAL struct and function definitions into one header file.
Cc Pavel Machek <[email protected]>Signed-off-by Pekka Enberg <[email protected]>
ACK.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html