Clean up unused avdt definitions

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iac74f0262f77d4a9dd040f767f0b54151c089376

diff --git a/stack/avdt/avdt_defs.h b/stack/avdt/avdt_defs.h
index 5e3c0bd..2fed92e 100644 (file)
--- a/stack/avdt/avdt_defs.h
+++ b/stack/avdt/avdt_defs.h
@@ -62,10 +62,6 @@
 /* used for general reject */
 #define AVDT_SIG_NONE 0
 
-/* some maximum and minimum sizes of signalling messages */
-#define AVDT_DISCOVER_REQ_MIN 1
-#define AVDT_DISCOVER_REQ_MAX 124
-
 /* service category information element field values */
 #define AVDT_CAT_TRANS 1     /* Media Transport */
 #define AVDT_CAT_REPORT 2    /* Reporting */
@@ -133,21 +129,6 @@
 /* first byte of media packet header */
 #define AVDT_MEDIA_OCTET1 0x80
 
-/* for adaptation layer header */
-/* coding of length field */
-#define AVDT_ALH_LCODE_MASK 0x03
-/* No length field present. Take length from l2cap */
-#define AVDT_ALH_LCODE_NONE 0x00
-/* 16bit length field */
-#define AVDT_ALH_LCODE_16BIT 0x01
-/* 9 bit length field, MSB = 0, 8 LSBs in 1 octet following */
-#define AVDT_ALH_LCODE_9BITM0 0x02
-/* 9 bit length field, MSB = 1, 8 LSBs in 1 octet following */
-#define AVDT_ALH_LCODE_9BITM1 0x03
-
-/* set this for continuation packet */
-#define AVDT_ALH_FRAG_MASK 0x04
-
 /*****************************************************************************
  * message parsing and building macros
  ****************************************************************************/

diff --git a/stack/avdt/avdt_int.h b/stack/avdt/avdt_int.h
index 6526e30..6e61437 100644 (file)
--- a/stack/avdt/avdt_int.h
+++ b/stack/avdt/avdt_int.h
@@ -313,7 +313,6 @@ enum {
 #define AVDT_AD_ST_UNUSED 0  /* Unused - unallocated */
 #define AVDT_AD_ST_IDLE 1    /* No connection */
 #define AVDT_AD_ST_ACP 2     /* Waiting to accept a connection */
-#define AVDT_AD_ST_INT 3     /* Initiating a connection */
 #define AVDT_AD_ST_CONN 4    /* Waiting for connection confirm */
 #define AVDT_AD_ST_CFG 5     /* Waiting for configuration complete */
 #define AVDT_AD_ST_OPEN 6    /* Channel opened */
@@ -321,16 +320,9 @@ enum {
 #define AVDT_AD_ST_SEC_ACP 8 /* Security process as ACP */
 
 /* Configuration flags. AvdtpTransportChannel.cfg_flags */
-#define AVDT_L2C_CFG_IND_DONE (1 << 0)
-#define AVDT_L2C_CFG_CFM_DONE (1 << 1)
 #define AVDT_L2C_CFG_CONN_INT (1 << 2)
 #define AVDT_L2C_CFG_CONN_ACP (1 << 3)
 
-/* result code for avdt_ad_write_req() (L2CA_DataWrite()) */
-#define AVDT_AD_FAILED L2CAP_DW_FAILED       /* FALSE */
-#define AVDT_AD_SUCCESS L2CAP_DW_SUCCESS     /* TRUE */
-#define AVDT_AD_CONGESTED L2CAP_DW_CONGESTED /* 2 */
-
 /*****************************************************************************
  * data types
  ****************************************************************************/