tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: winbond: sme_api.h Coding style fixes.

I fixed the things reported by checkpatch.pl except
one long line and a __inline.
I also removed commented away code and versioning comments.

Signed-off-by: Lars Lindley <lindley@coyote.org>
Pavel Machek <pavel@ucw.cz>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Lars Lindley and committed by
Greg Kroah-Hartman c64ba207 fa6896f2

+71 -140
+71 -140
drivers/staging/winbond/sme_api.h
··· 2 2 * sme_api.h 3 3 * 4 4 * Copyright(C) 2002 Winbond Electronics Corp. 5 - * 6 - * modification history 7 - * --------------------------------------------------------------------------- 8 - * 1.00.001, 2003-04-21, Kevin created 9 - * 1.00.002, 2003-05-14, PD43 & PE20 modified 10 - * 11 5 */ 12 6 13 7 #ifndef __SME_API_H__ ··· 12 18 #include "localpara.h" 13 19 14 20 /****************** CONSTANT AND MACRO SECTION ******************************/ 15 - #define _INLINE __inline 21 + #define _INLINE __inline 16 22 17 - #define MEDIA_STATE_DISCONNECTED 0 18 - #define MEDIA_STATE_CONNECTED 1 23 + #define MEDIA_STATE_DISCONNECTED 0 24 + #define MEDIA_STATE_CONNECTED 1 19 25 20 - //ARRAY CHECK 21 - #define MAX_POWER_TO_DB 32 26 + /* ARRAY CHECK */ 27 + #define MAX_POWER_TO_DB 32 22 28 23 29 /****************** TYPE DEFINITION SECTION *********************************/ 24 30 25 31 /****************** EXPORTED FUNCTION DECLARATION SECTION *******************/ 26 32 27 - // OID_802_11_BSSID 33 + /* OID_802_11_BSSID */ 28 34 s8 sme_get_bssid(void *pcore_data, u8 *pbssid); 29 - s8 sme_get_desired_bssid(void *pcore_data, u8 *pbssid);//Not use 35 + s8 sme_get_desired_bssid(void *pcore_data, u8 *pbssid); /* Not use */ 30 36 s8 sme_set_desired_bssid(void *pcore_data, u8 *pbssid); 31 37 32 - // OID_802_11_SSID 38 + /* OID_802_11_SSID */ 33 39 s8 sme_get_ssid(void *pcore_data, u8 *pssid, u8 *pssid_len); 34 - s8 sme_get_desired_ssid(void *pcore_data, u8 *pssid, u8 *pssid_len);// Not use 40 + s8 sme_get_desired_ssid(void *pcore_data, u8 *pssid, u8 *pssid_len);/* Not use */ 35 41 s8 sme_set_desired_ssid(void *pcore_data, u8 *pssid, u8 ssid_len); 36 42 37 - // OID_802_11_INFRASTRUCTURE_MODE 43 + /* OID_802_11_INFRASTRUCTURE_MODE */ 38 44 s8 sme_get_bss_type(void *pcore_data, u8 *pbss_type); 39 - s8 sme_get_desired_bss_type(void *pcore_data, u8 *pbss_type);//Not use 45 + s8 sme_get_desired_bss_type(void *pcore_data, u8 *pbss_type); /* Not use */ 40 46 s8 sme_set_desired_bss_type(void *pcore_data, u8 bss_type); 41 47 42 - // OID_802_11_FRAGMENTATION_THRESHOLD 48 + /* OID_802_11_FRAGMENTATION_THRESHOLD */ 43 49 s8 sme_get_fragment_threshold(void *pcore_data, u32 *pthreshold); 44 50 s8 sme_set_fragment_threshold(void *pcore_data, u32 threshold); 45 51 46 - // OID_802_11_RTS_THRESHOLD 52 + /* OID_802_11_RTS_THRESHOLD */ 47 53 s8 sme_get_rts_threshold(void *pcore_data, u32 *pthreshold); 48 54 s8 sme_set_rts_threshold(void *pcore_data, u32 threshold); 49 55 50 - // OID_802_11_CONFIGURATION 56 + /* OID_802_11_CONFIGURATION */ 51 57 s8 sme_get_beacon_period(void *pcore_data, u16 *pbeacon_period); 52 58 s8 sme_set_beacon_period(void *pcore_data, u16 beacon_period); 53 59 ··· 58 64 s8 sme_get_current_band(void *pcore_data, u8 *pcurrent_band); 59 65 s8 sme_set_current_channel(void *pcore_data, u8 current_channel); 60 66 61 - // OID_802_11_BSSID_LIST 67 + /* OID_802_11_BSSID_LIST */ 62 68 s8 sme_get_scan_bss_count(void *pcore_data, u8 *pcount); 63 69 s8 sme_get_scan_bss(void *pcore_data, u8 index, void **ppbss); 64 70 65 71 s8 sme_get_connected_bss(void *pcore_data, void **ppbss_now); 66 72 67 - // OID_802_11_AUTHENTICATION_MODE 73 + /* OID_802_11_AUTHENTICATION_MODE */ 68 74 s8 sme_get_auth_mode(void *pcore_data, u8 *pauth_mode); 69 75 s8 sme_set_auth_mode(void *pcore_data, u8 auth_mode); 70 76 71 - // OID_802_11_WEP_STATUS / OID_802_11_ENCRYPTION_STATUS 77 + /* OID_802_11_WEP_STATUS / OID_802_11_ENCRYPTION_STATUS */ 72 78 s8 sme_get_wep_mode(void *pcore_data, u8 *pwep_mode); 73 79 s8 sme_set_wep_mode(void *pcore_data, u8 wep_mode); 74 - //s8 sme_get_encryption_status(void *pcore_data, u8 *pstatus); 75 - //s8 sme_set_encryption_status(void *pcore_data, u8 status); 76 80 77 - // ??????????????????????????????????????? 78 - 79 - // OID_GEN_VENDOR_ID 80 - // OID_802_3_PERMANENT_ADDRESS 81 + /* OID_GEN_VENDOR_ID */ 82 + /* OID_802_3_PERMANENT_ADDRESS */ 81 83 s8 sme_get_permanent_mac_addr(void *pcore_data, u8 *pmac_addr); 82 84 83 - // OID_802_3_CURRENT_ADDRESS 85 + /* OID_802_3_CURRENT_ADDRESS */ 84 86 s8 sme_get_current_mac_addr(void *pcore_data, u8 *pmac_addr); 85 87 86 - // OID_802_11_NETWORK_TYPE_IN_USE 88 + /* OID_802_11_NETWORK_TYPE_IN_USE */ 87 89 s8 sme_get_network_type_in_use(void *pcore_data, u8 *ptype); 88 90 s8 sme_set_network_type_in_use(void *pcore_data, u8 type); 89 91 90 - // OID_802_11_SUPPORTED_RATES 92 + /* OID_802_11_SUPPORTED_RATES */ 91 93 s8 sme_get_supported_rate(void *pcore_data, u8 *prates); 92 94 93 - // OID_802_11_ADD_WEP 94 - //12/29/03' wkchen 95 + /* OID_802_11_ADD_WEP */ 95 96 s8 sme_set_add_wep(void *pcore_data, u32 key_index, u32 key_len, 96 97 u8 *Address, u8 *key); 97 98 98 - // OID_802_11_REMOVE_WEP 99 + /* OID_802_11_REMOVE_WEP */ 99 100 s8 sme_set_remove_wep(void *pcre_data, u32 key_index); 100 101 101 - // OID_802_11_DISASSOCIATE 102 + /* OID_802_11_DISASSOCIATE */ 102 103 s8 sme_set_disassociate(void *pcore_data); 103 104 104 - // OID_802_11_POWER_MODE 105 + /* OID_802_11_POWER_MODE */ 105 106 s8 sme_get_power_mode(void *pcore_data, u8 *pmode); 106 107 s8 sme_set_power_mode(void *pcore_data, u8 mode); 107 108 108 - // OID_802_11_BSSID_LIST_SCAN 109 + /* OID_802_11_BSSID_LIST_SCAN */ 109 110 s8 sme_set_bssid_list_scan(void *pcore_data, void *pscan_para); 110 111 111 - // OID_802_11_RELOAD_DEFAULTS 112 + /* OID_802_11_RELOAD_DEFAULTS */ 112 113 s8 sme_set_reload_defaults(void *pcore_data, u8 reload_type); 113 114 114 115 115 - // The following SME API functions are used for WPA 116 - // 117 - // Mandatory OIDs for WPA 118 - // 119 - 120 - // OID_802_11_ADD_KEY 121 - //s8 sme_set_add_key(void *pcore_data, NDIS_802_11_KEY *pkey); 122 - 123 - // OID_802_11_REMOVE_KEY 124 - //s8 sme_set_remove_key(void *pcore_data, NDIS_802_11_REMOVE_KEY *pkey); 125 - 126 - // OID_802_11_ASSOCIATION_INFORMATION 127 - //s8 sme_set_association_information(void *pcore_data, 128 - // NDIS_802_11_ASSOCIATION_INFORMATION *pinfo); 129 - 130 - // OID_802_11_TEST 131 - //s8 sme_set_test(void *pcore_data, NDIS_802_11_TEST *ptest_data); 132 - 133 - //--------------------------------------------------------------------------// 134 - /* 135 - // The left OIDs 136 - 137 - // OID_802_11_NETWORK_TYPES_SUPPORTED 138 - // OID_802_11_TX_POWER_LEVEL 139 - // OID_802_11_RSSI_TRIGGER 140 - // OID_802_11_NUMBER_OF_ANTENNAS 141 - // OID_802_11_RX_ANTENNA_SELECTED 142 - // OID_802_11_TX_ANTENNA_SELECTED 143 - // OID_802_11_STATISTICS 144 - // OID_802_11_DESIRED_RATES 145 - // OID_802_11_PRIVACY_FILTER 146 - 147 - */ 148 - 149 116 /*------------------------- none-standard ----------------------------------*/ 150 117 s8 sme_get_connect_status(void *pcore_data, u8 *pstatus); 151 - 152 - /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ 153 - //s8 sme_get_scan_type(void *pcore_data, u8 *pscan_type); 154 - //s8 sme_set_scan_type(void *pcore_data, u8 scan_type); 155 - 156 - //s8 sme_get_scan_channel_list(void *pcore_data, u8 *pscan_type); 157 - //s8 sme_set_scan_channel_list(void *pcore_data, u8 scan_type); 158 - 118 + /*--------------------------------------------------------------------------*/ 159 119 160 120 void sme_get_encryption_status(void *pcore_data, u8 *EncryptStatus); 161 121 void sme_set_encryption_status(void *pcore_data, u8 EncryptStatus); 162 - s8 sme_add_key(void *pcore_data, 163 - u32 key_index, 164 - u8 key_len, 165 - u8 key_type, 166 - u8 *key_bssid, 167 - //u8 *key_rsc, 168 - u8 *ptx_tsc, 169 - u8 *prx_tsc, 170 - u8 *key_material); 122 + s8 sme_add_key(void *pcore_data, 123 + u32 key_index, 124 + u8 key_len, 125 + u8 key_type, 126 + u8 *key_bssid, 127 + u8 *ptx_tsc, 128 + u8 *prx_tsc, 129 + u8 *key_material); 171 130 void sme_remove_default_key(void *pcore_data, int index); 172 131 void sme_remove_mapping_key(void *pcore_data, u8 *pmac_addr); 173 132 void sme_clear_all_mapping_key(void *pcore_data); ··· 149 202 void sme_get_tx_antenna(void *pcore_data, u32 *TxAntenna); 150 203 s8 sme_set_tx_antenna(void *pcore_data, u32 TxAntenna); 151 204 s8 sme_set_IBSS_chan(void *pcore_data, struct chan_info chan); 152 - 153 - //20061108 WPS 154 205 s8 sme_set_IE_append(void *pcore_data, u8 *buffer, u16 buf_len); 155 206 156 - 157 - 158 - 159 - //================== Local functions ====================== 160 - //#ifdef _HSINCHU 161 - //void drv_translate_rssi(); // HW RSSI bit -> NDIS RSSI representation 162 - //void drv_translate_bss_description(); // Local bss desc -> NDIS bss desc 163 - //void drv_translate_channel(u8 NetworkType, u8 ChannelNumber, u32 *freq); // channel number -> channel /freq. 164 - //#endif _HSINCHU 165 - // 166 - static const u32 PowerDbToMw[] = 167 - { 168 - 56, //mW, MAX - 0, 17.5 dbm 169 - 40, //mW, MAX - 1, 16.0 dbm 170 - 30, //mW, MAX - 2, 14.8 dbm 171 - 20, //mW, MAX - 3, 13.0 dbm 172 - 15, //mW, MAX - 4, 11.8 dbm 173 - 12, //mW, MAX - 5, 10.6 dbm 174 - 9, //mW, MAX - 6, 9.4 dbm 175 - 7, //mW, MAX - 7, 8.3 dbm 176 - 5, //mW, MAX - 8, 6.4 dbm 177 - 4, //mW, MAX - 9, 5.3 dbm 178 - 3, //mW, MAX - 10, 4.0 dbm 179 - 2, //mW, MAX - 11, ? dbm 180 - 2, //mW, MAX - 12, ? dbm 181 - 2, //mW, MAX - 13, ? dbm 182 - 2, //mW, MAX - 14, ? dbm 183 - 2, //mW, MAX - 15, ? dbm 184 - 2, //mW, MAX - 16, ? dbm 185 - 2, //mW, MAX - 17, ? dbm 186 - 2, //mW, MAX - 18, ? dbm 187 - 1, //mW, MAX - 19, ? dbm 188 - 1, //mW, MAX - 20, ? dbm 189 - 1, //mW, MAX - 21, ? dbm 190 - 1, //mW, MAX - 22, ? dbm 191 - 1, //mW, MAX - 23, ? dbm 192 - 1, //mW, MAX - 24, ? dbm 193 - 1, //mW, MAX - 25, ? dbm 194 - 1, //mW, MAX - 26, ? dbm 195 - 1, //mW, MAX - 27, ? dbm 196 - 1, //mW, MAX - 28, ? dbm 197 - 1, //mW, MAX - 29, ? dbm 198 - 1, //mW, MAX - 30, ? dbm 199 - 1 //mW, MAX - 31, ? dbm 207 + /* ================== Local functions ====================== */ 208 + static const u32 PowerDbToMw[] = { 209 + 56, /* mW, MAX - 0, 17.5 dbm */ 210 + 40, /* mW, MAX - 1, 16.0 dbm */ 211 + 30, /* mW, MAX - 2, 14.8 dbm */ 212 + 20, /* mW, MAX - 3, 13.0 dbm */ 213 + 15, /* mW, MAX - 4, 11.8 dbm */ 214 + 12, /* mW, MAX - 5, 10.6 dbm */ 215 + 9, /* mW, MAX - 6, 9.4 dbm */ 216 + 7, /* mW, MAX - 7, 8.3 dbm */ 217 + 5, /* mW, MAX - 8, 6.4 dbm */ 218 + 4, /* mW, MAX - 9, 5.3 dbm */ 219 + 3, /* mW, MAX - 10, 4.0 dbm */ 220 + 2, /* mW, MAX - 11, ? dbm */ 221 + 2, /* mW, MAX - 12, ? dbm */ 222 + 2, /* mW, MAX - 13, ? dbm */ 223 + 2, /* mW, MAX - 14, ? dbm */ 224 + 2, /* mW, MAX - 15, ? dbm */ 225 + 2, /* mW, MAX - 16, ? dbm */ 226 + 2, /* mW, MAX - 17, ? dbm */ 227 + 2, /* mW, MAX - 18, ? dbm */ 228 + 1, /* mW, MAX - 19, ? dbm */ 229 + 1, /* mW, MAX - 20, ? dbm */ 230 + 1, /* mW, MAX - 21, ? dbm */ 231 + 1, /* mW, MAX - 22, ? dbm */ 232 + 1, /* mW, MAX - 23, ? dbm */ 233 + 1, /* mW, MAX - 24, ? dbm */ 234 + 1, /* mW, MAX - 25, ? dbm */ 235 + 1, /* mW, MAX - 26, ? dbm */ 236 + 1, /* mW, MAX - 27, ? dbm */ 237 + 1, /* mW, MAX - 28, ? dbm */ 238 + 1, /* mW, MAX - 29, ? dbm */ 239 + 1, /* mW, MAX - 30, ? dbm */ 240 + 1 /* mW, MAX - 31, ? dbm */ 200 241 }; 201 - 202 - 203 - 204 - 205 242 206 243 #endif /* __SME_API_H__ */ 207 244