dbd83ef585
1. Move the implementation in 1.0/default to 1.1/default.
2. Move all of the implementation to
android::hardware::V1_1::implementation namespace.
3. All of the header files include the android::hardware::V1_0 namespace
so that it can access the types from 1.0 package. ("using namespace" is
against Google style guide though :().
The other option to prefix each 1.0 type with the namespace name.
For example: V1_0::WifiStatus.
4. Added the implementation of the new 1.1 method
IWifiChip.setTxPowerLimit().
4. The executable name and the .rc still has 1.0 name in it to avoid
changing all the device.mk files.
TODO: Hookup to the new legacy HAL API.
Bug: 62437848
Test: mmm -j128 hardware/interfaces/wifi/1.1/default/
Test: Device boots up and able to connect to wifi networks.
Test: New VTS tests passes
Change-Id: Ib36282939e70b064f246041a03d8870f5cb6410e
106 lines
3.5 KiB
C++
106 lines
3.5 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "wifi_status_util.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_1 {
|
|
namespace implementation {
|
|
|
|
std::string legacyErrorToString(legacy_hal::wifi_error error) {
|
|
switch (error) {
|
|
case legacy_hal::WIFI_SUCCESS:
|
|
return "SUCCESS";
|
|
case legacy_hal::WIFI_ERROR_UNINITIALIZED:
|
|
return "UNINITIALIZED";
|
|
case legacy_hal::WIFI_ERROR_NOT_AVAILABLE:
|
|
return "NOT_AVAILABLE";
|
|
case legacy_hal::WIFI_ERROR_NOT_SUPPORTED:
|
|
return "NOT_SUPPORTED";
|
|
case legacy_hal::WIFI_ERROR_INVALID_ARGS:
|
|
return "INVALID_ARGS";
|
|
case legacy_hal::WIFI_ERROR_INVALID_REQUEST_ID:
|
|
return "INVALID_REQUEST_ID";
|
|
case legacy_hal::WIFI_ERROR_TIMED_OUT:
|
|
return "TIMED_OUT";
|
|
case legacy_hal::WIFI_ERROR_TOO_MANY_REQUESTS:
|
|
return "TOO_MANY_REQUESTS";
|
|
case legacy_hal::WIFI_ERROR_OUT_OF_MEMORY:
|
|
return "OUT_OF_MEMORY";
|
|
case legacy_hal::WIFI_ERROR_BUSY:
|
|
return "BUSY";
|
|
case legacy_hal::WIFI_ERROR_UNKNOWN:
|
|
return "UNKNOWN";
|
|
}
|
|
}
|
|
|
|
WifiStatus createWifiStatus(WifiStatusCode code,
|
|
const std::string& description) {
|
|
return {code, description};
|
|
}
|
|
|
|
WifiStatus createWifiStatus(WifiStatusCode code) {
|
|
return createWifiStatus(code, "");
|
|
}
|
|
|
|
WifiStatus createWifiStatusFromLegacyError(legacy_hal::wifi_error error,
|
|
const std::string& desc) {
|
|
switch (error) {
|
|
case legacy_hal::WIFI_ERROR_UNINITIALIZED:
|
|
case legacy_hal::WIFI_ERROR_NOT_AVAILABLE:
|
|
return createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_NOT_SUPPORTED:
|
|
return createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_INVALID_ARGS:
|
|
case legacy_hal::WIFI_ERROR_INVALID_REQUEST_ID:
|
|
return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_TIMED_OUT:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", timed out");
|
|
|
|
case legacy_hal::WIFI_ERROR_TOO_MANY_REQUESTS:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", too many requests");
|
|
|
|
case legacy_hal::WIFI_ERROR_OUT_OF_MEMORY:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", out of memory");
|
|
|
|
case legacy_hal::WIFI_ERROR_BUSY:
|
|
return createWifiStatus(WifiStatusCode::ERROR_BUSY);
|
|
|
|
case legacy_hal::WIFI_ERROR_NONE:
|
|
return createWifiStatus(WifiStatusCode::SUCCESS, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_UNKNOWN:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN, "unknown");
|
|
}
|
|
}
|
|
|
|
WifiStatus createWifiStatusFromLegacyError(legacy_hal::wifi_error error) {
|
|
return createWifiStatusFromLegacyError(error, "");
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_1
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|