Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 80aba53616a5f2f97adf386a2a3ccd5fb0dbfdd6

Authored by Pekka Enberg
Committed by Greg Kroah-Hartman
1 parent 8971280fb2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Staging: w35und: #include cleanup 

This patch moves #includes from sysdef.h and common.h to the files which
actually need them. This makes the dependencies less complex and allows us to
move code around much easily.

Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

Showing 41 changed files with 208 additions and 94 deletions Side-by-side Diff

drivers/staging/winbond/adapter.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_ADAPTER_H
  2 +#define __WINBOND_ADAPTER_H
  3 +
  4 +#include <linux/wireless.h>
  5 +
  6 +#include "bssdscpt.h"
  7 +#include "mto.h"
  8 +#include "wbhal_s.h"
  9 +
1 10 #define OS_SET_SHUTDOWN( _A ) _A->shutdown=1
2 11 #define OS_SET_RESUME( _A ) _A->shutdown=0
3 12 #define OS_STOP( _A ) WBLINUX_stop( _A )
... ... @@ -45,4 +54,6 @@
45 54  
46 55 u8 LinkName[MAX_ANSI_STRING];
47 56 };
  57 +
  58 +#endif
drivers/staging/winbond/bss_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_BSS_F_H
  2 +#define __WINBOND_BSS_F_H
  3 +
  4 +#include "adapter.h"
  5 +
  6 +struct PMKID_Information_Element;
  7 +
1 8 //
2 9 // BSS descriptor DataBase management global function
3 10 //
... ... @@ -51,5 +58,7 @@
51 58  
52 59 u16 SearchPmkid(struct wb35_adapter * adapter, struct Management_Frame* msgHeader,
53 60 struct PMKID_Information_Element * AssoReq_PMKID );
  61 +#endif
  62 +
54 63 #endif
drivers/staging/winbond/bssdscpt.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_BSSDSCPT_H
  2 +#define __WINBOND_BSSDSCPT_H
  3 +
  4 +#include <linux/types.h>
  5 +
  6 +#include "mds_s.h"
  7 +#include "mlme_s.h"
  8 +
1 9 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 10 // bssdscpt.c
3 11 // BSS descriptor data base
... ... @@ -152,4 +160,6 @@
152 160 ((u16)(adapter)->sLocalPara.wConnectedSTAindex)
153 161  
154 162 #define psBSS(i) (&(adapter->asBSSDescriptElement[(i)]))
  163 +
  164 +#endif
drivers/staging/winbond/ds_tkip.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_DS_TKIP_H
  2 +#define __WINBOND_DS_TKIP_H
  3 +
  4 +#include <linux/types.h>
  5 +
1 6 // Rotation functions on 32 bit values
2 7 #define ROL32( A, n ) \
3 8 ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 ) ) )
... ... @@ -28,4 +33,6 @@
28 33 //void _append_data( u8 *pData, u16 size, tkip_t *p );
29 34 void Mds_MicGet( void* adapter, void* pRxLayer1, u8 *pKey, u8 *pMic );
30 35 void Mds_MicFill( void* adapter, void* pDes, u8 *XmitBufAddress );
  36 +
  37 +#endif
drivers/staging/winbond/gl_80211.h
Diff comments   View file @ 80aba53
1   -
2 1 #ifndef __GL_80211_H__
3 2 #define __GL_80211_H__
  3 +
  4 +#include <linux/types.h>
