http://downloads.netgear.com/files/GPL/GPL_Source_V361j_DM111PSP_series_consumer_rele...

[bcm963xx.git] / userapps / broadcom / cfm / inc / wldefs.h

diff --git a/userapps/broadcom/cfm/inc/wldefs.h b/userapps/broadcom/cfm/inc/wldefs.h
index c67f214..da4205e 100755 (executable)
--- a/userapps/broadcom/cfm/inc/wldefs.h
+++ b/userapps/broadcom/cfm/inc/wldefs.h
@@ -69,6 +69,7 @@
 #define WL_KEY64_SIZE_CHAR              5
 #define WL_KEY128_SIZE_HEX              26
 #define WL_KEY128_SIZE_CHAR             13
+#define WL_KEY64_SIZE_ASCII            5
 #define WL_MAX_ASSOC_STA                128
 
 #define WL_FLT_MAC_OFF   "disabled"
@@ -123,10 +124,18 @@
 #define WL_BASIC_RATE_1_2        "12"
 #define WL_BASIC_RATE_WIFI_2     "wifi2"
 
+#if 0 //swda remove,05/03/2005
 #define WL_MODE_G_AUTO           1
 #define WL_MODE_G_PERFORMANCE    4
 #define WL_MODE_G_LRS            5
 #define WL_MODE_B_ONLY           0
+#else //swda add,05/03/2005
+#define WL_MODE_G_AUTO           0
+#define WL_MODE_G_PERFORMANCE    1
+#define WL_MODE_G_LRS            2
+#define WL_MODE_G_GONLY          3
+#define WL_MODE_B_ONLY           4
+#endif
 
 #define WL_AUTO                  "auto"
 #define WL_OFF                   "off"
@@ -252,6 +261,10 @@ typedef int chanspec_t;
 #define WL_CHANSPEC_BAND_2G            0x2000
 #define INVCHANSPEC    255
 
+//swda add,06/06/2006
+#define WL_KEY_ASCII 0
+#define WL_KEY_HEX   1
+//swda add end
 /********************** Global Structs ****************************************/
 
 typedef enum {
@@ -336,13 +349,19 @@ typedef struct {
    char wlRifs[WL_SIZE_8_MAX];
    char wlAmpdu[WL_SIZE_8_MAX];
    char wlAmsdu[WL_SIZE_8_MAX];
-   char wlNmode[WL_SIZE_8_MAX];
+   char wlNmode[WL_SIZE_8_MAX];        
    int wlNReqd;
 #endif      
 } WIRELESS_VAR, *PWIRELESS_VAR;
 
 typedef struct {
    char wlSsid[WL_SSID_SIZE_MAX];
+   //swda add,05/03/2005
+   int  wlHide;
+   int  wlKeyType;// 0:ASCII  1:Hex
+   char wlKeys128_ascii[WL_KEY_NUM][15];//ASCII
+   char wlKeys64_ascii[WL_KEY_NUM][7];//ASCII
+   //swda add end
    char wlKeys128[WL_KEY_NUM][WL_MID_SIZE_MAX];
    char wlKeys64[WL_KEY_NUM][WL_SM_SIZE_MAX];
    char wlWpaPsk[WL_WPA_PSK_SIZE_MAX];
@@ -383,6 +402,8 @@ typedef struct {
 typedef struct {
    char macAddress[WL_MID_SIZE_MAX];
    char ssid[WL_SSID_SIZE_MAX];
+   char aptxmode;//swda add,05/03/2005
+   int channel;//swda add,05/03/2005
 } WL_FLT_MAC_ENTRY, *PWL_FLT_MAC_ENTRY;
 
 typedef struct { // don't want store ssid