Merge "Remove extern specifiers from function prototype declarations"
GitOrigin-RevId: 75a13e1e350fe75aa651a88e8ea3b48530eed95f
Change-Id: I2bfaa10b2a67b1818e25821fd238bc5fd8ead3dc
diff --git a/system/embdrv/sbc/decoder/srce/dequant.c b/system/embdrv/sbc/decoder/srce/dequant.c
index cd592f3..e2bce9e 100644
--- a/system/embdrv/sbc/decoder/srce/dequant.c
+++ b/system/embdrv/sbc/decoder/srce/dequant.c
@@ -117,8 +117,8 @@
#define SBC_DEQUANT_SCALING_FACTOR 1.38019122262781f
#endif
-extern const uint32_t dequant_long_scaled[17];
-extern const uint32_t dequant_long_unscaled[17];
+const uint32_t dequant_long_scaled[17];
+const uint32_t dequant_long_unscaled[17];
/** Scales x by y bits to the right, adding a rounding factor.
*/
diff --git a/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h b/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h
index 081f8ab..cc1bb97 100644
--- a/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h
+++ b/system/embdrv/sbc/encoder/include/sbc_enc_func_declare.h
@@ -37,19 +37,19 @@
/* Global functions*/
-extern void sbc_enc_bit_alloc_mono(SBC_ENC_PARAMS* CodecParams);
-extern void sbc_enc_bit_alloc_ste(SBC_ENC_PARAMS* CodecParams);
+void sbc_enc_bit_alloc_mono(SBC_ENC_PARAMS* CodecParams);
+void sbc_enc_bit_alloc_ste(SBC_ENC_PARAMS* CodecParams);
-extern void SbcAnalysisInit(void);
+void SbcAnalysisInit(void);
-extern void SbcAnalysisFilter4(SBC_ENC_PARAMS* strEncParams, int16_t* input);
-extern void SbcAnalysisFilter8(SBC_ENC_PARAMS* strEncParams, int16_t* input);
+void SbcAnalysisFilter4(SBC_ENC_PARAMS* strEncParams, int16_t* input);
+void SbcAnalysisFilter8(SBC_ENC_PARAMS* strEncParams, int16_t* input);
-extern void SBC_FastIDCT8(int32_t* pInVect, int32_t* pOutVect);
-extern void SBC_FastIDCT4(int32_t* x0, int32_t* pOutVect);
+void SBC_FastIDCT8(int32_t* pInVect, int32_t* pOutVect);
+void SBC_FastIDCT4(int32_t* x0, int32_t* pOutVect);
-extern uint32_t EncPacking(SBC_ENC_PARAMS* strEncParams, uint8_t* output);
-extern void EncQuantizer(SBC_ENC_PARAMS*);
+uint32_t EncPacking(SBC_ENC_PARAMS* strEncParams, uint8_t* output);
+void EncQuantizer(SBC_ENC_PARAMS*);
#if (SBC_DSP_OPT == TRUE)
int32_t SBC_Multiply_32_16_Simplified(int32_t s32In2Temp, int32_t s32In1Temp);
#endif
diff --git a/system/embdrv/sbc/encoder/include/sbc_encoder.h b/system/embdrv/sbc/encoder/include/sbc_encoder.h
index e8c9036..fa54da2 100644
--- a/system/embdrv/sbc/encoder/include/sbc_encoder.h
+++ b/system/embdrv/sbc/encoder/include/sbc_encoder.h
@@ -30,6 +30,8 @@
#include <stdbool.h>
#include <string.h>
+#include "bt_target.h"
+
/*DEFINES*/
#ifndef FALSE
#define FALSE 0
@@ -199,9 +201,9 @@
/* Encode the frame using SBC. The output is written into |output|. Return
* number of bytes written. */
-extern uint32_t SBC_Encode(SBC_ENC_PARAMS* strEncParams, int16_t* input,
- uint8_t* output);
-extern void SBC_Encoder_Init(SBC_ENC_PARAMS* strEncParams);
+uint32_t SBC_Encode(SBC_ENC_PARAMS* strEncParams, int16_t* input,
+ uint8_t* output);
+void SBC_Encoder_Init(SBC_ENC_PARAMS* strEncParams);
#ifdef __cplusplus
}
diff --git a/system/embdrv/sbc/encoder/include/sbc_types.h b/system/embdrv/sbc/encoder/include/sbc_types.h
index 0aece6f..1877d03 100644
--- a/system/embdrv/sbc/encoder/include/sbc_types.h
+++ b/system/embdrv/sbc/encoder/include/sbc_types.h
@@ -27,6 +27,8 @@
#include <stdint.h>
+#include "bt_target.h"
+
#define abs32(x) (((x) >= 0) ? (x) : (-(x)))
#endif
diff --git a/system/embdrv/sbc/encoder/srce/sbc_encoder.c b/system/embdrv/sbc/encoder/srce/sbc_encoder.c
index 35f5413..54212ad 100644
--- a/system/embdrv/sbc/encoder/srce/sbc_encoder.c
+++ b/system/embdrv/sbc/encoder/srce/sbc_encoder.c
@@ -24,6 +24,7 @@
#include "sbc_encoder.h"
#include <string.h>
+#include "bt_target.h"
#include "sbc_enc_func_declare.h"
int16_t EncMaxShiftCounter;