4 5  
5 6 /****************** CONSTANT AND MACRO SECTION ******************************/
6 7  
drivers/staging/winbond/linux/common.h
Diff comments   View file @ 80aba53
... ... @@ -10,27 +10,6 @@
10 10 #ifndef COMMON_DEF
11 11 #define COMMON_DEF
12 12  
13   -#include <linux/version.h>
14   -#include <linux/usb.h>
15   -#include <linux/kernel.h> //need for kernel alert
16   -#include <linux/autoconf.h>
17   -#include <linux/sched.h>
18   -#include <linux/signal.h>
19   -#include <linux/slab.h> //memory allocate
20   -#include <linux/module.h>
21   -#include <linux/netdevice.h>
22   -#include <linux/etherdevice.h>
23   -#include <linux/init.h>//need for init and exit modules marco
24   -#include <linux/ctype.h>
25   -#include <linux/wait.h>
26   -#include <linux/list.h>
27   -#include <linux/wireless.h>
28   -#include <linux/if_arp.h>
29   -#include <asm/uaccess.h>
30   -#include <net/iw_handler.h>
31   -#include <linux/skbuff.h>
32   -
33   -
34 13 //#define DEBUG_ENABLED 1
35 14  
36 15 //==================================================================================================
drivers/staging/winbond/linux/sysdef.h
Diff comments   View file @ 80aba53
... ... @@ -37,37 +37,8 @@
37 37 #define _PE_USB_INI_DUMP_
38 38 #endif
39 39  
40   -
41   -
42   -#include "common.h" // Individual file depends on OS
43   -
44   -#include "../wb35_ver.h"
45   -#include "../mac_structures.h"
46   -#include "../ds_tkip.h"
47   -#include "../localpara.h"
48   -#include "../sme_s.h"
49   -#include "../scan_s.h"
50   -#include "../mds_s.h"
51   -#include "../mlme_s.h"
52   -#include "../bssdscpt.h"
53   -#include "../sme_api.h"
54   -#include "../gl_80211.h"
55   -#include "../mto.h"
56   -#include "../wbhal_s.h"
57   -
58   -
59   -#include "../adapter.h"
60   -
61   -#include "../mlme_mib.h"
62   -#include "../mds_f.h"
63   -#include "../bss_f.h"
64   -#include "../mlmetxrx_f.h"
65   -#include "../mto_f.h"
66   -#include "../wbhal_f.h"
67   -#include "../wblinux_f.h"
68 40 // Kernel Timer resolution, NDIS is 10ms, 10000us
69 41 #define MIN_TIMEOUT_VAL (10) //ms
70   -
71 42  
72 43 #endif
drivers/staging/winbond/linux/wb35reg.c
Diff comments   View file @ 80aba53
1 1 #include "sysdef.h"
  2 +#include "wb35reg_f.h"
  3 +
  4 +#include <linux/usb.h>
2 5  
3 6 extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency);
4 7  
drivers/staging/winbond/linux/wb35reg_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WB35REG_F_H
  2 +#define __WINBOND_WB35REG_F_H
  3 +
  4 +#include "../wbhal_s.h"
  5 +
1 6 //====================================
2 7 // Interface function declare
3 8 //====================================
... ... @@ -52,4 +57,6 @@
52 57 void Wb35Reg_phy_calibration( phw_data_t pHwData );
53 58 void Wb35Reg_Update( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue );
54 59 unsigned char adjust_TXVGA_for_iq_mag( phw_data_t pHwData );
  60 +
  61 +#endif
drivers/staging/winbond/linux/wb35reg_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WB35REG_S_H
  2 +#define __WINBOND_WB35REG_S_H
  3 +
  4 +#include <linux/spinlock.h>
  5 +#include <linux/types.h>
  6 +#include <asm/atomic.h>
  7 +
