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

Commit 3e27dfa2 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: wlang-ng: Fix block comments style warnings in hfa384x.h 



 This patch fixes the following checkpatch.pl warnings in hfa384x.h:
 WARNING: Block comments use * on subsequent lines
 WARNING: Block comments use a trailing */ on a separate line

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f046456

drivers/staging/wlan-ng/hfa384x.h

+96 −70
Original line number Original line Diff line number Diff line
@@ -174,11 +174,12 @@ 
#define		HFA384x_CMD_ERR			((u16)(0x7F))

#define		HFA384x_CMD_ERR			((u16)(0x7F))





/*--- Programming Modes --------------------------

/*--- Programming Modes --------------------------

	MODE 0: Disable programming

 *	MODE 0: Disable programming

	MODE 1: Enable volatile memory programming

 *	MODE 1: Enable volatile memory programming

	MODE 2: Enable non-volatile memory programming

 *	MODE 2: Enable non-volatile memory programming

	MODE 3: Program non-volatile memory section

 *	MODE 3: Program non-volatile memory section

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

 *-------------------------------------------------

 */

#define		HFA384x_PROGMODE_DISABLE	((u16)0x00)

#define		HFA384x_PROGMODE_DISABLE	((u16)0x00)

#define		HFA384x_PROGMODE_RAM		((u16)0x01)

#define		HFA384x_PROGMODE_RAM		((u16)0x01)

#define		HFA384x_PROGMODE_NV		((u16)0x02)

#define		HFA384x_PROGMODE_NV		((u16)0x02)
@@ -186,8 +187,9 @@ 




/*--- Record ID Constants --------------------------*/

/*--- Record ID Constants --------------------------*/

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

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

Configuration RIDs: Network Parameters, Static Configuration Entities

 * Configuration RIDs: Network Parameters, Static Configuration Entities

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_CNFPORTTYPE		((u16)0xFC00)

#define		HFA384x_RID_CNFPORTTYPE		((u16)0xFC00)

#define		HFA384x_RID_CNFOWNMACADDR	((u16)0xFC01)

#define		HFA384x_RID_CNFOWNMACADDR	((u16)0xFC01)

#define		HFA384x_RID_CNFDESIREDSSID	((u16)0xFC02)

#define		HFA384x_RID_CNFDESIREDSSID	((u16)0xFC02)
@@ -196,17 +198,19 @@ Configuration RIDs: Network Parameters, Static Configuration Entities 
#define		HFA384x_RID_CNFMAXDATALEN	((u16)0xFC07)

#define		HFA384x_RID_CNFMAXDATALEN	((u16)0xFC07)





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

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

Configuration RID lengths: Network Params, Static Config Entities

 * Configuration RID lengths: Network Params, Static Config Entities

  This is the length of JUST the DATA part of the RID (does not

 * This is the length of JUST the DATA part of the RID (does not

  include the len or code fields)

 * include the len or code fields)

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_CNFOWNMACADDR_LEN	((u16)6)

#define		HFA384x_RID_CNFOWNMACADDR_LEN	((u16)6)

#define		HFA384x_RID_CNFDESIREDSSID_LEN	((u16)34)

#define		HFA384x_RID_CNFDESIREDSSID_LEN	((u16)34)

#define		HFA384x_RID_CNFOWNSSID_LEN	((u16)34)

#define		HFA384x_RID_CNFOWNSSID_LEN	((u16)34)





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

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

Configuration RIDs: Network Parameters, Dynamic Configuration Entities

 * Configuration RIDs: Network Parameters, Dynamic Configuration Entities

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_CREATEIBSS		((u16)0xFC81)

#define		HFA384x_RID_CREATEIBSS		((u16)0xFC81)

#define		HFA384x_RID_FRAGTHRESH		((u16)0xFC82)

#define		HFA384x_RID_FRAGTHRESH		((u16)0xFC82)

