summaryrefslogtreecommitdiffstats
path: root/radio/1.6
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2021-03-10 14:43:29 -0800
committerAmit Mahajan <amitmahajan@google.com>2021-03-11 18:23:04 +0000
commitca2a225881a2a8e0fa456b23e061b919412c79b1 (patch)
tree24cdbbb215278b205ab73250f4cfc1fa733ae2bc /radio/1.6
parent6e1ce4d3c9e002dc0c4d0b76e98e32cb99dd2557 (diff)
downloadplatform_hardware_interfaces-ca2a225881a2a8e0fa456b23e061b919412c79b1.tar.gz
platform_hardware_interfaces-ca2a225881a2a8e0fa456b23e061b919412c79b1.tar.bz2
platform_hardware_interfaces-ca2a225881a2a8e0fa456b23e061b919412c79b1.zip
Simplify slicing related structs.
Test: atest VtsHalRadioV1_6TargetTest Bug: 178075054 Merged-in: I6f711321ff8825e86b3d1da20ea985e81088eae0 Change-Id: I6f711321ff8825e86b3d1da20ea985e81088eae0
Diffstat (limited to 'radio/1.6')
-rw-r--r--radio/1.6/types.hal58
1 files changed, 14 insertions, 44 deletions
diff --git a/radio/1.6/types.hal b/radio/1.6/types.hal
index 3e49cfdf5f..c7564ce4af 100644
--- a/radio/1.6/types.hal
+++ b/radio/1.6/types.hal
@@ -878,6 +878,11 @@ struct SliceInfo {
* see: 3GPP TS 24.501 Section 9.11.2.8.
*/
int32_t mappedHplmnSD;
+
+ /**
+ * Field to indicate the current status of the slice.
+ */
+ SliceStatus status;
};
/**
@@ -984,9 +989,9 @@ struct SlicingConfig {
*/
vec<UrspRule> urspRules;
/**
- * Struct containing all NSSAIs (list of slice info).
+ * List of all slices.
*/
- Nssais nssais;
+ vec<SliceInfo> sliceInfo;
};
/**
@@ -1009,7 +1014,6 @@ struct UrspRule {
vec<RouteSelectionDescriptor> routeSelectionDescriptor;
};
-
/**
* This struct represents a single route selection descriptor as defined in
* 3GPP TS 24.526.
@@ -1065,47 +1069,13 @@ safe_union OptionalSscMode {
SscMode value;
};
-/**
- * This struct contains all NSSAIs (lists of slices).
- */
-struct Nssais {
- /**
- * These are all the slices configured by the network. This includes allowed
- * and rejected slices, as well as slices that are neither allowed nor rejected
- * yet. Empty vector indicates that no slices are configured, and in that case
- * allowed and rejected vectors must be empty as well.
- */
- vec<SliceInfo> configured;
- /**
- * These are all the slices that the UE is allowed to use. All these slices
- * must be configured as well. Empty vector indicates that no slices are
- * allowed yet.
- */
- vec<SliceInfo> allowed;
- /**
- * These are all the slices that the UE is not allowed to use. All these slices
- * must be configured as well. Empty vector indicates that no slices are
- * rejected yet.
- */
- vec<RejectedSliceInfo> rejected;
- /**
- * Default configured NSSAI
- */
- vec<SliceInfo> defaultConfigured;
-};
-
-/**
- * This struct represents a network slice rejected by the network. It contains a
- * rejectionCause corresponding to a rejected network slice.
- */
-struct RejectedSliceInfo {
- SliceInfo sliceInfo;
- SliceRejectionCause rejectionCause;
-};
-
-enum SliceRejectionCause : int32_t {
- NOT_AVAILABLE_IN_PLMN,
- NOT_AVAILABLE_IN_REG_AREA,
+enum SliceStatus : int32_t {
+ UNKNOWN,
+ CONFIGURED, // Configured but not allowed or rejected yet
+ ALLOWED, // Allowed to be used
+ REJECTED_NOT_AVAILABLE_IN_PLMN, // Rejected because not available in PLMN
+ REJECTED_NOT_AVAILABLE_IN_REG_AREA, // Rejected because not available in reg area
+ DEFAULT_CONFIGURED, // Considered valid when configured/allowed slices are not available
};
/**