Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-block.git] / drivers / staging / rt2860 / oid.h
index 8519afccd979f2d93fce1f9a209ce0245b5fc2a1..0227c4a38f9f0c89d0121f05d7cf3e7211ec7f53 100644 (file)
 //
 #define        OID_GET_SET_TOGGLE                      0x8000
 
-#define        OID_802_11_NETWORK_TYPES_SUPPORTED                      0x0103
-#define        OID_802_11_NETWORK_TYPE_IN_USE                          0x0104
-#define        OID_802_11_RSSI_TRIGGER                                         0x0107
-#define        RT_OID_802_11_RSSI                                                      0x0108 //rt2860 only , kathy
-#define        RT_OID_802_11_RSSI_1                                            0x0109 //rt2860 only , kathy
-#define        RT_OID_802_11_RSSI_2                                            0x010A //rt2860 only , kathy
-#define        OID_802_11_NUMBER_OF_ANTENNAS                           0x010B
-#define        OID_802_11_RX_ANTENNA_SELECTED                          0x010C
-#define        OID_802_11_TX_ANTENNA_SELECTED                          0x010D
-#define        OID_802_11_SUPPORTED_RATES                                      0x010E
-#define        OID_802_11_ADD_WEP                                                      0x0112
-#define        OID_802_11_REMOVE_WEP                                           0x0113
-#define        OID_802_11_DISASSOCIATE                                         0x0114
-#define        OID_802_11_PRIVACY_FILTER                                       0x0118
-#define        OID_802_11_ASSOCIATION_INFORMATION                      0x011E
-#define        OID_802_11_TEST                                                         0x011F
-#define        RT_OID_802_11_COUNTRY_REGION                            0x0507
-#define        OID_802_11_BSSID_LIST_SCAN                                      0x0508
-#define        OID_802_11_SSID                                                         0x0509
-#define        OID_802_11_BSSID                                                        0x050A
-#define        RT_OID_802_11_RADIO                                                     0x050B
-#define        RT_OID_802_11_PHY_MODE                                          0x050C
-#define        RT_OID_802_11_STA_CONFIG                                        0x050D
-#define        OID_802_11_DESIRED_RATES                                        0x050E
-#define        RT_OID_802_11_PREAMBLE                                          0x050F
-#define        OID_802_11_WEP_STATUS                                           0x0510
-#define        OID_802_11_AUTHENTICATION_MODE                          0x0511
-#define        OID_802_11_INFRASTRUCTURE_MODE                          0x0512
-#define        RT_OID_802_11_RESET_COUNTERS                            0x0513
-#define        OID_802_11_RTS_THRESHOLD                                        0x0514
-#define        OID_802_11_FRAGMENTATION_THRESHOLD                      0x0515
-#define        OID_802_11_POWER_MODE                                           0x0516
-#define        OID_802_11_TX_POWER_LEVEL                                       0x0517
-#define        RT_OID_802_11_ADD_WPA                                           0x0518
-#define        OID_802_11_REMOVE_KEY                                           0x0519
-#define        OID_802_11_ADD_KEY                                                      0x0520
-#define        OID_802_11_CONFIGURATION                                        0x0521
-#define        OID_802_11_TX_PACKET_BURST                                      0x0522
-#define        RT_OID_802_11_QUERY_NOISE_LEVEL                         0x0523
-#define        RT_OID_802_11_EXTRA_INFO                                        0x0524
-#ifdef DBG
-#define        RT_OID_802_11_HARDWARE_REGISTER                         0x0525
-#endif
-#define OID_802_11_ENCRYPTION_STATUS            OID_802_11_WEP_STATUS
-#define OID_802_11_DEAUTHENTICATION                 0x0526
-#define OID_802_11_DROP_UNENCRYPTED                 0x0527
-#define OID_802_11_MIC_FAILURE_REPORT_FRAME         0x0528
-
-// For 802.1x daemin using to require current driver configuration
-#define OID_802_11_RADIUS_QUERY_SETTING                                0x0540
+#define OID_802_11_ADD_WEP                     0x0112
+#define OID_802_11_DISASSOCIATE                        0x0114
+#define OID_802_11_BSSID_LIST_SCAN             0x0508
+#define OID_802_11_SSID                                0x0509
+#define OID_802_11_BSSID                       0x050A
+#define OID_802_11_MIC_FAILURE_REPORT_FRAME    0x0528
 
 #define        RT_OID_DEVICE_NAME                                                      0x0607
 #define        RT_OID_VERSION_INFO                                                     0x0608