#define		HFA384x_RID_RTSTHRESH		((u16)0xFC83)

#define		HFA384x_RID_RTSTHRESH		((u16)0xFC83)
@@ -214,8 +218,9 @@ Configuration RIDs: Network Parameters, Dynamic Configuration Entities 
#define		HFA384x_RID_PROMISCMODE		((u16)0xFC85)

#define		HFA384x_RID_PROMISCMODE		((u16)0xFC85)





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

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

Information RIDs: NIC Information

 * Information RIDs: NIC Information

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

 *----------------------------------------------------------------------

 */

#define		HFA384x_RID_MAXLOADTIME		((u16)0xFD00)

#define		HFA384x_RID_MAXLOADTIME		((u16)0xFD00)

#define		HFA384x_RID_DOWNLOADBUFFER	((u16)0xFD01)

#define		HFA384x_RID_DOWNLOADBUFFER	((u16)0xFD01)

#define		HFA384x_RID_PRIIDENTITY		((u16)0xFD02)

#define		HFA384x_RID_PRIIDENTITY		((u16)0xFD02)
@@ -231,15 +236,17 @@ Information RIDs: NIC Information 
#define		HFA384x_RID_STA_CFIACTRANGES	((u16)0xFD23)

#define		HFA384x_RID_STA_CFIACTRANGES	((u16)0xFD23)





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

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

Information RID Lengths: NIC Information

 * Information RID Lengths: NIC Information

  This is the length of JUST the DATA part of the RID (does not

 * This is the length of JUST the DATA part of the RID (does not

  include the len or code fields)

 * include the len or code fields)

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

 *---------------------------------------------------------------------

 */

#define		HFA384x_RID_NICSERIALNUMBER_LEN		((u16)12)

#define		HFA384x_RID_NICSERIALNUMBER_LEN		((u16)12)





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

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

Information RIDs:  MAC Information

 * Information RIDs:  MAC Information

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_PORTSTATUS		((u16)0xFD40)

#define		HFA384x_RID_PORTSTATUS		((u16)0xFD40)

#define		HFA384x_RID_CURRENTSSID		((u16)0xFD41)

#define		HFA384x_RID_CURRENTSSID		((u16)0xFD41)

#define		HFA384x_RID_CURRENTBSSID	((u16)0xFD42)

#define		HFA384x_RID_CURRENTBSSID	((u16)0xFD42)
@@ -251,23 +258,26 @@ Information RIDs: MAC Information 
#define		HFA384x_RID_DBMCOMMSQUALITY	((u16)0xFD51)

#define		HFA384x_RID_DBMCOMMSQUALITY	((u16)0xFD51)





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

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

Information RID Lengths:  MAC Information

 * Information RID Lengths:  MAC Information

  This is the length of JUST the DATA part of the RID (does not

 * This is the length of JUST the DATA part of the RID (does not

  include the len or code fields)

 * include the len or code fields)

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_DBMCOMMSQUALITY_LEN	 \

#define		HFA384x_RID_DBMCOMMSQUALITY_LEN	 \

	((u16)sizeof(hfa384x_dbmcommsquality_t))

	((u16)sizeof(hfa384x_dbmcommsquality_t))

#define		HFA384x_RID_JOINREQUEST_LEN \

#define		HFA384x_RID_JOINREQUEST_LEN \

	((u16)sizeof(hfa384x_JoinRequest_data_t))

	((u16)sizeof(hfa384x_JoinRequest_data_t))





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

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

Information RIDs:  Modem Information

 * Information RIDs:  Modem Information

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_CURRENTCHANNEL	((u16)0xFDC1)

#define		HFA384x_RID_CURRENTCHANNEL	((u16)0xFDC1)





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

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

API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)

 * API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RID_CNFWEPDEFAULTKEYID	((u16)0xFC23)

#define		HFA384x_RID_CNFWEPDEFAULTKEYID	((u16)0xFC23)

