shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: remove typedef from enum

Browse Source 
This patch removes typedef from enumerated types defined in
coreconfigurator.c file and also changes their names to avoid CamelCase
naming convention as shown:

- tenuBasicFrmType to basic_frame_type
- tenuFrmSubtype to sub_frame_type
- tenuInfoElemID to info_element_id

Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tony Cho
2015-10-02 14:22:03 +09:00
committed by Greg Kroah-Hartman
parent c9d4834d94
commit 9dd2f7719d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/wilc1000/coreconfigurator.c
View File

@@ -18,16 +18,16 @@
BEACON_INTERVAL_LEN + CAP_INFO_LEN)
/* Basic Frame Type Codes (2-bit) */
typedef enum {
enum basic_frame_type {
FRAME_TYPE_CONTROL = 0x04,
FRAME_TYPE_DATA = 0x08,
FRAME_TYPE_MANAGEMENT = 0x00,
FRAME_TYPE_RESERVED = 0x0C,
FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF
} tenuBasicFrmType;
};
/* Frame Type and Subtype Codes (6-bit) */
typedef enum {
enum sub_frame_type {
ASSOC_REQ = 0x00,
ASSOC_RSP = 0x10,
REASSOC_REQ = 0x20,
@@ -64,10 +64,10 @@ typedef enum {
BLOCKACK_REQ = 0x84,
BLOCKACK = 0x94,
FRAME_SUBTYPE_FORCE_32BIT = 0xFFFFFFFF
} tenuFrmSubtype;
};
/* Element ID of various Information Elements */
typedef enum {
enum info_element_id {
ISSID = 0, /* Service Set Identifier */
ISUPRATES = 1, /* Supported Rates */
IFHPARMS = 2, /* FH parameter set */
@@ -108,7 +108,7 @@ typedef enum {
IWMM = 221, /* WMM parameters */
IWPAELEMENT = 221, /* WPA Information Element */
INFOELEM_ID_FORCE_32BIT = 0xFFFFFFFF
} tenuInfoElemID;
};
typedef struct {
@@ -159,9 +159,9 @@ static inline u32 get_beacon_timestamp_hi(u8 *data)
/* This function extracts the 'frame type and sub type' bits from the MAC */
/* header of the input frame. */
/* Returns the value in the LSB of the returned value. */
static inline tenuFrmSubtype get_sub_type(u8 *header)
static inline enum sub_frame_type get_sub_type(u8 *header)
{
return ((tenuFrmSubtype)(header[0] & 0xFC));
return ((enum sub_frame_type)(header[0] & 0xFC));
}
/* This function extracts the 'to ds' bit from the MAC header of the input */
@@ -245,7 +245,7 @@ static inline u16 get_cap_info(u8 *data)
{
u16 cap_info = 0;
u16 index = MAC_HDR_LEN;
tenuFrmSubtype st;
enum sub_frame_type st;
st = get_sub_type(data);