From 4e074f72dfc9d6dbd14a53f67cd879195210e6b8 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Sat, 23 Jul 2016 15:08:13 +0200 Subject: [PATCH] use btstack prefix for sbc files --- example/Makefile.inc | 6 +++--- example/sco_demo_util.c | 2 +- src/classic/{sbc_decoder.h => btstack_sbc_decoder.h} | 2 +- ...bc_decoder_bludroid.c => btstack_sbc_decoder_bludroid.c} | 4 ++-- ...bc_encoder_bludroid.c => btstack_sbc_encoder_bludroid.c} | 2 +- src/classic/{sbc_plc.c => btstack_sbc_plc.c} | 2 +- src/classic/{sbc_plc.h => btstack_sbc_plc.h} | 0 test/sbc/Makefile | 6 +++--- test/sbc/sbc_decoder_test.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/classic/{sbc_decoder.h => btstack_sbc_decoder.h} (99%) rename src/classic/{sbc_decoder_bludroid.c => btstack_sbc_decoder_bludroid.c} (99%) rename src/classic/{sbc_encoder_bludroid.c => btstack_sbc_encoder_bludroid.c} (100%) rename src/classic/{sbc_plc.c => btstack_sbc_plc.c} (99%) rename src/classic/{sbc_plc.h => btstack_sbc_plc.h} (100%) diff --git a/example/Makefile.inc b/example/Makefile.inc index efadc7f2e..fb7df5e68 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -73,11 +73,11 @@ include ${SBC_DECODER_ROOT}/Makefile.inc include ${SBC_ENCODER_ROOT}/Makefile.inc SBC_DECODER += \ - ${BTSTACK_ROOT}/src/classic/sbc_plc.c \ - ${BTSTACK_ROOT}/src/classic/sbc_decoder_bludroid.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bludroid.c \ SBC_ENCODER += \ - ${BTSTACK_ROOT}/src/classic/sbc_encoder_bludroid.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bludroid.c \ EXAMPLES = \ ancs_client_demo \ diff --git a/example/sco_demo_util.c b/example/sco_demo_util.c index 8118108a2..5cecf76dc 100644 --- a/example/sco_demo_util.c +++ b/example/sco_demo_util.c @@ -44,7 +44,7 @@ #include "sco_demo_util.h" #include "btstack_debug.h" -#include "sbc_decoder.h" +#include "btstack_sbc_decoder.h" // configure test mode #define SCO_DEMO_MODE_SINE 0 diff --git a/src/classic/sbc_decoder.h b/src/classic/btstack_sbc_decoder.h similarity index 99% rename from src/classic/sbc_decoder.h rename to src/classic/btstack_sbc_decoder.h index 496ef51b9..267cd5ffb 100644 --- a/src/classic/sbc_decoder.h +++ b/src/classic/btstack_sbc_decoder.h @@ -44,7 +44,7 @@ #define __SBC_DECODER_H #include -#include "sbc_plc.h" +#include "btstack_sbc_plc.h" #if defined __cplusplus extern "C" { diff --git a/src/classic/sbc_decoder_bludroid.c b/src/classic/btstack_sbc_decoder_bludroid.c similarity index 99% rename from src/classic/sbc_decoder_bludroid.c rename to src/classic/btstack_sbc_decoder_bludroid.c index 451cd2aad..22f3b145a 100644 --- a/src/classic/sbc_decoder_bludroid.c +++ b/src/classic/btstack_sbc_decoder_bludroid.c @@ -50,8 +50,8 @@ #include #include -#include "sbc_decoder.h" -#include "sbc_plc.h" +#include "btstack_sbc_decoder.h" +#include "btstack_sbc_plc.h" #include "oi_codec_sbc.h" #include "oi_assert.h" diff --git a/src/classic/sbc_encoder_bludroid.c b/src/classic/btstack_sbc_encoder_bludroid.c similarity index 100% rename from src/classic/sbc_encoder_bludroid.c rename to src/classic/btstack_sbc_encoder_bludroid.c index 6d502bbdf..ce2a24a57 100644 --- a/src/classic/sbc_encoder_bludroid.c +++ b/src/classic/btstack_sbc_encoder_bludroid.c @@ -50,8 +50,8 @@ #include #include -#include "btstack_sbc_encoder.h" #include "sbc_encoder.h" +#include "btstack_sbc_encoder.h" #include "btstack.h" #define SBC_MAX_CHANNELS 2 diff --git a/src/classic/sbc_plc.c b/src/classic/btstack_sbc_plc.c similarity index 99% rename from src/classic/sbc_plc.c rename to src/classic/btstack_sbc_plc.c index 50786b5d3..3f5f8f622 100644 --- a/src/classic/sbc_plc.c +++ b/src/classic/btstack_sbc_plc.c @@ -48,7 +48,7 @@ #include #include -#include "sbc_plc.h" +#include "btstack_sbc_plc.h" static uint8_t indices0[] = { 0xad, 0x00, 0x00, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x77, 0x6d, 0xb6, 0xdd, 0xdb, 0x6d, 0xb7, 0x76, 0xdb, 0x6d, 0xdd, 0xb6, 0xdb, 0x77, 0x6d, diff --git a/src/classic/sbc_plc.h b/src/classic/btstack_sbc_plc.h similarity index 100% rename from src/classic/sbc_plc.h rename to src/classic/btstack_sbc_plc.h diff --git a/test/sbc/Makefile b/test/sbc/Makefile index 6e28a95a7..daf082f93 100644 --- a/test/sbc/Makefile +++ b/test/sbc/Makefile @@ -8,11 +8,11 @@ include ${SBC_DECODER_ROOT}/Makefile.inc include ${SBC_ENCODER_ROOT}/Makefile.inc SBC_DECODER += \ - ${BTSTACK_ROOT}/src/classic/sbc_plc.c \ - ${BTSTACK_ROOT}/src/classic/sbc_decoder_bludroid.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bludroid.c \ SBC_ENCODER += \ - ${BTSTACK_ROOT}/src/classic/sbc_encoder_bludroid.c \ + ${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bludroid.c \ SBC_DECODER_OBJ = $(SBC_DECODER:.c=.o) SBC_ENCODER_OBJ = $(SBC_ENCODER:.c=.o) diff --git a/test/sbc/sbc_decoder_test.c b/test/sbc/sbc_decoder_test.c index 02213704e..43d5dd772 100644 --- a/test/sbc/sbc_decoder_test.c +++ b/test/sbc/sbc_decoder_test.c @@ -53,7 +53,7 @@ #include "oi_assert.h" #include "btstack.h" -#include "sbc_decoder.h" +#include "btstack_sbc_decoder.h" static uint8_t read_buffer[24];