-#define        OID_802_11_BSSID_LIST                                           0x0609
-#define        OID_802_3_CURRENT_ADDRESS                                       0x060A
 #define        OID_GEN_MEDIA_CONNECT_STATUS                            0x060B
-#define        RT_OID_802_11_QUERY_LINK_STATUS                         0x060C
-#define        OID_802_11_RSSI                                                         0x060D
-#define        OID_802_11_STATISTICS                                           0x060E
 #define        OID_GEN_RCV_OK                                                          0x060F
 #define        OID_GEN_RCV_NO_BUFFER                                           0x0610
-#define        RT_OID_802_11_QUERY_EEPROM_VERSION                      0x0611
-#define        RT_OID_802_11_QUERY_FIRMWARE_VERSION            0x0612
-#define        RT_OID_802_11_QUERY_LAST_RX_RATE                        0x0613
-#define        RT_OID_802_11_TX_POWER_LEVEL_1                          0x0614
-#define        RT_OID_802_11_QUERY_PIDVID                                      0x0615
 
 #define OID_SET_COUNTERMEASURES                     0x0616
-#define OID_802_11_SET_IEEE8021X                    0x0617
-#define OID_802_11_SET_IEEE8021X_REQUIRE_KEY        0x0618
-#define OID_802_11_PMKID                            0x0620
 #define RT_OID_WPA_SUPPLICANT_SUPPORT               0x0621
 #define RT_OID_WE_VERSION_COMPILED                  0x0622
 #define RT_OID_NEW_DRIVER                           0x0623
 
-
 //rt2860 , kathy
-#define        RT_OID_802_11_SNR_0                                                     0x0630
-#define        RT_OID_802_11_SNR_1                                                     0x0631
-#define        RT_OID_802_11_QUERY_LAST_TX_RATE                        0x0632
-#define        RT_OID_802_11_QUERY_HT_PHYMODE                          0x0633
-#define        RT_OID_802_11_SET_HT_PHYMODE                            0x0634
-#define        OID_802_11_RELOAD_DEFAULTS                                      0x0635
-#define        RT_OID_802_11_QUERY_APSD_SETTING                        0x0636
-#define        RT_OID_802_11_SET_APSD_SETTING                          0x0637
-#define        RT_OID_802_11_QUERY_APSD_PSM                            0x0638
-#define        RT_OID_802_11_SET_APSD_PSM                                      0x0639
-#define        RT_OID_802_11_QUERY_DLS                                         0x063A
-#define        RT_OID_802_11_SET_DLS                                           0x063B
-#define        RT_OID_802_11_QUERY_DLS_PARAM                           0x063C
-#define        RT_OID_802_11_SET_DLS_PARAM                                     0x063D
-#define RT_OID_802_11_QUERY_WMM                        0x063E
-#define RT_OID_802_11_SET_WMM                                          0x063F
-#define RT_OID_802_11_QUERY_IMME_BA_CAP                                0x0640
-#define RT_OID_802_11_SET_IMME_BA_CAP                          0x0641
-#define RT_OID_802_11_QUERY_BATABLE                                    0x0642
-#define RT_OID_802_11_ADD_IMME_BA                                      0x0643
-#define RT_OID_802_11_TEAR_IMME_BA                                     0x0644
 #define RT_OID_DRIVER_DEVICE_NAME                   0x0645
-#define RT_OID_802_11_QUERY_DAT_HT_PHYMODE          0x0646
 #define RT_OID_QUERY_MULTIPLE_CARD_SUPPORT          0x0647
 
 // Ralink defined OIDs
 // Dennis Lee move to platform specific
 
