diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-19 23:09:00 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-19 23:09:00 -0700 |
| commit | d3fffb9251a7d4b8ce1f74d48050a528353a4817 (patch) | |
| tree | 2f71acad7f3f610b32521f1768e9e933f7ad4074 | |
| parent | 6f4d4701e9ed8767b70203a0f6348dc5cf5f9f0c (diff) | |
| download | ti-android-1.5r3.tar.gz | |
auto import from //branches/cupcake_rel/...@141571android-sdk-1.5_r3android-sdk-1.5_r1android-sdk-1.5-preandroid-1.5r4android-1.5r3android-1.5r2android-1.5cupcake-releasecupcake
| -rw-r--r-- | wpa_supplicant_lib/driver_ti.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/wpa_supplicant_lib/driver_ti.c b/wpa_supplicant_lib/driver_ti.c index 91ddeb8..f38ddb7 100644 --- a/wpa_supplicant_lib/driver_ti.c +++ b/wpa_supplicant_lib/driver_ti.c @@ -798,23 +798,28 @@ static void ti_init_scan_params( scan_Params_t *pScanParams, int noOfChan = myDrv->scan_channels; int btCoexScan = myDrv->btcoex_scan; int i, j; + UINT8 tid = 0, probeNum = 3; if( noOfChan > MAX_NUMBER_OF_CHANNELS_PER_SCAN ) noOfChan = MAX_NUMBER_OF_CHANNELS_PER_SCAN; /* init application scan default params */ pScanParams->desiredSsid.len = 0; - pScanParams->scanType = scanType; pScanParams->band = RADIO_BAND_2_4_GHZ; - if( btCoexScan ) { - pScanParams->probeReqNumber = 1; + if( btCoexScan ) { /* Changing scan parameteres to coexist with BT A2DP */ + if( scanType == SCAN_TYPE_NORMAL_PASSIVE ) + scanType = SCAN_TYPE_TRIGGERED_PASSIVE; + else if( scanType == SCAN_TYPE_NORMAL_ACTIVE ) + scanType = SCAN_TYPE_TRIGGERED_ACTIVE; + probeNum = 1; + tid = 0xFF; scanMaxDwellTime /= 6; scanMinDwellTime /= 6; chanMaxDwellTime /= 6; chanMinDwellTime /= 6; } - else { - pScanParams->probeReqNumber = 3; - } + pScanParams->scanType = scanType; + pScanParams->probeReqNumber = probeNum; + pScanParams->Tid = tid; pScanParams->probeRequestRate = DRV_RATE_MASK_2_BARKER; pScanParams->numOfChannels = (UINT8)noOfChan; for(i=0;( i < noOfChan );i++) { |