summaryrefslogtreecommitdiff
path: root/wifi/1.1/default/wifi_ap_iface.cpp
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-06-20 12:05:40 -0700
committerRoshan Pius <rpius@google.com>2017-07-06 19:44:33 +0000
commitdbd83ef5855a40840278fa865d23b31cc911cd2e (patch)
tree8348b0865c65be5959119887fd08f5b9d534d1ca /wifi/1.1/default/wifi_ap_iface.cpp
parentee3daf9ab68231cc4eb71eba8fec9d2f28c7ecef (diff)
wifi(implementation): Create 1.1 interface package
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
Diffstat (limited to 'wifi/1.1/default/wifi_ap_iface.cpp')
-rw-r--r--wifi/1.1/default/wifi_ap_iface.cpp106
1 files changed, 106 insertions, 0 deletions
diff --git a/wifi/1.1/default/wifi_ap_iface.cpp b/wifi/1.1/default/wifi_ap_iface.cpp
new file mode 100644
index 0000000000..150a6cc06f
--- /dev/null
+++ b/wifi/1.1/default/wifi_ap_iface.cpp
@@ -0,0 +1,106 @@
+/*
+ * 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 <android-base/logging.h>
+
+#include "hidl_return_util.h"
+#include "hidl_struct_util.h"
+#include "wifi_ap_iface.h"
+#include "wifi_status_util.h"
+
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_1 {
+namespace implementation {
+using hidl_return_util::validateAndCall;
+
+WifiApIface::WifiApIface(
+ const std::string& ifname,
+ const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
+ : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
+
+void WifiApIface::invalidate() {
+ legacy_hal_.reset();
+ is_valid_ = false;
+}
+
+bool WifiApIface::isValid() {
+ return is_valid_;
+}
+
+Return<void> WifiApIface::getName(getName_cb hidl_status_cb) {
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiApIface::getNameInternal,
+ hidl_status_cb);
+}
+
+Return<void> WifiApIface::getType(getType_cb hidl_status_cb) {
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiApIface::getTypeInternal,
+ hidl_status_cb);
+}
+
+Return<void> WifiApIface::setCountryCode(const hidl_array<int8_t, 2>& code,
+ setCountryCode_cb hidl_status_cb) {
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiApIface::setCountryCodeInternal,
+ hidl_status_cb,
+ code);
+}
+
+Return<void> WifiApIface::getValidFrequenciesForBand(
+ WifiBand band, getValidFrequenciesForBand_cb hidl_status_cb) {
+ return validateAndCall(this,
+ WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiApIface::getValidFrequenciesForBandInternal,
+ hidl_status_cb,
+ band);
+}
+
+std::pair<WifiStatus, std::string> WifiApIface::getNameInternal() {
+ return {createWifiStatus(WifiStatusCode::SUCCESS), ifname_};
+}
+
+std::pair<WifiStatus, IfaceType> WifiApIface::getTypeInternal() {
+ return {createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::AP};
+}
+
+WifiStatus WifiApIface::setCountryCodeInternal(
+ const std::array<int8_t, 2>& code) {
+ legacy_hal::wifi_error legacy_status =
+ legacy_hal_.lock()->setCountryCode(code);
+ return createWifiStatusFromLegacyError(legacy_status);
+}
+
+std::pair<WifiStatus, std::vector<WifiChannelInMhz>>
+WifiApIface::getValidFrequenciesForBandInternal(WifiBand band) {
+ static_assert(sizeof(WifiChannelInMhz) == sizeof(uint32_t), "Size mismatch");
+ legacy_hal::wifi_error legacy_status;
+ std::vector<uint32_t> valid_frequencies;
+ std::tie(legacy_status, valid_frequencies) =
+ legacy_hal_.lock()->getValidFrequenciesForBand(
+ hidl_struct_util::convertHidlWifiBandToLegacy(band));
+ return {createWifiStatusFromLegacyError(legacy_status), valid_frequencies};
+}
+} // namespace implementation
+} // namespace V1_1
+} // namespace wifi
+} // namespace hardware
+} // namespace android