1 8 //=======================================================================================
2 9 /*
3 10 HAL setting function
... ... @@ -161,4 +168,6 @@
161 168 u32 SQ3_index;
162 169  
163 170 };
  171 +
  172 +#endif
drivers/staging/winbond/linux/wb35rx.c
Diff comments   View file @ 80aba53
... ... @@ -8,7 +8,10 @@
8 8 // Processing the Rx message from down layer
9 9 //
10 10 //============================================================================
  11 +#include <linux/usb.h>
  12 +
11 13 #include "sysdef.h"
  14 +#include "wb35rx_f.h"
12 15  
13 16 void Wb35Rx_start(phw_data_t pHwData)
14 17 {
drivers/staging/winbond/linux/wb35rx_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WB35RX_F_H
  2 +#define __WINBOND_WB35RX_F_H
  3 +
  4 +#include "../wbhal_s.h"
  5 +
1 6 //====================================
2 7 // Interface function declare
3 8 //====================================
... ... @@ -11,4 +16,6 @@
11 16  
12 17 void Wb35Rx( phw_data_t pHwData );
13 18 void Wb35Rx_Complete(struct urb *urb);
  19 +
  20 +#endif
drivers/staging/winbond/linux/wb35tx.c
Diff comments   View file @ 80aba53
... ... @@ -8,8 +8,11 @@
8 8 // Processing the Tx message and put into down layer
9 9 //
10 10 //============================================================================
11   -#include "sysdef.h"
  11 +#include <linux/usb.h>
12 12  
  13 +#include "wb35tx_f.h"
  14 +#include "../mds_f.h"
  15 +#include "sysdef.h"
13 16  
14 17 unsigned char
15 18 Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer)
drivers/staging/winbond/linux/wb35tx_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WB35TX_F_H
  2 +#define __WINBOND_WB35TX_F_H
  3 +
  4 +#include "../wbhal_f.h"
  5 +
1 6 //====================================
2 7 // Interface function declare
3 8 //====================================
... ... @@ -16,4 +21,6 @@
16 21 void Wb35Tx_reset_descriptor( phw_data_t pHwData );
17 22  
18 23 void Wb35Tx_CurrentTime( phw_data_t pHwData, u32 TimeCount );
  24 +
  25 +#endif
drivers/staging/winbond/linux/wb35tx_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WB35_TX_S_H
  2 +#define __WINBOND_WB35_TX_S_H
  3 +
  4 +#include "../mds_s.h"
  5 +
1 6 //====================================
2 7 // IS89C35 Tx related definition
3 8 //====================================
... ... @@ -40,4 +45,6 @@
40 45 u32 TxTimer; // 20060928 Add if sending packet not great than 13
41 46  
42 47 } WB35TX, *PWB35TX;
  48 +
  49 +#endif
drivers/staging/winbond/linux/wbusb.c
Diff comments   View file @ 80aba53
... ... @@ -3,8 +3,12 @@
3 3 *
4 4 * Distribute under GPLv2.
5 5 */
6   -#include "sysdef.h"
7 6 #include <net/mac80211.h>
  7 +#include <linux/usb.h>
  8 +
  9 +#include "../mlmetxrx_f.h"
  10 +#include "../wbhal_f.h"
  11 +#include "../wblinux_f.h"
8 12  
9 13 MODULE_AUTHOR(DRIVER_AUTHOR);
10 14 MODULE_DESCRIPTION(DRIVER_DESC);
drivers/staging/winbond/linux/wbusb_s.h
Diff comments   View file @ 80aba53
... ... @@ -11,6 +11,11 @@
11 11 //
12 12 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
13 13  
  14 +#ifndef __WINBOND_WBUSB_S_H
  15 +#define __WINBOND_WBUSB_S_H
  16 +
  17 +#include <linux/types.h>
  18 +
14 19 //---------------------------------------------------------------------------
15 20 // RW_CONTEXT --
16 21 //
17 22  
18 23  
... ... @@ -23,17 +28,14 @@
23 28 void* pCallBackFunctionParameter;
24 29 } RW_CONTEXT, *PRW_CONTEXT;
25 30  
26   -
27   -
28   -
29 31 #define DRIVER_AUTHOR "Original by: Jeff Lee<YY_Lee@issc.com.tw> Adapted to 2.6.x by Costantino Leandro (Rxart Desktop) <le_costantino@pixartargentina.com.ar>"
30 32 #define DRIVER_DESC "IS89C35 802.11bg WLAN USB Driver"
31 33  
32   -
33   -
34 34 typedef struct _WBUSB {
35 35 u32 IsUsb20;
36 36 struct usb_device *udev;
37 37 u32 DetectCount;
38 38 } WBUSB, *PWBUSB;
  39 +
  40 +#endif
drivers/staging/winbond/localpara.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_LOCALPARA_H
  2 +#define __WINBOND_LOCALPARA_H
  3 +
1 4 //=============================================================
2 5 // LocalPara.h -
3 6 //=============================================================
  7 +
  8 +#include "mac_structures.h"
  9 +
4 10 //Define the local ability
5 11  
6 12 #define LOCAL_DEFAULT_BEACON_PERIOD 100 //ms
... ... @@ -271,4 +277,6 @@
271 277 u16 reserved_7;
272 278  
273 279 } WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT;
  280 +
  281 +#endif
drivers/staging/winbond/mac_structures.h
Diff comments   View file @ 80aba53
... ... @@ -21,6 +21,7 @@
21 21 #ifndef _MAC_Structures_H_
22 22 #define _MAC_Structures_H_
23 23  
  24 +#include <linux/skbuff.h>
