Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9883aa1 authored by Jin Chen's avatar Jin Chen Committed by Automerger Merge Worker
Browse files

Merge "[uwb](hal) Add radar support" am: a0920e2e am: 021d87aa 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2644416



Change-Id: Ib1a71d85b11a514c87c746724d7d24364db8f440
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54ef99bb 021d87aa

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorCapabilityTlvTypes.aidl

+20 −19
Original line number Diff line number Diff line
@@ -34,23 +34,24 @@ 
package android.hardware.uwb.fira_android;

@Backing(type="int") @VintfStability

enum UwbVendorCapabilityTlvTypes {

  SUPPORTED_POWER_STATS_QUERY = 192,

  CCC_SUPPORTED_CHAPS_PER_SLOT = 160,

  CCC_SUPPORTED_SYNC_CODES = 161,

  CCC_SUPPORTED_HOPPING_CONFIG_MODES_AND_SEQUENCES = 162,

  CCC_SUPPORTED_CHANNELS = 163,

  CCC_SUPPORTED_VERSIONS = 164,

  CCC_SUPPORTED_UWB_CONFIGS = 165,

  CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 166,

  CCC_SUPPORTED_RAN_MULTIPLIER = 167,

  CCC_SUPPORTED_MAX_RANGING_SESSION_NUMBER = 168,

  CCC_SUPPORTED_MIN_UWB_INITIATION_TIME_MS = 169,

  SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 227,

  SUPPORTED_MIN_RANGING_INTERVAL_MS = 228,

  SUPPORTED_RANGE_DATA_NTF_CONFIG = 229,

  SUPPORTED_RSSI_REPORTING = 230,

  SUPPORTED_DIAGNOSTICS = 231,

  SUPPORTED_MIN_SLOT_DURATION_RSTU = 232,

  SUPPORTED_MAX_RANGING_SESSION_NUMBER = 233,

  SUPPORTED_CHANNELS_AOA = 234,

  SUPPORTED_POWER_STATS_QUERY = 0xC0,

  CCC_SUPPORTED_CHAPS_PER_SLOT = 0xA0,

  CCC_SUPPORTED_SYNC_CODES = 0xA1,

  CCC_SUPPORTED_HOPPING_CONFIG_MODES_AND_SEQUENCES = 0xA2,

  CCC_SUPPORTED_CHANNELS = 0xA3,

  CCC_SUPPORTED_VERSIONS = 0xA4,

  CCC_SUPPORTED_UWB_CONFIGS = 0xA5,

  CCC_SUPPORTED_PULSE_SHAPE_COMBOS = 0xA6,

  CCC_SUPPORTED_RAN_MULTIPLIER = 0xA7,

  CCC_SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xA8,

  CCC_SUPPORTED_MIN_UWB_INITIATION_TIME_MS = 0xA9,

  RADAR_SUPPORT = 0xB0,

  SUPPORTED_AOA_RESULT_REQ_ANTENNA_INTERLEAVING = 0xE3,

  SUPPORTED_MIN_RANGING_INTERVAL_MS = 0xE4,

  SUPPORTED_RANGE_DATA_NTF_CONFIG = 0xE5,

  SUPPORTED_RSSI_REPORTING = 0xE6,

  SUPPORTED_DIAGNOSTICS = 0xE7,

  SUPPORTED_MIN_SLOT_DURATION_RSTU = 0xE8,

  SUPPORTED_MAX_RANGING_SESSION_NUMBER = 0xE9,

  SUPPORTED_CHANNELS_AOA = 0xEA,

}

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorCapabilityTlvValues.aidl

