diff options
author | Jim Lieb <lieb@canonical.com> | 2009-08-12 17:54:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:08 -0400 |
commit | 256a816b6b78bf29fba0c0f1bbcf998953429422 (patch) | |
tree | c74cbe782154efac2cac80e075c06e44efb81055 /drivers/staging/vt6655/bssdb.c | |
parent | 8a3d91b02830dd7c58d27e5de65222219ac2163f (diff) |
Staging: vt665x: remove tbit.h part 2
Remove use of tbit macros adn remove header file.
Signed-off-by: Jim Lieb <lieb@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/bssdb.c')
-rw-r--r-- | drivers/staging/vt6655/bssdb.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index f5ef1b57130..9535d4473c5 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c | |||
@@ -39,7 +39,6 @@ | |||
39 | * | 39 | * |
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "tbit.h" | ||
43 | #include "ttype.h" | 42 | #include "ttype.h" |
44 | #include "tmacro.h" | 43 | #include "tmacro.h" |
45 | #include "tether.h" | 44 | #include "tether.h" |
@@ -1035,14 +1034,14 @@ BSSvSecondCallBack( | |||
1035 | //2008-4-14 <add> by chester for led issue | 1034 | //2008-4-14 <add> by chester for led issue |
1036 | #ifdef FOR_LED_ON_NOTEBOOK | 1035 | #ifdef FOR_LED_ON_NOTEBOOK |
1037 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); | 1036 | MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO); |
1038 | if (((BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)&&(pDevice->bHWRadioOff == FALSE))||(BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)&&(pDevice->bHWRadioOff == TRUE)))&&(cc==FALSE)){ | 1037 | if ((( !(pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == FALSE))||((pDevice->byGPIO & GPIO0_DATA)&&(pDevice->bHWRadioOff == TRUE)))&&(cc==FALSE)){ |
1039 | cc=TRUE; | 1038 | cc=TRUE; |
1040 | } | 1039 | } |
1041 | else if(cc==TRUE){ | 1040 | else if(cc==TRUE){ |
1042 | 1041 | ||
1043 | if(pDevice->bHWRadioOff == TRUE){ | 1042 | if(pDevice->bHWRadioOff == TRUE){ |
1044 | if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)) | 1043 | if ( !(pDevice->byGPIO & GPIO0_DATA)) |
1045 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1044 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1046 | {if(status==1) goto start; | 1045 | {if(status==1) goto start; |
1047 | status=1; | 1046 | status=1; |
1048 | CARDbRadioPowerOff(pDevice); | 1047 | CARDbRadioPowerOff(pDevice); |
@@ -1053,15 +1052,15 @@ CARDbRadioPowerOff(pDevice); | |||
1053 | pDevice->bLinkPass = FALSE; | 1052 | pDevice->bLinkPass = FALSE; |
1054 | 1053 | ||
1055 | } | 1054 | } |
1056 | if (BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)) | 1055 | if (pDevice->byGPIO &GPIO0_DATA) |
1057 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1056 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1058 | {if(status==2) goto start; | 1057 | {if(status==2) goto start; |
1059 | status=2; | 1058 | status=2; |
1060 | CARDbRadioPowerOn(pDevice); | 1059 | CARDbRadioPowerOn(pDevice); |
1061 | } } | 1060 | } } |
1062 | else{ | 1061 | else{ |
1063 | if (BITbIsBitOn(pDevice->byGPIO,GPIO0_DATA)) | 1062 | if (pDevice->byGPIO & GPIO0_DATA) |
1064 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1063 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1065 | {if(status==3) goto start; | 1064 | {if(status==3) goto start; |
1066 | status=3; | 1065 | status=3; |
1067 | CARDbRadioPowerOff(pDevice); | 1066 | CARDbRadioPowerOff(pDevice); |
@@ -1072,8 +1071,8 @@ CARDbRadioPowerOff(pDevice); | |||
1072 | pDevice->bLinkPass = FALSE; | 1071 | pDevice->bLinkPass = FALSE; |
1073 | 1072 | ||
1074 | } | 1073 | } |
1075 | if (BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA)) | 1074 | if ( !(pDevice->byGPIO & GPIO0_DATA)) |
1076 | //||(BITbIsBitOff(pDevice->byGPIO,GPIO0_DATA) && BITbIsBitOn(pDevice->byRadioCtl, EEP_RADIOCTL_INV))) | 1075 | //||( !(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) |
1077 | {if(status==4) goto start; | 1076 | {if(status==4) goto start; |
1078 | status=4; | 1077 | status=4; |
1079 | CARDbRadioPowerOn(pDevice); | 1078 | CARDbRadioPowerOn(pDevice); |