24 25  
25 26 //=========================================================
26 27 // Some miscellaneous definitions
... ... @@ -115,10 +116,6 @@
115 116 #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6)
116 117 #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2)
117 118  
118   -#ifdef WB_LINUX
119   -#define UNALIGNED
120   -#endif
121   -
122 119 //========================================================
123 120 typedef enum enum_PowerManagementMode
124 121 {
... ... @@ -464,7 +461,7 @@
464 461 {
465 462 u8 Element_ID;
466 463 u8 Length;
467   - UNALIGNED SUITE_SELECTOR OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
  464 + SUITE_SELECTOR OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
468 465 u16 Version;
469 466 SUITE_SELECTOR GroupKeySuite;
470 467 u16 PairwiseKeySuiteCount;
drivers/staging/winbond/mds.c
Diff comments   View file @ 80aba53
  1 +#include "ds_tkip.h"
  2 +#include "gl_80211.h"
  3 +#include "mds_f.h"
  4 +#include "mlmetxrx_f.h"
  5 +#include "mto_f.h"
1 6 #include "os_common.h"
  7 +#include "wbhal_f.h"
  8 +#include "wblinux_f.h"
2 9  
3 10 void
4 11 Mds_reset_descriptor(struct wb35_adapter * adapter)
drivers/staging/winbond/mds_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_MDS_F_H
  2 +#define __WINBOND_MDS_F_H
  3 +
  4 +#include "wbhal_s.h"
  5 +#include "adapter.h"
  6 +
1 7 unsigned char Mds_initial( struct wb35_adapter *adapter );
2 8 void Mds_Destroy( struct wb35_adapter *adapter );
3 9 void Mds_Tx( struct wb35_adapter *adapter );
... ... @@ -23,4 +29,6 @@
23 29 void MDS_GetNextPacketComplete( struct wb35_adapter *adapter, PDESCRIPTOR pDes );
24 30 void MDS_SendResult( struct wb35_adapter *adapter, u8 PacketId, unsigned char SendOK );
25 31 void MDS_EthernetPacketReceive( struct wb35_adapter *adapter, PRXLAYER1 pRxLayer1 );
  32 +
  33 +#endif
drivers/staging/winbond/mds_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_MDS_H
  2 +#define __WINBOND_MDS_H
  3 +
  4 +#include <linux/timer.h>
  5 +#include <linux/types.h>
  6 +#include <asm/atomic.h>
  7 +
  8 +#include "localpara.h"
  9 +#include "mac_structures.h"
  10 +#include "scan_s.h"
  11 +
1 12 ////////////////////////////////////////////////////////////////////////////////////////////////////////
2 13 #define MAX_USB_TX_DESCRIPTOR 15 // IS89C35 ability
3 14 #define MAX_USB_TX_BUFFER_NUMBER 4 // Virtual pre-buffer number of MAX_USB_TX_BUFFER
... ... @@ -177,4 +188,6 @@
177 188 u8 *ReservedBufferPoint;// Point to the next availabe address of reserved buffer
178 189  
179 190 }RXLAYER1, * PRXLAYER1;
  191 +
  192 +#endif
drivers/staging/winbond/mlme_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_MLME_H
  2 +#define __WINBOND_MLME_H
  3 +
  4 +#include <linux/types.h>
  5 +#include <linux/spinlock.h>
  6 +
  7 +#include "mac_structures.h"
  8 +#include "mds_s.h"
  9 +
1 10 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 11 // Mlme.h
3 12 // Define the related definitions of MLME module
... ... @@ -191,4 +200,6 @@
191 200 u8 __attribute__ ((packed)) *pbFramePtr;
192 201  
193 202 }__attribute__ ((packed)) RXDATA, *psRXDATA;
  203 +
  204 +#endif
drivers/staging/winbond/mlmetxrx.c
Diff comments   View file @ 80aba53
... ... @@ -17,6 +17,8 @@
17 17 //============================================================================
18 18 #include "os_common.h"
19 19  
  20 +#include "mds_f.h"
  21 +