#define		HFA384x_RID_CNFWEPDEFAULTKEY0	((u16)0xFC24)

#define		HFA384x_RID_CNFWEPDEFAULTKEY0	((u16)0xFC24)

#define		HFA384x_RID_CNFWEPDEFAULTKEY1	((u16)0xFC25)

#define		HFA384x_RID_CNFWEPDEFAULTKEY1	((u16)0xFC25)
@@ -291,8 +301,9 @@ API ENHANCEMENTS (NOT ALREADY IMPLEMENTED) 
#define		HFA384x_RID_CNFWEP128DEFAULTKEY_LEN	((u16)14)

#define		HFA384x_RID_CNFWEP128DEFAULTKEY_LEN	((u16)14)





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

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

PD Record codes

 * PD Record codes

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

 *--------------------------------------------------------------------

 */

#define HFA384x_PDR_PCB_PARTNUM		((u16)0x0001)

#define HFA384x_PDR_PCB_PARTNUM		((u16)0x0001)

#define HFA384x_PDR_PDAVER		((u16)0x0002)

#define HFA384x_PDR_PDAVER		((u16)0x0002)

#define HFA384x_PDR_NIC_SERIAL		((u16)0x0003)

#define HFA384x_PDR_NIC_SERIAL		((u16)0x0003)
@@ -362,9 +373,10 @@ struct hfa384x_bytestr32 { 
} __packed;

} __packed;





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

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

Configuration Record Structures:

 * Configuration Record Structures:

	Network Parameters, Static Configuration Entities

 *	Network Parameters, Static Configuration Entities

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

 *--------------------------------------------------------------------

 */





/*-- Hardware/Firmware Component Information ----------*/

/*-- Hardware/Firmware Component Information ----------*/

struct hfa384x_compident {

struct hfa384x_compident {
@@ -388,9 +400,10 @@ typedef struct hfa384x_caplevel { 
#define HFA384x_CNFAUTHENTICATION_LEAP		0x0004

#define HFA384x_CNFAUTHENTICATION_LEAP		0x0004





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

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

Configuration Record Structures:

 * Configuration Record Structures:

	Network Parameters, Dynamic Configuration Entities

 *	Network Parameters, Dynamic Configuration Entities

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

 *--------------------------------------------------------------------

 */





#define HFA384x_CREATEIBSS_JOINCREATEIBSS          0

#define HFA384x_CREATEIBSS_JOINCREATEIBSS          0
@@ -421,8 +434,9 @@ typedef struct hfa384x_WPAData { 
} __packed hfa384x_WPAData_t;

} __packed hfa384x_WPAData_t;





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

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

Information Record Structures: NIC Information

 * Information Record Structures: NIC Information

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

 *--------------------------------------------------------------------

 */





/*-- Information Record: DownLoadBuffer --*/

/*-- Information Record: DownLoadBuffer --*/

/* NOTE: The page and offset are in AUX format */

/* NOTE: The page and offset are in AUX format */
@@ -433,8 +447,9 @@ typedef struct hfa384x_downloadbuffer { 
} __packed hfa384x_downloadbuffer_t;

} __packed hfa384x_downloadbuffer_t;





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

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

Information Record Structures: NIC Information

 * Information Record Structures: NIC Information

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

 *--------------------------------------------------------------------

 */





#define HFA384x_PSTATUS_CONN_IBSS	((u16)3)

#define HFA384x_PSTATUS_CONN_IBSS	((u16)3)
@@ -453,10 +468,11 @@ typedef struct hfa384x_dbmcommsquality { 
} __packed hfa384x_dbmcommsquality_t;

} __packed hfa384x_dbmcommsquality_t;





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

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

FRAME STRUCTURES: Communication Frames

 * FRAME STRUCTURES: Communication Frames

----------------------------------------------------------------------

 *--------------------------------------------------------------------

Communication Frames: Transmit Frames

 * Communication Frames: Transmit Frames

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

 *--------------------------------------------------------------------

 */

