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

staging: vt6656: replaced custom BYTE definition with u8

Checkpatch findings were not resolved, only direct replacement.

sed -i 's/\bBYTE\b/u8/g' drivers/staging/vt6656/*.[ch]
sed -i 's/\bPBYTE\b/u8 */g' drivers/staging/vt6656/*.[ch]

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Andres More and committed by
Greg Kroah-Hartman
b902fbfe 175c5125

+871 -874
+12 -12
drivers/staging/vt6656/80211hdr.h
··· 269 269 #define WLAN_MGMT_GET_TIM_OFFSET(b) (((b) & ~BIT0) >> 1) 270 270 271 271 /* 3-Addr & 4-Addr */ 272 - #define WLAN_HDR_A3_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR3_LEN) 273 - #define WLAN_HDR_A4_DATA_PTR(p) (((PBYTE)(p)) + WLAN_HDR_ADDR4_LEN) 272 + #define WLAN_HDR_A3_DATA_PTR(p) (((u8 *)(p)) + WLAN_HDR_ADDR3_LEN) 273 + #define WLAN_HDR_A4_DATA_PTR(p) (((u8 *)(p)) + WLAN_HDR_ADDR4_LEN) 274 274 275 275 /* IEEE ADDR */ 276 276 #define IEEE_ADDR_UNIVERSAL 0x02 277 277 #define IEEE_ADDR_GROUP 0x01 278 278 279 279 typedef struct { 280 - BYTE abyAddr[6]; 280 + u8 abyAddr[6]; 281 281 } IEEE_ADDR, *PIEEE_ADDR; 282 282 283 283 /* 802.11 Header Format */ ··· 286 286 287 287 WORD wFrameCtl; 288 288 WORD wDurationID; 289 - BYTE abyAddr1[WLAN_ADDR_LEN]; 290 - BYTE abyAddr2[WLAN_ADDR_LEN]; 289 + u8 abyAddr1[WLAN_ADDR_LEN]; 290 + u8 abyAddr2[WLAN_ADDR_LEN]; 291 291 292 292 } __attribute__ ((__packed__)) 293 293 WLAN_80211HDR_A2, *PWLAN_80211HDR_A2; ··· 296 296 297 297 WORD wFrameCtl; 298 298 WORD wDurationID; 299 - BYTE abyAddr1[WLAN_ADDR_LEN]; 300 - BYTE abyAddr2[WLAN_ADDR_LEN]; 301 - BYTE abyAddr3[WLAN_ADDR_LEN]; 299 + u8 abyAddr1[WLAN_ADDR_LEN]; 300 + u8 abyAddr2[WLAN_ADDR_LEN]; 301 + u8 abyAddr3[WLAN_ADDR_LEN]; 302 302 WORD wSeqCtl; 303 303 304 304 } __attribute__ ((__packed__)) ··· 308 308 309 309 WORD wFrameCtl; 310 310 WORD wDurationID; 311 - BYTE abyAddr1[WLAN_ADDR_LEN]; 312 - BYTE abyAddr2[WLAN_ADDR_LEN]; 313 - BYTE abyAddr3[WLAN_ADDR_LEN]; 311 + u8 abyAddr1[WLAN_ADDR_LEN]; 312 + u8 abyAddr2[WLAN_ADDR_LEN]; 313 + u8 abyAddr3[WLAN_ADDR_LEN]; 314 314 WORD wSeqCtl; 315 - BYTE abyAddr4[WLAN_ADDR_LEN]; 315 + u8 abyAddr4[WLAN_ADDR_LEN]; 316 316 317 317 } __attribute__ ((__packed__)) 318 318 WLAN_80211HDR_A4, *PWLAN_80211HDR_A4;
+16 -16
drivers/staging/vt6656/80211mgr.c
··· 141 141 + WLAN_BEACON_OFF_CAPINFO); 142 142 143 143 /* Information elements */ 144 - pItem = (PWLAN_IE)((PBYTE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))) 144 + pItem = (PWLAN_IE)((u8 *)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))) 145 145 + WLAN_BEACON_OFF_SSID); 146 - while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { 146 + while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) { 147 147 148 148 switch (pItem->byElementID) { 149 149 case WLAN_EID_SSID: ··· 224 224 break; 225 225 226 226 } 227 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 227 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 228 228 } 229 229 } 230 230 ··· 376 376 pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) 377 377 + WLAN_ASSOCREQ_OFF_SSID); 378 378 379 - while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { 379 + while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) { 380 380 switch (pItem->byElementID) { 381 381 case WLAN_EID_SSID: 382 382 if (pFrame->pSSID == NULL) ··· 407 407 pItem->byElementID); 408 408 break; 409 409 } 410 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 410 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 411 411 } 412 412 } 413 413 ··· 474 474 + WLAN_ASSOCRESP_OFF_SUPP_RATES); 475 475 476 476 pItem = (PWLAN_IE)(pFrame->pSuppRates); 477 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 477 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 478 478 479 - if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) { 479 + if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) { 480 480 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem; 481 481 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem); 482 482 } else ··· 545 545 pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) 546 546 + WLAN_REASSOCREQ_OFF_SSID); 547 547 548 - while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { 548 + while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) { 549 549 550 550 switch (pItem->byElementID) { 551 551 case WLAN_EID_SSID: ··· 576 576 pItem->byElementID); 577 577 break; 578 578 } 579 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 579 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 580 580 } 581 581 } 582 582 ··· 626 626 /* Information elements */ 627 627 pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))); 628 628 629 - while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { 629 + while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) { 630 630 631 631 switch (pItem->byElementID) { 632 632 case WLAN_EID_SSID: ··· 649 649 break; 650 650 } 651 651 652 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 652 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 653 653 } 654 654 } 655 655 ··· 722 722 pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) 723 723 + WLAN_PROBERESP_OFF_SSID); 724 724 725 - while (((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) { 725 + while (((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) { 726 726 switch (pItem->byElementID) { 727 727 case WLAN_EID_SSID: 728 728 if (pFrame->pSSID == NULL) ··· 796 796 break; 797 797 } 798 798 799 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 799 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 800 800 } 801 801 } 802 802 ··· 862 862 pItem = (PWLAN_IE)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3)) 863 863 + WLAN_AUTHEN_OFF_CHALLENGE); 864 864 865 - if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) 865 + if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE)) 866 866 pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem; 867 867 } 868 868 ··· 980 980 + WLAN_REASSOCRESP_OFF_SUPP_RATES); 981 981 982 982 pItem = (PWLAN_IE)(pFrame->pSuppRates); 983 - pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len); 983 + pItem = (PWLAN_IE)(((u8 *)pItem) + 2 + pItem->len); 984 984 985 - if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) 985 + if ((((u8 *)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) 986 986 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem; 987 987 }
+127 -127
drivers/staging/vt6656/80211mgr.h
··· 223 223 224 224 #pragma pack(1) 225 225 typedef struct tagWLAN_IE { 226 - BYTE byElementID; 227 - BYTE len; 226 + u8 byElementID; 227 + u8 len; 228 228 } __attribute__ ((__packed__)) 229 229 WLAN_IE, *PWLAN_IE; 230 230 231 231 /* Service Set IDentity (SSID) */ 232 232 #pragma pack(1) 233 233 typedef struct tagWLAN_IE_SSID { 234 - BYTE byElementID; 235 - BYTE len; 236 - BYTE abySSID[1]; 234 + u8 byElementID; 235 + u8 len; 236 + u8 abySSID[1]; 237 237 } __attribute__ ((__packed__)) 238 238 WLAN_IE_SSID, *PWLAN_IE_SSID; 239 239 240 240 /* Supported Rates */ 241 241 #pragma pack(1) 242 242 typedef struct tagWLAN_IE_SUPP_RATES { 243 - BYTE byElementID; 244 - BYTE len; 245 - BYTE abyRates[1]; 243 + u8 byElementID; 244 + u8 len; 245 + u8 abyRates[1]; 246 246 } __attribute__ ((__packed__)) 247 247 WLAN_IE_SUPP_RATES, *PWLAN_IE_SUPP_RATES; 248 248 249 249 /* FH Parameter Set */ 250 250 #pragma pack(1) 251 251 typedef struct _WLAN_IE_FH_PARMS { 252 - BYTE byElementID; 253 - BYTE len; 252 + u8 byElementID; 253 + u8 len; 254 254 WORD wDwellTime; 255 - BYTE byHopSet; 256 - BYTE byHopPattern; 257 - BYTE byHopIndex; 255 + u8 byHopSet; 256 + u8 byHopPattern; 257 + u8 byHopIndex; 258 258 } WLAN_IE_FH_PARMS, *PWLAN_IE_FH_PARMS; 259 259 260 260 /* DS Parameter Set */ 261 261 #pragma pack(1) 262 262 typedef struct tagWLAN_IE_DS_PARMS { 263 - BYTE byElementID; 264 - BYTE len; 265 - BYTE byCurrChannel; 263 + u8 byElementID; 264 + u8 len; 265 + u8 byCurrChannel; 266 266 } __attribute__ ((__packed__)) 267 267 WLAN_IE_DS_PARMS, *PWLAN_IE_DS_PARMS; 268 268 269 269 /* CF Parameter Set */ 270 270 #pragma pack(1) 271 271 typedef struct tagWLAN_IE_CF_PARMS { 272 - BYTE byElementID; 273 - BYTE len; 274 - BYTE byCFPCount; 275 - BYTE byCFPPeriod; 272 + u8 byElementID; 273 + u8 len; 274 + u8 byCFPCount; 275 + u8 byCFPPeriod; 276 276 WORD wCFPMaxDuration; 277 277 WORD wCFPDurRemaining; 278 278 } __attribute__ ((__packed__)) ··· 281 281 /* TIM */ 282 282 #pragma pack(1) 283 283 typedef struct tagWLAN_IE_TIM { 284 - BYTE byElementID; 285 - BYTE len; 286 - BYTE byDTIMCount; 287 - BYTE byDTIMPeriod; 288 - BYTE byBitMapCtl; 289 - BYTE byVirtBitMap[1]; 284 + u8 byElementID; 285 + u8 len; 286 + u8 byDTIMCount; 287 + u8 byDTIMPeriod; 288 + u8 byBitMapCtl; 289 + u8 byVirtBitMap[1]; 290 290 } __attribute__ ((__packed__)) 291 291 WLAN_IE_TIM, *PWLAN_IE_TIM; 292 292 293 293 /* IBSS Parameter Set */ 294 294 #pragma pack(1) 295 295 typedef struct tagWLAN_IE_IBSS_PARMS { 296 - BYTE byElementID; 297 - BYTE len; 296 + u8 byElementID; 297 + u8 len; 298 298 WORD wATIMWindow; 299 299 } __attribute__ ((__packed__)) 300 300 WLAN_IE_IBSS_PARMS, *PWLAN_IE_IBSS_PARMS; ··· 302 302 /* Challenge Text */ 303 303 #pragma pack(1) 304 304 typedef struct tagWLAN_IE_CHALLENGE { 305 - BYTE byElementID; 306 - BYTE len; 307 - BYTE abyChallenge[1]; 305 + u8 byElementID; 306 + u8 len; 307 + u8 abyChallenge[1]; 308 308 } __attribute__ ((__packed__)) 309 309 WLAN_IE_CHALLENGE, *PWLAN_IE_CHALLENGE; 310 310 311 311 #pragma pack(1) 312 312 typedef struct tagWLAN_IE_RSN_EXT { 313 - BYTE byElementID; 314 - BYTE len; 315 - BYTE abyOUI[4]; 313 + u8 byElementID; 314 + u8 len; 315 + u8 abyOUI[4]; 316 316 WORD wVersion; 317 - BYTE abyMulticast[4]; 317 + u8 abyMulticast[4]; 318 318 WORD wPKCount; 319 319 struct { 320 - BYTE abyOUI[4]; 320 + u8 abyOUI[4]; 321 321 } PKSList[1]; 322 322 /* the rest is variable so need to overlay ieauth structure */ 323 323 } WLAN_IE_RSN_EXT, *PWLAN_IE_RSN_EXT; ··· 326 326 typedef struct tagWLAN_IE_RSN_AUTH { 327 327 WORD wAuthCount; 328 328 struct { 329 - BYTE abyOUI[4]; 329 + u8 abyOUI[4]; 330 330 } AuthKSList[1]; 331 331 } WLAN_IE_RSN_AUTH, *PWLAN_IE_RSN_AUTH; 332 332 333 333 /* RSN Identity */ 334 334 #pragma pack(1) 335 335 typedef struct tagWLAN_IE_RSN { 336 - BYTE byElementID; 337 - BYTE len; 336 + u8 byElementID; 337 + u8 len; 338 338 WORD wVersion; 339 - BYTE abyRSN[WLAN_MIN_ARRAY]; 339 + u8 abyRSN[WLAN_MIN_ARRAY]; 340 340 } WLAN_IE_RSN, *PWLAN_IE_RSN; 341 341 342 342 /* CCX Identity DavidWang */ 343 343 #pragma pack(1) 344 344 typedef struct tagWLAN_IE_CCX { 345 - BYTE byElementID; 346 - BYTE len; 347 - BYTE abyCCX[30]; 345 + u8 byElementID; 346 + u8 len; 347 + u8 abyCCX[30]; 348 348 } WLAN_IE_CCX, *PWLAN_IE_CCX; 349 349 #pragma pack(1) 350 350 typedef struct tagWLAN_IE_CCX_IP { 351 - BYTE byElementID; 352 - BYTE len; 353 - BYTE abyCCXOUI[4]; 354 - BYTE abyCCXIP[4]; 355 - BYTE abyCCXREV[2]; 351 + u8 byElementID; 352 + u8 len; 353 + u8 abyCCXOUI[4]; 354 + u8 abyCCXIP[4]; 355 + u8 abyCCXREV[2]; 356 356 } WLAN_IE_CCX_IP, *PWLAN_IE_CCX_IP; 357 357 #pragma pack(1) 358 358 typedef struct tagWLAN_IE_CCX_Ver { 359 - BYTE byElementID; 360 - BYTE len; 361 - BYTE abyCCXVer[5]; 359 + u8 byElementID; 360 + u8 len; 361 + u8 abyCCXVer[5]; 362 362 } WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver; 363 363 364 364 /* ERP */ 365 365 #pragma pack(1) 366 366 typedef struct tagWLAN_IE_ERP { 367 - BYTE byElementID; 368 - BYTE len; 369 - BYTE byContext; 367 + u8 byElementID; 368 + u8 len; 369 + u8 byContext; 370 370 } __attribute__ ((__packed__)) 371 371 WLAN_IE_ERP, *PWLAN_IE_ERP; 372 372 373 373 #pragma pack(1) 374 374 typedef struct _MEASEURE_REQ { 375 - BYTE byChannel; 376 - BYTE abyStartTime[8]; 377 - BYTE abyDuration[2]; 375 + u8 byChannel; 376 + u8 abyStartTime[8]; 377 + u8 abyDuration[2]; 378 378 } MEASEURE_REQ, *PMEASEURE_REQ, 379 379 MEASEURE_REQ_BASIC, *PMEASEURE_REQ_BASIC, 380 380 MEASEURE_REQ_CCA, *PMEASEURE_REQ_CCA, 381 381 MEASEURE_REQ_RPI, *PMEASEURE_REQ_RPI; 382 382 383 383 typedef struct _MEASEURE_REP_BASIC { 384 - BYTE byChannel; 385 - BYTE abyStartTime[8]; 386 - BYTE abyDuration[2]; 387 - BYTE byMap; 384 + u8 byChannel; 385 + u8 abyStartTime[8]; 386 + u8 abyDuration[2]; 387 + u8 byMap; 388 388 } MEASEURE_REP_BASIC, *PMEASEURE_REP_BASIC; 389 389 390 390 typedef struct _MEASEURE_REP_CCA { 391 - BYTE byChannel; 392 - BYTE abyStartTime[8]; 393 - BYTE abyDuration[2]; 394 - BYTE byCCABusyFraction; 391 + u8 byChannel; 392 + u8 abyStartTime[8]; 393 + u8 abyDuration[2]; 394 + u8 byCCABusyFraction; 395 395 } MEASEURE_REP_CCA, *PMEASEURE_REP_CCA; 396 396 397 397 typedef struct _MEASEURE_REP_RPI { 398 - BYTE byChannel; 399 - BYTE abyStartTime[8]; 400 - BYTE abyDuration[2]; 401 - BYTE abyRPIdensity[8]; 398 + u8 byChannel; 399 + u8 abyStartTime[8]; 400 + u8 abyDuration[2]; 401 + u8 abyRPIdensity[8]; 402 402 } MEASEURE_REP_RPI, *PMEASEURE_REP_RPI; 403 403 404 404 typedef union _MEASEURE_REP { ··· 410 410 } MEASEURE_REP, *PMEASEURE_REP; 411 411 412 412 typedef struct _WLAN_IE_MEASURE_REQ { 413 - BYTE byElementID; 414 - BYTE len; 415 - BYTE byToken; 416 - BYTE byMode; 417 - BYTE byType; 413 + u8 byElementID; 414 + u8 len; 415 + u8 byToken; 416 + u8 byMode; 417 + u8 byType; 418 418 MEASEURE_REQ sReq; 419 419 } WLAN_IE_MEASURE_REQ, *PWLAN_IE_MEASURE_REQ; 420 420 421 421 typedef struct _WLAN_IE_MEASURE_REP { 422 - BYTE byElementID; 423 - BYTE len; 424 - BYTE byToken; 425 - BYTE byMode; 426 - BYTE byType; 422 + u8 byElementID; 423 + u8 len; 424 + u8 byToken; 425 + u8 byMode; 426 + u8 byType; 427 427 MEASEURE_REP sRep; 428 428 } WLAN_IE_MEASURE_REP, *PWLAN_IE_MEASURE_REP; 429 429 430 430 typedef struct _WLAN_IE_CH_SW { 431 - BYTE byElementID; 432 - BYTE len; 433 - BYTE byMode; 434 - BYTE byChannel; 435 - BYTE byCount; 431 + u8 byElementID; 432 + u8 len; 433 + u8 byMode; 434 + u8 byChannel; 435 + u8 byCount; 436 436 } WLAN_IE_CH_SW, *PWLAN_IE_CH_SW; 437 437 438 438 typedef struct _WLAN_IE_QUIET { 439 - BYTE byElementID; 440 - BYTE len; 441 - BYTE byQuietCount; 442 - BYTE byQuietPeriod; 443 - BYTE abyQuietDuration[2]; 444 - BYTE abyQuietOffset[2]; 439 + u8 byElementID; 440 + u8 len; 441 + u8 byQuietCount; 442 + u8 byQuietPeriod; 443 + u8 abyQuietDuration[2]; 444 + u8 abyQuietOffset[2]; 445 445 } WLAN_IE_QUIET, *PWLAN_IE_QUIET; 446 446 447 447 typedef struct _WLAN_IE_COUNTRY { 448 - BYTE byElementID; 449 - BYTE len; 450 - BYTE abyCountryString[3]; 451 - BYTE abyCountryInfo[3]; 448 + u8 byElementID; 449 + u8 len; 450 + u8 abyCountryString[3]; 451 + u8 abyCountryInfo[3]; 452 452 } WLAN_IE_COUNTRY, *PWLAN_IE_COUNTRY; 453 453 454 454 typedef struct _WLAN_IE_PW_CONST { 455 - BYTE byElementID; 456 - BYTE len; 457 - BYTE byPower; 455 + u8 byElementID; 456 + u8 len; 457 + u8 byPower; 458 458 } WLAN_IE_PW_CONST, *PWLAN_IE_PW_CONST; 459 459 460 460 typedef struct _WLAN_IE_PW_CAP { 461 - BYTE byElementID; 462 - BYTE len; 463 - BYTE byMinPower; 464 - BYTE byMaxPower; 461 + u8 byElementID; 462 + u8 len; 463 + u8 byMinPower; 464 + u8 byMaxPower; 465 465 } WLAN_IE_PW_CAP, *PWLAN_IE_PW_CAP; 466 466 467 467 typedef struct _WLAN_IE_SUPP_CH { 468 - BYTE byElementID; 469 - BYTE len; 470 - BYTE abyChannelTuple[2]; 468 + u8 byElementID; 469 + u8 len; 470 + u8 abyChannelTuple[2]; 471 471 } WLAN_IE_SUPP_CH, *PWLAN_IE_SUPP_CH; 472 472 473 473 typedef struct _WLAN_IE_TPC_REQ { 474 - BYTE byElementID; 475 - BYTE len; 474 + u8 byElementID; 475 + u8 len; 476 476 } WLAN_IE_TPC_REQ, *PWLAN_IE_TPC_REQ; 477 477 478 478 typedef struct _WLAN_IE_TPC_REP { 479 - BYTE byElementID; 480 - BYTE len; 481 - BYTE byTxPower; 482 - BYTE byLinkMargin; 479 + u8 byElementID; 480 + u8 len; 481 + u8 byTxPower; 482 + u8 byLinkMargin; 483 483 } WLAN_IE_TPC_REP, *PWLAN_IE_TPC_REP; 484 484 485 485 486 486 typedef struct _WLAN_IE_IBSS_DFS { 487 - BYTE byElementID; 488 - BYTE len; 489 - BYTE abyDFSOwner[6]; 490 - BYTE byDFSRecovery; 491 - BYTE abyChannelMap[2]; 487 + u8 byElementID; 488 + u8 len; 489 + u8 abyDFSOwner[6]; 490 + u8 byDFSRecovery; 491 + u8 abyChannelMap[2]; 492 492 } WLAN_IE_IBSS_DFS, *PWLAN_IE_IBSS_DFS; 493 493 494 494 #pragma pack() ··· 500 500 501 501 unsigned int uType; 502 502 unsigned int len; 503 - PBYTE pBuf; 503 + u8 * pBuf; 504 504 PUWLAN_80211HDR pHdr; 505 505 506 506 } WLAN_FR_MGMT, *PWLAN_FR_MGMT; ··· 510 510 511 511 unsigned int uType; 512 512 unsigned int len; 513 - PBYTE pBuf; 513 + u8 * pBuf; 514 514 PUWLAN_80211HDR pHdr; 515 515 /* fixed fields */ 516 516 u64 *pqwTimestamp; ··· 541 541 542 542 unsigned int uType; 543 543 unsigned int len; 544 - PBYTE pBuf; 544 + u8 * pBuf; 545 545 PUWLAN_80211HDR pHdr; 546 546 547 547 /* fixed fields */ ··· 555 555 556 556 unsigned int uType; 557 557 unsigned int len; 558 - PBYTE pBuf; 558 + u8 * pBuf; 559 559 PUWLAN_80211HDR pHdr; 560 560 /* fixed fields */ 561 561 PWORD pwReason; ··· 568 568 569 569 unsigned int uType; 570 570 unsigned int len; 571 - PBYTE pBuf; 571 + u8 * pBuf; 572 572 PUWLAN_80211HDR pHdr; 573 573 /* fixed fields */ 574 574 PWORD pwCapInfo; ··· 592 592 593 593 unsigned int uType; 594 594 unsigned int len; 595 - PBYTE pBuf; 595 + u8 * pBuf; 596 596 PUWLAN_80211HDR pHdr; 597 597 /* fixed fields */ 598 598 PWORD pwCapInfo; ··· 609 609 610 610 unsigned int uType; 611 611 unsigned int len; 612 - PBYTE pBuf; 612 + u8 * pBuf; 613 613 PUWLAN_80211HDR pHdr; 614 614 615 615 /* fixed fields */ ··· 634 634 635 635 unsigned int uType; 636 636 unsigned int len; 637 - PBYTE pBuf; 637 + u8 * pBuf; 638 638 PUWLAN_80211HDR pHdr; 639 639 /* fixed fields */ 640 640 PWORD pwCapInfo; ··· 651 651 652 652 unsigned int uType; 653 653 unsigned int len; 654 - PBYTE pBuf; 654 + u8 * pBuf; 655 655 PUWLAN_80211HDR pHdr; 656 656 /* fixed fields */ 657 657 /* info elements */ ··· 666 666 667 667 unsigned int uType; 668 668 unsigned int len; 669 - PBYTE pBuf; 669 + u8 * pBuf; 670 670 PUWLAN_80211HDR pHdr; 671 671 /* fixed fields */ 672 672 u64 *pqwTimestamp; ··· 695 695 696 696 unsigned int uType; 697 697 unsigned int len; 698 - PBYTE pBuf; 698 + u8 * pBuf; 699 699 PUWLAN_80211HDR pHdr; 700 700 /* fixed fields */ 701 701 PWORD pwAuthAlgorithm; ··· 711 711 712 712 unsigned int uType; 713 713 unsigned int len; 714 - PBYTE pBuf; 714 + u8 * pBuf; 715 715 PUWLAN_80211HDR pHdr; 716 716 /* fixed fields */ 717 717 PWORD pwReason;
+41 -41
drivers/staging/vt6656/aes_ccmp.c
··· 43 43 * SBOX Table 44 44 */ 45 45 46 - BYTE sbox_table[256] = { 46 + u8 sbox_table[256] = { 47 47 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 48 48 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 49 49 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, ··· 62 62 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 63 63 }; 64 64 65 - BYTE dot2_table[256] = { 65 + u8 dot2_table[256] = { 66 66 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, 67 67 0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e, 68 68 0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, ··· 81 81 0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9, 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5 82 82 }; 83 83 84 - BYTE dot3_table[256] = { 84 + u8 dot3_table[256] = { 85 85 0x00, 0x03, 0x06, 0x05, 0x0c, 0x0f, 0x0a, 0x09, 0x18, 0x1b, 0x1e, 0x1d, 0x14, 0x17, 0x12, 0x11, 86 86 0x30, 0x33, 0x36, 0x35, 0x3c, 0x3f, 0x3a, 0x39, 0x28, 0x2b, 0x2e, 0x2d, 0x24, 0x27, 0x22, 0x21, 87 87 0x60, 0x63, 0x66, 0x65, 0x6c, 0x6f, 0x6a, 0x69, 0x78, 0x7b, 0x7e, 0x7d, 0x74, 0x77, 0x72, 0x71, ··· 106 106 107 107 /*--------------------- Export Functions --------------------------*/ 108 108 109 - static void xor_128(BYTE *a, BYTE *b, BYTE *out) 109 + static void xor_128(u8 *a, u8 *b, u8 *out) 110 110 { 111 111 PDWORD dwPtrA = (PDWORD) a; 112 112 PDWORD dwPtrB = (PDWORD) b; ··· 119 119 } 120 120 121 121 122 - static void xor_32(BYTE *a, BYTE *b, BYTE *out) 122 + static void xor_32(u8 *a, u8 *b, u8 *out) 123 123 { 124 124 PDWORD dwPtrA = (PDWORD) a; 125 125 PDWORD dwPtrB = (PDWORD) b; ··· 128 128 (*dwPtrOut++) = (*dwPtrA++) ^ (*dwPtrB++); 129 129 } 130 130 131 - void AddRoundKey(BYTE *key, int round) 131 + void AddRoundKey(u8 *key, int round) 132 132 { 133 - BYTE sbox_key[4]; 134 - BYTE rcon_table[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36}; 133 + u8 sbox_key[4]; 134 + u8 rcon_table[10] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36}; 135 135 136 136 sbox_key[0] = sbox_table[key[13]]; 137 137 sbox_key[1] = sbox_table[key[14]]; ··· 146 146 xor_32(&key[12], &key[8], &key[12]); 147 147 } 148 148 149 - void SubBytes(BYTE *in, BYTE *out) 149 + void SubBytes(u8 *in, u8 *out) 150 150 { 151 151 int i; 152 152 ··· 154 154 out[i] = sbox_table[in[i]]; 155 155 } 156 156 157 - void ShiftRows(BYTE *in, BYTE *out) 157 + void ShiftRows(u8 *in, u8 *out) 158 158 { 159 159 out[0] = in[0]; 160 160 out[1] = in[5]; ··· 174 174 out[15] = in[11]; 175 175 } 176 176 177 - void MixColumns(BYTE *in, BYTE *out) 177 + void MixColumns(u8 *in, u8 *out) 178 178 { 179 179 180 180 out[0] = dot2_table[in[0]] ^ dot3_table[in[1]] ^ in[2] ^ in[3]; ··· 183 183 out[3] = dot3_table[in[0]] ^ in[1] ^ in[2] ^ dot2_table[in[3]]; 184 184 } 185 185 186 - void AESv128(BYTE *key, BYTE *data, BYTE *ciphertext) 186 + void AESv128(u8 *key, u8 *data, u8 *ciphertext) 187 187 { 188 188 int i; 189 189 int round; 190 - BYTE TmpdataA[16]; 191 - BYTE TmpdataB[16]; 192 - BYTE abyRoundKey[16]; 190 + u8 TmpdataA[16]; 191 + u8 TmpdataB[16]; 192 + u8 abyRoundKey[16]; 193 193 194 194 for (i = 0; i < 16; i++) 195 195 abyRoundKey[i] = key[i]; ··· 231 231 * 232 232 */ 233 233 234 - bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize) 234 + bool AESbGenCCMP(u8 * pbyRxKey, u8 * pbyFrame, WORD wFrameSize) 235 235 { 236 - BYTE abyNonce[13]; 237 - BYTE MIC_IV[16]; 238 - BYTE MIC_HDR1[16]; 239 - BYTE MIC_HDR2[16]; 240 - BYTE abyMIC[16]; 241 - BYTE abyCTRPLD[16]; 242 - BYTE abyTmp[16]; 243 - BYTE abyPlainText[16]; 244 - BYTE abyLastCipher[16]; 236 + u8 abyNonce[13]; 237 + u8 MIC_IV[16]; 238 + u8 MIC_HDR1[16]; 239 + u8 MIC_HDR2[16]; 240 + u8 abyMIC[16]; 241 + u8 abyCTRPLD[16]; 242 + u8 abyTmp[16]; 243 + u8 abyPlainText[16]; 244 + u8 abyLastCipher[16]; 245 245 246 246 PS802_11Header pMACHeader = (PS802_11Header) pbyFrame; 247 - PBYTE pbyIV; 248 - PBYTE pbyPayload; 247 + u8 * pbyIV; 248 + u8 * pbyPayload; 249 249 WORD wHLen = 22; 250 250 /* 8 is IV, 8 is MIC, 4 is CRC */ 251 251 WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN; 252 252 bool bA4 = false; 253 - BYTE byTmp; 253 + u8 byTmp; 254 254 WORD wCnt; 255 255 int ii, jj, kk; 256 256 ··· 276 276 /* MIC_IV */ 277 277 MIC_IV[0] = 0x59; 278 278 memcpy(&(MIC_IV[1]), &(abyNonce[0]), 13); 279 - MIC_IV[14] = (BYTE)(wPayloadSize >> 8); 280 - MIC_IV[15] = (BYTE)(wPayloadSize & 0xff); 279 + MIC_IV[14] = (u8)(wPayloadSize >> 8); 280 + MIC_IV[15] = (u8)(wPayloadSize & 0xff); 281 281 282 282 /* MIC_HDR1 */ 283 - MIC_HDR1[0] = (BYTE)(wHLen >> 8); 284 - MIC_HDR1[1] = (BYTE)(wHLen & 0xff); 285 - byTmp = (BYTE)(pMACHeader->wFrameCtl & 0xff); 283 + MIC_HDR1[0] = (u8)(wHLen >> 8); 284 + MIC_HDR1[1] = (u8)(wHLen & 0xff); 285 + byTmp = (u8)(pMACHeader->wFrameCtl & 0xff); 286 286 MIC_HDR1[2] = byTmp & 0x8f; 287 - byTmp = (BYTE)(pMACHeader->wFrameCtl >> 8); 287 + byTmp = (u8)(pMACHeader->wFrameCtl >> 8); 288 288 byTmp &= 0x87; 289 289 MIC_HDR1[3] = byTmp | 0x40; 290 290 memcpy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, ETH_ALEN); ··· 292 292 293 293 /* MIC_HDR2 */ 294 294 memcpy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, ETH_ALEN); 295 - byTmp = (BYTE)(pMACHeader->wSeqCtl & 0xff); 295 + byTmp = (u8)(pMACHeader->wSeqCtl & 0xff); 296 296 MIC_HDR2[6] = byTmp & 0x0f; 297 297 MIC_HDR2[7] = 0; 298 298 ··· 326 326 327 327 for (jj = wPayloadSize; jj > 16; jj = jj-16) { 328 328 329 - abyCTRPLD[14] = (BYTE) (wCnt >> 8); 330 - abyCTRPLD[15] = (BYTE) (wCnt & 0xff); 329 + abyCTRPLD[14] = (u8) (wCnt >> 8); 330 + abyCTRPLD[15] = (u8) (wCnt & 0xff); 331 331 332 332 AESv128(pbyRxKey, abyCTRPLD, abyTmp); 333 333 ··· 349 349 for (ii = jj; ii < 16; ii++) 350 350 abyLastCipher[ii] = 0x00; 351 351 352 - abyCTRPLD[14] = (BYTE) (wCnt >> 8); 353 - abyCTRPLD[15] = (BYTE) (wCnt & 0xff); 352 + abyCTRPLD[14] = (u8) (wCnt >> 8); 353 + abyCTRPLD[15] = (u8) (wCnt & 0xff); 354 354 355 355 AESv128(pbyRxKey, abyCTRPLD, abyTmp); 356 356 for (kk = 0; kk < 16; kk++) ··· 370 370 /* => above is the calculated MIC */ 371 371 372 372 wCnt = 0; 373 - abyCTRPLD[14] = (BYTE) (wCnt >> 8); 374 - abyCTRPLD[15] = (BYTE) (wCnt & 0xff); 373 + abyCTRPLD[14] = (u8) (wCnt >> 8); 374 + abyCTRPLD[15] = (u8) (wCnt & 0xff); 375 375 AESv128(pbyRxKey, abyCTRPLD, abyTmp); 376 376 377 377 for (kk = 0; kk < 8; kk++)
+1 -1
drivers/staging/vt6656/aes_ccmp.h
··· 41 41 /*--------------------- Export Variables --------------------------*/ 42 42 43 43 /*--------------------- Export Functions --------------------------*/ 44 - bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize); 44 + bool AESbGenCCMP(u8 * pbyRxKey, u8 * pbyFrame, WORD wFrameSize); 45 45 46 46 #endif /* __AES_CCMP_H__ */
+17 -17
drivers/staging/vt6656/baseband.c
··· 66 66 /*--------------------- Static Variables --------------------------*/ 67 67 68 68 69 - BYTE abyVT3184_AGC[] = { 69 + u8 abyVT3184_AGC[] = { 70 70 0x00, //0 71 71 0x00, //1 72 72 0x02, //2 ··· 134 134 }; 135 135 136 136 137 - BYTE abyVT3184_AL2230[] = { 137 + u8 abyVT3184_AL2230[] = { 138 138 0x31,//00 139 139 0x00, 140 140 0x00, ··· 396 396 397 397 398 398 //{{RobertYu:20060515, new BB setting for VT3226D0 399 - BYTE abyVT3184_VT3226D0[] = { 399 + u8 abyVT3184_VT3226D0[] = { 400 400 0x31,//00 401 401 0x00, 402 402 0x00, ··· 691 691 */ 692 692 unsigned int 693 693 BBuGetFrameTime( 694 - BYTE byPreambleType, 695 - BYTE byPktType, 694 + u8 byPreambleType, 695 + u8 byPktType, 696 696 unsigned int cbFrameLength, 697 697 WORD wRate 698 698 ) ··· 964 964 { 965 965 int ntStatus; 966 966 WORD wLength; 967 - PBYTE pbyAddr; 968 - PBYTE pbyAgc; 967 + u8 * pbyAddr; 968 + u8 * pbyAgc; 969 969 WORD wLengthAgc; 970 - BYTE abyArray[256]; 970 + u8 abyArray[256]; 971 971 972 972 ntStatus = CONTROLnsRequestIn(pDevice, 973 973 MESSAGE_TYPE_READ, ··· 1155 1155 */ 1156 1156 void BBvLoopbackOn(struct vnt_private *pDevice) 1157 1157 { 1158 - BYTE byData; 1158 + u8 byData; 1159 1159 1160 1160 //CR C9 = 0x00 1161 1161 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0xC9, &pDevice->byBBCRc9);//CR201 ··· 1169 1169 if (pDevice->wCurrentRate <= RATE_11M) { //CCK 1170 1170 // Enable internal digital loopback: CR33 |= 0000 0001 1171 1171 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33 1172 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (BYTE)(byData | 0x01));//CR33 1172 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData | 0x01));//CR33 1173 1173 // CR154 = 0x00 1174 1174 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, 0); //CR154 1175 1175 ··· 1178 1178 else { //OFDM 1179 1179 // Enable internal digital loopback:CR154 |= 0000 0001 1180 1180 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154 1181 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (BYTE)(byData | 0x01));//CR154 1181 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData | 0x01));//CR154 1182 1182 // CR33 = 0x00 1183 1183 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, 0); //CR33 1184 1184 ··· 1190 1190 1191 1191 // Disable TX_IQUN 1192 1192 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x09, &pDevice->byBBCR09); 1193 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, (BYTE)(pDevice->byBBCR09 & 0xDE)); 1193 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x09, (u8)(pDevice->byBBCR09 & 0xDE)); 1194 1194 } 1195 1195 1196 1196 /* ··· 1218 1218 if (pDevice->wCurrentRate <= RATE_11M) { // CCK 1219 1219 // Set the CR33 Bit2 to disable internal Loopback. 1220 1220 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33 1221 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (BYTE)(byData & 0xFE));//CR33 1221 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (u8)(byData & 0xFE));//CR33 1222 1222 } else { /* OFDM */ 1223 1223 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154 1224 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (BYTE)(byData & 0xFE));//CR154 1224 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (u8)(byData & 0xFE));//CR154 1225 1225 } 1226 1226 ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x0E, &byData);//CR14 1227 - ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, (BYTE)(byData | 0x80));//CR14 1227 + ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0E, (u8)(byData | 0x80));//CR14 1228 1228 1229 1229 } 1230 1230 ··· 1243 1243 */ 1244 1244 void BBvSetShortSlotTime(struct vnt_private *pDevice) 1245 1245 { 1246 - BYTE byBBVGA=0; 1246 + u8 byBBVGA=0; 1247 1247 1248 1248 if (pDevice->bShortSlotTime) 1249 1249 pDevice->byBBRxConf &= 0xDF;//1101 1111 ··· 1258 1258 } 1259 1259 1260 1260 1261 - void BBvSetVGAGainOffset(struct vnt_private *pDevice, BYTE byData) 1261 + void BBvSetVGAGainOffset(struct vnt_private *pDevice, u8 byData) 1262 1262 { 1263 1263 1264 1264 ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData);
+2 -2
drivers/staging/vt6656/baseband.h
··· 97 97 98 98 unsigned int 99 99 BBuGetFrameTime( 100 - BYTE byPreambleType, 101 - BYTE byFreqType, 100 + u8 byPreambleType, 101 + u8 byFreqType, 102 102 unsigned int cbFrameLength, 103 103 WORD wRate 104 104 );
+9 -9
drivers/staging/vt6656/bssdb.c
··· 430 430 unsigned int uLen = pRSNWPA->len + 2; 431 431 432 432 if (uLen <= (uIELength - 433 - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { 433 + (unsigned int) (ULONG_PTR) ((u8 *) pRSNWPA - pbyIEs))) { 434 434 pBSSList->wWPALen = uLen; 435 435 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); 436 436 WPA_ParseRSN(pBSSList, pRSNWPA); ··· 443 443 unsigned int uLen = pRSN->len + 2; 444 444 445 445 if (uLen <= (uIELength - 446 - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { 446 + (unsigned int) (ULONG_PTR) ((u8 *) pRSN - pbyIEs))) { 447 447 pBSSList->wRSNLen = uLen; 448 448 memcpy(pBSSList->byRSNIE, pRSN, uLen); 449 449 WPA2vParseRSN(pBSSList, pRSN); ··· 483 483 if (pDevice->bUpdateBBVGA) { 484 484 // Monitor if RSSI is too strong. 485 485 pBSSList->byRSSIStatCnt = 0; 486 - RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &pBSSList->ldBmMAX); 486 + RFvRSSITodBm(pDevice, (u8)(pRxPacket->uRSSI), &pBSSList->ldBmMAX); 487 487 pBSSList->ldBmAverage[0] = pBSSList->ldBmMAX; 488 488 pBSSList->ldBmAverRange = pBSSList->ldBmMAX; 489 489 for (ii = 1; ii < RSSI_STAT_COUNT; ii++) ··· 592 592 if (pRSNWPA != NULL) { 593 593 unsigned int uLen = pRSNWPA->len + 2; 594 594 if (uLen <= (uIELength - 595 - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { 595 + (unsigned int) (ULONG_PTR) ((u8 *) pRSNWPA - pbyIEs))) { 596 596 pBSSList->wWPALen = uLen; 597 597 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); 598 598 WPA_ParseRSN(pBSSList, pRSNWPA); ··· 604 604 if (pRSN != NULL) { 605 605 unsigned int uLen = pRSN->len + 2; 606 606 if (uLen <= (uIELength - 607 - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { 607 + (unsigned int) (ULONG_PTR) ((u8 *) pRSN - pbyIEs))) { 608 608 pBSSList->wRSNLen = uLen; 609 609 memcpy(pBSSList->byRSNIE, pRSN, uLen); 610 610 WPA2vParseRSN(pBSSList, pRSN); ··· 612 612 } 613 613 614 614 if (pRxPacket->uRSSI != 0) { 615 - RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &ldBm); 615 + RFvRSSITodBm(pDevice, (u8)(pRxPacket->uRSSI), &ldBm); 616 616 // Monitor if RSSI is too strong. 617 617 pBSSList->byRSSIStatCnt++; 618 618 pBSSList->byRSSIStatCnt %= RSSI_STAT_COUNT; ··· 1207 1207 byTxRetry = (byTSR & 0xF0) >> 4; 1208 1208 wRate = (WORD) (byPktNO & 0xF0) >> 4; 1209 1209 wFIFOCtl = pStatistic->abyTxPktInfo[byPktNum].wFIFOCtl; 1210 - pbyDestAddr = (PBYTE) &( pStatistic->abyTxPktInfo[byPktNum].abyDestAddr[0]); 1210 + pbyDestAddr = (u8 *) &( pStatistic->abyTxPktInfo[byPktNum].abyDestAddr[0]); 1211 1211 1212 1212 if (wFIFOCtl & FIFOCTL_AUTO_FB_0) { 1213 1213 byFallBack = AUTO_FB_0; ··· 1433 1433 } 1434 1434 else 1435 1435 { 1436 - RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm); 1436 + RFvRSSITodBm(pDevice, (u8)(pDevice->uCurrRSSI), &ldBm); 1437 1437 if(-ldBm < 50) { 1438 1438 RssiRatio = 4000; 1439 1439 } ··· 1473 1473 ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) { 1474 1474 pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID); 1475 1475 if (pBSSList != NULL) { 1476 - pDevice->byBBPreEDRSSI = (BYTE) (~(pBSSList->ldBmAverRange) + 1); 1476 + pDevice->byBBPreEDRSSI = (u8) (~(pBSSList->ldBmAverRange) + 1); 1477 1477 BBvUpdatePreEDThreshold(pDevice, false); 1478 1478 } 1479 1479 }
+31 -31
drivers/staging/vt6656/bssdb.h
··· 80 80 81 81 typedef struct tagSERPObject { 82 82 bool bERPExist; 83 - BYTE byERP; 83 + u8 byERP; 84 84 } ERPObject, *PERPObject; 85 85 86 86 ··· 93 93 typedef struct tagKnownBSS { 94 94 // BSS info 95 95 bool bActive; 96 - BYTE abyBSSID[WLAN_BSSID_LEN]; 96 + u8 abyBSSID[WLAN_BSSID_LEN]; 97 97 unsigned int uChannel; 98 - BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 99 - BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 98 + u8 abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 99 + u8 abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 100 100 unsigned int uRSSI; 101 - BYTE bySQ; 101 + u8 bySQ; 102 102 WORD wBeaconInterval; 103 103 WORD wCapInfo; 104 - BYTE abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 105 - BYTE byRxRate; 104 + u8 abySSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 105 + u8 byRxRate; 106 106 107 107 // WORD wATIMWindow; 108 - BYTE byRSSIStatCnt; 108 + u8 byRSSIStatCnt; 109 109 signed long ldBmMAX; 110 110 signed long ldBmAverage[RSSI_STAT_COUNT]; 111 111 signed long ldBmAverRange; ··· 114 114 115 115 //++ WPA informations 116 116 bool bWPAValid; 117 - BYTE byGKType; 118 - BYTE abyPKType[4]; 117 + u8 byGKType; 118 + u8 abyPKType[4]; 119 119 WORD wPKCount; 120 - BYTE abyAuthType[4]; 120 + u8 abyAuthType[4]; 121 121 WORD wAuthCount; 122 - BYTE byDefaultK_as_PK; 123 - BYTE byReplayIdx; 122 + u8 byDefaultK_as_PK; 123 + u8 byReplayIdx; 124 124 //-- 125 125 126 126 //++ WPA2 informations 127 127 bool bWPA2Valid; 128 - BYTE byCSSGK; 128 + u8 byCSSGK; 129 129 WORD wCSSPKCount; 130 - BYTE abyCSSPK[4]; 130 + u8 abyCSSPK[4]; 131 131 WORD wAKMSSAuthCount; 132 - BYTE abyAKMSSAuthType[4]; 132 + u8 abyAKMSSAuthType[4]; 133 133 134 134 //++ wpactl 135 - BYTE byWPAIE[MAX_WPA_IE_LEN]; 136 - BYTE byRSNIE[MAX_WPA_IE_LEN]; 135 + u8 byWPAIE[MAX_WPA_IE_LEN]; 136 + u8 byRSNIE[MAX_WPA_IE_LEN]; 137 137 WORD wWPALen; 138 138 WORD wRSNLen; 139 139 140 140 // Clear count 141 141 unsigned int uClearCount; 142 - // BYTE abyIEs[WLAN_BEACON_FR_MAXLEN]; 142 + // u8 abyIEs[WLAN_BEACON_FR_MAXLEN]; 143 143 unsigned int uIELength; 144 144 u64 qwBSSTimestamp; 145 145 u64 qwLocalTSF;/* local TSF timer */ ··· 148 148 149 149 ERPObject sERP; 150 150 SRSNCapObject sRSNCapObj; 151 - BYTE abyIEs[1024]; // don't move this field !! 151 + u8 abyIEs[1024]; // don't move this field !! 152 152 153 153 } __attribute__ ((__packed__)) 154 154 KnownBSS , *PKnownBSS; ··· 168 168 typedef struct tagKnownNodeDB { 169 169 // STA info 170 170 bool bActive; 171 - BYTE abyMACAddr[WLAN_ADDR_LEN]; 172 - BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; 173 - BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; 171 + u8 abyMACAddr[WLAN_ADDR_LEN]; 172 + u8 abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; 173 + u8 abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN]; 174 174 WORD wTxDataRate; 175 175 bool bShortPreamble; 176 176 bool bERPExist; ··· 179 179 WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. 180 180 WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. 181 181 WORD wSuppRate; 182 - BYTE byTopOFDMBasicRate;//Records the highest basic rate in OFDM mode 183 - BYTE byTopCCKBasicRate; //Records the highest basic rate in CCK mode 182 + u8 byTopOFDMBasicRate;//Records the highest basic rate in OFDM mode 183 + u8 byTopCCKBasicRate; //Records the highest basic rate in CCK mode 184 184 185 185 // For AP mode 186 186 struct sk_buff_head sTxPSQueue; ··· 190 190 NODE_STATE eNodeState; 191 191 bool bPSEnable; 192 192 bool bRxPSPoll; 193 - BYTE byAuthSequence; 193 + u8 byAuthSequence; 194 194 unsigned long ulLastRxJiffer; 195 - BYTE bySuppRate; 195 + u8 bySuppRate; 196 196 DWORD dwFlags; 197 197 WORD wEnQueueCnt; 198 198 199 199 bool bOnFly; 200 200 unsigned long long KeyRSC; 201 - BYTE byKeyIndex; 201 + u8 byKeyIndex; 202 202 DWORD dwKeyIndex; 203 - BYTE byCipherSuite; 203 + u8 byCipherSuite; 204 204 DWORD dwTSC47_16; 205 205 WORD wTSC15_0; 206 206 unsigned int uWepKeyLength; 207 - BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; 207 + u8 abyWepKey[WLAN_WEPMAX_KEYLEN]; 208 208 // 209 209 // Auto rate fallback vars 210 210 bool bIsInFallback; ··· 270 270 u8 *pbyIEs, 271 271 void *pRxPacketContext); 272 272 273 - int BSSbIsSTAInNodeDB(struct vnt_private *, PBYTE abyDstAddr, 273 + int BSSbIsSTAInNodeDB(struct vnt_private *, u8 * abyDstAddr, 274 274 u32 *puNodeIndex); 275 275 276 276 void BSSvCreateOneNode(struct vnt_private *, u32 *puNodeIndex);
+22 -22
drivers/staging/vt6656/card.c
··· 133 133 pDevice->byCurPwr = 0xFF; 134 134 RFbRawSetPower(pDevice, pDevice->abyCCKPwrTbl[uConnectionChannel-1], RATE_1M); 135 135 } 136 - ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(BYTE)(uConnectionChannel|0x80)); 136 + ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(u8)(uConnectionChannel|0x80)); 137 137 } 138 138 139 139 /* ··· 221 221 void 222 222 CARDvCalculateOFDMRParameter ( 223 223 WORD wRate, 224 - BYTE byBBType, 225 - PBYTE pbyTxRate, 226 - PBYTE pbyRsvTime 224 + u8 byBBType, 225 + u8 * pbyTxRate, 226 + u8 * pbyRsvTime 227 227 ) 228 228 { 229 229 switch (wRate) { ··· 434 434 &abyTxRate[8], 435 435 &abyRsvTime[8]); 436 436 437 - abyData[0] = (BYTE)(awLen[0]&0xFF); 438 - abyData[1] = (BYTE)(awLen[0]>>8); 437 + abyData[0] = (u8)(awLen[0]&0xFF); 438 + abyData[1] = (u8)(awLen[0]>>8); 439 439 abyData[2] = abySignal[0]; 440 440 abyData[3] = abyServ[0]; 441 441 442 - abyData[4] = (BYTE)(awLen[1]&0xFF); 443 - abyData[5] = (BYTE)(awLen[1]>>8); 442 + abyData[4] = (u8)(awLen[1]&0xFF); 443 + abyData[5] = (u8)(awLen[1]>>8); 444 444 abyData[6] = abySignal[1]; 445 445 abyData[7] = abyServ[1]; 446 446 447 - abyData[8] = (BYTE)(awLen[2]&0xFF); 448 - abyData[9] = (BYTE)(awLen[2]>>8); 447 + abyData[8] = (u8)(awLen[2]&0xFF); 448 + abyData[9] = (u8)(awLen[2]>>8); 449 449 abyData[10] = abySignal[2]; 450 450 abyData[11] = abyServ[2]; 451 451 452 - abyData[12] = (BYTE)(awLen[3]&0xFF); 453 - abyData[13] = (BYTE)(awLen[3]>>8); 452 + abyData[12] = (u8)(awLen[3]&0xFF); 453 + abyData[13] = (u8)(awLen[3]>>8); 454 454 abyData[14] = abySignal[3]; 455 455 abyData[15] = abyServ[3]; 456 456 ··· 500 500 byMaxMin = 5; 501 501 } 502 502 else {// PK_TYPE_11GA & PK_TYPE_11GB 503 - BYTE byRate = 0; 503 + u8 byRate = 0; 504 504 bool bOFDMRate = false; 505 505 unsigned int ii = 0; 506 506 PWLAN_IE_SUPP_RATES pItemRates = NULL; ··· 515 515 516 516 pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt.abyCurrSuppRates; 517 517 for (ii = 0; ii < pItemRates->len; ii++) { 518 - byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); 518 + byRate = (u8)(pItemRates->abyRates[ii]&0x7F); 519 519 if (RATEwGetRateIdx(byRate) > RATE_11M) { 520 520 bOFDMRate = true; 521 521 break; ··· 525 525 pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt 526 526 .abyCurrExtSuppRates; 527 527 for (ii = 0; ii < pItemRates->len; ii++) { 528 - byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); 528 + byRate = (u8)(pItemRates->abyRates[ii]&0x7F); 529 529 if (RATEwGetRateIdx(byRate) > RATE_11M) { 530 530 bOFDMRate = true; 531 531 break; ··· 544 544 pDevice->uCwMax = C_CWMAX; 545 545 pDevice->uEIFS = C_EIFS; 546 546 547 - byData[0] = (BYTE)pDevice->uSIFS; 548 - byData[1] = (BYTE)pDevice->uDIFS; 549 - byData[2] = (BYTE)pDevice->uEIFS; 550 - byData[3] = (BYTE)pDevice->uSlot; 547 + byData[0] = (u8)pDevice->uSIFS; 548 + byData[1] = (u8)pDevice->uDIFS; 549 + byData[2] = (u8)pDevice->uEIFS; 550 + byData[3] = (u8)pDevice->uSlot; 551 551 CONTROLnsRequestOut(pDevice, 552 552 MESSAGE_TYPE_WRITE, 553 553 MAC_REG_SIFS, ··· 627 627 { 628 628 629 629 if (pDevice->byBBType == BB_TYPE_11A || pDevice->byBBType == BB_TYPE_11B) { 630 - return (BYTE)pDevice->byBBType; 630 + return (u8)pDevice->byBBType; 631 631 } 632 632 else if (CARDbIsOFDMinBasicRate(pDevice)) { 633 633 return PK_TYPE_11GA; ··· 653 653 * Return Value: TSF Offset value 654 654 * 655 655 */ 656 - u64 CARDqGetTSFOffset(BYTE byRxRate, u64 qwTSF1, u64 qwTSF2) 656 + u64 CARDqGetTSFOffset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2) 657 657 { 658 658 u64 qwTSFOffset = 0; 659 659 WORD wRxBcnTSFOffst = 0; ··· 996 996 } 997 997 998 998 vUpdateIFS(pDevice); 999 - CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType); 999 + CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType); 1000 1000 1001 1001 if ( pDevice->byBBType == BB_TYPE_11A ) { 1002 1002 //request by Jack 2005-04-26
+1 -1
drivers/staging/vt6656/card.h
··· 74 74 void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF, 75 75 WORD wBeaconInterval); 76 76 u64 CARDqGetNextTBTT(u64 qwTSF, WORD wBeaconInterval); 77 - u64 CARDqGetTSFOffset(BYTE byRxRate, u64 qwTSF1, u64 qwTSF2); 77 + u64 CARDqGetTSFOffset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2); 78 78 int CARDbRadioPowerOff(struct vnt_private *pDevice); 79 79 int CARDbRadioPowerOn(struct vnt_private *pDevice); 80 80 u8 CARDbyGetPktType(struct vnt_private *pDevice);
+7 -7
drivers/staging/vt6656/channel.c
··· 116 116 ************************************************************************/ 117 117 static struct 118 118 { 119 - BYTE byChannelCountryCode; /* The country code */ 119 + u8 byChannelCountryCode; /* The country code */ 120 120 char chCountryCode[2]; 121 - BYTE bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */ 122 - BYTE byPower[CB_MAX_CHANNEL]; 121 + u8 bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */ 122 + u8 byPower[CB_MAX_CHANNEL]; 123 123 } ChannelRuleTab[] = 124 124 { 125 125 /************************************************************************ ··· 425 425 bool 426 426 CHvChannelGetList ( 427 427 unsigned int uCountryCodeIdx, 428 - PBYTE pbyChannelTable 428 + u8 * pbyChannelTable 429 429 ) 430 430 { 431 431 if (uCountryCodeIdx >= CCODE_MAX) { ··· 508 508 } 509 509 } 510 510 511 - BYTE CHbyGetChannelMapping(BYTE byChannelNumber) 511 + u8 CHbyGetChannelMapping(u8 byChannelNumber) 512 512 { 513 - BYTE ii; 514 - BYTE byCHMapping = 0; 513 + u8 ii; 514 + u8 byCHMapping = 0; 515 515 516 516 for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) { 517 517 if (sChannelTbl[ii].byChannelNumber == byChannelNumber)
+3 -3
drivers/staging/vt6656/channel.h
··· 38 38 /*--------------------- Export Classes ----------------------------*/ 39 39 40 40 typedef struct tagSChannelTblElement { 41 - BYTE byChannelNumber; 41 + u8 byChannelNumber; 42 42 unsigned int uFrequency; 43 43 bool bValid; 44 44 } SChannelTblElement, *PSChannelTblElement; ··· 49 49 50 50 bool ChannelValid(unsigned int CountryCode, unsigned int ChannelNum); 51 51 void CHvInitChannelTable(struct vnt_private *pDevice); 52 - BYTE CHbyGetChannelMapping(BYTE byChannelNumber); 52 + u8 CHbyGetChannelMapping(u8 byChannelNumber); 53 53 54 - bool CHvChannelGetList(unsigned int uCountryCodeIdx, PBYTE pbyChannelTable); 54 + bool CHvChannelGetList(unsigned int uCountryCodeIdx, u8 * pbyChannelTable); 55 55 56 56 #endif /* _CHANNEL_H_ */
+14 -14
drivers/staging/vt6656/datarate.c
··· 57 57 58 58 /* static int msglevel = MSG_LEVEL_DEBUG; */ 59 59 static int msglevel =MSG_LEVEL_INFO; 60 - const BYTE acbyIERate[MAX_RATE] = 60 + const u8 acbyIERate[MAX_RATE] = 61 61 {0x02, 0x04, 0x0B, 0x16, 0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; 62 62 63 63 #define AUTORATE_TXOK_CNT 0x0400 ··· 70 70 71 71 void s_vResetCounter(PKnownNodeDB psNodeDBTable) 72 72 { 73 - BYTE ii; 73 + u8 ii; 74 74 75 75 /* clear statistics counter for auto_rate */ 76 76 for (ii = 0; ii <= MAX_RATE; ii++) { ··· 92 92 * 93 93 * Parameters: 94 94 * In: 95 - * BYTE - Rate value in SuppRates IE or ExtSuppRates IE 95 + * u8 - Rate value in SuppRates IE or ExtSuppRates IE 96 96 * Out: 97 97 * none 98 98 * 99 99 * Return Value: RateIdx 100 100 * 101 101 -*/ 102 - BYTE 102 + u8 103 103 DATARATEbyGetRateIdx ( 104 - BYTE byRate 104 + u8 byRate 105 105 ) 106 106 { 107 - BYTE ii; 107 + u8 ii; 108 108 109 109 /* erase BasicRate flag */ 110 110 byRate = byRate & 0x7F; ··· 146 146 * 147 147 * Parameters: 148 148 * In: 149 - * BYTE - Rate value in SuppRates IE or ExtSuppRates IE 149 + * u8 - Rate value in SuppRates IE or ExtSuppRates IE 150 150 * Out: 151 151 * none 152 152 * ··· 155 155 -*/ 156 156 WORD 157 157 RATEwGetRateIdx( 158 - BYTE byRate 158 + u8 byRate 159 159 ) 160 160 { 161 161 WORD ii; ··· 216 216 } 217 217 218 218 for (ii = 0; ii < uRateLen; ii++) { 219 - byRate = (BYTE)(pItemRates->abyRates[ii]); 219 + byRate = (u8)(pItemRates->abyRates[ii]); 220 220 if (WLAN_MGMT_IS_BASICRATE(byRate) && 221 221 (bUpdateBasicRate == true)) { 222 222 /* ··· 226 226 CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); 227 227 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); 228 228 } 229 - byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); 229 + byRate = (u8)(pItemRates->abyRates[ii]&0x7F); 230 230 if (byHighSuppRate == 0) 231 231 byHighSuppRate = byRate; 232 232 if (byRate > byHighSuppRate) ··· 242 242 uExtRateLen = WLAN_RATES_MAXLEN; 243 243 244 244 for (ii = 0; ii < uExtRateLen ; ii++) { 245 - byRate = (BYTE)(pItemExtRates->abyRates[ii]); 245 + byRate = (u8)(pItemExtRates->abyRates[ii]); 246 246 /* select highest basic rate */ 247 247 if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) { 248 248 /* ··· 252 252 CARDbAddBasicRate((void *)pDevice, RATEwGetRateIdx(byRate)); 253 253 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", RATEwGetRateIdx(byRate)); 254 254 } 255 - byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F); 255 + byRate = (u8)(pItemExtRates->abyRates[ii]&0x7F); 256 256 if (byHighSuppRate == 0) 257 257 byHighSuppRate = byRate; 258 258 if (byRate > byHighSuppRate) ··· 400 400 * Return Value: None 401 401 * 402 402 -*/ 403 - BYTE 403 + u8 404 404 RATEuSetIE ( 405 405 PWLAN_IE_SUPP_RATES pSrcRates, 406 406 PWLAN_IE_SUPP_RATES pDstRates, ··· 423 423 } 424 424 } 425 425 } 426 - return (BYTE)uRateCnt; 426 + return (u8)uRateCnt; 427 427 } 428 428
+4 -4
drivers/staging/vt6656/datarate.h
··· 77 77 void RATEvTxRateFallBack(struct vnt_private *pDevice, 78 78 PKnownNodeDB psNodeDBTable); 79 79 80 - BYTE 80 + u8 81 81 RATEuSetIE( 82 82 PWLAN_IE_SUPP_RATES pSrcRates, 83 83 PWLAN_IE_SUPP_RATES pDstRates, ··· 86 86 87 87 WORD 88 88 RATEwGetRateIdx( 89 - BYTE byRate 89 + u8 byRate 90 90 ); 91 91 92 92 93 - BYTE 93 + u8 94 94 DATARATEbyGetRateIdx( 95 - BYTE byRate 95 + u8 byRate 96 96 ); 97 97 98 98 #endif /* __DATARATE_H__ */
+34 -34
drivers/staging/vt6656/desc.h
··· 190 190 typedef struct tagSRTSData { 191 191 WORD wFrameControl; 192 192 WORD wDurationID; 193 - BYTE abyRA[ETH_ALEN]; 194 - BYTE abyTA[ETH_ALEN]; 193 + u8 abyRA[ETH_ALEN]; 194 + u8 abyTA[ETH_ALEN]; 195 195 } __attribute__ ((__packed__)) 196 196 SRTSData, *PSRTSData; 197 197 198 198 typedef const SRTSData *PCSRTSData; 199 199 200 200 typedef struct tagSRTS_g { 201 - BYTE bySignalField_b; 202 - BYTE byServiceField_b; 201 + u8 bySignalField_b; 202 + u8 byServiceField_b; 203 203 WORD wTransmitLength_b; 204 - BYTE bySignalField_a; 205 - BYTE byServiceField_a; 204 + u8 bySignalField_a; 205 + u8 byServiceField_a; 206 206 WORD wTransmitLength_a; 207 207 WORD wDuration_ba; 208 208 WORD wDuration_aa; ··· 214 214 typedef const SRTS_g *PCSRTS_g; 215 215 216 216 typedef struct tagSRTS_g_FB { 217 - BYTE bySignalField_b; 218 - BYTE byServiceField_b; 217 + u8 bySignalField_b; 218 + u8 byServiceField_b; 219 219 WORD wTransmitLength_b; 220 - BYTE bySignalField_a; 221 - BYTE byServiceField_a; 220 + u8 bySignalField_a; 221 + u8 byServiceField_a; 222 222 WORD wTransmitLength_a; 223 223 WORD wDuration_ba; 224 224 WORD wDuration_aa; ··· 235 235 typedef const SRTS_g_FB *PCSRTS_g_FB; 236 236 237 237 typedef struct tagSRTS_ab { 238 - BYTE bySignalField; 239 - BYTE byServiceField; 238 + u8 bySignalField; 239 + u8 byServiceField; 240 240 WORD wTransmitLength; 241 241 WORD wDuration; 242 242 WORD wReserved; ··· 247 247 typedef const SRTS_ab *PCSRTS_ab; 248 248 249 249 typedef struct tagSRTS_a_FB { 250 - BYTE bySignalField; 251 - BYTE byServiceField; 250 + u8 bySignalField; 251 + u8 byServiceField; 252 252 WORD wTransmitLength; 253 253 WORD wDuration; 254 254 WORD wReserved; ··· 266 266 typedef struct tagSCTSData { 267 267 WORD wFrameControl; 268 268 WORD wDurationID; 269 - BYTE abyRA[ETH_ALEN]; 269 + u8 abyRA[ETH_ALEN]; 270 270 WORD wReserved; 271 271 } __attribute__ ((__packed__)) 272 272 SCTSData, *PSCTSData; 273 273 274 274 typedef struct tagSCTS { 275 - BYTE bySignalField_b; 276 - BYTE byServiceField_b; 275 + u8 bySignalField_b; 276 + u8 byServiceField_b; 277 277 WORD wTransmitLength_b; 278 278 WORD wDuration_ba; 279 279 WORD wReserved; ··· 284 284 typedef const SCTS *PCSCTS; 285 285 286 286 typedef struct tagSCTS_FB { 287 - BYTE bySignalField_b; 288 - BYTE byServiceField_b; 287 + u8 bySignalField_b; 288 + u8 byServiceField_b; 289 289 WORD wTransmitLength_b; 290 290 WORD wDuration_ba; 291 291 WORD wReserved; ··· 321 321 * TX data header 322 322 */ 323 323 typedef struct tagSTxDataHead_g { 324 - BYTE bySignalField_b; 325 - BYTE byServiceField_b; 324 + u8 bySignalField_b; 325 + u8 byServiceField_b; 326 326 WORD wTransmitLength_b; 327 - BYTE bySignalField_a; 328 - BYTE byServiceField_a; 327 + u8 bySignalField_a; 328 + u8 byServiceField_a; 329 329 WORD wTransmitLength_a; 330 330 WORD wDuration_b; 331 331 WORD wDuration_a; ··· 337 337 typedef const STxDataHead_g *PCSTxDataHead_g; 338 338 339 339 typedef struct tagSTxDataHead_g_FB { 340 - BYTE bySignalField_b; 341 - BYTE byServiceField_b; 340 + u8 bySignalField_b; 341 + u8 byServiceField_b; 342 342 WORD wTransmitLength_b; 343 - BYTE bySignalField_a; 344 - BYTE byServiceField_a; 343 + u8 bySignalField_a; 344 + u8 byServiceField_a; 345 345 WORD wTransmitLength_a; 346 346 WORD wDuration_b; 347 347 WORD wDuration_a; ··· 354 354 typedef const STxDataHead_g_FB *PCSTxDataHead_g_FB; 355 355 356 356 typedef struct tagSTxDataHead_ab { 357 - BYTE bySignalField; 358 - BYTE byServiceField; 357 + u8 bySignalField; 358 + u8 byServiceField; 359 359 WORD wTransmitLength; 360 360 WORD wDuration; 361 361 WORD wTimeStampOff; ··· 364 364 typedef const STxDataHead_ab *PCSTxDataHead_ab; 365 365 366 366 typedef struct tagSTxDataHead_a_FB { 367 - BYTE bySignalField; 368 - BYTE byServiceField; 367 + u8 bySignalField; 368 + u8 byServiceField; 369 369 WORD wTransmitLength; 370 370 WORD wDuration; 371 371 WORD wTimeStampOff; ··· 397 397 398 398 typedef struct tagSSecretKey { 399 399 u32 dwLowDword; 400 - BYTE byHighByte; 400 + u8 byHighByte; 401 401 } __attribute__ ((__packed__)) 402 402 SSecretKey; 403 403 404 404 typedef struct tagSKeyEntry { 405 - BYTE abyAddrHi[2]; 405 + u8 abyAddrHi[2]; 406 406 WORD wKCTL; 407 - BYTE abyAddrLo[4]; 407 + u8 abyAddrLo[4]; 408 408 u32 dwKey0[4]; 409 409 u32 dwKey1[4]; 410 410 u32 dwKey2[4];
+5 -5
drivers/staging/vt6656/device.h
··· 212 212 */ 213 213 typedef struct { 214 214 unsigned int uDataLen; 215 - PBYTE pDataBuf; 215 + u8 * pDataBuf; 216 216 /* struct urb *pUrb; */ 217 217 bool bInUse; 218 218 } INT_BUFFER, *PINT_BUFFER; ··· 310 310 typedef struct tagSQuietControl { 311 311 bool bEnable; 312 312 DWORD dwStartTime; 313 - BYTE byPeriod; 313 + u8 byPeriod; 314 314 WORD wDuration; 315 315 } SQuietControl, *PSQuietControl; 316 316 317 317 /* The receive duplicate detection cache entry */ 318 318 typedef struct tagSCacheEntry{ 319 319 WORD wFmSequence; 320 - BYTE abyAddr2[ETH_ALEN]; 320 + u8 abyAddr2[ETH_ALEN]; 321 321 WORD wFrameCtl; 322 322 } SCacheEntry, *PSCacheEntry; 323 323 ··· 337 337 { 338 338 WORD wSequence; 339 339 WORD wFragNum; 340 - BYTE abyAddr2[ETH_ALEN]; 340 + u8 abyAddr2[ETH_ALEN]; 341 341 unsigned int uLifetime; 342 342 struct sk_buff* skb; 343 - PBYTE pbyRxBuffer; 343 + u8 * pbyRxBuffer; 344 344 unsigned int cbFrameLength; 345 345 bool bInUse; 346 346 } SDeFragControlBlock, *PSDeFragControlBlock;
+28 -28
drivers/staging/vt6656/dpc.c
··· 64 64 //static int msglevel =MSG_LEVEL_DEBUG; 65 65 static int msglevel =MSG_LEVEL_INFO; 66 66 67 - const BYTE acbyRxRate[MAX_RATE] = 67 + const u8 acbyRxRate[MAX_RATE] = 68 68 {2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108}; 69 69 70 70 ··· 74 74 75 75 /*--------------------- Static Functions --------------------------*/ 76 76 77 - static BYTE s_byGetRateIdx(BYTE byRate); 77 + static u8 s_byGetRateIdx(u8 byRate); 78 78 79 79 static 80 80 void 81 81 s_vGetDASA( 82 - PBYTE pbyRxBufferAddr, 82 + u8 * pbyRxBufferAddr, 83 83 unsigned int *pcbHeaderSize, 84 84 PSEthernetHeader psEthHeader 85 85 ); ··· 135 135 136 136 pMACHeader = (PS802_11Header) (pbyRxBufferAddr + cbHeaderSize); 137 137 138 - s_vGetDASA((PBYTE)pMACHeader, &cbHeaderSize, &pDevice->sRxEthHeader); 138 + s_vGetDASA((u8 *)pMACHeader, &cbHeaderSize, &pDevice->sRxEthHeader); 139 139 140 140 if (bIsWEP) { 141 141 if (bExtIV) { ··· 150 150 cbHeaderSize += WLAN_HDR_ADDR3_LEN; 151 151 }; 152 152 153 - pbyRxBuffer = (PBYTE) (pbyRxBufferAddr + cbHeaderSize); 153 + pbyRxBuffer = (u8 *) (pbyRxBufferAddr + cbHeaderSize); 154 154 if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_Bridgetunnel[0])) { 155 155 cbHeaderSize += 6; 156 156 } else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) { ··· 188 188 } 189 189 190 190 cbHeaderSize -= (ETH_ALEN * 2); 191 - pbyRxBuffer = (PBYTE) (pbyRxBufferAddr + cbHeaderSize); 191 + pbyRxBuffer = (u8 *) (pbyRxBufferAddr + cbHeaderSize); 192 192 for (ii = 0; ii < ETH_ALEN; ii++) 193 193 *pbyRxBuffer++ = pDevice->sRxEthHeader.abyDstAddr[ii]; 194 194 for (ii = 0; ii < ETH_ALEN; ii++) ··· 200 200 201 201 202 202 203 - static BYTE s_byGetRateIdx(BYTE byRate) 203 + static u8 s_byGetRateIdx(u8 byRate) 204 204 { 205 - BYTE byRateIdx; 205 + u8 byRateIdx; 206 206 207 207 for (byRateIdx = 0; byRateIdx <MAX_RATE ; byRateIdx++) { 208 208 if (acbyRxRate[byRateIdx%MAX_RATE] == byRate) ··· 215 215 static 216 216 void 217 217 s_vGetDASA ( 218 - PBYTE pbyRxBufferAddr, 218 + u8 * pbyRxBufferAddr, 219 219 unsigned int *pcbHeaderSize, 220 220 PSEthernetHeader psEthHeader 221 221 ) ··· 321 321 return false; 322 322 } 323 323 324 - pbyDAddress = (PBYTE)(skb->data); 324 + pbyDAddress = (u8 *)(skb->data); 325 325 pbyRxSts = pbyDAddress+4; 326 326 pbyRxRate = pbyDAddress+5; 327 327 ··· 407 407 // Use for TKIP MIC 408 408 s_vGetDASA(pbyFrame, &cbHeaderSize, &pDevice->sRxEthHeader); 409 409 410 - if (!compare_ether_addr((PBYTE)&(pDevice->sRxEthHeader.abySrcAddr[0]), 410 + if (!compare_ether_addr((u8 *)&(pDevice->sRxEthHeader.abySrcAddr[0]), 411 411 pDevice->abyCurrentNetAddr)) 412 412 return false; 413 413 ··· 415 415 if (IS_CTL_PSPOLL(pbyFrame) || !IS_TYPE_CONTROL(pbyFrame)) { 416 416 p802_11Header = (PS802_11Header) (pbyFrame); 417 417 // get SA NodeIndex 418 - if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(p802_11Header->abyAddr2), &iSANodeIndex)) { 418 + if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(p802_11Header->abyAddr2), &iSANodeIndex)) { 419 419 pMgmt->sNodeDBTable[iSANodeIndex].ulLastRxJiffer = jiffies; 420 420 pMgmt->sNodeDBTable[iSANodeIndex].uInActiveCount = 0; 421 421 } ··· 529 529 // Handle Control & Manage Frame 530 530 531 531 if (IS_TYPE_MGMT((pbyFrame))) { 532 - PBYTE pbyData1; 533 - PBYTE pbyData2; 532 + u8 * pbyData1; 533 + u8 * pbyData2; 534 534 535 535 pRxPacket = &(pRCB->sMngPacket); 536 536 pRxPacket->p80211Header = (PUWLAN_80211HDR)(pbyFrame); ··· 622 622 } 623 623 //mike add:station mode check eapol-key challenge---> 624 624 { 625 - BYTE Protocol_Version; //802.1x Authentication 626 - BYTE Packet_Type; //802.1x Authentication 627 - BYTE Descriptor_type; 625 + u8 Protocol_Version; //802.1x Authentication 626 + u8 Packet_Type; //802.1x Authentication 627 + u8 Descriptor_type; 628 628 WORD Key_info; 629 629 if (bIsWEP) 630 630 cbIVOffset = 8; ··· 703 703 // ----------------------------------------------- 704 704 705 705 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && (pDevice->bEnable8021x == true)){ 706 - BYTE abyMacHdr[24]; 706 + u8 abyMacHdr[24]; 707 707 708 708 // Only 802.1x packet incoming allowed 709 709 if (bIsWEP) ··· 776 776 } 777 777 778 778 MIC_vInit(dwMICKey0, dwMICKey1); 779 - MIC_vAppend((PBYTE)&(pDevice->sRxEthHeader.abyDstAddr[0]), 12); 779 + MIC_vAppend((u8 *)&(pDevice->sRxEthHeader.abyDstAddr[0]), 12); 780 780 dwMIC_Priority = 0; 781 - MIC_vAppend((PBYTE)&dwMIC_Priority, 4); 781 + MIC_vAppend((u8 *)&dwMIC_Priority, 4); 782 782 // 4 is Rcv buffer header, 24 is MAC Header, and 8 is IV and Ext IV. 783 - MIC_vAppend((PBYTE)(skb->data + 8 + WLAN_HDR_ADDR3_LEN + 8), 783 + MIC_vAppend((u8 *)(skb->data + 8 + WLAN_HDR_ADDR3_LEN + 8), 784 784 FrameSize - WLAN_HDR_ADDR3_LEN - 8); 785 785 MIC_vGetMIC(&dwLocalMIC_L, &dwLocalMIC_R); 786 786 MIC_vUnInit(); ··· 877 877 } // ----- End of Reply Counter Check -------------------------- 878 878 879 879 880 - s_vProcessRxMACHeader(pDevice, (PBYTE)(skb->data+8), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset); 880 + s_vProcessRxMACHeader(pDevice, (u8 *)(skb->data+8), FrameSize, bIsWEP, bExtIV, &cbHeaderOffset); 881 881 FrameSize -= cbHeaderOffset; 882 882 cbHeaderOffset += 8; // 8 is Rcv buffer header 883 883 ··· 946 946 // reason = (6) class 2 received from nonauth sta 947 947 vMgrDeAuthenBeginSta(pDevice, 948 948 pMgmt, 949 - (PBYTE)(p802_11Header->abyAddr2), 949 + (u8 *)(p802_11Header->abyAddr2), 950 950 (WLAN_MGMT_REASON_CLASS2_NONAUTH), 951 951 &Status 952 952 ); ··· 958 958 // reason = (7) class 3 received from nonassoc sta 959 959 vMgrDisassocBeginSta(pDevice, 960 960 pMgmt, 961 - (PBYTE)(p802_11Header->abyAddr2), 961 + (u8 *)(p802_11Header->abyAddr2), 962 962 (WLAN_MGMT_REASON_CLASS3_NONASSOC), 963 963 &Status 964 964 ); ··· 1011 1011 else { 1012 1012 vMgrDeAuthenBeginSta(pDevice, 1013 1013 pMgmt, 1014 - (PBYTE)(p802_11Header->abyAddr2), 1014 + (u8 *)(p802_11Header->abyAddr2), 1015 1015 (WLAN_MGMT_REASON_CLASS2_NONAUTH), 1016 1016 &Status 1017 1017 ); ··· 1301 1301 if (FrameSize > CB_MAX_BUF_SIZE) 1302 1302 return false; 1303 1303 // check DA 1304 - if (is_multicast_ether_addr((PBYTE)(skb->data+cbHeaderOffset))) { 1304 + if (is_multicast_ether_addr((u8 *)(skb->data+cbHeaderOffset))) { 1305 1305 if (pMgmt->sNodeDBTable[0].bPSEnable) { 1306 1306 1307 1307 skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz); ··· 1326 1326 } 1327 1327 else { 1328 1328 // check if relay 1329 - if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(skb->data+cbHeaderOffset), &iDANodeIndex)) { 1329 + if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(skb->data+cbHeaderOffset), &iDANodeIndex)) { 1330 1330 if (pMgmt->sNodeDBTable[iDANodeIndex].eNodeState >= NODE_ASSOC) { 1331 1331 if (pMgmt->sNodeDBTable[iDANodeIndex].bPSEnable) { 1332 1332 // queue this skb until next PS tx, and then release. ··· 1356 1356 iDANodeIndex = 0; 1357 1357 1358 1358 if ((pDevice->uAssocCount > 1) && (iDANodeIndex >= 0)) { 1359 - bRelayPacketSend(pDevice, (PBYTE) (skb->data + cbHeaderOffset), 1359 + bRelayPacketSend(pDevice, (u8 *) (skb->data + cbHeaderOffset), 1360 1360 FrameSize, (unsigned int) iDANodeIndex); 1361 1361 } 1362 1362
+1 -1
drivers/staging/vt6656/firmware.c
··· 142 142 0, 143 143 MESSAGE_REQUEST_VERSION, 144 144 2, 145 - (PBYTE) &(pDevice->wFirmwareVersion)); 145 + (u8 *) &(pDevice->wFirmwareVersion)); 146 146 147 147 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Firmware Version [%04x]\n", pDevice->wFirmwareVersion); 148 148 if (ntStatus != STATUS_SUCCESS) {
+4 -4
drivers/staging/vt6656/hostap.c
··· 491 491 492 492 dwKeyIndex = (DWORD)(param->u.crypt.idx); 493 493 if (param->u.crypt.flags & HOSTAP_CRYPT_FLAG_SET_TX_KEY) { 494 - pDevice->byKeyIndex = (BYTE)dwKeyIndex; 494 + pDevice->byKeyIndex = (u8)dwKeyIndex; 495 495 pDevice->bTransmitKey = true; 496 496 dwKeyIndex |= (1 << 31); 497 497 } ··· 515 515 &param->sta_addr[0], 516 516 dwKeyIndex & ~(USE_KEYRSC), 517 517 param->u.crypt.key_len, 518 - &KeyRSC, (PBYTE)abyKey, 518 + &KeyRSC, (u8 *)abyKey, 519 519 KEY_CTL_WEP 520 520 ) == true) { 521 521 ··· 585 585 dwKeyIndex, 586 586 param->u.crypt.key_len, 587 587 &KeyRSC, 588 - (PBYTE)abyKey, 588 + (u8 *)abyKey, 589 589 byKeyDecMode 590 590 ) == true) { 591 591 ··· 670 670 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: %d\n", iNodeIndex); 671 671 memset(param->u.crypt.seq, 0, 8); 672 672 for (ii = 0 ; ii < 8 ; ii++) { 673 - param->u.crypt.seq[ii] = (BYTE)pMgmt->sNodeDBTable[iNodeIndex].KeyRSC >> (ii * 8); 673 + param->u.crypt.seq[ii] = (u8)pMgmt->sNodeDBTable[iNodeIndex].KeyRSC >> (ii * 8); 674 674 } 675 675 676 676 return ret;
+8 -8
drivers/staging/vt6656/int.c
··· 98 98 pINTData = (PSINTData) pDevice->intBuf.pDataBuf; 99 99 if (pINTData->byTSR0 & TSR_VALID) { 100 100 STAvUpdateTDStatCounter(&(pDevice->scStatistic), 101 - (BYTE)(pINTData->byPkt0 & 0x0F), 102 - (BYTE)(pINTData->byPkt0>>4), 101 + (u8)(pINTData->byPkt0 & 0x0F), 102 + (u8)(pINTData->byPkt0>>4), 103 103 pINTData->byTSR0); 104 104 BSSvUpdateNodeTxCounter(pDevice, 105 105 &(pDevice->scStatistic), ··· 109 109 } 110 110 if (pINTData->byTSR1 & TSR_VALID) { 111 111 STAvUpdateTDStatCounter(&(pDevice->scStatistic), 112 - (BYTE)(pINTData->byPkt1 & 0x0F), 113 - (BYTE)(pINTData->byPkt1>>4), 112 + (u8)(pINTData->byPkt1 & 0x0F), 113 + (u8)(pINTData->byPkt1>>4), 114 114 pINTData->byTSR1); 115 115 BSSvUpdateNodeTxCounter(pDevice, 116 116 &(pDevice->scStatistic), ··· 120 120 } 121 121 if (pINTData->byTSR2 & TSR_VALID) { 122 122 STAvUpdateTDStatCounter(&(pDevice->scStatistic), 123 - (BYTE)(pINTData->byPkt2 & 0x0F), 124 - (BYTE)(pINTData->byPkt2>>4), 123 + (u8)(pINTData->byPkt2 & 0x0F), 124 + (u8)(pINTData->byPkt2>>4), 125 125 pINTData->byTSR2); 126 126 BSSvUpdateNodeTxCounter(pDevice, 127 127 &(pDevice->scStatistic), ··· 131 131 } 132 132 if (pINTData->byTSR3 & TSR_VALID) { 133 133 STAvUpdateTDStatCounter(&(pDevice->scStatistic), 134 - (BYTE)(pINTData->byPkt3 & 0x0F), 135 - (BYTE)(pINTData->byPkt3>>4), 134 + (u8)(pINTData->byPkt3 & 0x0F), 135 + (u8)(pINTData->byPkt3>>4), 136 136 pINTData->byTSR3); 137 137 BSSvUpdateNodeTxCounter(pDevice, 138 138 &(pDevice->scStatistic),
+15 -15
drivers/staging/vt6656/int.h
··· 35 35 36 36 /*--------------------- Export Definitions -------------------------*/ 37 37 typedef struct tagSINTData { 38 - BYTE byTSR0; 39 - BYTE byPkt0; 38 + u8 byTSR0; 39 + u8 byPkt0; 40 40 WORD wTime0; 41 - BYTE byTSR1; 42 - BYTE byPkt1; 41 + u8 byTSR1; 42 + u8 byPkt1; 43 43 WORD wTime1; 44 - BYTE byTSR2; 45 - BYTE byPkt2; 44 + u8 byTSR2; 45 + u8 byPkt2; 46 46 WORD wTime2; 47 - BYTE byTSR3; 48 - BYTE byPkt3; 47 + u8 byTSR3; 48 + u8 byPkt3; 49 49 WORD wTime3; 50 50 u64 qwTSF; 51 - BYTE byISR0; 52 - BYTE byISR1; 53 - BYTE byRTSSuccess; 54 - BYTE byRTSFail; 55 - BYTE byACKFail; 56 - BYTE byFCSErr; 57 - BYTE abySW[2]; 51 + u8 byISR0; 52 + u8 byISR1; 53 + u8 byRTSSuccess; 54 + u8 byRTSFail; 55 + u8 byACKFail; 56 + u8 byFCSErr; 57 + u8 abySW[2]; 58 58 } __attribute__ ((__packed__)) 59 59 SINTData, *PSINTData; 60 60
+12 -12
drivers/staging/vt6656/iwctl.c
··· 61 61 pDevice->wstats.status = pDevice->eOPMode; 62 62 if (pDevice->scStatistic.LinkQuality > 100) 63 63 pDevice->scStatistic.LinkQuality = 100; 64 - pDevice->wstats.qual.qual =(BYTE)pDevice->scStatistic.LinkQuality; 65 - RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm); 64 + pDevice->wstats.qual.qual =(u8)pDevice->scStatistic.LinkQuality; 65 + RFvRSSITodBm(pDevice, (u8)(pDevice->uCurrRSSI), &ldBm); 66 66 pDevice->wstats.qual.level = ldBm; 67 67 pDevice->wstats.qual.noise = 0; 68 68 pDevice->wstats.qual.updated = 1; ··· 95 95 struct iw_point *wrq = &wrqu->data; 96 96 struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; 97 97 struct iw_scan_req *req = (struct iw_scan_req *)extra; 98 - BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 98 + u8 abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 99 99 PWLAN_IE_SSID pItemSSID = NULL; 100 100 101 101 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) ··· 238 238 // ADD quality 239 239 memset(&iwe, 0, sizeof(iwe)); 240 240 iwe.cmd = IWEVQUAL; 241 - RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); 241 + RFvRSSITodBm(pDevice, (u8)(pBSS->uRSSI), &ldBm); 242 242 iwe.u.qual.level = ldBm; 243 243 iwe.u.qual.noise = 0; 244 244 ··· 532 532 struct iw_range *range = (struct iw_range *)extra; 533 533 int i; 534 534 int k; 535 - BYTE abySupportedRates[13] = { 535 + u8 abySupportedRates[13] = { 536 536 0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 537 537 0x60, 0x6C, 0x90 538 538 }; ··· 635 635 struct sockaddr *wrq = &wrqu->ap_addr; 636 636 struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; 637 637 int rc = 0; 638 - BYTE ZeroBSSID[WLAN_BSSID_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 638 + u8 ZeroBSSID[WLAN_BSSID_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 639 639 640 640 PRINT_K(" SIOCSIWAP\n"); 641 641 ··· 819 819 if (pDevice->bWPASuppWextEnabled == true) { 820 820 /*******search if in hidden ssid mode ****/ 821 821 PKnownBSS pCurr = NULL; 822 - BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 822 + u8 abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 823 823 unsigned ii; 824 824 unsigned uSameBssidNum = 0; 825 825 ··· 913 913 int rc = 0; 914 914 u8 brate = 0; 915 915 int i; 916 - BYTE abySupportedRates[13] = { 916 + u8 abySupportedRates[13] = { 917 917 0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 918 918 0x60, 0x6C, 0x90 919 919 }; ··· 996 996 return -EFAULT; 997 997 998 998 { 999 - BYTE abySupportedRates[13] = { 999 + u8 abySupportedRates[13] = { 1000 1000 0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 1001 1001 0x48, 0x60, 0x6C, 0x90 1002 1002 }; ··· 1227 1227 KEY_CTL_WEP); 1228 1228 spin_unlock_irq(&pDevice->lock); 1229 1229 } 1230 - pDevice->byKeyIndex = (BYTE)dwKeyIndex; 1230 + pDevice->byKeyIndex = (u8)dwKeyIndex; 1231 1231 pDevice->uKeyLength = wrq->length; 1232 1232 pDevice->bTransmitKey = true; 1233 1233 pDevice->bEncryptionEnable = true; ··· 1317 1317 memcpy(abyKey, pKey->abyKey, pKey->uKeyLength); 1318 1318 memcpy(extra, abyKey, WLAN_WEP232_KEYLEN); 1319 1319 } 1320 - } else if (KeybGetKey(&(pDevice->sKey), pDevice->abyBroadcastAddr, (BYTE)index, &pKey)) { 1320 + } else if (KeybGetKey(&(pDevice->sKey), pDevice->abyBroadcastAddr, (u8)index, &pKey)) { 1321 1321 wrq->length = pKey->uKeyLength; 1322 1322 memcpy(abyKey, pKey->abyKey, pKey->uKeyLength); 1323 1323 memcpy(extra, abyKey, WLAN_WEP232_KEYLEN); ··· 1424 1424 1425 1425 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSENS\n"); 1426 1426 if (pDevice->bLinkPass == true) { 1427 - RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm); 1427 + RFvRSSITodBm(pDevice, (u8)(pDevice->uCurrRSSI), &ldBm); 1428 1428 wrq->value = ldBm; 1429 1429 } else { 1430 1430 wrq->value = 0;
+3 -3
drivers/staging/vt6656/key.c
··· 79 79 pTable->KeyTable[i].bInUse = false; 80 80 pTable->KeyTable[i].wKeyCtl = 0; 81 81 pTable->KeyTable[i].bSoftWEP = false; 82 - pbyData[wLength++] = (BYTE) i; 82 + pbyData[wLength++] = (u8) i; 83 83 //MACvDisableKeyEntry(pDevice, i); 84 84 } 85 85 } ··· 130 130 pTable->KeyTable[i].wKeyCtl = 0; 131 131 pTable->KeyTable[i].dwGTKeyIndex = 0; 132 132 pTable->KeyTable[i].bSoftWEP = false; 133 - pbyData[i] = (BYTE) i; 133 + pbyData[i] = (u8) i; 134 134 } 135 - pbyData[i] = (BYTE) i; 135 + pbyData[i] = (u8) i; 136 136 CONTROLnsRequestOut(pDevice, 137 137 MESSAGE_TYPE_CLRKEYENTRY, 138 138 0,
+6 -6
drivers/staging/vt6656/key.h
··· 59 59 { 60 60 bool bKeyValid; 61 61 u32 uKeyLength; 62 - BYTE abyKey[MAX_KEY_LEN]; 62 + u8 abyKey[MAX_KEY_LEN]; 63 63 u64 KeyRSC; 64 64 DWORD dwTSC47_16; 65 65 WORD wTSC15_0; 66 - BYTE byCipherSuite; 67 - BYTE byReserved0; 66 + u8 byCipherSuite; 67 + u8 byReserved0; 68 68 DWORD dwKeyIndex; 69 69 void *pvKeyTable; 70 70 } SKeyItem, *PSKeyItem; //64 71 71 72 72 typedef struct tagSKeyTable 73 73 { 74 - BYTE abyBSSID[ETH_ALEN]; /* 6 */ 75 - BYTE byReserved0[2]; //8 74 + u8 abyBSSID[ETH_ALEN]; /* 6 */ 75 + u8 byReserved0[2]; //8 76 76 SKeyItem PairwiseKey; 77 77 SKeyItem GroupKey[MAX_GROUP_KEY]; //64*5 = 320, 320+8=328 78 78 DWORD dwGTKeyIndex; // GroupTransmitKey Index 79 79 bool bInUse; 80 80 WORD wKeyCtl; 81 81 bool bSoftWEP; 82 - BYTE byReserved1[6]; 82 + u8 byReserved1[6]; 83 83 } SKeyTable, *PSKeyTable; //352 84 84 85 85 typedef struct tagSKeyManagement
+22 -22
drivers/staging/vt6656/mac.c
··· 169 169 170 170 if (wOffset > 273) 171 171 return; 172 - pbyData[0] = (BYTE)dwData; 173 - pbyData[1] = (BYTE)(dwData>>8); 174 - pbyData[2] = (BYTE)(dwData>>16); 175 - pbyData[3] = (BYTE)(dwData>>24); 172 + pbyData[0] = (u8)dwData; 173 + pbyData[1] = (u8)(dwData>>8); 174 + pbyData[2] = (u8)(dwData>>16); 175 + pbyData[3] = (u8)(dwData>>24); 176 176 177 177 CONTROLnsRequestOut(pDevice, 178 178 MESSAGE_TYPE_WRITE_MISCFF, ··· 203 203 u8 byData; 204 204 205 205 206 - byData = (BYTE) uEntryIdx; 206 + byData = (u8) uEntryIdx; 207 207 208 208 wOffset = MISCFIFO_KEYETRY0; 209 209 wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); ··· 294 294 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 295 295 } 296 296 */ 297 - pbyKey = (PBYTE)pdwKey; 297 + pbyKey = (u8 *)pdwKey; 298 298 299 - pbyData[0] = (BYTE)dwData1; 300 - pbyData[1] = (BYTE)(dwData1>>8); 301 - pbyData[2] = (BYTE)(dwData1>>16); 302 - pbyData[3] = (BYTE)(dwData1>>24); 303 - pbyData[4] = (BYTE)dwData2; 304 - pbyData[5] = (BYTE)(dwData2>>8); 305 - pbyData[6] = (BYTE)(dwData2>>16); 306 - pbyData[7] = (BYTE)(dwData2>>24); 299 + pbyData[0] = (u8)dwData1; 300 + pbyData[1] = (u8)(dwData1>>8); 301 + pbyData[2] = (u8)(dwData1>>16); 302 + pbyData[3] = (u8)(dwData1>>24); 303 + pbyData[4] = (u8)dwData2; 304 + pbyData[5] = (u8)(dwData2>>8); 305 + pbyData[6] = (u8)(dwData2>>16); 306 + pbyData[7] = (u8)(dwData2>>24); 307 307 for (ii = 8; ii < 24; ii++) 308 308 pbyData[ii] = *pbyKey++; 309 309 ··· 358 358 u8 pbyData[2]; 359 359 360 360 361 - pbyData[0] = (BYTE)(wData & 0xff); 362 - pbyData[1] = (BYTE)(wData >> 8); 361 + pbyData[0] = (u8)(wData & 0xff); 362 + pbyData[1] = (u8)(wData >> 8); 363 363 364 364 CONTROLnsRequestOut(pDevice, 365 365 MESSAGE_TYPE_WRITE, ··· 376 376 u8 pbyData[6]; 377 377 378 378 379 - pbyData[0] = *((PBYTE)pbyEtherAddr); 380 - pbyData[1] = *((PBYTE)pbyEtherAddr+1); 381 - pbyData[2] = *((PBYTE)pbyEtherAddr+2); 382 - pbyData[3] = *((PBYTE)pbyEtherAddr+3); 383 - pbyData[4] = *((PBYTE)pbyEtherAddr+4); 384 - pbyData[5] = *((PBYTE)pbyEtherAddr+5); 379 + pbyData[0] = *((u8 *)pbyEtherAddr); 380 + pbyData[1] = *((u8 *)pbyEtherAddr+1); 381 + pbyData[2] = *((u8 *)pbyEtherAddr+2); 382 + pbyData[3] = *((u8 *)pbyEtherAddr+3); 383 + pbyData[4] = *((u8 *)pbyEtherAddr+4); 384 + pbyData[5] = *((u8 *)pbyEtherAddr+5); 385 385 386 386 CONTROLnsRequestOut(pDevice, 387 387 MESSAGE_TYPE_WRITE,
+8 -8
drivers/staging/vt6656/main_usb.c
··· 258 258 static void 259 259 device_set_options(struct vnt_private *pDevice) { 260 260 261 - BYTE abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 262 - BYTE abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; 261 + u8 abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; 262 + u8 abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; 263 263 u8 abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; 264 264 265 265 memcpy(pDevice->abyBroadcastAddr, abyBroadcastAddr, ETH_ALEN); ··· 366 366 } 367 367 } 368 368 369 - sInitCmd.byInitClass = (BYTE)InitType; 370 - sInitCmd.bExistSWNetAddr = (BYTE) pDevice->bExistSWNetAddr; 369 + sInitCmd.byInitClass = (u8)InitType; 370 + sInitCmd.bExistSWNetAddr = (u8) pDevice->bExistSWNetAddr; 371 371 for (ii = 0; ii < 6; ii++) 372 372 sInitCmd.bySWNetAddr[ii] = pDevice->abyCurrentNetAddr[ii]; 373 373 sInitCmd.byShortRetryLimit = pDevice->byShortRetryLimit; ··· 379 379 0, 380 380 0, 381 381 sizeof(CMD_CARD_INIT), 382 - (PBYTE) &(sInitCmd)); 382 + (u8 *) &(sInitCmd)); 383 383 384 384 if ( ntStatus != STATUS_SUCCESS ) { 385 385 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Issue Card init fail \n"); ··· 388 388 } 389 389 if (InitType == DEVICE_INIT_COLD) { 390 390 391 - ntStatus = CONTROLnsRequestIn(pDevice,MESSAGE_TYPE_INIT_RSP,0,0,sizeof(RSP_CARD_INIT), (PBYTE) &(sInitRsp)); 391 + ntStatus = CONTROLnsRequestIn(pDevice,MESSAGE_TYPE_INIT_RSP,0,0,sizeof(RSP_CARD_INIT), (u8 *) &(sInitRsp)); 392 392 393 393 if (ntStatus != STATUS_SUCCESS) { 394 394 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Cardinit request in status fail!\n"); ··· 1470 1470 mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31)); 1471 1471 } 1472 1472 for (ii = 0; ii < 4; ii++) { 1473 - MACvWriteMultiAddr(pDevice, ii, *((PBYTE)&mc_filter[0] + ii)); 1474 - MACvWriteMultiAddr(pDevice, ii+ 4, *((PBYTE)&mc_filter[1] + ii)); 1473 + MACvWriteMultiAddr(pDevice, ii, *((u8 *)&mc_filter[0] + ii)); 1474 + MACvWriteMultiAddr(pDevice, ii+ 4, *((u8 *)&mc_filter[1] + ii)); 1475 1475 } 1476 1476 pDevice->byRxMode &= ~(RCR_UNICAST); 1477 1477 pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST);
+18 -18
drivers/staging/vt6656/mib.c
··· 89 89 * Return Value: none 90 90 * 91 91 */ 92 - void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr1) 92 + void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, u8 byIsr0, u8 byIsr1) 93 93 { 94 94 /**********************/ 95 95 /* ABNORMAL interrupt */ ··· 152 152 * 153 153 */ 154 154 void STAvUpdateRDStatCounter(PSStatCounter pStatistic, 155 - BYTE byRSR, BYTE byNewRSR, 156 - BYTE byRxSts, BYTE byRxRate, 157 - PBYTE pbyBuffer, unsigned int cbFrameLength) 155 + u8 byRSR, u8 byNewRSR, 156 + u8 byRxSts, u8 byRxRate, 157 + u8 * pbyBuffer, unsigned int cbFrameLength) 158 158 { 159 159 /* need change */ 160 160 PS802_11Header pHeader = (PS802_11Header)pbyBuffer; ··· 390 390 void 391 391 STAvUpdateRDStatCounterEx ( 392 392 PSStatCounter pStatistic, 393 - BYTE byRSR, 394 - BYTE byNewRSR, 395 - BYTE byRxSts, 396 - BYTE byRxRate, 397 - PBYTE pbyBuffer, 393 + u8 byRSR, 394 + u8 byNewRSR, 395 + u8 byRxSts, 396 + u8 byRxRate, 397 + u8 * pbyBuffer, 398 398 unsigned int cbFrameLength 399 399 ) 400 400 { ··· 411 411 // rx length 412 412 pStatistic->dwCntRxFrmLength = cbFrameLength; 413 413 // rx pattern, we just see 10 bytes for sample 414 - memcpy(pStatistic->abyCntRxPattern, (PBYTE)pbyBuffer, 10); 414 + memcpy(pStatistic->abyCntRxPattern, (u8 *)pbyBuffer, 10); 415 415 } 416 416 417 417 ··· 435 435 void 436 436 STAvUpdateTDStatCounter ( 437 437 PSStatCounter pStatistic, 438 - BYTE byPktNum, 439 - BYTE byRate, 440 - BYTE byTSR 438 + u8 byPktNum, 439 + u8 byRate, 440 + u8 byTSR 441 441 ) 442 442 { 443 - BYTE byRetyCnt; 443 + u8 byRetyCnt; 444 444 // increase tx packet count 445 445 pStatistic->dwTsrTxPacket++; 446 446 ··· 524 524 STAvUpdate802_11Counter( 525 525 PSDot11Counters p802_11Counter, 526 526 PSStatCounter pStatistic, 527 - BYTE byRTSSuccess, 528 - BYTE byRTSFail, 529 - BYTE byACKFail, 530 - BYTE byFCSErr 527 + u8 byRTSSuccess, 528 + u8 byRTSFail, 529 + u8 byACKFail, 530 + u8 byFCSErr 531 531 ) 532 532 { 533 533 //p802_11Counter->TransmittedFragmentCount
+17 -17
drivers/staging/vt6656/mib.h
··· 92 92 signed long ifType; 93 93 signed long ifMtu; 94 94 DWORD ifSpeed; 95 - BYTE ifPhysAddress[ETH_ALEN]; 95 + u8 ifPhysAddress[ETH_ALEN]; 96 96 signed long ifAdminStatus; 97 97 signed long ifOperStatus; 98 98 DWORD ifLastChange; ··· 228 228 // Tx packet information 229 229 // 230 230 typedef struct tagSTxPktInfo { 231 - BYTE byBroadMultiUni; 231 + u8 byBroadMultiUni; 232 232 WORD wLength; 233 233 WORD wFIFOCtl; 234 - BYTE abyDestAddr[ETH_ALEN]; 234 + u8 abyDestAddr[ETH_ALEN]; 235 235 } STxPktInfo, *PSTxPktInfo; 236 236 237 237 ··· 318 318 DWORD dwCntRxFrmLength; 319 319 DWORD dwCntTxBufLength; 320 320 321 - BYTE abyCntRxPattern[16]; 322 - BYTE abyCntTxPattern[16]; 321 + u8 abyCntRxPattern[16]; 322 + u8 abyCntTxPattern[16]; 323 323 324 324 325 325 ··· 376 376 void STAvClearAllCounter(PSStatCounter pStatistic); 377 377 378 378 void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, 379 - BYTE byIsr0, 380 - BYTE byIsr1); 379 + u8 byIsr0, 380 + u8 byIsr1); 381 381 382 382 void STAvUpdateRDStatCounter(PSStatCounter pStatistic, 383 - BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, 384 - BYTE byRxRate, PBYTE pbyBuffer, 383 + u8 byRSR, u8 byNewRSR, u8 byRxSts, 384 + u8 byRxRate, u8 * pbyBuffer, 385 385 unsigned int cbFrameLength); 386 386 387 387 void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic, 388 - BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, 389 - BYTE byRxRate, PBYTE pbyBuffer, 388 + u8 byRSR, u8 byNewRSR, u8 byRxSts, 389 + u8 byRxRate, u8 * pbyBuffer, 390 390 unsigned int cbFrameLength); 391 391 392 - void STAvUpdateTDStatCounter(PSStatCounter pStatistic, BYTE byPktNum, 393 - BYTE byRate, BYTE byTSR); 392 + void STAvUpdateTDStatCounter(PSStatCounter pStatistic, u8 byPktNum, 393 + u8 byRate, u8 byTSR); 394 394 395 395 void 396 396 STAvUpdate802_11Counter( 397 397 PSDot11Counters p802_11Counter, 398 398 PSStatCounter pStatistic, 399 - BYTE byRTSSuccess, 400 - BYTE byRTSFail, 401 - BYTE byACKFail, 402 - BYTE byFCSErr 399 + u8 byRTSSuccess, 400 + u8 byRTSFail, 401 + u8 byACKFail, 402 + u8 byFCSErr 403 403 ); 404 404 405 405 void STAvClear802_11Counter(PSDot11Counters p802_11Counter);
+12 -12
drivers/staging/vt6656/michael.c
··· 26 26 * Date: Sep 4, 2002 27 27 * 28 28 * Functions: 29 - * s_dwGetUINT32 - Convert from BYTE[] to DWORD in a portable way 30 - * s_vPutUINT32 - Convert from DWORD to BYTE[] in a portable way 29 + * s_dwGetUINT32 - Convert from u8[] to DWORD in a portable way 30 + * s_vPutUINT32 - Convert from DWORD to u8[] in a portable way 31 31 * s_vClear - Reset the state to the empty message. 32 32 * s_vSetKey - Set the key. 33 33 * MIC_vInit - Set the key. ··· 48 48 49 49 /*--------------------- Static Functions --------------------------*/ 50 50 /* 51 - * static DWORD s_dwGetUINT32(BYTE * p); Get DWORD from 51 + * static DWORD s_dwGetUINT32(u8 * p); Get DWORD from 52 52 * 4 bytes LSByte first 53 - * static void s_vPutUINT32(BYTE* p, DWORD val); Put DWORD into 53 + * static void s_vPutUINT32(u8* p, DWORD val); Put DWORD into 54 54 * 4 bytes LSByte first 55 55 */ 56 56 static void s_vClear(void); /* Clear the internal message, 57 57 * resets the object to the 58 58 * state just after construction. */ 59 59 static void s_vSetKey(DWORD dwK0, DWORD dwK1); 60 - static void s_vAppendByte(BYTE b); /* Add a single byte to the internal 60 + static void s_vAppendByte(u8 b); /* Add a single byte to the internal 61 61 * message */ 62 62 63 63 /*--------------------- Export Variables --------------------------*/ ··· 69 69 /*--------------------- Export Functions --------------------------*/ 70 70 71 71 /* 72 - static DWORD s_dwGetUINT32 (BYTE * p) 73 - // Convert from BYTE[] to DWORD in a portable way 72 + static DWORD s_dwGetUINT32 (u8 * p) 73 + // Convert from u8[] to DWORD in a portable way 74 74 { 75 75 DWORD res = 0; 76 76 unsigned int i; ··· 79 79 return res; 80 80 } 81 81 82 - static void s_vPutUINT32(BYTE *p, DWORD val) 83 - // Convert from DWORD to BYTE[] in a portable way 82 + static void s_vPutUINT32(u8 *p, DWORD val) 83 + // Convert from DWORD to u8[] in a portable way 84 84 { 85 85 unsigned int i; 86 86 for (i = 0; i < 4; i++) { 87 - *p++ = (BYTE) (val & 0xff); 87 + *p++ = (u8) (val & 0xff); 88 88 val >>= 8; 89 89 } 90 90 } ··· 108 108 s_vClear(); 109 109 } 110 110 111 - static void s_vAppendByte(BYTE b) 111 + static void s_vAppendByte(u8 b) 112 112 { 113 113 /* Append the byte to our word-sized buffer */ 114 114 M |= b << (8*nBytesInM); ··· 148 148 s_vClear(); 149 149 } 150 150 151 - void MIC_vAppend(PBYTE src, unsigned int nBytes) 151 + void MIC_vAppend(u8 * src, unsigned int nBytes) 152 152 { 153 153 /* This is simple */ 154 154 while (nBytes > 0) {
+1 -1
drivers/staging/vt6656/michael.h
··· 40 40 void MIC_vUnInit(void); 41 41 42 42 // Append bytes to the message to be MICed 43 - void MIC_vAppend(PBYTE src, unsigned int nBytes); 43 + void MIC_vAppend(u8 * src, unsigned int nBytes); 44 44 45 45 // Get the MIC result. Destination should accept 8 bytes of result. 46 46 // This also resets the message to empty.
+11 -11
drivers/staging/vt6656/rc4.c
··· 32 32 33 33 #include "rc4.h" 34 34 35 - void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len) 35 + void rc4_init(PRC4Ext pRC4, u8 * pbyKey, unsigned int cbKey_len) 36 36 { 37 37 unsigned int ust1, ust2; 38 38 unsigned int keyindex; 39 39 unsigned int stateindex; 40 - PBYTE pbyst; 40 + u8 * pbyst; 41 41 unsigned int idx; 42 42 43 43 pbyst = pRC4->abystate; 44 44 pRC4->ux = 0; 45 45 pRC4->uy = 0; 46 46 for (idx = 0; idx < 256; idx++) 47 - pbyst[idx] = (BYTE)idx; 47 + pbyst[idx] = (u8)idx; 48 48 keyindex = 0; 49 49 stateindex = 0; 50 50 for (idx = 0; idx < 256; idx++) { 51 51 ust1 = pbyst[idx]; 52 52 stateindex = (stateindex + pbyKey[keyindex] + ust1) & 0xff; 53 53 ust2 = pbyst[stateindex]; 54 - pbyst[stateindex] = (BYTE)ust1; 55 - pbyst[idx] = (BYTE)ust2; 54 + pbyst[stateindex] = (u8)ust1; 55 + pbyst[idx] = (u8)ust2; 56 56 if (++keyindex >= cbKey_len) 57 57 keyindex = 0; 58 58 } ··· 63 63 unsigned int ux; 64 64 unsigned int uy; 65 65 unsigned int ustx, usty; 66 - PBYTE pbyst; 66 + u8 * pbyst; 67 67 68 68 pbyst = pRC4->abystate; 69 69 ux = (pRC4->ux + 1) & 0xff; ··· 72 72 usty = pbyst[uy]; 73 73 pRC4->ux = ux; 74 74 pRC4->uy = uy; 75 - pbyst[uy] = (BYTE)ustx; 76 - pbyst[ux] = (BYTE)usty; 75 + pbyst[uy] = (u8)ustx; 76 + pbyst[ux] = (u8)usty; 77 77 78 78 return pbyst[(ustx + usty) & 0xff]; 79 79 } 80 80 81 - void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, 82 - PBYTE pbySrc, unsigned int cbData_len) 81 + void rc4_encrypt(PRC4Ext pRC4, u8 * pbyDest, 82 + u8 * pbySrc, unsigned int cbData_len) 83 83 { 84 84 unsigned int ii; 85 85 for (ii = 0; ii < cbData_len; ii++) 86 - pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4)); 86 + pbyDest[ii] = (u8)(pbySrc[ii] ^ rc4_byte(pRC4)); 87 87 }
+3 -3
drivers/staging/vt6656/rc4.h
··· 37 37 typedef struct { 38 38 unsigned int ux; 39 39 unsigned int uy; 40 - BYTE abystate[256]; 40 + u8 abystate[256]; 41 41 } RC4Ext, *PRC4Ext; 42 42 43 - void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len); 43 + void rc4_init(PRC4Ext pRC4, u8 * pbyKey, unsigned int cbKey_len); 44 44 unsigned int rc4_byte(PRC4Ext pRC4); 45 - void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, 45 + void rc4_encrypt(PRC4Ext pRC4, u8 * pbyDest, u8 * pbySrc, 46 46 unsigned int cbData_len); 47 47 48 48 #endif /* __RC4_H__ */
+31 -31
drivers/staging/vt6656/rndis.h
··· 74 74 75 75 typedef struct _CMD_MESSAGE 76 76 { 77 - BYTE byData[256]; 77 + u8 byData[256]; 78 78 } CMD_MESSAGE, *PCMD_MESSAGE; 79 79 80 80 typedef struct _CMD_WRITE_MASK 81 81 { 82 - BYTE byData; 83 - BYTE byMask; 82 + u8 byData; 83 + u8 byMask; 84 84 } CMD_WRITE_MASK, *PCMD_WRITE_MASK; 85 85 86 86 typedef struct _CMD_CARD_INIT 87 87 { 88 - BYTE byInitClass; 89 - BYTE bExistSWNetAddr; 90 - BYTE bySWNetAddr[6]; 91 - BYTE byShortRetryLimit; 92 - BYTE byLongRetryLimit; 88 + u8 byInitClass; 89 + u8 bExistSWNetAddr; 90 + u8 bySWNetAddr[6]; 91 + u8 byShortRetryLimit; 92 + u8 byLongRetryLimit; 93 93 } CMD_CARD_INIT, *PCMD_CARD_INIT; 94 94 95 95 typedef struct _RSP_CARD_INIT 96 96 { 97 - BYTE byStatus; 98 - BYTE byNetAddr[6]; 99 - BYTE byRFType; 100 - BYTE byMinChannel; 101 - BYTE byMaxChannel; 97 + u8 byStatus; 98 + u8 byNetAddr[6]; 99 + u8 byRFType; 100 + u8 byMinChannel; 101 + u8 byMaxChannel; 102 102 } RSP_CARD_INIT, *PRSP_CARD_INIT; 103 103 104 104 typedef struct _CMD_SET_KEY 105 105 { 106 106 WORD wKCTL; 107 - BYTE abyMacAddr[6]; 108 - BYTE abyKey[16]; 107 + u8 abyMacAddr[6]; 108 + u8 abyKey[16]; 109 109 } CMD_SET_KEY, *PCMD_SET_KEY; 110 110 111 111 typedef struct _CMD_CLRKEY_ENTRY 112 112 { 113 - BYTE abyKeyEntry[11]; 113 + u8 abyKeyEntry[11]; 114 114 } CMD_CLRKEY_ENTRY, *PCMD_CLRKEY_ENTRY; 115 115 116 116 typedef struct _CMD_WRITE_MISCFF ··· 120 120 121 121 typedef struct _CMD_SET_TSFTBTT 122 122 { 123 - BYTE abyTSF_TBTT[8]; 123 + u8 abyTSF_TBTT[8]; 124 124 } CMD_SET_TSFTBTT, *PCMD_SET_TSFTBTT; 125 125 126 126 typedef struct _CMD_SET_SSTIFS 127 127 { 128 - BYTE bySIFS; 129 - BYTE byDIFS; 130 - BYTE byEIFS; 131 - BYTE bySlotTime; 132 - BYTE byCwMax_Min; 133 - BYTE byBBCR10; 128 + u8 bySIFS; 129 + u8 byDIFS; 130 + u8 byEIFS; 131 + u8 bySlotTime; 132 + u8 byCwMax_Min; 133 + u8 byBBCR10; 134 134 } CMD_SET_SSTIFS, *PCMD_SET_SSTIFS; 135 135 136 136 typedef struct _CMD_CHANGE_BBTYPE 137 137 { 138 - BYTE bySIFS; 139 - BYTE byDIFS; 140 - BYTE byEIFS; 141 - BYTE bySlotTime; 142 - BYTE byCwMax_Min; 143 - BYTE byBBCR10; 144 - BYTE byBB_BBType; //CR88 145 - BYTE byMAC_BBType; 138 + u8 bySIFS; 139 + u8 byDIFS; 140 + u8 byEIFS; 141 + u8 bySlotTime; 142 + u8 byCwMax_Min; 143 + u8 byBBCR10; 144 + u8 byBB_BBType; //CR88 145 + u8 byMAC_BBType; 146 146 DWORD dwRSPINF_b_1; 147 147 DWORD dwRSPINF_b_2; 148 148 DWORD dwRSPINF_b_55;
+96 -96
drivers/staging/vt6656/rxtx.c
··· 222 222 223 223 if (pTransmitKey->byCipherSuite == KEY_CTL_WEP) { 224 224 if (pTransmitKey->uKeyLength == WLAN_WEP232_KEYLEN ){ 225 - memcpy(pDevice->abyPRNG, (PBYTE)&(dwRevIVCounter), 3); 225 + memcpy(pDevice->abyPRNG, (u8 *)&(dwRevIVCounter), 3); 226 226 memcpy(pDevice->abyPRNG+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); 227 227 } else { 228 - memcpy(pbyBuf, (PBYTE)&(dwRevIVCounter), 3); 228 + memcpy(pbyBuf, (u8 *)&(dwRevIVCounter), 3); 229 229 memcpy(pbyBuf+3, pTransmitKey->abyKey, pTransmitKey->uKeyLength); 230 230 if(pTransmitKey->uKeyLength == WLAN_WEP40_KEYLEN) { 231 - memcpy(pbyBuf+8, (PBYTE)&(dwRevIVCounter), 3); 231 + memcpy(pbyBuf+8, (u8 *)&(dwRevIVCounter), 3); 232 232 memcpy(pbyBuf+11, pTransmitKey->abyKey, pTransmitKey->uKeyLength); 233 233 } 234 234 memcpy(pDevice->abyPRNG, pbyBuf, 16); ··· 252 252 // Make IV 253 253 memcpy(pdwIV, pDevice->abyPRNG, 3); 254 254 255 - *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV 255 + *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV 256 256 // Append IV&ExtIV after Mac Header 257 257 *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16); 258 258 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n", ··· 267 267 268 268 // Make IV 269 269 *pdwIV = 0; 270 - *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV 270 + *(pbyIVHead+3) = (u8)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV 271 271 *pdwIV |= cpu_to_le16((WORD)(pTransmitKey->wTSC15_0)); 272 272 //Append IV&ExtIV after Mac Header 273 273 *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16); 274 274 275 275 //Fill MICHDR0 276 276 *pMICHDR = 0x59; 277 - *((PBYTE)(pMICHDR+1)) = 0; // TxPriority 277 + *((u8 *)(pMICHDR+1)) = 0; // TxPriority 278 278 memcpy(pMICHDR+2, &(pMACHeader->abyAddr2[0]), 6); 279 - *((PBYTE)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16)); 280 - *((PBYTE)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16)); 281 - *((PBYTE)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16)); 282 - *((PBYTE)(pMICHDR+11)) = LOBYTE(LOWORD(pTransmitKey->dwTSC47_16)); 283 - *((PBYTE)(pMICHDR+12)) = HIBYTE(pTransmitKey->wTSC15_0); 284 - *((PBYTE)(pMICHDR+13)) = LOBYTE(pTransmitKey->wTSC15_0); 285 - *((PBYTE)(pMICHDR+14)) = HIBYTE(wPayloadLen); 286 - *((PBYTE)(pMICHDR+15)) = LOBYTE(wPayloadLen); 279 + *((u8 *)(pMICHDR+8)) = HIBYTE(HIWORD(pTransmitKey->dwTSC47_16)); 280 + *((u8 *)(pMICHDR+9)) = LOBYTE(HIWORD(pTransmitKey->dwTSC47_16)); 281 + *((u8 *)(pMICHDR+10)) = HIBYTE(LOWORD(pTransmitKey->dwTSC47_16)); 282 + *((u8 *)(pMICHDR+11)) = LOBYTE(LOWORD(pTransmitKey->dwTSC47_16)); 283 + *((u8 *)(pMICHDR+12)) = HIBYTE(pTransmitKey->wTSC15_0); 284 + *((u8 *)(pMICHDR+13)) = LOBYTE(pTransmitKey->wTSC15_0); 285 + *((u8 *)(pMICHDR+14)) = HIBYTE(wPayloadLen); 286 + *((u8 *)(pMICHDR+15)) = LOBYTE(wPayloadLen); 287 287 288 288 //Fill MICHDR1 289 - *((PBYTE)(pMICHDR+16)) = 0; // HLEN[15:8] 289 + *((u8 *)(pMICHDR+16)) = 0; // HLEN[15:8] 290 290 if (pDevice->bLongHeader) { 291 - *((PBYTE)(pMICHDR+17)) = 28; // HLEN[7:0] 291 + *((u8 *)(pMICHDR+17)) = 28; // HLEN[7:0] 292 292 } else { 293 - *((PBYTE)(pMICHDR+17)) = 22; // HLEN[7:0] 293 + *((u8 *)(pMICHDR+17)) = 22; // HLEN[7:0] 294 294 } 295 295 wValue = cpu_to_le16(pMACHeader->wFrameCtl & 0xC78F); 296 - memcpy(pMICHDR+18, (PBYTE)&wValue, 2); // MSKFRACTL 296 + memcpy(pMICHDR+18, (u8 *)&wValue, 2); // MSKFRACTL 297 297 memcpy(pMICHDR+20, &(pMACHeader->abyAddr1[0]), 6); 298 298 memcpy(pMICHDR+26, &(pMACHeader->abyAddr2[0]), 6); 299 299 ··· 302 302 wValue = pMACHeader->wSeqCtl; 303 303 wValue &= 0x000F; 304 304 wValue = cpu_to_le16(wValue); 305 - memcpy(pMICHDR+38, (PBYTE)&wValue, 2); // MSKSEQCTL 305 + memcpy(pMICHDR+38, (u8 *)&wValue, 2); // MSKSEQCTL 306 306 if (pDevice->bLongHeader) { 307 307 memcpy(pMICHDR+40, &(pMACHeader->abyAddr4[0]), 6); 308 308 } ··· 671 671 PSTxDataHead_ab pBuf = (PSTxDataHead_ab) pTxDataHead; 672 672 //Get SignalField,ServiceField,Length 673 673 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 674 - (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 674 + (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 675 675 ); 676 676 //Get Duration and TimeStampOff 677 677 pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, ··· 688 688 PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead; 689 689 //Get SignalField,ServiceField,Length 690 690 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 691 - (PWORD)&(pBuf->wTransmitLength_a), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 691 + (PWORD)&(pBuf->wTransmitLength_a), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a) 692 692 ); 693 693 BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 694 - (PWORD)&(pBuf->wTransmitLength_b), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 694 + (PWORD)&(pBuf->wTransmitLength_b), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 695 695 ); 696 696 //Get Duration and TimeStamp 697 697 pBuf->wDuration_a = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, ··· 711 711 PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead; 712 712 //Get SignalField,ServiceField,Length 713 713 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 714 - (PWORD)&(pBuf->wTransmitLength_a), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 714 + (PWORD)&(pBuf->wTransmitLength_a), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a) 715 715 ); 716 716 BBvCalculateParameter(pDevice, cbFrameLength, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 717 - (PWORD)&(pBuf->wTransmitLength_b), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 717 + (PWORD)&(pBuf->wTransmitLength_b), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 718 718 ); 719 719 //Get Duration and TimeStamp 720 720 pBuf->wDuration_a = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, ··· 737 737 PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead; 738 738 //Get SignalField,ServiceField,Length 739 739 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 740 - (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 740 + (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 741 741 ); 742 742 //Get Duration and TimeStampOff 743 743 pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, ··· 754 754 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; 755 755 //Get SignalField,ServiceField,Length 756 756 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 757 - (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 757 + (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 758 758 ); 759 759 //Get Duration and TimeStampOff 760 760 pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType, ··· 772 772 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; 773 773 //Get SignalField,ServiceField,Length 774 774 BBvCalculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, 775 - (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 775 + (PWORD)&(pBuf->wTransmitLength), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 776 776 ); 777 777 //Get Duration and TimeStampOff 778 778 pBuf->wDuration = (WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType, ··· 810 810 PSRTS_g pBuf = (PSRTS_g)pvRTS; 811 811 //Get SignalField,ServiceField,Length 812 812 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 813 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 813 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 814 814 ); 815 815 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 816 816 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 817 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 817 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a) 818 818 ); 819 819 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 820 820 //Get Duration ··· 852 852 PSRTS_g_FB pBuf = (PSRTS_g_FB)pvRTS; 853 853 //Get SignalField,ServiceField,Length 854 854 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 855 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 855 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 856 856 ); 857 857 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 858 858 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 859 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 859 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_a), (u8 *)&(pBuf->bySignalField_a) 860 860 ); 861 861 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 862 862 //Get Duration ··· 901 901 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 902 902 //Get SignalField,ServiceField,Length 903 903 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 904 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 904 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 905 905 ); 906 906 pBuf->wTransmitLength = cpu_to_le16(wLen); 907 907 //Get Duration ··· 936 936 PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS; 937 937 //Get SignalField,ServiceField,Length 938 938 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType, 939 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 939 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 940 940 ); 941 941 pBuf->wTransmitLength = cpu_to_le16(wLen); 942 942 //Get Duration ··· 972 972 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 973 973 //Get SignalField,ServiceField,Length 974 974 BBvCalculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 975 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 975 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField), (u8 *)&(pBuf->bySignalField) 976 976 ); 977 977 pBuf->wTransmitLength = cpu_to_le16(wLen); 978 978 //Get Duration ··· 1028 1028 PSCTS_FB pBuf = (PSCTS_FB)pvCTS; 1029 1029 //Get SignalField,ServiceField,Length 1030 1030 BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 1031 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 1031 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 1032 1032 ); 1033 1033 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 1034 1034 pBuf->wDuration_ba = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data ··· 1053 1053 PSCTS pBuf = (PSCTS)pvCTS; 1054 1054 //Get SignalField,ServiceField,Length 1055 1055 BBvCalculateParameter(pDevice, uCTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 1056 - (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 1056 + (PWORD)&(wLen), (u8 *)&(pBuf->byServiceField_b), (u8 *)&(pBuf->bySignalField_b) 1057 1057 ); 1058 1058 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 1059 1059 //Get CTSDuration_ba ··· 1195 1195 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter END.\n"); 1196 1196 } 1197 1197 /* 1198 - PBYTE pbyBuffer,//point to pTxBufHead 1198 + u8 * pbyBuffer,//point to pTxBufHead 1199 1199 WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last 1200 1200 unsigned int cbFragmentSize,//Hdr+payoad+FCS 1201 1201 */ ··· 1358 1358 pTxBufHead->wFIFOCtl |= (FIFOCTL_RTS | FIFOCTL_LRETRY); 1359 1359 } 1360 1360 1361 - pbyTxBufferAddr = (PBYTE) &(pTxBufHead->adwTxKey[0]); 1361 + pbyTxBufferAddr = (u8 *) &(pTxBufHead->adwTxKey[0]); 1362 1362 wTxBufSize = sizeof(STxBufHead); 1363 1363 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet 1364 1364 if (byFBOption == AUTO_FB_NONE) { ··· 1437 1437 } // Auto Fall Back 1438 1438 } 1439 1439 1440 - pbyMacHdr = (PBYTE)(pbyTxBufferAddr + cbHeaderLength); 1441 - pbyIVHead = (PBYTE)(pbyMacHdr + cbMACHdLen + uPadding); 1442 - pbyPayloadHead = (PBYTE)(pbyMacHdr + cbMACHdLen + uPadding + cbIVlen); 1440 + pbyMacHdr = (u8 *)(pbyTxBufferAddr + cbHeaderLength); 1441 + pbyIVHead = (u8 *)(pbyMacHdr + cbMACHdLen + uPadding); 1442 + pbyPayloadHead = (u8 *)(pbyMacHdr + cbMACHdLen + uPadding + cbIVlen); 1443 1443 1444 1444 1445 1445 //========================= ··· 1464 1464 1465 1465 if (bNeedEncryption == true) { 1466 1466 //Fill TXKEY 1467 - s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 1468 - pbyMacHdr, (WORD)cbFrameBodySize, (PBYTE)pMICHDR); 1467 + s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 1468 + pbyMacHdr, (WORD)cbFrameBodySize, (u8 *)pMICHDR); 1469 1469 1470 1470 if (pDevice->bEnableHostWEP) { 1471 1471 pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; ··· 1478 1478 if (pDevice->dwDiagRefCount == 0) { 1479 1479 if ((psEthHeader->wType == cpu_to_be16(ETH_P_IPX)) || 1480 1480 (psEthHeader->wType == cpu_to_le16(0xF380))) { 1481 - memcpy((PBYTE) (pbyPayloadHead), 1481 + memcpy((u8 *) (pbyPayloadHead), 1482 1482 abySNAP_Bridgetunnel, 6); 1483 1483 } else { 1484 - memcpy((PBYTE) (pbyPayloadHead), &abySNAP_RFC1042[0], 6); 1484 + memcpy((u8 *) (pbyPayloadHead), &abySNAP_RFC1042[0], 6); 1485 1485 } 1486 - pbyType = (PBYTE) (pbyPayloadHead + 6); 1486 + pbyType = (u8 *) (pbyPayloadHead + 6); 1487 1487 memcpy(pbyType, &(psEthHeader->wType), sizeof(WORD)); 1488 1488 } else { 1489 - memcpy((PBYTE) (pbyPayloadHead), &(psEthHeader->wType), sizeof(WORD)); 1489 + memcpy((u8 *) (pbyPayloadHead), &(psEthHeader->wType), sizeof(WORD)); 1490 1490 1491 1491 } 1492 1492 ··· 1502 1502 1503 1503 } else { 1504 1504 // while bRelayPacketSend psEthHeader is point to header+payload 1505 - memcpy((pbyPayloadHead + cb802_1_H_len), ((PBYTE)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN); 1505 + memcpy((pbyPayloadHead + cb802_1_H_len), ((u8 *)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN); 1506 1506 } 1507 1507 1508 1508 ASSERT(uLength == cbNdisBodySize); ··· 1525 1525 } 1526 1526 // DO Software Michael 1527 1527 MIC_vInit(dwMICKey0, dwMICKey1); 1528 - MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12); 1528 + MIC_vAppend((u8 *)&(psEthHeader->abyDstAddr[0]), 12); 1529 1529 dwMIC_Priority = 0; 1530 - MIC_vAppend((PBYTE)&dwMIC_Priority, 4); 1530 + MIC_vAppend((u8 *)&dwMIC_Priority, 4); 1531 1531 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n", 1532 1532 dwMICKey0, dwMICKey1); 1533 1533 ··· 1535 1535 1536 1536 //DBG_PRN_GRP12(("Length:%d, %d\n", cbFrameBodySize, uFromHDtoPLDLength)); 1537 1537 //for (ii = 0; ii < cbFrameBodySize; ii++) { 1538 - // DBG_PRN_GRP12(("%02x ", *((PBYTE)((pbyPayloadHead + cb802_1_H_len) + ii)))); 1538 + // DBG_PRN_GRP12(("%02x ", *((u8 *)((pbyPayloadHead + cb802_1_H_len) + ii)))); 1539 1539 //} 1540 1540 //DBG_PRN_GRP12(("\n\n\n")); 1541 1541 ··· 1740 1740 } 1741 1741 1742 1742 pTX_Buffer = (PTX_BUFFER) (&pContext->Data[0]); 1743 - pbyTxBufferAddr = (PBYTE)&(pTX_Buffer->adwTxKey[0]); 1743 + pbyTxBufferAddr = (u8 *)&(pTX_Buffer->adwTxKey[0]); 1744 1744 cbFrameBodySize = pPacket->cbPayloadLen; 1745 1745 pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; 1746 1746 wTxBufSize = sizeof(STxBufHead); ··· 1902 1902 cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + cbFrameBodySize; 1903 1903 1904 1904 if (WLAN_GET_FC_ISWEP(pPacket->p80211Header->sA4.wFrameCtl) != 0) { 1905 - PBYTE pbyIVHead; 1906 - PBYTE pbyPayloadHead; 1907 - PBYTE pbyBSSID; 1905 + u8 * pbyIVHead; 1906 + u8 * pbyPayloadHead; 1907 + u8 * pbyBSSID; 1908 1908 PSKeyItem pTransmitKey = NULL; 1909 1909 1910 - pbyIVHead = (PBYTE)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding); 1911 - pbyPayloadHead = (PBYTE)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding + cbIVlen); 1910 + pbyIVHead = (u8 *)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding); 1911 + pbyPayloadHead = (u8 *)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding + cbIVlen); 1912 1912 do { 1913 1913 if ((pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) && 1914 1914 (pDevice->bLinkPass == true)) { ··· 1935 1935 } 1936 1936 } while(false); 1937 1937 //Fill TXKEY 1938 - s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 1939 - (PBYTE)pMACHeader, (WORD)cbFrameBodySize, NULL); 1938 + s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 1939 + (u8 *)pMACHeader, (WORD)cbFrameBodySize, NULL); 1940 1940 1941 1941 memcpy(pMACHeader, pPacket->p80211Header, cbMacHdLen); 1942 - memcpy(pbyPayloadHead, ((PBYTE)(pPacket->p80211Header) + cbMacHdLen), 1942 + memcpy(pbyPayloadHead, ((u8 *)(pPacket->p80211Header) + cbMacHdLen), 1943 1943 cbFrameBodySize); 1944 1944 } 1945 1945 else { ··· 1968 1968 1969 1969 1970 1970 pTX_Buffer->wTxByteCount = cpu_to_le16((WORD)(cbReqCount)); 1971 - pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 1971 + pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 1972 1972 pTX_Buffer->byType = 0x00; 1973 1973 1974 1974 pContext->pPacket = NULL; ··· 1976 1976 pContext->uBufLen = (WORD)cbReqCount + 4; //USB header 1977 1977 1978 1978 if (WLAN_GET_FC_TODS(pMACHeader->wFrameCtl) == 0) { 1979 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 1979 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 1980 1980 } 1981 1981 else { 1982 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 1982 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 1983 1983 } 1984 1984 1985 1985 PIPEnsSendBulkOut(pDevice,pContext); ··· 2012 2012 return status ; 2013 2013 } 2014 2014 pTX_Buffer = (PBEACON_BUFFER) (&pContext->Data[0]); 2015 - pbyTxBufferAddr = (PBYTE)&(pTX_Buffer->wFIFOCtl); 2015 + pbyTxBufferAddr = (u8 *)&(pTX_Buffer->wFIFOCtl); 2016 2016 2017 2017 cbFrameBodySize = pPacket->cbPayloadLen; 2018 2018 ··· 2025 2025 pTxDataHead = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize); 2026 2026 //Get SignalField,ServiceField,Length 2027 2027 BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11A, 2028 - (PWORD)&(pTxDataHead->wTransmitLength), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField) 2028 + (PWORD)&(pTxDataHead->wTransmitLength), (u8 *)&(pTxDataHead->byServiceField), (u8 *)&(pTxDataHead->bySignalField) 2029 2029 ); 2030 2030 //Get Duration and TimeStampOff 2031 2031 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, PK_TYPE_11A, ··· 2038 2038 pTxDataHead = (PSTxDataHead_ab) (pbyTxBufferAddr + wTxBufSize); 2039 2039 //Get SignalField,ServiceField,Length 2040 2040 BBvCalculateParameter(pDevice, cbFrameSize, wCurrentRate, PK_TYPE_11B, 2041 - (PWORD)&(pTxDataHead->wTransmitLength), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField) 2041 + (PWORD)&(pTxDataHead->wTransmitLength), (u8 *)&(pTxDataHead->byServiceField), (u8 *)&(pTxDataHead->bySignalField) 2042 2042 ); 2043 2043 //Get Duration and TimeStampOff 2044 2044 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, PK_TYPE_11B, ··· 2060 2060 cbReqCount = cbHeaderSize + WLAN_HDR_ADDR3_LEN + cbFrameBodySize; 2061 2061 2062 2062 pTX_Buffer->wTxByteCount = (WORD)cbReqCount; 2063 - pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2063 + pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2064 2064 pTX_Buffer->byType = 0x01; 2065 2065 2066 2066 pContext->pPacket = NULL; ··· 2126 2126 } 2127 2127 2128 2128 pTX_Buffer = (PTX_BUFFER)(&pContext->Data[0]); 2129 - pbyTxBufferAddr = (PBYTE)(&pTX_Buffer->adwTxKey[0]); 2129 + pbyTxBufferAddr = (u8 *)(&pTX_Buffer->adwTxKey[0]); 2130 2130 pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; 2131 2131 wTxBufSize = sizeof(STxBufHead); 2132 2132 memset(pTxBufHead, 0, wTxBufSize); ··· 2177 2177 } 2178 2178 else { 2179 2179 if (pDevice->bEnableHostWEP) { 2180 - if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(p80211Header->sA3.abyAddr1), &uNodeIndex)) 2180 + if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(p80211Header->sA3.abyAddr1), &uNodeIndex)) 2181 2181 bNodeExist = true; 2182 2182 } 2183 2183 bNeedACK = true; ··· 2314 2314 2315 2315 cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + (cbFrameBodySize + cbMIClen) + cbExtSuppRate; 2316 2316 2317 - pbyMacHdr = (PBYTE)(pbyTxBufferAddr + cbHeaderSize); 2318 - pbyPayloadHead = (PBYTE)(pbyMacHdr + cbMacHdLen + uPadding + cbIVlen); 2319 - pbyIVHead = (PBYTE)(pbyMacHdr + cbMacHdLen + uPadding); 2317 + pbyMacHdr = (u8 *)(pbyTxBufferAddr + cbHeaderSize); 2318 + pbyPayloadHead = (u8 *)(pbyMacHdr + cbMacHdLen + uPadding + cbIVlen); 2319 + pbyIVHead = (u8 *)(pbyMacHdr + cbMacHdLen + uPadding); 2320 2320 2321 2321 // Copy the Packet into a tx Buffer 2322 2322 memcpy(pbyMacHdr, skb->data, cbMacHdLen); ··· 2364 2364 2365 2365 // DO Software Michael 2366 2366 MIC_vInit(dwMICKey0, dwMICKey1); 2367 - MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12); 2367 + MIC_vAppend((u8 *)&(sEthHeader.abyDstAddr[0]), 12); 2368 2368 dwMIC_Priority = 0; 2369 - MIC_vAppend((PBYTE)&dwMIC_Priority, 4); 2369 + MIC_vAppend((u8 *)&dwMIC_Priority, 4); 2370 2370 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\ 2371 2371 " %X, %X\n", dwMICKey0, dwMICKey1); 2372 2372 ··· 2393 2393 2394 2394 } 2395 2395 2396 - s_vFillTxKey(pDevice, (PBYTE)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 2397 - pbyMacHdr, (WORD)cbFrameBodySize, (PBYTE)pMICHDR); 2396 + s_vFillTxKey(pDevice, (u8 *)(pTxBufHead->adwTxKey), pbyIVHead, pTransmitKey, 2397 + pbyMacHdr, (WORD)cbFrameBodySize, (u8 *)pMICHDR); 2398 2398 2399 2399 if (pDevice->bEnableHostWEP) { 2400 2400 pMgmt->sNodeDBTable[uNodeIndex].dwTSC47_16 = pTransmitKey->dwTSC47_16; ··· 2427 2427 } 2428 2428 2429 2429 pTX_Buffer->wTxByteCount = cpu_to_le16((WORD)(cbReqCount)); 2430 - pTX_Buffer->byPKTNO = (BYTE) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2430 + pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2431 2431 pTX_Buffer->byType = 0x00; 2432 2432 2433 2433 pContext->pPacket = skb; ··· 2435 2435 pContext->uBufLen = (WORD)cbReqCount + 4; //USB header 2436 2436 2437 2437 if (WLAN_GET_FC_TODS(pMACHeader->wFrameCtl) == 0) { 2438 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 2438 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr1[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 2439 2439 } 2440 2440 else { 2441 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 2441 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pMACHeader->abyAddr3[0]),(WORD)cbFrameSize,pTX_Buffer->wFIFOCtl); 2442 2442 } 2443 2443 PIPEnsSendBulkOut(pDevice,pContext); 2444 2444 return ; ··· 2496 2496 return 0; 2497 2497 } 2498 2498 2499 - if (is_multicast_ether_addr((PBYTE)(skb->data))) { 2499 + if (is_multicast_ether_addr((u8 *)(skb->data))) { 2500 2500 uNodeIndex = 0; 2501 2501 bNodeExist = true; 2502 2502 if (pMgmt->sNodeDBTable[0].bPSEnable) { ··· 2518 2518 2519 2519 }else { 2520 2520 2521 - if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(skb->data), &uNodeIndex)) { 2521 + if (BSSbIsSTAInNodeDB(pDevice, (u8 *)(skb->data), &uNodeIndex)) { 2522 2522 2523 2523 if (pMgmt->sNodeDBTable[uNodeIndex].bPSEnable) { 2524 2524 ··· 2562 2562 return STATUS_RESOURCES; 2563 2563 } 2564 2564 2565 - memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)(skb->data), ETH_HLEN); 2565 + memcpy(pDevice->sTxEthHeader.abyDstAddr, (u8 *)(skb->data), ETH_HLEN); 2566 2566 2567 2567 //mike add:station mode check eapol-key challenge---> 2568 2568 { 2569 - BYTE Protocol_Version; //802.1x Authentication 2570 - BYTE Packet_Type; //802.1x Authentication 2571 - BYTE Descriptor_type; 2569 + u8 Protocol_Version; //802.1x Authentication 2570 + u8 Packet_Type; //802.1x Authentication 2571 + u8 Descriptor_type; 2572 2572 WORD Key_info; 2573 2573 2574 2574 Protocol_Version = skb->data[ETH_HLEN]; ··· 2665 2665 } 2666 2666 } 2667 2667 2668 - byPktType = (BYTE)pDevice->byPacketType; 2668 + byPktType = (u8)pDevice->byPacketType; 2669 2669 2670 2670 if (pDevice->bFixRate) { 2671 2671 if (pDevice->byBBType == BB_TYPE_11B) { ··· 2793 2793 } 2794 2794 2795 2795 fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType, 2796 - (PBYTE)(&pContext->Data[0]), bNeedEncryption, 2796 + (u8 *)(&pContext->Data[0]), bNeedEncryption, 2797 2797 skb->len, uDMAIdx, &pDevice->sTxEthHeader, 2798 - (PBYTE)skb->data, pTransmitKey, uNodeIndex, 2798 + (u8 *)skb->data, pTransmitKey, uNodeIndex, 2799 2799 pDevice->wCurrentRate, 2800 2800 &uHeaderLen, &BytesToWrite 2801 2801 ); ··· 2816 2816 } 2817 2817 2818 2818 pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]); 2819 - pTX_Buffer->byPKTNO = (BYTE) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2819 + pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2820 2820 pTX_Buffer->wTxByteCount = (WORD)BytesToWrite; 2821 2821 2822 2822 pContext->pPacket = skb; 2823 2823 pContext->Type = CONTEXT_DATA_PACKET; 2824 2824 pContext->uBufLen = (WORD)BytesToWrite + 4 ; //USB header 2825 2825 2826 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl); 2826 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl); 2827 2827 2828 2828 status = PIPEnsSendBulkOut(pDevice,pContext); 2829 2829 2830 2830 if (bNeedDeAuth == true) { 2831 2831 WORD wReason = WLAN_MGMT_REASON_MIC_FAILURE; 2832 2832 2833 - bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (PBYTE) &wReason); 2833 + bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (u8 *) &wReason); 2834 2834 } 2835 2835 2836 2836 if(status!=STATUS_PENDING) { ··· 2885 2885 return false; 2886 2886 } 2887 2887 2888 - memcpy(pDevice->sTxEthHeader.abyDstAddr, (PBYTE)pbySkbData, ETH_HLEN); 2888 + memcpy(pDevice->sTxEthHeader.abyDstAddr, (u8 *)pbySkbData, ETH_HLEN); 2889 2889 2890 2890 if (pDevice->bEncryptionEnable == true) { 2891 2891 bNeedEncryption = true; ··· 2919 2919 return false; 2920 2920 } 2921 2921 2922 - byPktTyp = (BYTE)pDevice->byPacketType; 2922 + byPktTyp = (u8)pDevice->byPacketType; 2923 2923 2924 2924 if (pDevice->bFixRate) { 2925 2925 if (pDevice->byBBType == BB_TYPE_11B) { ··· 2957 2957 // and send the irp. 2958 2958 2959 2959 fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType, 2960 - (PBYTE)(&pContext->Data[0]), bNeedEncryption, 2960 + (u8 *)(&pContext->Data[0]), bNeedEncryption, 2961 2961 uDataLen, TYPE_AC0DMA, &pDevice->sTxEthHeader, 2962 2962 pbySkbData, pTransmitKey, uNodeIndex, 2963 2963 pDevice->wCurrentRate, ··· 2970 2970 } 2971 2971 2972 2972 pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]); 2973 - pTX_Buffer->byPKTNO = (BYTE) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2973 + pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); 2974 2974 pTX_Buffer->wTxByteCount = (WORD)BytesToWrite; 2975 2975 2976 2976 pContext->pPacket = NULL; 2977 2977 pContext->Type = CONTEXT_DATA_PACKET; 2978 2978 pContext->uBufLen = (WORD)BytesToWrite + 4 ; //USB header 2979 2979 2980 - s_vSaveTxPktInfo(pDevice, (BYTE) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl); 2980 + s_vSaveTxPktInfo(pDevice, (u8) (pTX_Buffer->byPKTNO & 0x0F), &(pContext->sEthHeader.abyDstAddr[0]),(WORD) (BytesToWrite-uHeaderLen),pTX_Buffer->wFIFOCtl); 2981 2981 2982 2982 status = PIPEnsSendBulkOut(pDevice,pContext); 2983 2983
+93 -93
drivers/staging/vt6656/rxtx.h
··· 43 43 typedef struct tagSRTSDataF { 44 44 WORD wFrameControl; 45 45 WORD wDurationID; 46 - BYTE abyRA[ETH_ALEN]; 47 - BYTE abyTA[ETH_ALEN]; 46 + u8 abyRA[ETH_ALEN]; 47 + u8 abyTA[ETH_ALEN]; 48 48 } SRTSDataF, *PSRTSDataF; 49 49 50 50 // ··· 53 53 typedef struct tagSCTSDataF { 54 54 WORD wFrameControl; 55 55 WORD wDurationID; 56 - BYTE abyRA[ETH_ALEN]; 56 + u8 abyRA[ETH_ALEN]; 57 57 WORD wReserved; 58 58 } SCTSDataF, *PSCTSDataF; 59 59 ··· 78 78 WORD wTxRrvTime_a; 79 79 80 80 //RTS 81 - BYTE byRTSSignalField_b; 82 - BYTE byRTSServiceField_b; 81 + u8 byRTSSignalField_b; 82 + u8 byRTSServiceField_b; 83 83 WORD wRTSTransmitLength_b; 84 - BYTE byRTSSignalField_a; 85 - BYTE byRTSServiceField_a; 84 + u8 byRTSSignalField_a; 85 + u8 byRTSServiceField_a; 86 86 WORD wRTSTransmitLength_a; 87 87 WORD wRTSDuration_ba; 88 88 WORD wRTSDuration_aa; ··· 91 91 SRTSDataF sRTS; 92 92 93 93 //Data 94 - BYTE bySignalField_b; 95 - BYTE byServiceField_b; 94 + u8 bySignalField_b; 95 + u8 byServiceField_b; 96 96 WORD wTransmitLength_b; 97 - BYTE bySignalField_a; 98 - BYTE byServiceField_a; 97 + u8 bySignalField_a; 98 + u8 byServiceField_a; 99 99 WORD wTransmitLength_a; 100 100 WORD wDuration_b; 101 101 WORD wDuration_a; ··· 117 117 SMICHDR sMICHDR; 118 118 119 119 //RTS 120 - BYTE byRTSSignalField_b; 121 - BYTE byRTSServiceField_b; 120 + u8 byRTSSignalField_b; 121 + u8 byRTSServiceField_b; 122 122 WORD wRTSTransmitLength_b; 123 - BYTE byRTSSignalField_a; 124 - BYTE byRTSServiceField_a; 123 + u8 byRTSSignalField_a; 124 + u8 byRTSServiceField_a; 125 125 WORD wRTSTransmitLength_a; 126 126 WORD wRTSDuration_ba; 127 127 WORD wRTSDuration_aa; ··· 130 130 SRTSDataF sRTS; 131 131 132 132 //Data 133 - BYTE bySignalField_b; 134 - BYTE byServiceField_b; 133 + u8 bySignalField_b; 134 + u8 byServiceField_b; 135 135 WORD wTransmitLength_b; 136 - BYTE bySignalField_a; 137 - BYTE byServiceField_a; 136 + u8 bySignalField_a; 137 + u8 byServiceField_a; 138 138 WORD wTransmitLength_a; 139 139 WORD wDuration_b; 140 140 WORD wDuration_a; ··· 152 152 WORD wTxRrvTime_a; 153 153 154 154 //CTS 155 - BYTE byCTSSignalField_b; 156 - BYTE byCTSServiceField_b; 155 + u8 byCTSSignalField_b; 156 + u8 byCTSServiceField_b; 157 157 WORD wCTSTransmitLength_b; 158 158 WORD wCTSDuration_ba; 159 159 WORD wReserved3; 160 160 SCTSDataF sCTS; 161 161 162 162 //Data 163 - BYTE bySignalField_b; 164 - BYTE byServiceField_b; 163 + u8 bySignalField_b; 164 + u8 byServiceField_b; 165 165 WORD wTransmitLength_b; 166 - BYTE bySignalField_a; 167 - BYTE byServiceField_a; 166 + u8 bySignalField_a; 167 + u8 byServiceField_a; 168 168 WORD wTransmitLength_a; 169 169 WORD wDuration_b; 170 170 WORD wDuration_a; ··· 186 186 SMICHDR sMICHDR; 187 187 188 188 //CTS 189 - BYTE byCTSSignalField_b; 190 - BYTE byCTSServiceField_b; 189 + u8 byCTSSignalField_b; 190 + u8 byCTSServiceField_b; 191 191 WORD wCTSTransmitLength_b; 192 192 WORD wCTSDuration_ba; 193 193 WORD wReserved3; 194 194 SCTSDataF sCTS; 195 195 196 196 //Data 197 - BYTE bySignalField_b; 198 - BYTE byServiceField_b; 197 + u8 bySignalField_b; 198 + u8 byServiceField_b; 199 199 WORD wTransmitLength_b; 200 - BYTE bySignalField_a; 201 - BYTE byServiceField_a; 200 + u8 bySignalField_a; 201 + u8 byServiceField_a; 202 202 WORD wTransmitLength_a; 203 203 WORD wDuration_b; 204 204 WORD wDuration_a; ··· 214 214 WORD wTimeStamp; 215 215 216 216 //CTS 217 - BYTE byCTSSignalField_b; 218 - BYTE byCTSServiceField_b; 217 + u8 byCTSSignalField_b; 218 + u8 byCTSServiceField_b; 219 219 WORD wCTSTransmitLength_b; 220 220 WORD wCTSDuration_ba; 221 221 WORD wReserved1; 222 222 SCTSDataF sCTS; 223 223 224 224 //Data 225 - BYTE bySignalField_a; 226 - BYTE byServiceField_a; 225 + u8 bySignalField_a; 226 + u8 byServiceField_a; 227 227 WORD wTransmitLength_a; 228 228 WORD wDuration_a; 229 229 WORD wTimeStampOff_a; ··· 239 239 WORD wTxRrvTime_ab; 240 240 241 241 //RTS 242 - BYTE byRTSSignalField_ab; 243 - BYTE byRTSServiceField_ab; 242 + u8 byRTSSignalField_ab; 243 + u8 byRTSServiceField_ab; 244 244 WORD wRTSTransmitLength_ab; 245 245 WORD wRTSDuration_ab; 246 246 WORD wReserved2; 247 247 SRTSDataF sRTS; 248 248 249 249 //Data 250 - BYTE bySignalField_ab; 251 - BYTE byServiceField_ab; 250 + u8 bySignalField_ab; 251 + u8 byServiceField_ab; 252 252 WORD wTransmitLength_ab; 253 253 WORD wDuration_ab; 254 254 WORD wTimeStampOff_ab; ··· 266 266 SMICHDR sMICHDR; 267 267 268 268 //RTS 269 - BYTE byRTSSignalField_ab; 270 - BYTE byRTSServiceField_ab; 269 + u8 byRTSSignalField_ab; 270 + u8 byRTSServiceField_ab; 271 271 WORD wRTSTransmitLength_ab; 272 272 WORD wRTSDuration_ab; 273 273 WORD wReserved2; 274 274 SRTSDataF sRTS; 275 275 276 276 //Data 277 - BYTE bySignalField_ab; 278 - BYTE byServiceField_ab; 277 + u8 bySignalField_ab; 278 + u8 byServiceField_ab; 279 279 WORD wTransmitLength_ab; 280 280 WORD wDuration_ab; 281 281 WORD wTimeStampOff_ab; ··· 292 292 WORD wTxRrvTime_ab; 293 293 294 294 //Data 295 - BYTE bySignalField_ab; 296 - BYTE byServiceField_ab; 295 + u8 bySignalField_ab; 296 + u8 byServiceField_ab; 297 297 WORD wTransmitLength_ab; 298 298 WORD wDuration_ab; 299 299 WORD wTimeStampOff_ab; ··· 309 309 SMICHDR sMICHDR; 310 310 311 311 //Data 312 - BYTE bySignalField_ab; 313 - BYTE byServiceField_ab; 312 + u8 bySignalField_ab; 313 + u8 byServiceField_ab; 314 314 WORD wTransmitLength_ab; 315 315 WORD wDuration_ab; 316 316 WORD wTimeStampOff_ab; ··· 324 324 WORD wTimeStamp; 325 325 326 326 //Data 327 - BYTE bySignalField_ab; 328 - BYTE byServiceField_ab; 327 + u8 bySignalField_ab; 328 + u8 byServiceField_ab; 329 329 WORD wTransmitLength_ab; 330 330 WORD wDuration_ab; 331 331 WORD wTimeStampOff_ab; ··· 343 343 WORD wTxRrvTime_a; 344 344 345 345 //RTS 346 - BYTE byRTSSignalField_b; 347 - BYTE byRTSServiceField_b; 346 + u8 byRTSSignalField_b; 347 + u8 byRTSServiceField_b; 348 348 WORD wRTSTransmitLength_b; 349 - BYTE byRTSSignalField_a; 350 - BYTE byRTSServiceField_a; 349 + u8 byRTSSignalField_a; 350 + u8 byRTSServiceField_a; 351 351 WORD wRTSTransmitLength_a; 352 352 WORD wRTSDuration_ba; 353 353 WORD wRTSDuration_aa; ··· 360 360 SRTSDataF sRTS; 361 361 362 362 //Data 363 - BYTE bySignalField_b; 364 - BYTE byServiceField_b; 363 + u8 bySignalField_b; 364 + u8 byServiceField_b; 365 365 WORD wTransmitLength_b; 366 - BYTE bySignalField_a; 367 - BYTE byServiceField_a; 366 + u8 bySignalField_a; 367 + u8 byServiceField_a; 368 368 WORD wTransmitLength_a; 369 369 WORD wDuration_b; 370 370 WORD wDuration_a; ··· 389 389 SMICHDR sMICHDR; 390 390 391 391 //RTS 392 - BYTE byRTSSignalField_b; 393 - BYTE byRTSServiceField_b; 392 + u8 byRTSSignalField_b; 393 + u8 byRTSServiceField_b; 394 394 WORD wRTSTransmitLength_b; 395 - BYTE byRTSSignalField_a; 396 - BYTE byRTSServiceField_a; 395 + u8 byRTSSignalField_a; 396 + u8 byRTSServiceField_a; 397 397 WORD wRTSTransmitLength_a; 398 398 WORD wRTSDuration_ba; 399 399 WORD wRTSDuration_aa; ··· 406 406 SRTSDataF sRTS; 407 407 408 408 //Data 409 - BYTE bySignalField_b; 410 - BYTE byServiceField_b; 409 + u8 bySignalField_b; 410 + u8 byServiceField_b; 411 411 WORD wTransmitLength_b; 412 - BYTE bySignalField_a; 413 - BYTE byServiceField_a; 412 + u8 bySignalField_a; 413 + u8 byServiceField_a; 414 414 WORD wTransmitLength_a; 415 415 WORD wDuration_b; 416 416 WORD wDuration_a; ··· 432 432 WORD wTxRrvTime_a; 433 433 434 434 //CTS 435 - BYTE byCTSSignalField_b; 436 - BYTE byCTSServiceField_b; 435 + u8 byCTSSignalField_b; 436 + u8 byCTSServiceField_b; 437 437 WORD wCTSTransmitLength_b; 438 438 WORD wCTSDuration_ba; 439 439 WORD wReserved3; ··· 442 442 SCTSDataF sCTS; 443 443 444 444 //Data 445 - BYTE bySignalField_b; 446 - BYTE byServiceField_b; 445 + u8 bySignalField_b; 446 + u8 byServiceField_b; 447 447 WORD wTransmitLength_b; 448 - BYTE bySignalField_a; 449 - BYTE byServiceField_a; 448 + u8 bySignalField_a; 449 + u8 byServiceField_a; 450 450 WORD wTransmitLength_a; 451 451 WORD wDuration_b; 452 452 WORD wDuration_a; ··· 470 470 SMICHDR sMICHDR; 471 471 472 472 //CTS 473 - BYTE byCTSSignalField_b; 474 - BYTE byCTSServiceField_b; 473 + u8 byCTSSignalField_b; 474 + u8 byCTSServiceField_b; 475 475 WORD wCTSTransmitLength_b; 476 476 WORD wCTSDuration_ba; 477 477 WORD wReserved3; ··· 480 480 SCTSDataF sCTS; 481 481 482 482 //Data 483 - BYTE bySignalField_b; 484 - BYTE byServiceField_b; 483 + u8 bySignalField_b; 484 + u8 byServiceField_b; 485 485 WORD wTransmitLength_b; 486 - BYTE bySignalField_a; 487 - BYTE byServiceField_a; 486 + u8 bySignalField_a; 487 + u8 byServiceField_a; 488 488 WORD wTransmitLength_a; 489 489 WORD wDuration_b; 490 490 WORD wDuration_a; ··· 504 504 WORD wTxRrvTime_a; 505 505 506 506 //RTS 507 - BYTE byRTSSignalField_a; 508 - BYTE byRTSServiceField_a; 507 + u8 byRTSSignalField_a; 508 + u8 byRTSServiceField_a; 509 509 WORD wRTSTransmitLength_a; 510 510 WORD wRTSDuration_a; 511 511 WORD wReserved2; ··· 514 514 SRTSDataF sRTS; 515 515 516 516 //Data 517 - BYTE bySignalField_a; 518 - BYTE byServiceField_a; 517 + u8 bySignalField_a; 518 + u8 byServiceField_a; 519 519 WORD wTransmitLength_a; 520 520 WORD wDuration_a; 521 521 WORD wTimeStampOff_a; ··· 534 534 SMICHDR sMICHDR; 535 535 536 536 //RTS 537 - BYTE byRTSSignalField_a; 538 - BYTE byRTSServiceField_a; 537 + u8 byRTSSignalField_a; 538 + u8 byRTSServiceField_a; 539 539 WORD wRTSTransmitLength_a; 540 540 WORD wRTSDuration_a; 541 541 WORD wReserved2; ··· 544 544 SRTSDataF sRTS; 545 545 546 546 //Data 547 - BYTE bySignalField_a; 548 - BYTE byServiceField_a; 547 + u8 bySignalField_a; 548 + u8 byServiceField_a; 549 549 WORD wTransmitLength_a; 550 550 WORD wDuration_a; 551 551 WORD wTimeStampOff_a; ··· 563 563 WORD wTxRrvTime_a; 564 564 565 565 //Data 566 - BYTE bySignalField_a; 567 - BYTE byServiceField_a; 566 + u8 bySignalField_a; 567 + u8 byServiceField_a; 568 568 WORD wTransmitLength_a; 569 569 WORD wDuration_a; 570 570 WORD wTimeStampOff_a; ··· 583 583 SMICHDR sMICHDR; 584 584 585 585 //Data 586 - BYTE bySignalField_a; 587 - BYTE byServiceField_a; 586 + u8 bySignalField_a; 587 + u8 byServiceField_a; 588 588 WORD wTransmitLength_a; 589 589 WORD wDuration_a; 590 590 WORD wTimeStampOff_a; ··· 626 626 // 627 627 typedef struct tagSTX_BUFFER 628 628 { 629 - BYTE byType; 630 - BYTE byPKTNO; 629 + u8 byType; 630 + u8 byPKTNO; 631 631 WORD wTxByteCount; 632 632 633 633 u32 adwTxKey[4]; ··· 648 648 // 649 649 typedef struct tagSBEACON_BUFFER 650 650 { 651 - BYTE byType; 652 - BYTE byPKTNO; 651 + u8 byType; 652 + u8 byPKTNO; 653 653 WORD wTxByteCount; 654 654 655 655 WORD wFIFOCtl;
+19 -19
drivers/staging/vt6656/srom.h
··· 86 86 // 2048 bits = 256 bytes = 128 words 87 87 // 88 88 typedef struct tagSSromReg { 89 - BYTE abyPAR[6]; // 0x00 (WORD) 89 + u8 abyPAR[6]; // 0x00 (WORD) 90 90 91 91 WORD wSUB_VID; // 0x03 (WORD) 92 92 WORD wSUB_SID; 93 93 94 - BYTE byBCFG0; // 0x05 (WORD) 95 - BYTE byBCFG1; 94 + u8 byBCFG0; // 0x05 (WORD) 95 + u8 byBCFG1; 96 96 97 - BYTE byFCR0; // 0x06 (WORD) 98 - BYTE byFCR1; 99 - BYTE byPMC0; // 0x07 (WORD) 100 - BYTE byPMC1; 101 - BYTE byMAXLAT; // 0x08 (WORD) 102 - BYTE byMINGNT; 103 - BYTE byCFG0; // 0x09 (WORD) 104 - BYTE byCFG1; 97 + u8 byFCR0; // 0x06 (WORD) 98 + u8 byFCR1; 99 + u8 byPMC0; // 0x07 (WORD) 100 + u8 byPMC1; 101 + u8 byMAXLAT; // 0x08 (WORD) 102 + u8 byMINGNT; 103 + u8 byCFG0; // 0x09 (WORD) 104 + u8 byCFG1; 105 105 WORD wCISPTR; // 0x0A (WORD) 106 106 WORD wRsv0; // 0x0B (WORD) 107 107 WORD wRsv1; // 0x0C (WORD) 108 - BYTE byBBPAIR; // 0x0D (WORD) 109 - BYTE byRFTYPE; 110 - BYTE byMinChannel; // 0x0E (WORD) 111 - BYTE byMaxChannel; 112 - BYTE bySignature; // 0x0F (WORD) 113 - BYTE byCheckSum; 108 + u8 byBBPAIR; // 0x0D (WORD) 109 + u8 byRFTYPE; 110 + u8 byMinChannel; // 0x0E (WORD) 111 + u8 byMaxChannel; 112 + u8 bySignature; // 0x0F (WORD) 113 + u8 byCheckSum; 114 114 115 - BYTE abyReserved0[96]; // 0x10 (WORD) 116 - BYTE abyCIS[128]; // 0x80 (WORD) 115 + u8 abyReserved0[96]; // 0x10 (WORD) 116 + u8 abyCIS[128]; // 0x80 (WORD) 117 117 } SSromReg, *PSSromReg; 118 118 119 119 /*--------------------- Export Macros ------------------------------*/
+4 -4
drivers/staging/vt6656/tcrc.c
··· 132 132 * Return Value: CRC-32 133 133 * 134 134 -*/ 135 - DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed) 135 + DWORD CRCdwCrc32(u8 * pbyData, unsigned int cbByte, DWORD dwCrcSeed) 136 136 { 137 137 DWORD dwCrc; 138 138 139 139 dwCrc = dwCrcSeed; 140 140 while (cbByte--) { 141 - dwCrc = s_adwCrc32Table[(BYTE)((dwCrc ^ (*pbyData)) & 0xFF)] ^ 141 + dwCrc = s_adwCrc32Table[(u8)((dwCrc ^ (*pbyData)) & 0xFF)] ^ 142 142 (dwCrc >> 8); 143 143 pbyData++; 144 144 } ··· 165 165 * Return Value: CRC-32 166 166 * 167 167 -*/ 168 - DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte) 168 + DWORD CRCdwGetCrc32(u8 * pbyData, unsigned int cbByte) 169 169 { 170 170 return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL); 171 171 } ··· 191 191 * Return Value: CRC-32 192 192 * 193 193 -*/ 194 - DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC) 194 + DWORD CRCdwGetCrc32Ex(u8 * pbyData, unsigned int cbByte, DWORD dwPreCRC) 195 195 { 196 196 return CRCdwCrc32(pbyData, cbByte, dwPreCRC); 197 197 }
+3 -3
drivers/staging/vt6656/tcrc.h
··· 43 43 44 44 /*--------------------- Export Functions --------------------------*/ 45 45 46 - DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed); 47 - DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte); 48 - DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC); 46 + DWORD CRCdwCrc32(u8 * pbyData, unsigned int cbByte, DWORD dwCrcSeed); 47 + DWORD CRCdwGetCrc32(u8 * pbyData, unsigned int cbByte); 48 + DWORD CRCdwGetCrc32Ex(u8 * pbyData, unsigned int cbByte, DWORD dwPreCRC); 49 49 50 50 #endif /* __TCRC_H__ */
+5 -5
drivers/staging/vt6656/tether.c
··· 61 61 * Return Value: Hash value 62 62 * 63 63 */ 64 - BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr) 64 + u8 ETHbyGetHashIndexByCrc32(u8 * pbyMultiAddr) 65 65 { 66 66 int ii; 67 - BYTE byTmpHash; 68 - BYTE byHash = 0; 67 + u8 byTmpHash; 68 + u8 byHash = 0; 69 69 70 70 /* get the least 6-bits from CRC generator */ 71 - byTmpHash = (BYTE)(CRCdwCrc32(pbyMultiAddr, ETH_ALEN, 71 + byTmpHash = (u8)(CRCdwCrc32(pbyMultiAddr, ETH_ALEN, 72 72 0xFFFFFFFFL) & 0x3F); 73 73 /* reverse most bit to least bit */ 74 74 for (ii = 0; ii < (sizeof(byTmpHash) * 8); ii++) { ··· 96 96 * Return Value: true if ok; false if error. 97 97 * 98 98 */ 99 - bool ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength) 99 + bool ETHbIsBufferCrc32Ok(u8 * pbyBuffer, unsigned int cbFrameLength) 100 100 { 101 101 DWORD dwCRC; 102 102
+11 -11
drivers/staging/vt6656/tether.h
··· 120 120 // Ethernet packet 121 121 // 122 122 typedef struct tagSEthernetHeader { 123 - BYTE abyDstAddr[ETH_ALEN]; 124 - BYTE abySrcAddr[ETH_ALEN]; 123 + u8 abyDstAddr[ETH_ALEN]; 124 + u8 abySrcAddr[ETH_ALEN]; 125 125 WORD wType; 126 126 } __attribute__ ((__packed__)) 127 127 SEthernetHeader, *PSEthernetHeader; ··· 131 131 // 802_3 packet 132 132 // 133 133 typedef struct tagS802_3Header { 134 - BYTE abyDstAddr[ETH_ALEN]; 135 - BYTE abySrcAddr[ETH_ALEN]; 134 + u8 abyDstAddr[ETH_ALEN]; 135 + u8 abySrcAddr[ETH_ALEN]; 136 136 WORD wLen; 137 137 } __attribute__ ((__packed__)) 138 138 S802_3Header, *PS802_3Header; ··· 143 143 typedef struct tagS802_11Header { 144 144 WORD wFrameCtl; 145 145 WORD wDurationID; 146 - BYTE abyAddr1[ETH_ALEN]; 147 - BYTE abyAddr2[ETH_ALEN]; 148 - BYTE abyAddr3[ETH_ALEN]; 146 + u8 abyAddr1[ETH_ALEN]; 147 + u8 abyAddr2[ETH_ALEN]; 148 + u8 abyAddr3[ETH_ALEN]; 149 149 WORD wSeqCtl; 150 - BYTE abyAddr4[ETH_ALEN]; 150 + u8 abyAddr4[ETH_ALEN]; 151 151 } __attribute__ ((__packed__)) 152 152 S802_11Header, *PS802_11Header; 153 153 ··· 159 159 160 160 /*--------------------- Export Functions --------------------------*/ 161 161 162 - BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); 163 - //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); 164 - bool ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength); 162 + u8 ETHbyGetHashIndexByCrc32(u8 * pbyMultiAddr); 163 + //u8 ETHbyGetHashIndexByCrc(u8 * pbyMultiAddr); 164 + bool ETHbIsBufferCrc32Ok(u8 * pbyBuffer, unsigned int cbFrameLength); 165 165 166 166 #endif /* __TETHER_H__ */
+5 -5
drivers/staging/vt6656/tkip.c
··· 55 55 /* The 2nd table is the same as the 1st but with the upper and lower */ 56 56 /* bytes swapped. To allow an endian tolerant implementation, the byte */ 57 57 /* halves have been expressed independently here. */ 58 - const BYTE TKIP_Sbox_Lower[256] = { 58 + const u8 TKIP_Sbox_Lower[256] = { 59 59 0xA5,0x84,0x99,0x8D,0x0D,0xBD,0xB1,0x54, 60 60 0x50,0x03,0xA9,0x7D,0x19,0x62,0xE6,0x9A, 61 61 0x45,0x9D,0x40,0x87,0x15,0xEB,0xC9,0x0B, ··· 90 90 0xC3,0xB0,0x77,0x11,0xCB,0xFC,0xD6,0x3A 91 91 }; 92 92 93 - const BYTE TKIP_Sbox_Upper[256] = { 93 + const u8 TKIP_Sbox_Upper[256] = { 94 94 0xC6,0xF8,0xEE,0xF6,0xFF,0xD6,0xDE,0x91, 95 95 0x60,0x02,0xCE,0x56,0xE7,0xB5,0x4D,0xEC, 96 96 0x8F,0x1F,0x89,0xFA,0xEF,0xB2,0x8E,0xFB, ··· 182 182 * 183 183 */ 184 184 void TKIPvMixKey( 185 - PBYTE pbyTKey, 186 - PBYTE pbyTA, 185 + u8 * pbyTKey, 186 + u8 * pbyTA, 187 187 WORD wTSC15_0, 188 188 DWORD dwTSC47_16, 189 - PBYTE pbyRC4Key 189 + u8 * pbyRC4Key 190 190 ) 191 191 { 192 192 u32 p1k[5];
+3 -3
drivers/staging/vt6656/tkip.h
··· 47 47 /*--------------------- Export Functions --------------------------*/ 48 48 49 49 void TKIPvMixKey( 50 - PBYTE pbyTKey, 51 - PBYTE pbyTA, 50 + u8 * pbyTKey, 51 + u8 * pbyTA, 52 52 WORD wTSC15_0, 53 53 DWORD dwTSC47_16, 54 - PBYTE pbyRC4Key 54 + u8 * pbyRC4Key 55 55 ); 56 56 57 57 #endif /* __TKIP_H__ */
+3 -3
drivers/staging/vt6656/tmacro.h
··· 34 34 /****** Common helper macros ***********************************************/ 35 35 36 36 #if !defined(LOBYTE) 37 - #define LOBYTE(w) ((BYTE)(w)) 37 + #define LOBYTE(w) ((u8)(w)) 38 38 #endif 39 39 #if !defined(HIBYTE) 40 - #define HIBYTE(w) ((BYTE)(((WORD)(w) >> 8) & 0xFF)) 40 + #define HIBYTE(w) ((u8)(((WORD)(w) >> 8) & 0xFF)) 41 41 #endif 42 42 43 43 #if !defined(LOWORD) ··· 51 51 #define HIDWORD(q) ((q).u.dwHighDword) 52 52 53 53 #if !defined(MAKEWORD) 54 - #define MAKEWORD(lb, hb) ((WORD)(((BYTE)(lb)) | (((WORD)((BYTE)(hb))) << 8))) 54 + #define MAKEWORD(lb, hb) ((WORD)(((u8)(lb)) | (((WORD)((u8)(hb))) << 8))) 55 55 #endif 56 56 #if !defined(MAKEDWORD) 57 57 #define MAKEDWORD(lw, hw) ((DWORD)(((WORD)(lw)) | (((DWORD)((WORD)(hw))) << 16)))
-3
drivers/staging/vt6656/ttype.h
··· 35 35 36 36 /****** Simple typedefs ***************************************************/ 37 37 38 - typedef u8 BYTE; 39 38 typedef u16 WORD; 40 39 typedef u32 DWORD; 41 40 ··· 44 45 typedef u32 DWORD_PTR; 45 46 46 47 // boolean pointer 47 - 48 - typedef BYTE * PBYTE; 49 48 50 49 typedef WORD * PWORD; 51 50
+2 -2
drivers/staging/vt6656/wcmd.c
··· 260 260 + WLAN_PROBEREQ_FR_MAXLEN); 261 261 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 262 262 + sizeof(struct vnt_tx_mgmt)); 263 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 263 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 264 264 sFrame.len = WLAN_PROBEREQ_FR_MAXLEN; 265 265 vMgrEncodeProbeRequest(&sFrame); 266 266 sFrame.pHdr->sA3.wFrameCtl = cpu_to_le16( ··· 845 845 846 846 { 847 847 int ntStatus = STATUS_SUCCESS; 848 - BYTE byTmp; 848 + u8 byTmp; 849 849 850 850 ntStatus = CONTROLnsRequestIn(pDevice, 851 851 MESSAGE_TYPE_READ,
+1 -1
drivers/staging/vt6656/wcmd.h
··· 73 73 74 74 typedef struct tagCMD_ITEM { 75 75 CMD_CODE eCmd; 76 - BYTE abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 76 + u8 abyCmdDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 77 77 bool bNeedRadioOFF; 78 78 bool bRadioCmd; 79 79 bool bForceSCAN;
+3 -3
drivers/staging/vt6656/wctl.c
··· 213 213 } 214 214 } 215 215 // reserve 8 byte to match MAC RX Buffer 216 - pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (PBYTE) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 8); 217 - // pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (PBYTE) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 4); 216 + pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (u8 *) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 8); 217 + // pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer = (u8 *) (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].skb->data + 4); 218 218 memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, pMACHeader, cbFrameLength); 219 219 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength = cbFrameLength; 220 220 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += cbFrameLength; ··· 229 229 (pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum == (pMACHeader->wSeqCtl & 0x000F)) && 230 230 ((pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength + cbFrameLength - uHeaderSize) < 2346)) { 231 231 232 - memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, ((PBYTE) (pMACHeader) + uHeaderSize), (cbFrameLength - uHeaderSize)); 232 + memcpy(pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer, ((u8 *) (pMACHeader) + uHeaderSize), (cbFrameLength - uHeaderSize)); 233 233 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength += (cbFrameLength - uHeaderSize); 234 234 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += (cbFrameLength - uHeaderSize); 235 235 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++;
+43 -43
drivers/staging/vt6656/wmgr.c
··· 191 191 s_bCipherMatch ( 192 192 PKnownBSS pBSSNode, 193 193 NDIS_802_11_ENCRYPTION_STATUS EncStatus, 194 - PBYTE pbyCCSPK, 195 - PBYTE pbyCCSGK 194 + u8 * pbyCCSPK, 195 + u8 * pbyCCSGK 196 196 ); 197 197 198 198 static void Encyption_Rebuild(struct vnt_private *, PKnownBSS pCurr); ··· 426 426 + sizeof(struct vnt_tx_mgmt)); 427 427 428 428 // Setup the sFrame structure 429 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 429 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 430 430 sFrame.len = WLAN_DISASSOC_FR_MAXLEN; 431 431 432 432 // format fixed field frame structure ··· 496 496 memset(abyCurrSuppRates, 0, WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1); 497 497 memset(abyCurrExtSuppRates, 0, WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1); 498 498 sFrame.len = pRxPacket->cbMPDULen; 499 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 499 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 500 500 501 501 vMgrDecodeAssocRequest(&sFrame); 502 502 ··· 643 643 //decode the frame 644 644 memset(&sFrame, 0, sizeof(WLAN_FR_REASSOCREQ)); 645 645 sFrame.len = pRxPacket->cbMPDULen; 646 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 646 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 647 647 vMgrDecodeReassocRequest(&sFrame); 648 648 649 649 if (pMgmt->sNodeDBTable[uNodeIndex].eNodeState >= NODE_AUTH) { ··· 777 777 pMgmt->eCurrState == WMAC_STATE_ASSOC) { 778 778 779 779 sFrame.len = pRxPacket->cbMPDULen; 780 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 780 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 781 781 // decode the frame 782 782 vMgrDecodeAssocResponse(&sFrame); 783 783 if ((sFrame.pwCapInfo == NULL) ··· 820 820 821 821 //if(pDevice->bWPASuppWextEnabled == true) 822 822 { 823 - BYTE buf[512]; 823 + u8 buf[512]; 824 824 size_t len; 825 825 union iwreq_data wrqu; 826 826 int we_event; ··· 906 906 + WLAN_AUTHEN_FR_MAXLEN); 907 907 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 908 908 + sizeof(struct vnt_tx_mgmt)); 909 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 909 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 910 910 sFrame.len = WLAN_AUTHEN_FR_MAXLEN; 911 911 vMgrEncodeAuthen(&sFrame); 912 912 /* insert values */ ··· 960 960 + WLAN_DEAUTHEN_FR_MAXLEN); 961 961 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 962 962 + sizeof(struct vnt_tx_mgmt)); 963 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 963 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 964 964 sFrame.len = WLAN_DEAUTHEN_FR_MAXLEN; 965 965 vMgrEncodeDeauthen(&sFrame); 966 966 /* insert values */ ··· 1012 1012 1013 1013 // decode the frame 1014 1014 sFrame.len = pRxPacket->cbMPDULen; 1015 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1015 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1016 1016 vMgrDecodeAuthen(&sFrame); 1017 1017 switch (cpu_to_le16((*(sFrame.pwAuthSequence )))){ 1018 1018 case 1: ··· 1082 1082 + WLAN_AUTHEN_FR_MAXLEN); 1083 1083 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 1084 1084 + sizeof(struct vnt_tx_mgmt)); 1085 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 1085 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 1086 1086 sFrame.len = WLAN_AUTHEN_FR_MAXLEN; 1087 1087 // format buffer structure 1088 1088 vMgrEncodeAuthen(&sFrame); ··· 1193 1193 pTxPacket->p80211Header 1194 1194 = (PUWLAN_80211HDR)((u8 *)pTxPacket 1195 1195 + sizeof(struct vnt_tx_mgmt)); 1196 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 1196 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 1197 1197 sFrame.len = WLAN_AUTHEN_FR_MAXLEN; 1198 1198 // format buffer structure 1199 1199 vMgrEncodeAuthen(&sFrame); ··· 1297 1297 + WLAN_AUTHEN_FR_MAXLEN); 1298 1298 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 1299 1299 + sizeof(struct vnt_tx_mgmt)); 1300 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 1300 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 1301 1301 sFrame.len = WLAN_AUTHEN_FR_MAXLEN; 1302 1302 // format buffer structure 1303 1303 vMgrEncodeAuthen(&sFrame); ··· 1385 1385 // if is acting an AP.. 1386 1386 // a STA is leaving this BSS.. 1387 1387 sFrame.len = pRxPacket->cbMPDULen; 1388 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1388 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1389 1389 if (BSSbIsSTAInNodeDB(pDevice, pRxPacket->p80211Header->sA3.abyAddr2, &uNodeIndex)) { 1390 1390 BSSvRemoveOneNode(pDevice, uNodeIndex); 1391 1391 } ··· 1395 1395 } 1396 1396 else if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ){ 1397 1397 sFrame.len = pRxPacket->cbMPDULen; 1398 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1398 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1399 1399 vMgrDecodeDisassociation(&sFrame); 1400 1400 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP disassociated me, reason=%d.\n", cpu_to_le16(*(sFrame.pwReason))); 1401 1401 ··· 1454 1454 // if is acting an AP.. 1455 1455 // a STA is leaving this BSS.. 1456 1456 sFrame.len = pRxPacket->cbMPDULen; 1457 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1457 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1458 1458 if (BSSbIsSTAInNodeDB(pDevice, pRxPacket->p80211Header->sA3.abyAddr2, &uNodeIndex)) { 1459 1459 BSSvRemoveOneNode(pDevice, uNodeIndex); 1460 1460 } ··· 1465 1465 else { 1466 1466 if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ) { 1467 1467 sFrame.len = pRxPacket->cbMPDULen; 1468 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1468 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1469 1469 vMgrDecodeDeauthen(&sFrame); 1470 1470 pDevice->fWPA_Authened = false; 1471 1471 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP deauthed me, reason=%d.\n", cpu_to_le16((*(sFrame.pwReason)))); ··· 1576 1576 1577 1577 memset(&sFrame, 0, sizeof(WLAN_FR_BEACON)); 1578 1578 sFrame.len = pRxPacket->cbMPDULen; 1579 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1579 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 1580 1580 1581 1581 // decode the beacon frame 1582 1582 vMgrDecodeBeacon(&sFrame); ··· 1672 1672 return; 1673 1673 } 1674 1674 1675 - if(byCurrChannel == (BYTE)pMgmt->uCurrChannel) 1675 + if(byCurrChannel == (u8)pMgmt->uCurrChannel) 1676 1676 bIsChannelEqual = true; 1677 1677 1678 1678 if (bIsChannelEqual && (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { ··· 1785 1785 pDevice->byPreambleType = 0; 1786 1786 } 1787 1787 if (pDevice->byPreambleType != byOldPreambleType) 1788 - CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType); 1788 + CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType); 1789 1789 // 1790 1790 // Basic Rate Set may change dynamically 1791 1791 // ··· 2009 2009 pDevice->byPreambleType = 0; 2010 2010 } 2011 2011 if (pDevice->byPreambleType != byOldPreambleType) 2012 - CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType); 2012 + CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType); 2013 2013 2014 2014 2015 2015 // MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); ··· 2411 2411 if (pItemExtRates->len <= ii) 2412 2412 break; 2413 2413 } 2414 - pItemRates->len += (BYTE)ii; 2414 + pItemRates->len += (u8)ii; 2415 2415 if (pItemExtRates->len - ii > 0) { 2416 - pItemExtRates->len -= (BYTE)ii; 2416 + pItemExtRates->len -= (u8)ii; 2417 2417 for (uu = 0; uu < pItemExtRates->len; uu ++) { 2418 2418 pItemExtRates->abyRates[uu] = pItemExtRates->abyRates[uu + ii]; 2419 2419 } ··· 2466 2466 pDevice->byPreambleType = 0; 2467 2467 } 2468 2468 // Change PreambleType must set RSPINF again 2469 - CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType); 2469 + CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType); 2470 2470 2471 2471 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n"); 2472 2472 ··· 2597 2597 pDevice->byPreambleType = 0; 2598 2598 } 2599 2599 // Change PreambleType must set RSPINF again 2600 - CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType); 2600 + CARDvSetRSPINF(pDevice, (u8)pDevice->byBBType); 2601 2601 2602 2602 // Prepare beacon 2603 2603 bMgrPrepareBeaconToSend((void *) pDevice, pMgmt); ··· 2906 2906 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 2907 2907 + sizeof(struct vnt_tx_mgmt)); 2908 2908 // Setup the sFrame structure. 2909 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 2909 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 2910 2910 sFrame.len = WLAN_BEACON_FR_MAXLEN; 2911 2911 vMgrEncodeBeacon(&sFrame); 2912 2912 // Setup the header ··· 2945 2945 sFrame.len += (1) + WLAN_IEHDR_LEN; 2946 2946 sFrame.pDSParms->byElementID = WLAN_EID_DS_PARMS; 2947 2947 sFrame.pDSParms->len = 1; 2948 - sFrame.pDSParms->byCurrChannel = (BYTE)uCurrChannel; 2948 + sFrame.pDSParms->byCurrChannel = (u8)uCurrChannel; 2949 2949 } 2950 2950 // TIM field 2951 2951 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { ··· 3073 3073 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 3074 3074 + sizeof(struct vnt_tx_mgmt)); 3075 3075 // Setup the sFrame structure. 3076 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 3076 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 3077 3077 sFrame.len = WLAN_PROBERESP_FR_MAXLEN; 3078 3078 vMgrEncodeProbeResponse(&sFrame); 3079 3079 // Setup the header ··· 3114 3114 sFrame.len += (1) + WLAN_IEHDR_LEN; 3115 3115 sFrame.pDSParms->byElementID = WLAN_EID_DS_PARMS; 3116 3116 sFrame.pDSParms->len = 1; 3117 - sFrame.pDSParms->byCurrChannel = (BYTE)uCurrChannel; 3117 + sFrame.pDSParms->byCurrChannel = (u8)uCurrChannel; 3118 3118 } 3119 3119 3120 3120 if (pMgmt->eCurrMode != WMAC_MODE_ESS_AP) { ··· 3199 3199 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 3200 3200 + sizeof(struct vnt_tx_mgmt)); 3201 3201 // Setup the sFrame structure. 3202 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 3202 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 3203 3203 sFrame.len = WLAN_ASSOCREQ_FR_MAXLEN; 3204 3204 // format fixed field frame structure 3205 3205 vMgrEncodeAssocRequest(&sFrame); ··· 3287 3287 sFrame.pRSNWPA->PKSList[0].abyOUI[3] = WPA_NONE; 3288 3288 } 3289 3289 // Auth Key Management Suite 3290 - pbyRSN = (PBYTE)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len); 3290 + pbyRSN = (u8 *)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len); 3291 3291 *pbyRSN++=0x01; 3292 3292 *pbyRSN++=0x00; 3293 3293 *pbyRSN++=0x00; ··· 3457 3457 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 3458 3458 + sizeof(struct vnt_tx_mgmt)); 3459 3459 /* Setup the sFrame structure. */ 3460 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 3460 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 3461 3461 sFrame.len = WLAN_REASSOCREQ_FR_MAXLEN; 3462 3462 3463 3463 // format fixed field frame structure ··· 3546 3546 sFrame.pRSNWPA->PKSList[0].abyOUI[3] = WPA_NONE; 3547 3547 } 3548 3548 // Auth Key Management Suite 3549 - pbyRSN = (PBYTE)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len); 3549 + pbyRSN = (u8 *)(sFrame.pBuf + sFrame.len + 2 + sFrame.pRSNWPA->len); 3550 3550 *pbyRSN++=0x01; 3551 3551 *pbyRSN++=0x00; 3552 3552 *pbyRSN++=0x00; ··· 3704 3704 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 3705 3705 + sizeof(struct vnt_tx_mgmt)); 3706 3706 // Setup the sFrame structure 3707 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 3707 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 3708 3708 sFrame.len = WLAN_REASSOCRESP_FR_MAXLEN; 3709 3709 vMgrEncodeAssocResponse(&sFrame); 3710 3710 // Setup the header ··· 3773 3773 pTxPacket->p80211Header = (PUWLAN_80211HDR)((u8 *)pTxPacket 3774 3774 + sizeof(struct vnt_tx_mgmt)); 3775 3775 // Setup the sFrame structure 3776 - sFrame.pBuf = (PBYTE)pTxPacket->p80211Header; 3776 + sFrame.pBuf = (u8 *)pTxPacket->p80211Header; 3777 3777 sFrame.len = WLAN_REASSOCRESP_FR_MAXLEN; 3778 3778 vMgrEncodeReassocResponse(&sFrame); 3779 3779 // Setup the header ··· 3839 3839 memset(&sFrame, 0, sizeof(WLAN_FR_PROBERESP)); 3840 3840 // decode the frame 3841 3841 sFrame.len = pRxPacket->cbMPDULen; 3842 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 3842 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 3843 3843 vMgrDecodeProbeResponse(&sFrame); 3844 3844 3845 3845 if ((sFrame.pqwTimestamp == NULL) ··· 3969 3969 memset(&sFrame, 0, sizeof(WLAN_FR_PROBEREQ)); 3970 3970 // decode the frame 3971 3971 sFrame.len = pRxPacket->cbMPDULen; 3972 - sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 3972 + sFrame.pBuf = (u8 *)pRxPacket->p80211Header; 3973 3973 vMgrDecodeProbeRequest(&sFrame); 3974 3974 /* 3975 3975 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%pM\n", ··· 4000 4000 0, 4001 4001 sFrame.pHdr->sA3.abyAddr2, 4002 4002 (PWLAN_IE_SSID)pMgmt->abyCurrSSID, 4003 - (PBYTE)pMgmt->abyCurrBSSID, 4003 + (u8 *)pMgmt->abyCurrBSSID, 4004 4004 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, 4005 4005 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates, 4006 4006 byPHYType ··· 4199 4199 pMgmt->uCurrChannel, 4200 4200 pMgmt->wCurrATIMWindow, //0, 4201 4201 (PWLAN_IE_SSID)pMgmt->abyCurrSSID, 4202 - (PBYTE)pMgmt->abyCurrBSSID, 4202 + (u8 *)pMgmt->abyCurrBSSID, 4203 4203 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, 4204 4204 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrExtSuppRates 4205 4205 ); ··· 4368 4368 s_bCipherMatch ( 4369 4369 PKnownBSS pBSSNode, 4370 4370 NDIS_802_11_ENCRYPTION_STATUS EncStatus, 4371 - PBYTE pbyCCSPK, 4372 - PBYTE pbyCCSGK 4371 + u8 * pbyCCSPK, 4372 + u8 * pbyCCSGK 4373 4373 ) 4374 4374 { 4375 - BYTE byMulticastCipher = KEY_CTL_INVALID; 4376 - BYTE byCipherMask = 0x00; 4375 + u8 byMulticastCipher = KEY_CTL_INVALID; 4376 + u8 byCipherMask = 0x00; 4377 4377 int i; 4378 4378 4379 4379 if (pBSSNode == NULL)
+11 -11
drivers/staging/vt6656/wpa.c
··· 45 45 /*--------------------- Static Variables --------------------------*/ 46 46 static int msglevel =MSG_LEVEL_INFO; 47 47 48 - const BYTE abyOUI00[4] = { 0x00, 0x50, 0xf2, 0x00 }; 49 - const BYTE abyOUI01[4] = { 0x00, 0x50, 0xf2, 0x01 }; 50 - const BYTE abyOUI02[4] = { 0x00, 0x50, 0xf2, 0x02 }; 51 - const BYTE abyOUI03[4] = { 0x00, 0x50, 0xf2, 0x03 }; 52 - const BYTE abyOUI04[4] = { 0x00, 0x50, 0xf2, 0x04 }; 53 - const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; 48 + const u8 abyOUI00[4] = { 0x00, 0x50, 0xf2, 0x00 }; 49 + const u8 abyOUI01[4] = { 0x00, 0x50, 0xf2, 0x01 }; 50 + const u8 abyOUI02[4] = { 0x00, 0x50, 0xf2, 0x02 }; 51 + const u8 abyOUI03[4] = { 0x00, 0x50, 0xf2, 0x03 }; 52 + const u8 abyOUI04[4] = { 0x00, 0x50, 0xf2, 0x04 }; 53 + const u8 abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; 54 54 55 55 56 56 /*+ ··· 112 112 { 113 113 PWLAN_IE_RSN_AUTH pIE_RSN_Auth = NULL; 114 114 int i, j, m, n = 0; 115 - PBYTE pbyCaps; 115 + u8 * pbyCaps; 116 116 117 117 WPA_ClearRSN(pBSSList); 118 118 ··· 209 209 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+4+(m+n)*4: %d\n", 14+4+(m+n)*4); 210 210 211 211 if(pRSN->len+2 >= 14+4+(m+n)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*n)+Cap(2) 212 - pbyCaps = (PBYTE)pIE_RSN_Auth->AuthKSList[n].abyOUI; 212 + pbyCaps = (u8 *)pIE_RSN_Auth->AuthKSList[n].abyOUI; 213 213 pBSSList->byDefaultK_as_PK = (*pbyCaps) & WPA_GROUPFLAG; 214 214 pBSSList->byReplayIdx = 2 << ((*pbyCaps >> WPA_REPLAYBITSSHIFT) & WPA_REPLAYBITS); 215 215 pBSSList->sRSNCapObj.bRSNCapExist = true; ··· 241 241 -*/ 242 242 bool 243 243 WPA_SearchRSN( 244 - BYTE byCmd, 245 - BYTE byEncrypt, 244 + u8 byCmd, 245 + u8 byEncrypt, 246 246 PKnownBSS pBSSList 247 247 ) 248 248 { 249 249 int ii; 250 - BYTE byPKType = WPA_NONE; 250 + u8 byPKType = WPA_NONE; 251 251 252 252 if (pBSSList->bWPAValid == false) 253 253 return false;
+2 -2
drivers/staging/vt6656/wpa.h
··· 71 71 72 72 bool 73 73 WPA_SearchRSN( 74 - BYTE byCmd, 75 - BYTE byEncrypt, 74 + u8 byCmd, 75 + u8 byEncrypt, 76 76 PKnownBSS pBSSList 77 77 ); 78 78
+11 -11
drivers/staging/vt6656/wpa2.c
··· 41 41 42 42 /*--------------------- Static Variables --------------------------*/ 43 43 44 - const BYTE abyOUIGK[4] = { 0x00, 0x0F, 0xAC, 0x00 }; 45 - const BYTE abyOUIWEP40[4] = { 0x00, 0x0F, 0xAC, 0x01 }; 46 - const BYTE abyOUIWEP104[4] = { 0x00, 0x0F, 0xAC, 0x05 }; 47 - const BYTE abyOUITKIP[4] = { 0x00, 0x0F, 0xAC, 0x02 }; 48 - const BYTE abyOUICCMP[4] = { 0x00, 0x0F, 0xAC, 0x04 }; 44 + const u8 abyOUIGK[4] = { 0x00, 0x0F, 0xAC, 0x00 }; 45 + const u8 abyOUIWEP40[4] = { 0x00, 0x0F, 0xAC, 0x01 }; 46 + const u8 abyOUIWEP104[4] = { 0x00, 0x0F, 0xAC, 0x05 }; 47 + const u8 abyOUITKIP[4] = { 0x00, 0x0F, 0xAC, 0x02 }; 48 + const u8 abyOUICCMP[4] = { 0x00, 0x0F, 0xAC, 0x04 }; 49 49 50 - const BYTE abyOUI8021X[4] = { 0x00, 0x0F, 0xAC, 0x01 }; 51 - const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 }; 50 + const u8 abyOUI8021X[4] = { 0x00, 0x0F, 0xAC, 0x01 }; 51 + const u8 abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 }; 52 52 53 53 54 54 /*--------------------- Static Functions --------------------------*/ ··· 114 114 { 115 115 int i, j; 116 116 WORD m = 0, n = 0; 117 - PBYTE pbyOUI; 117 + u8 * pbyOUI; 118 118 bool bUseGK = false; 119 119 120 120 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); ··· 167 167 j = 0; 168 168 pbyOUI = &(pRSN->abyRSN[6]); 169 169 170 - for (i = 0; (i < pBSSNode->wCSSPKCount) && (j < sizeof(pBSSNode->abyCSSPK)/sizeof(BYTE)); i++) { 170 + for (i = 0; (i < pBSSNode->wCSSPKCount) && (j < sizeof(pBSSNode->abyCSSPK)/sizeof(u8)); i++) { 171 171 172 172 if (pRSN->len >= 8+i*4+4) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*i) 173 173 if ( !memcmp(pbyOUI, abyOUIGK, 4)) { ··· 218 218 pBSSNode->wAKMSSAuthCount = *((PWORD) &(pRSN->abyRSN[6+4*m])); 219 219 j = 0; 220 220 pbyOUI = &(pRSN->abyRSN[8+4*m]); 221 - for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(BYTE)); i++) { 221 + for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(u8)); i++) { 222 222 if (pRSN->len >= 10+(m+i)*4+4) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSS(2)+AKS(4*i) 223 223 if ( !memcmp(pbyOUI, abyOUI8021X, 4)) 224 224 pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_802_1X; ··· 274 274 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) && 275 275 (pMgmt->pCurrBSS != NULL)) { 276 276 /* WPA2 IE */ 277 - pbyBuffer = (PBYTE) pRSNIEs; 277 + pbyBuffer = (u8 *) pRSNIEs; 278 278 pRSNIEs->byElementID = WLAN_EID_RSN; 279 279 pRSNIEs->len = 6; //Version(2)+GK(4) 280 280 pRSNIEs->wVersion = 1;
+2 -2
drivers/staging/vt6656/wpa2.h
··· 40 40 #define MAX_PMKID_CACHE 16 41 41 42 42 typedef struct tagsPMKIDInfo { 43 - BYTE abyBSSID[6]; 44 - BYTE abyPMKID[16]; 43 + u8 abyBSSID[6]; 44 + u8 abyPMKID[16]; 45 45 } PMKIDInfo, *PPMKIDInfo; 46 46 47 47 typedef struct tagSPMKIDCache {
+8 -8
drivers/staging/vt6656/wpactl.c
··· 72 72 struct viawget_wpa_param *param = ctx; 73 73 struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; 74 74 DWORD dwKeyIndex = 0; 75 - BYTE abyKey[MAX_KEY_LEN]; 76 - BYTE abySeq[MAX_KEY_LEN]; 75 + u8 abyKey[MAX_KEY_LEN]; 76 + u8 abySeq[MAX_KEY_LEN]; 77 77 u64 KeyRSC; 78 - BYTE byKeyDecMode = KEY_CTL_WEP; 78 + u8 byKeyDecMode = KEY_CTL_WEP; 79 79 int ret = 0; 80 80 int uu; 81 81 int ii; ··· 108 108 return -EINVAL; 109 109 } else { 110 110 if (param->u.wpa_key.set_tx) { 111 - pDevice->byKeyIndex = (BYTE)dwKeyIndex; 111 + pDevice->byKeyIndex = (u8)dwKeyIndex; 112 112 pDevice->bTransmitKey = true; 113 113 dwKeyIndex |= (1 << 31); 114 114 } ··· 204 204 if ((KeybSetAllGroupKey(pDevice, &(pDevice->sKey), dwKeyIndex, 205 205 param->u.wpa_key.key_len, 206 206 &KeyRSC, 207 - (PBYTE)abyKey, 207 + (u8 *)abyKey, 208 208 byKeyDecMode 209 209 ) == true) && 210 210 (KeybSetDefaultKey(pDevice, ··· 212 212 dwKeyIndex, 213 213 param->u.wpa_key.key_len, 214 214 &KeyRSC, 215 - (PBYTE)abyKey, 215 + (u8 *)abyKey, 216 216 byKeyDecMode 217 217 ) == true) ) { 218 218 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "GROUP Key Assign.\n"); ··· 234 234 } 235 235 if (KeybSetKey(pDevice, &(pDevice->sKey), &param->addr[0], 236 236 dwKeyIndex, param->u.wpa_key.key_len, 237 - &KeyRSC, (PBYTE)abyKey, byKeyDecMode 237 + &KeyRSC, (u8 *)abyKey, byKeyDecMode 238 238 ) == true) { 239 239 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Set\n"); 240 240 } else { ··· 250 250 } 251 251 } // BSSID not 0xffffffffffff 252 252 if ((ret == 0) && ((param->u.wpa_key.set_tx) != 0)) { 253 - pDevice->byKeyIndex = (BYTE)param->u.wpa_key.key_index; 253 + pDevice->byKeyIndex = (u8)param->u.wpa_key.key_index; 254 254 pDevice->bTransmitKey = true; 255 255 } 256 256 pDevice->bEncryptionEnable = true;