20 22 void MLMEResetTxRx(struct wb35_adapter * adapter)
21 23 {
22 24 s32 i;
drivers/staging/winbond/mlmetxrx_f.h
Diff comments   View file @ 80aba53
... ... @@ -8,6 +8,8 @@
8 8 #ifndef _MLMETXRX_H
9 9 #define _MLMETXRX_H
10 10  
  11 +#include "adapter.h"
  12 +
11 13 void
12 14 MLMEProcThread(
13 15 struct wb35_adapter * adapter
drivers/staging/winbond/mto.c
Diff comments   View file @ 80aba53
... ... @@ -23,6 +23,9 @@
23 23  
24 24 // LA20040210_DTO kevin
25 25 #include "os_common.h"
  26 +#include "sme_api.h"
  27 +#include "gl_80211.h"
  28 +#include "wbhal_f.h"
26 29  
27 30 // Declare SQ3 to rate and fragmentation threshold table
28 31 // Declare fragmentation thresholds table
drivers/staging/winbond/mto.h
Diff comments   View file @ 80aba53
... ... @@ -11,6 +11,8 @@
11 11 #ifndef __MTO_H__
12 12 #define __MTO_H__
13 13  
  14 +#include <linux/types.h>
  15 +
14 16 #define MTO_DEFAULT_TH_CNT 5
15 17 #define MTO_DEFAULT_TH_SQ3 112 //OLD IS 13 reference JohnXu
16 18 #define MTO_DEFAULT_TH_IDLE_SLOT 15
drivers/staging/winbond/mto_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_MTO_F_H
  2 +#define __WINBOND_MTO_F_H
  3 +
  4 +#include "adapter.h"
  5 +
1 6 extern void MTO_Init(struct wb35_adapter *);
2 7 extern void MTO_PeriodicTimerExpired(struct wb35_adapter *);
3 8 extern void MTO_SetDTORateRange(struct wb35_adapter *, u8 *, u8);
4 9 extern u8 MTO_GetTxRate(MTO_FUNC_INPUT, u32 fpdu_len);
5 10 extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT);
6 11 extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index);
  12 +
  13 +#endif
drivers/staging/winbond/phy_calibration.c
Diff comments   View file @ 80aba53
... ... @@ -12,6 +12,7 @@
12 12 /****************** INCLUDE FILES SECTION ***********************************/
13 13 #include "os_common.h"
14 14 #include "phy_calibration.h"
  15 +#include "wbhal_f.h"
15 16  
16 17  
17 18 /****************** DEBUG CONSTANT AND MACRO SECTION ************************/
drivers/staging/winbond/phy_calibration.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_PHY_CALIBRATION_H
  2 +#define __WINBOND_PHY_CALIBRATION_H
  3 +
  4 +#include "wbhal_f.h"
  5 +
1 6 // 20031229 Turbo add
2 7 #define REG_AGC_CTRL1 0x1000
3 8 #define REG_AGC_CTRL2 0x1004
... ... @@ -98,4 +103,6 @@
98 103  
99 104 void phy_set_rf_data( phw_data_t pHwData, u32 index, u32 value );
100 105 #define phy_init_rf( _A ) //RFSynthesizer_initial( _A )
  106 +
  107 +#endif
drivers/staging/winbond/reg.c
Diff comments   View file @ 80aba53
1 1 #include "os_common.h"
  2 +#include "wbhal_f.h"
2 3  
3 4 ///////////////////////////////////////////////////////////////////////////////////////////////////
4 5 // Original Phy.h
drivers/staging/winbond/rxisr.c
Diff comments   View file @ 80aba53
1 1 #include "os_common.h"
  2 +#include "adapter.h"
