Move stack/include/bt_types::FLOW_SPEC => stack/l2c

Towards functional aggregation

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: Id5863a3ce8a55c2573346ce4f749d9434f2549e7

diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h
index be88df0..1fbdbd9 100644 (file)
--- a/stack/include/bt_types.h
+++ b/stack/include/bt_types.h
@@ -643,20 +643,6 @@ typedef uint8_t INQ_LAP[LAP_LEN]; /* IAC as passed to Inquiry (LAP) */
 #define COF_LEN 12
 typedef uint8_t COF[COF_LEN]; /* ciphering offset number */
 
-typedef struct {
-  uint8_t qos_flags;          /* TBD */
-  uint8_t service_type;       /* see below */
-  uint32_t token_rate;        /* bytes/second */
-  uint32_t token_bucket_size; /* bytes */
-  uint32_t peak_bandwidth;    /* bytes/second */
-  uint32_t latency;           /* microseconds */
-  uint32_t delay_variation;   /* microseconds */
-} FLOW_SPEC;
-
-/* Values for service_type */
-#define SVC_TYPE_BEST_EFFORT 1
-#define SVC_TYPE_GUARANTEED 2
-
 #define BT_1SEC_TIMEOUT_MS (1 * 1000) /* 1 second */
 
 #define BT_EIR_FLAGS_TYPE 0x01

diff --git a/stack/include/l2c_api.h b/stack/include/l2c_api.h
index 5e568ce..d323975 100644 (file)
--- a/stack/include/l2c_api.h
+++ b/stack/include/l2c_api.h
@@ -124,6 +124,20 @@ constexpr tL2CAP_FCR_OPTS kDefaultErtmOptions = {
     1010   /* MPS segment size */
 };
 
+typedef struct {
+  uint8_t qos_flags;          /* TBD */
+  uint8_t service_type;       /* see below */
+  uint32_t token_rate;        /* bytes/second */
+  uint32_t token_bucket_size; /* bytes */
+  uint32_t peak_bandwidth;    /* bytes/second */
+  uint32_t latency;           /* microseconds */
+  uint32_t delay_variation;   /* microseconds */
+} FLOW_SPEC;
+
+/* Values for service_type */
+#define SVC_TYPE_BEST_EFFORT 1
+#define SVC_TYPE_GUARANTEED 2
+
 /* Define a structure to hold the configuration parameters. Since the
  * parameters are optional, for each parameter there is a boolean to
  * use to signify its presence or absence.