-#define        RT_OID_802_11_BSSID                                       (OID_GET_SET_TOGGLE | OID_802_11_BSSID)
-#define        RT_OID_802_11_SSID                                        (OID_GET_SET_TOGGLE | OID_802_11_SSID)
-#define        RT_OID_802_11_INFRASTRUCTURE_MODE         (OID_GET_SET_TOGGLE | OID_802_11_INFRASTRUCTURE_MODE)
-#define        RT_OID_802_11_ADD_WEP                             (OID_GET_SET_TOGGLE | OID_802_11_ADD_WEP)
-#define        RT_OID_802_11_ADD_KEY                             (OID_GET_SET_TOGGLE | OID_802_11_ADD_KEY)
-#define        RT_OID_802_11_REMOVE_WEP                          (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_WEP)
-#define        RT_OID_802_11_REMOVE_KEY                          (OID_GET_SET_TOGGLE | OID_802_11_REMOVE_KEY)
-#define        RT_OID_802_11_DISASSOCIATE                        (OID_GET_SET_TOGGLE | OID_802_11_DISASSOCIATE)
-#define        RT_OID_802_11_AUTHENTICATION_MODE         (OID_GET_SET_TOGGLE | OID_802_11_AUTHENTICATION_MODE)
-#define        RT_OID_802_11_PRIVACY_FILTER              (OID_GET_SET_TOGGLE | OID_802_11_PRIVACY_FILTER)
-#define        RT_OID_802_11_BSSID_LIST_SCAN             (OID_GET_SET_TOGGLE | OID_802_11_BSSID_LIST_SCAN)
-#define        RT_OID_802_11_WEP_STATUS                          (OID_GET_SET_TOGGLE | OID_802_11_WEP_STATUS)
-#define        RT_OID_802_11_RELOAD_DEFAULTS             (OID_GET_SET_TOGGLE | OID_802_11_RELOAD_DEFAULTS)
-#define        RT_OID_802_11_NETWORK_TYPE_IN_USE         (OID_GET_SET_TOGGLE | OID_802_11_NETWORK_TYPE_IN_USE)
-#define        RT_OID_802_11_TX_POWER_LEVEL              (OID_GET_SET_TOGGLE | OID_802_11_TX_POWER_LEVEL)
-#define        RT_OID_802_11_RSSI_TRIGGER                        (OID_GET_SET_TOGGLE | OID_802_11_RSSI_TRIGGER)
-#define        RT_OID_802_11_FRAGMENTATION_THRESHOLD (OID_GET_SET_TOGGLE |     OID_802_11_FRAGMENTATION_THRESHOLD)
-#define        RT_OID_802_11_RTS_THRESHOLD                       (OID_GET_SET_TOGGLE | OID_802_11_RTS_THRESHOLD)
-#define        RT_OID_802_11_RX_ANTENNA_SELECTED         (OID_GET_SET_TOGGLE | OID_802_11_RX_ANTENNA_SELECTED)
-#define        RT_OID_802_11_TX_ANTENNA_SELECTED         (OID_GET_SET_TOGGLE | OID_802_11_TX_ANTENNA_SELECTED)
-#define        RT_OID_802_11_SUPPORTED_RATES             (OID_GET_SET_TOGGLE | OID_802_11_SUPPORTED_RATES)
-#define        RT_OID_802_11_DESIRED_RATES                       (OID_GET_SET_TOGGLE | OID_802_11_DESIRED_RATES)
-#define        RT_OID_802_11_CONFIGURATION                       (OID_GET_SET_TOGGLE | OID_802_11_CONFIGURATION)
-#define        RT_OID_802_11_POWER_MODE                          (OID_GET_SET_TOGGLE | OID_802_11_POWER_MODE)
-
 typedef enum _NDIS_802_11_STATUS_TYPE
 {
     Ndis802_11StatusType_Authentication,
@@ -535,10 +430,8 @@ typedef enum _NDIS_802_11_WEP_STATUS
     Ndis802_11Encryption3KeyAbsent,
     Ndis802_11Encryption4Enabled,      // TKIP or AES mix
     Ndis802_11Encryption4KeyAbsent,
-#ifndef RT30xx
     Ndis802_11GroupWEP40Enabled,
        Ndis802_11GroupWEP104Enabled,
-#endif
 } NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS,
   NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
 