2 3  
3 4 static void RxTimerHandler(unsigned long data)
4 5 {
drivers/staging/winbond/scan_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_SCAN_S_H
  2 +#define __WINBOND_SCAN_S_H
  3 +
  4 +#include <linux/types.h>
  5 +#include "localpara.h"
  6 +
1 7 //
2 8 // SCAN task global CONSTANTS, STRUCTURES, variables
3 9 //
... ... @@ -111,4 +117,6 @@
111 117 //static void ScanTimerHandler(struct wb35_adapter * adapter);
112 118 //static void vScanTimerStart(struct wb35_adapter * adapter, int timeout_value);
113 119 //static void vScanTimerStop(struct wb35_adapter * adapter);
  120 +
  121 +#endif
drivers/staging/winbond/sme_api.c
Diff comments   View file @ 80aba53
... ... @@ -6,6 +6,7 @@
6 6 //
7 7 //------------------------------------------------------------------------------------
8 8 #include "os_common.h"
  9 +#include <linux/kernel.h>
9 10  
10 11 s8 sme_get_rssi(void *pcore_data, s32 *prssi)
11 12 {
drivers/staging/winbond/sme_api.h
Diff comments   View file @ 80aba53
... ... @@ -13,6 +13,10 @@
13 13 #ifndef __SME_API_H__
14 14 #define __SME_API_H__
15 15  
  16 +#include <linux/types.h>
  17 +
  18 +#include "localpara.h"
  19 +
16 20 /****************** INCLUDE FILES SECTION ***********************************/
17 21 //#include "GL\gl_core.h"
18 22  
drivers/staging/winbond/sme_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_SME_S_H
  2 +#define __WINBOND_SME_S_H
  3 +
  4 +#include <linux/types.h>
  5 +
  6 +#include "mac_structures.h"
  7 +#include "localpara.h"
  8 +
1 9 //
2 10 // SME_S.H -
3 11 // SME task global CONSTANTS, STRUCTURES, variables
... ... @@ -224,4 +232,6 @@
224 232  
225 233  
226 234 // Static function
  235 +
  236 +#endif
drivers/staging/winbond/wbhal.c
Diff comments   View file @ 80aba53
1 1 #include "os_common.h"
  2 +#include "wbhal_f.h"
  3 +#include "wblinux_f.h"
2 4  
3 5 void hal_get_ethernet_address( phw_data_t pHwData, u8 *current_address )
4 6 {
drivers/staging/winbond/wbhal_f.h
Diff comments   View file @ 80aba53
1 1 //=====================================================================
2 2 // Device related include
3 3 //=====================================================================
4   -#ifdef WB_LINUX
5   - #include "linux/wb35reg_f.h"
6   - #include "linux/wb35tx_f.h"
7   - #include "linux/wb35rx_f.h"
8   -#else
9   - #include "wb35reg_f.h"
10   - #include "wb35tx_f.h"
11   - #include "wb35rx_f.h"
12   -#endif
  4 +#include "linux/wb35reg_f.h"
  5 +#include "linux/wb35tx_f.h"
  6 +#include "linux/wb35rx_f.h"
  7 +
  8 +#include "adapter.h"
13 9  
14 10 //====================================================================================
15 11 // Function declaration
drivers/staging/winbond/wbhal_s.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WINBOND_WBHAL_S_H
  2 +#define __WINBOND_WBHAL_S_H
  3 +
  4 +#include <linux/types.h>
  5 +
  6 +#include "linux/common.h"
  7 +
1 8 //[20040722 WK]
2 9 #define HAL_LED_SET_MASK 0x001c //20060901 Extend
3 10 #define HAL_LED_SET_SHIFT 2
... ... @@ -611,4 +618,6 @@
611 618 u32 NumRate48M;
612 619 u32 NumRate54M;
613 620 } HAL_RATE, *PHAL_RATE;
  621 +
  622 +#endif
drivers/staging/winbond/wblinux.c
Diff comments   View file @ 80aba53
... ... @@ -8,7 +8,13 @@
8 8 // Linux releated routines
9 9 //
10 10 //============================================================================
  11 +#include <linux/netdevice.h>
  12 +
  13 +#include "mds_f.h"
  14 +#include "mto_f.h"
11 15 #include "os_common.h"
  16 +#include "wbhal_f.h"
  17 +#include "wblinux_f.h"
12 18  
13 19 unsigned char
14 20 WBLINUX_Initial(struct wb35_adapter * adapter)
drivers/staging/winbond/wblinux_f.h
Diff comments   View file @ 80aba53
  1 +#ifndef __WBLINUX_F_H
  2 +#define __WBLINUX_F_H
  3 +
  4 +#include "adapter.h"
  5 +#include "mds_s.h"
  6 +
1 7 //=========================================================================
2 8 // Copyright (c) 1996-2004 Winbond Electronic Corporation
3 9 //
... ... @@ -15,4 +21,6 @@
15 21 void WBLINUX_stop( struct wb35_adapter *adapter );
16 22 void WbWlanHalt( struct wb35_adapter *adapter );
17 23 unsigned char WbWLanInitialize(struct wb35_adapter *adapter);
  24 +
  25 +#endif