Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bb5a7ec authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: remove gl_80211.h header 



The gl_80211.h header file contains only two definitions that are actually
used. Move them to mds_s.h and remove the otherwise unused file.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3b055748

drivers/staging/winbond/gl_80211.h

deleted100644 → 0
+0 −126
Original line number Diff line number Diff line 
#ifndef __GL_80211_H__

#define __GL_80211_H__



#include <linux/types.h>



/****************** CONSTANT AND MACRO SECTION ******************************/



/* BSS Type */

enum {

    WLAN_BSSTYPE_INFRASTRUCTURE         = 0,

    WLAN_BSSTYPE_INDEPENDENT,

    WLAN_BSSTYPE_ANY_BSS,

};







/* Preamble_Type, see <SFS-802.11G-MIB-203> */

typedef enum preamble_type {

    WLAN_PREAMBLE_TYPE_SHORT,

    WLAN_PREAMBLE_TYPE_LONG,

}    preamble_type_e;





/* Slot_Time_Type, see <SFS-802.11G-MIB-208> */

typedef enum slot_time_type {

    WLAN_SLOT_TIME_TYPE_LONG,

    WLAN_SLOT_TIME_TYPE_SHORT,

}    slot_time_type_e;



/*--------------------------------------------------------------------------*/

/* Encryption Mode */

typedef enum {

    WEP_DISABLE                                         = 0,

    WEP_64,

    WEP_128,



    ENCRYPT_DISABLE,

    ENCRYPT_WEP,

    ENCRYPT_WEP_NOKEY,

    ENCRYPT_TKIP,

    ENCRYPT_TKIP_NOKEY,

    ENCRYPT_CCMP,

    ENCRYPT_CCMP_NOKEY,

}    encryption_mode_e;



typedef enum _WLAN_RADIO {

    WLAN_RADIO_ON,

    WLAN_RADIO_OFF,

    WLAN_RADIO_MAX, // not a real type, defined as an upper bound

} WLAN_RADIO;



typedef struct _WLAN_RADIO_STATUS {

	WLAN_RADIO HWStatus;

	WLAN_RADIO SWStatus;

} WLAN_RADIO_STATUS;



//----------------------------------------------------------------------------

// 20041021 1.1.81.1000 ybjiang

// add for radio notification

typedef

void (*RADIO_NOTIFICATION_HANDLER)(

	void *Data,

	void *RadioStatusBuffer,

	u32 RadioStatusBufferLen

	);



typedef struct _WLAN_RADIO_NOTIFICATION

{

    RADIO_NOTIFICATION_HANDLER RadioChangeHandler;

    void *Data;

} WLAN_RADIO_NOTIFICATION;



//----------------------------------------------------------------------------

// 20041102 1.1.91.1000 ybjiang

// add for OID_802_11_CUST_REGION_CAPABILITIES and OID_802_11_OID_REGION

typedef enum _WLAN_REGION_CODE

{

	WLAN_REGION_UNKNOWN,

	WLAN_REGION_EUROPE,

	WLAN_REGION_JAPAN,

	WLAN_REGION_USA,

	WLAN_REGION_FRANCE,

	WLAN_REGION_SPAIN,

	WLAN_REGION_ISRAEL,

	WLAN_REGION_MAX, // not a real type, defined as an upper bound

} WLAN_REGION_CODE;



#define REGION_NAME_MAX_LENGTH   256



typedef struct _WLAN_REGION_CHANNELS

{

	u32 Length;

	u32 NameLength;

	u8 Name[REGION_NAME_MAX_LENGTH];

	WLAN_REGION_CODE Code;

	u32 Frequency[1];

} WLAN_REGION_CHANNELS;



typedef struct _WLAN_REGION_CAPABILITIES

{

	u32 NumberOfItems;

	WLAN_REGION_CHANNELS Region[1];

} WLAN_REGION_CAPABILITIES;



typedef struct _region_name_map {

	WLAN_REGION_CODE region;

	u8 *name;

	u32 *channels;

} region_name_map;



/*--------------------------------------------------------------------------*/

#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]

#define MACSTR "%02X:%02X:%02X:%02X:%02X:%02X"



// TODO: 0627 kevin

#define MIC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5], (a)[6], (a)[7]

#define MICSTR "%02X %02X %02X %02X %02X %02X %02X %02X"



#define MICKEY2STR(a)   MIC2STR(a)

#define MICKEYSTR       MICSTR





#endif /* __GL_80211_H__ */

/*** end of file ***/

drivers/staging/winbond/mds.c

+0 −1
Original line number Diff line number Diff line 
#include "gl_80211.h"

#include "mds_f.h"

#include "mlmetxrx_f.h"

#include "mto.h"

drivers/staging/winbond/mds_s.h

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
#include "mac_structures.h"

#include "scan_s.h"



/* Preamble_Type, see <SFS-802.11G-MIB-203> */

enum {

	WLAN_PREAMBLE_TYPE_SHORT,

	WLAN_PREAMBLE_TYPE_LONG,

};



////////////////////////////////////////////////////////////////////////////////////////////////////////

#define MAX_USB_TX_DESCRIPTOR		15		// IS89C35 ability

#define MAX_USB_TX_BUFFER_NUMBER	4		// Virtual pre-buffer number of MAX_USB_TX_BUFFER

drivers/staging/winbond/mto.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
// LA20040210_DTO kevin

#include "sysdef.h"

#include "sme_api.h"

#include "gl_80211.h"

#include "wbhal_f.h"



// Declare SQ3 to rate and fragmentation threshold table