/*-- Communication Frame: Transmit Frame Structure --*/

/*-- Communication Frame: Transmit Frame Structure --*/

typedef struct hfa384x_tx_frame {

typedef struct hfa384x_tx_frame {

	u16 status;

	u16 status;
@@ -485,8 +501,9 @@ typedef struct hfa384x_tx_frame { 
	u16 data_length;	/* big endian format */

	u16 data_length;	/* big endian format */

} __packed hfa384x_tx_frame_t;

} __packed hfa384x_tx_frame_t;

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

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

Communication Frames: Field Masks for Transmit Frames

 * Communication Frames: Field Masks for Transmit Frames

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

 *--------------------------------------------------------------------

 */

/*-- Status Field --*/

/*-- Status Field --*/

#define		HFA384x_TXSTATUS_ACKERR			((u16)BIT(5))

#define		HFA384x_TXSTATUS_ACKERR			((u16)BIT(5))

#define		HFA384x_TXSTATUS_FORMERR		((u16)BIT(3))

#define		HFA384x_TXSTATUS_FORMERR		((u16)BIT(3))
@@ -500,8 +517,9 @@ Communication Frames: Field Masks for Transmit Frames 
#define		HFA384x_TX_TXEX				((u16)BIT(2))

#define		HFA384x_TX_TXEX				((u16)BIT(2))

#define		HFA384x_TX_TXOK				((u16)BIT(1))

#define		HFA384x_TX_TXOK				((u16)BIT(1))

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

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

Communication Frames: Test/Get/Set Field Values for Transmit Frames

 * Communication Frames: Test/Get/Set Field Values for Transmit Frames

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

 *--------------------------------------------------------------------

 */

/*-- Status Field --*/

/*-- Status Field --*/

#define HFA384x_TXSTATUS_ISERROR(v)	\

#define HFA384x_TXSTATUS_ISERROR(v)	\

	(((u16)(v)) & \

	(((u16)(v)) & \
@@ -517,8 +535,9 @@ Communication Frames: Test/Get/Set Field Values for Transmit Frames 
#define	HFA384x_TX_TXEX_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXEX, 2)

#define	HFA384x_TX_TXEX_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXEX, 2)

#define	HFA384x_TX_TXOK_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXOK, 1)

#define	HFA384x_TX_TXOK_SET(v)		HFA384x_TX_SET(v, HFA384x_TX_TXOK, 1)

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

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

Communication Frames: Receive Frames

 * Communication Frames: Receive Frames

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

 *--------------------------------------------------------------------

 */

/*-- Communication Frame: Receive Frame Structure --*/

/*-- Communication Frame: Receive Frame Structure --*/

typedef struct hfa384x_rx_frame {

typedef struct hfa384x_rx_frame {

	/*-- MAC rx descriptor (hfa384x byte order) --*/

	/*-- MAC rx descriptor (hfa384x byte order) --*/
@@ -547,8 +566,9 @@ typedef struct hfa384x_rx_frame { 
	u16 data_length;	/* IEEE? (big endian) format */

	u16 data_length;	/* IEEE? (big endian) format */

} __packed hfa384x_rx_frame_t;

} __packed hfa384x_rx_frame_t;

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

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

Communication Frames: Field Masks for Receive Frames

 * Communication Frames: Field Masks for Receive Frames

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

 *--------------------------------------------------------------------

 */





/*-- Status Fields --*/

/*-- Status Fields --*/

#define		HFA384x_RXSTATUS_MACPORT		((u16)(BIT(10) | \

#define		HFA384x_RXSTATUS_MACPORT		((u16)(BIT(10) | \
@@ -556,17 +576,19 @@ Communication Frames: Field Masks for Receive Frames 
								BIT(8)))

								BIT(8)))

#define		HFA384x_RXSTATUS_FCSERR			((u16)BIT(0))