+14 −12
Original line number Diff line number Diff line
@@ -40,17 +40,19 @@ enum UwbVendorCapabilityTlvValues { 
  PULSE_SHAPE_PRECURSOR_FREE = 1,

  PULSE_SHAPE_PRECURSOR_FREE_SPECIAL = 2,

  CHAPS_PER_SLOT_3 = 1,

  CHAPS_PER_SLOT_4 = 2,

  CHAPS_PER_SLOT_6 = 4,

  CHAPS_PER_SLOT_8 = 8,

  CHAPS_PER_SLOT_9 = 16,

  CHAPS_PER_SLOT_12 = 32,

  CHAPS_PER_SLOT_24 = 64,

  HOPPING_SEQUENCE_DEFAULT = 16,

  HOPPING_SEQUENCE_AES = 8,

  HOPPING_CONFIG_MODE_NONE = 128,

  HOPPING_CONFIG_MODE_CONTINUOUS = 64,

  HOPPING_CONFIG_MODE_ADAPTIVE = 32,

  CHAPS_PER_SLOT_4 = (1 << 1) /* 2 */,

  CHAPS_PER_SLOT_6 = (1 << 2) /* 4 */,

  CHAPS_PER_SLOT_8 = (1 << 3) /* 8 */,

  CHAPS_PER_SLOT_9 = (1 << 4) /* 16 */,

  CHAPS_PER_SLOT_12 = (1 << 5) /* 32 */,

  CHAPS_PER_SLOT_24 = (1 << 6) /* 64 */,

  HOPPING_SEQUENCE_DEFAULT = (1 << 4) /* 16 */,

  HOPPING_SEQUENCE_AES = (1 << 3) /* 8 */,

  HOPPING_CONFIG_MODE_NONE = (1 << 7) /* 128 */,

  HOPPING_CONFIG_MODE_CONTINUOUS = (1 << 6) /* 64 */,

  HOPPING_CONFIG_MODE_ADAPTIVE = (1 << 5) /* 32 */,

  CCC_CHANNEL_5 = 1,

  CCC_CHANNEL_9 = 2,

  CCC_CHANNEL_9 = (1 << 1) /* 2 */,

  RADAR_NOT_SUPPORTED = 0,

  RADAR_SWEEP_SAMPLES_SUPPORTED = 1,

}

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorGidAndroidOids.aidl

+6 −3
Original line number Diff line number Diff line
@@ -34,7 +34,10 @@ 
package android.hardware.uwb.fira_android;

@Backing(type="byte") @VintfStability

enum UwbVendorGidAndroidOids {

  ANDROID_GET_POWER_STATS = 0,

  ANDROID_SET_COUNTRY_CODE = 1,

  ANDROID_RANGE_DIAGNOSTICS = 2,

  ANDROID_GET_POWER_STATS = 0x0,

  ANDROID_SET_COUNTRY_CODE = 0x1,

  ANDROID_RANGE_DIAGNOSTICS = 0x2,

  RADAR_SET_APP_CONFIG = 0x11,

  RADAR_GET_APP_CONFIG = 0x12,

  RADAR_DATA_NTF = 0x13,

}

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorGids.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,5 +34,5 @@ 
package android.hardware.uwb.fira_android;

@Backing(type="byte") @VintfStability

enum UwbVendorGids {

  ANDROID = 12,

  ANDROID = 0xC,

}

uwb/aidl/aidl_api/android.hardware.uwb.fira_android/current/android/hardware/uwb/fira_android/UwbVendorRadarAppConfigTlvTypes.aidl

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.uwb.fira_android;

@Backing(type="int") @VintfStability

enum UwbVendorRadarAppConfigTlvTypes {

  RADAR_TIMING_PARAMS = 0x0,

  SAMPLES_PER_SWEEP = 0x1,

  RADAR_CHANNEL_NUMBER = 0x2,

  SWEEP_OFFSET = 0x3,

  RADAR_RFRAME_CONFIG = 0x4,

  RADAR_PREAMBLE_DURATION = 0x5,

  RADAR_PREAMBLE_CODE_INDEX = 0x6,

  RADAR_SESSION_PRIORITY = 0x7,

  BITS_PER_SAMPLE = 0x8,

  RADAR_PRF_MODE = 0x9,

  NUMBER_OF_BURSTS = 0xA,

  RADAR_DATA_TYPE = 0xB,

}