Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197412
b: refs/heads/master
c: 6593dfa
h: refs/heads/master
v: v3
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 41a499e commit 0a4ea3e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 324148788bf3744d90fb6894ec5744eb0ca91b74
refs/heads/master: 6593dfacd3320c4f5fefd6e307ea5c6e9c5dac4f
24 changes: 9 additions & 15 deletions trunk/drivers/staging/vt6656/card.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,27 @@

/*--------------------- Export Definitions -------------------------*/


/*--------------------- Export Classes ----------------------------*/

// Init card type
/* init card type */

typedef enum _CARD_PHY_TYPE {

PHY_TYPE_AUTO=0,
PHY_TYPE_AUTO = 0,
PHY_TYPE_11B,
PHY_TYPE_11G,
PHY_TYPE_11A
} CARD_PHY_TYPE, *PCARD_PHY_TYPE;

typedef enum _CARD_OP_MODE {

OP_MODE_INFRASTRUCTURE=0,
OP_MODE_INFRASTRUCTURE = 0,
OP_MODE_ADHOC,
OP_MODE_AP,
OP_MODE_UNKNOWN
} CARD_OP_MODE, *PCARD_OP_MODE;

#define CB_MAX_CHANNEL_24G 14
//#define CB_MAX_CHANNEL_5G 24
#define CB_MAX_CHANNEL_5G 42 //[20050104] add channel9(5045MHz), 41==>42
/* #define CB_MAX_CHANNEL_5G 24 */
#define CB_MAX_CHANNEL_5G 42 /* add channel9(5045MHz), 41==>42 */
#define CB_MAX_CHANNEL (CB_MAX_CHANNEL_24G+CB_MAX_CHANNEL_5G)

/*--------------------- Export Variables --------------------------*/
Expand All @@ -83,12 +80,9 @@ BOOL CARDbRadioPowerOn(void *pDeviceHandler);
BYTE CARDbyGetPktType(void *pDeviceHandler);
void CARDvSetBSSMode(void *pDeviceHandler);

BOOL
CARDbChannelSwitch (
void *pDeviceHandler,
BYTE byMode,
BYTE byNewChannel,
BYTE byCount
);
BOOL CARDbChannelSwitch(void *pDeviceHandler,
BYTE byMode,
BYTE byNewChannel,
BYTE byCount);

#endif /* __CARD_H__ */

0 comments on commit 0a4ea3e

Please sign in to comment.