@@ -626,27 +519,9 @@ typedef struct _NDIS_802_11_CAPABILITY
      NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1];
 } NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;
 
-#if WIRELESS_EXT <= 11
-#ifndef SIOCDEVPRIVATE
-#define SIOCDEVPRIVATE                              0x8BE0
-#endif
-#define SIOCIWFIRSTPRIV                                                                SIOCDEVPRIVATE
-#endif
-
-#ifdef RT30xx
 #define RT_PRIV_IOCTL_EXT                                                      (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon
-#endif
 #define RTPRIV_IOCTL_SET                                                       (SIOCIWFIRSTPRIV + 0x02)
 
-#ifdef DBG
-#define RTPRIV_IOCTL_BBP                            (SIOCIWFIRSTPRIV + 0x03)
-#define RTPRIV_IOCTL_MAC                            (SIOCIWFIRSTPRIV + 0x05)
-#ifdef RT30xx
-#define RTPRIV_IOCTL_RF                             (SIOCIWFIRSTPRIV + 0x13)
-#endif
-#define RTPRIV_IOCTL_E2P                            (SIOCIWFIRSTPRIV + 0x07)
-#endif
-
 #define RTPRIV_IOCTL_STATISTICS                     (SIOCIWFIRSTPRIV + 0x09)
 #define RTPRIV_IOCTL_ADD_PMKID_CACHE                (SIOCIWFIRSTPRIV + 0x0A)
 #define RTPRIV_IOCTL_RADIUS_DATA                    (SIOCIWFIRSTPRIV + 0x0C)
@@ -667,42 +542,11 @@ enum {
     RAIO_OFF = 10,
     RAIO_ON = 11,
        SHOW_CFG_VALUE = 20,
-#if !defined(RT2860) && !defined(RT30xx)
+#if !defined(RT2860)
        SHOW_ADHOC_ENTRY_INFO = 21,
 #endif
 };
 
-#define OID_802_11_BUILD_CHANNEL_EX                            0x0714
-#define OID_802_11_GET_CH_LIST                                 0x0715
-#define OID_802_11_GET_COUNTRY_CODE                            0x0716
-#define OID_802_11_GET_CHANNEL_GEOGRAPHY               0x0717
-
-#ifdef RT30xx
-#define RT_OID_WSC_SET_PASSPHRASE                   0x0740 // passphrase for wpa(2)-psk
-#define RT_OID_WSC_DRIVER_AUTO_CONNECT              0x0741
-#define RT_OID_WSC_QUERY_DEFAULT_PROFILE            0x0742
-#define RT_OID_WSC_SET_CONN_BY_PROFILE_INDEX        0x0743
-#define RT_OID_WSC_SET_ACTION                       0x0744
-#define RT_OID_WSC_SET_SSID                         0x0745
-#define RT_OID_WSC_SET_PIN_CODE                     0x0746
-#define RT_OID_WSC_SET_MODE                         0x0747 // PIN or PBC
-#define RT_OID_WSC_SET_CONF_MODE                    0x0748 // Enrollee or Registrar
-#define RT_OID_WSC_SET_PROFILE                      0x0749
-
-#define RT_OID_802_11_WSC_QUERY_PROFILE                                0x0750
-// for consistency with RT61
-#define RT_OID_WSC_QUERY_STATUS                                                0x0751
-#define RT_OID_WSC_PIN_CODE                                                    0x0752
-#define RT_OID_WSC_UUID                                                                0x0753
-#define RT_OID_WSC_SET_SELECTED_REGISTRAR                      0x0754
-#define RT_OID_WSC_EAPMSG                                                      0x0755
-#define RT_OID_WSC_MANUFACTURER                                                0x0756
-#define RT_OID_WSC_MODEL_NAME                                          0x0757
-#define RT_OID_WSC_MODEL_NO                                                    0x0758
-#define RT_OID_WSC_SERIAL_NO                                           0x0759
-#define RT_OID_WSC_MAC_ADDRESS                                         0x0760
-#endif
-
 #ifdef LLTD_SUPPORT
 // for consistency with RT61
 #define RT_OID_GET_PHY_MODE                         0x761