#define		HFA384x_RXSTATUS_FCSERR			((u16)BIT(0))

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

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

Communication Frames: Test/Get/Set Field Values for Receive Frames

 * Communication Frames: Test/Get/Set Field Values for Receive Frames

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_RXSTATUS_MACPORT_GET(value)	((u16)((((u16)(value)) \

#define		HFA384x_RXSTATUS_MACPORT_GET(value)	((u16)((((u16)(value)) \

					    & HFA384x_RXSTATUS_MACPORT) >> 8))

					    & HFA384x_RXSTATUS_MACPORT) >> 8))

#define		HFA384x_RXSTATUS_ISFCSERR(value)	((u16)(((u16)(value)) \

#define		HFA384x_RXSTATUS_ISFCSERR(value)	((u16)(((u16)(value)) \

						  & HFA384x_RXSTATUS_FCSERR))

						  & HFA384x_RXSTATUS_FCSERR))

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

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

 FRAME STRUCTURES: Information Types and Information Frame Structures

 * FRAME STRUCTURES: Information Types and Information Frame Structures

----------------------------------------------------------------------

 *--------------------------------------------------------------------

Information Types

 * Information Types

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

 *--------------------------------------------------------------------

 */

#define		HFA384x_IT_HANDOVERADDR			((u16)0xF000UL)

#define		HFA384x_IT_HANDOVERADDR			((u16)0xF000UL)

#define		HFA384x_IT_COMMTALLIES			((u16)0xF100UL)

#define		HFA384x_IT_COMMTALLIES			((u16)0xF100UL)

#define		HFA384x_IT_SCANRESULTS			((u16)0xF101UL)

#define		HFA384x_IT_SCANRESULTS			((u16)0xF101UL)
@@ -581,10 +603,11 @@ Information Types 
#define		HFA384x_IT_MICFAILURE			((u16)0xF206UL)

#define		HFA384x_IT_MICFAILURE			((u16)0xF206UL)





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

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

Information Frames Structures

 * Information Frames Structures

----------------------------------------------------------------------

 *--------------------------------------------------------------------

Information Frames: Notification Frame Structures

 * Information Frames: Notification Frame Structures

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

 *--------------------------------------------------------------------

 */





/*--  Inquiry Frame, Diagnose: Communication Tallies --*/

/*--  Inquiry Frame, Diagnose: Communication Tallies --*/

typedef struct hfa384x_CommTallies16 {

typedef struct hfa384x_CommTallies16 {
@@ -758,8 +781,9 @@ typedef struct hfa384x_InfFrame { 
} __packed hfa384x_InfFrame_t;

} __packed hfa384x_InfFrame_t;





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

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

USB Packet structures and constants.

 * USB Packet structures and constants.

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

 *--------------------------------------------------------------------

 */





/* Should be sent to the bulkout endpoint */

/* Should be sent to the bulkout endpoint */

#define HFA384x_USB_TXFRM	0

#define HFA384x_USB_TXFRM	0
@@ -905,8 +929,9 @@ typedef union hfa384x_usbin { 
} __packed hfa384x_usbin_t;

} __packed hfa384x_usbin_t;





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

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

PD record structures.

 * PD record structures.

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

 *--------------------------------------------------------------------

 */





typedef struct hfa384x_pdr_pcb_partnum {

typedef struct hfa384x_pdr_pcb_partnum {

	u8 num[8];

	u8 num[8];
@@ -1113,9 +1138,10 @@ typedef struct hfa384x_pdrec { 




#ifdef __KERNEL__

#ifdef __KERNEL__

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

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

---  MAC state structure, argument to all functions --

 * ---  MAC state structure, argument to all functions --

---  Also, a collection of support types --

 * ---  Also, a collection of support types --

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

 *--------------------------------------------------------------------

 */

typedef struct hfa384x_statusresult {

typedef struct hfa384x_statusresult {

	u16 status;

	u16 status;

	u16 resp0;

	u16 resp0;