From d2e6c4b762dcc377f289e211dfa917e640f4d468 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 20 Jan 2016 14:56:28 +0100 Subject: [PATCH] prefix memory_pool files with btstack_ --- example/embedded/Makefile.inc | 2 +- port/arduino/Makefile | 2 +- port/daemon/src/Makefile.in | 2 +- port/ez430-rf2560/Makefile | 2 +- port/ios/src/Makefile | 2 +- port/msp-exp430f5438-cc2564b/Makefile | 2 +- port/msp430f5229lp-cc2564b/Makefile | 2 +- .../app.X/nbproject/Makefile-default.mk | 12 ++++++------ .../pic32-harmony/app.X/nbproject/configurations.xml | 4 ++-- port/stm32-f103rb-nucleo/Makefile | 2 +- port/wiced/wiced.mk | 2 +- src/btstack.h | 2 +- src/btstack_memory.c | 2 +- src/{memory_pool.c => btstack_memory_pool.c} | 4 ++-- src/{memory_pool.h => btstack_memory_pool.h} | 2 +- test/ble_client/Makefile | 2 +- test/gatt_client/Makefile | 2 +- test/hfp/Makefile | 4 ++-- test/remote_device_db/Makefile | 2 +- test/security_manager/Makefile | 2 +- tool/btstack_memory_generator.py | 2 +- 21 files changed, 29 insertions(+), 29 deletions(-) rename src/{memory_pool.c => btstack_memory_pool.c} (98%) rename src/{memory_pool.h => btstack_memory_pool.h} (99%) diff --git a/example/embedded/Makefile.inc b/example/embedded/Makefile.inc index 25db772f7..594e30555 100644 --- a/example/embedded/Makefile.inc +++ b/example/embedded/Makefile.inc @@ -11,7 +11,7 @@ CFLAGS += -I${BTSTACK_ROOT}/src CORE += \ btstack_memory.c \ btstack_linked_list.c \ - memory_pool.c \ + btstack_memory_pool.c \ run_loop.c \ COMMON += \ diff --git a/port/arduino/Makefile b/port/arduino/Makefile index d6ce3efc1..65845c6d0 100644 --- a/port/arduino/Makefile +++ b/port/arduino/Makefile @@ -9,7 +9,7 @@ VERSION=`sed -n -e 's/^.*BTSTACK_VERSION \"\(.*\)\"/\1/p' ${BTSTACK_ROOT}/src/ve BTSTACK_PACKAGE=/tmp/btstack ARCHIVE=btstack-arduino-${VERSION}.zip -SRC_FILES = btstack_memory.c btstack_linked_list.c memory_pool.c run_loop.c +SRC_FILES = btstack_memory.c btstack_linked_list.c btstack_memory_pool.c run_loop.c SRC_FILES += hci_dump.c hci.c hci_cmds.c utils.c l2cap.c BLE_FILES = ad_parser.c att.c att_server.c att_dispatch.c att_db_util.c le_device_db_memory.c gatt_client.c BLE_FILES += sm.c ancs_client_lib.h ancs_client_lib.c diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in index 38dddbf6f..fc394d0fe 100644 --- a/port/daemon/src/Makefile.in +++ b/port/daemon/src/Makefile.in @@ -45,7 +45,7 @@ BTdaemon_SOURCES = \ hci_dump.c \ l2cap.c \ l2cap_signaling.c \ - memory_pool.c \ + btstack_memory_pool.c \ rfcomm.c \ bnep.c \ sdp.c \ diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile index f5370d40e..0cefb3e11 100644 --- a/port/ez430-rf2560/Makefile +++ b/port/ez430-rf2560/Makefile @@ -44,7 +44,7 @@ CORE = \ hal_usb.c \ hci_dump.c \ main.c \ - memory_pool.c \ + btstack_memory_pool.c \ run_loop.c \ run_loop_embedded.c \ utils.c \ diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile index ccee09682..aa09b212d 100644 --- a/port/ios/src/Makefile +++ b/port/ios/src/Makefile @@ -38,7 +38,7 @@ BTdaemon_FILES = \ hci.c \ l2cap.c \ l2cap_signaling.c \ - memory_pool.c \ + btstack_memory_pool.c \ rfcomm.c \ sdp.c \ sdp_client.c \ diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index bef94b96d..b3121c2b4 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -44,7 +44,7 @@ CORE = \ hal_usb.c \ hci_dump.c \ main.c \ - memory_pool.c \ + btstack_memory_pool.c \ run_loop.c \ run_loop_embedded.c \ utils.c \ diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index 246651926..a1d7b3eee 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -39,7 +39,7 @@ CORE = \ hci_dump.c \ btstack_memory.c \ linked_list.c \ - memory_pool.c \ + btstack_memory_pool.c \ utils.c \ main.c \ hal_board.c \ diff --git a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk index 5555985c9..287de6cb6 100644 --- a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk +++ b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk @@ -45,7 +45,7 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmds.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_dma.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/run_loop.c ../../../src/run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/utils.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/bt_control_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c +SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmds.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_dma.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/run_loop.c ../../../src/run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/utils.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/bt_control_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c # Object Files Quoted if spaced OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmds.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_parser.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_query_util.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/bt_control_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o @@ -55,7 +55,7 @@ POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/2048875307/system_init.o.d ${OBJECTDIR}/_ext OBJECTFILES=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/1386528437/bnep.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmds.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/hci_transport_h4_dma.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/linked_list.o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ${OBJECTDIR}/_ext/1386528437/pan.o ${OBJECTDIR}/_ext/1386528437/remote_device_db_memory.o ${OBJECTDIR}/_ext/1386528437/rfcomm.o ${OBJECTDIR}/_ext/1386528437/run_loop.o ${OBJECTDIR}/_ext/1386528437/run_loop_embedded.o ${OBJECTDIR}/_ext/1386528437/sdp.o ${OBJECTDIR}/_ext/1386528437/sdp_client.o ${OBJECTDIR}/_ext/1386528437/sdp_parser.o ${OBJECTDIR}/_ext/1386528437/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386528437/sdp_query_util.o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ${OBJECTDIR}/_ext/1386528437/utils.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o ${OBJECTDIR}/_ext/1768124388/bt_control_csr.o ${OBJECTDIR}/_ext/1386511916/ad_parser.o ${OBJECTDIR}/_ext/1386511916/att.o ${OBJECTDIR}/_ext/1386511916/att_dispatch.o ${OBJECTDIR}/_ext/1386511916/att_server.o ${OBJECTDIR}/_ext/1386511916/le_device_db_memory.o ${OBJECTDIR}/_ext/1386511916/sm.o ${OBJECTDIR}/_ext/350421922/spp_and_le_counter.o # Source Files -SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmds.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_dma.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/run_loop.c ../../../src/run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/utils.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/bt_control_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c +SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../src/bnep.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmds.c ../../../src/hci_dump.c ../../../src/hci_transport_h4_dma.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/linked_list.c ../../../src/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/run_loop.c ../../../src/run_loop_embedded.c ../../../src/sdp.c ../../../src/sdp_client.c ../../../src/sdp_parser.c ../../../src/sdp_query_rfcomm.c ../../../src/sdp_query_util.c ../../../src/sdp_util.c ../../../src/utils.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c ../../../chipset/csr/bt_control_csr.c ../../../ble/ad_parser.c ../../../ble/att.c ../../../ble/att_dispatch.c ../../../ble/att_server.c ../../../ble/le_device_db_memory.c ../../../ble/sm.c ../../../example/embedded/spp_and_le_counter.c CFLAGS= @@ -184,11 +184,11 @@ ${OBJECTDIR}/_ext/1386528437/linked_list.o: ../../../src/linked_list.c nbprojec @${RM} ${OBJECTDIR}/_ext/1386528437/linked_list.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/linked_list.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/linked_list.o.d" -o ${OBJECTDIR}/_ext/1386528437/linked_list.o ../../../src/linked_list.c -${OBJECTDIR}/_ext/1386528437/memory_pool.o: ../../../src/memory_pool.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/1386528437/memory_pool.o: ../../../src/btstack_memory_pool.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386528437" @${RM} ${OBJECTDIR}/_ext/1386528437/memory_pool.o.d @${RM} ${OBJECTDIR}/_ext/1386528437/memory_pool.o - @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" -o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ../../../src/memory_pool.c + @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" -o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ../../../src/btstack_memory_pool.c ${OBJECTDIR}/_ext/1386528437/pan.o: ../../../src/pan.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386528437" @@ -443,11 +443,11 @@ ${OBJECTDIR}/_ext/1386528437/linked_list.o: ../../../src/linked_list.c nbprojec @${RM} ${OBJECTDIR}/_ext/1386528437/linked_list.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/linked_list.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/linked_list.o.d" -o ${OBJECTDIR}/_ext/1386528437/linked_list.o ../../../src/linked_list.c -${OBJECTDIR}/_ext/1386528437/memory_pool.o: ../../../src/memory_pool.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/1386528437/memory_pool.o: ../../../src/btstack_memory_pool.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386528437" @${RM} ${OBJECTDIR}/_ext/1386528437/memory_pool.o.d @${RM} ${OBJECTDIR}/_ext/1386528437/memory_pool.o - @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" -o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ../../../src/memory_pool.c + @${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -MMD -MF "${OBJECTDIR}/_ext/1386528437/memory_pool.o.d" -o ${OBJECTDIR}/_ext/1386528437/memory_pool.o ../../../src/btstack_memory_pool.c ${OBJECTDIR}/_ext/1386528437/pan.o: ../../../src/pan.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386528437" diff --git a/port/pic32-harmony/app.X/nbproject/configurations.xml b/port/pic32-harmony/app.X/nbproject/configurations.xml index 33736e1bf..cb7c6a619 100644 --- a/port/pic32-harmony/app.X/nbproject/configurations.xml +++ b/port/pic32-harmony/app.X/nbproject/configurations.xml @@ -36,7 +36,7 @@ ../../../src/hci_cmds.h ../../../src/btstack_linked_list.h - ../../../src/memory_pool.h + ../../../src/btstack_memory_pool.h ../../../src/run_loop.h ../../../src/utils.h ../../../src/bnep.h @@ -128,7 +128,7 @@ ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/btstack_linked_list.c - ../../../src/memory_pool.c + ../../../src/btstack_memory_pool.c ../../../src/classic/remote_device_db_memory.c ../../../src/classic/rfcomm.c ../../../src/run_loop.c diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile index eea772441..1349ba28e 100644 --- a/port/stm32-f103rb-nucleo/Makefile +++ b/port/stm32-f103rb-nucleo/Makefile @@ -19,7 +19,7 @@ CORE = \ main.c \ btstack_memory.c \ btstack_linked_list.c \ - memory_pool.c \ + btstack_memory_pool.c \ run_loop.c \ run_loop_embedded.c diff --git a/port/wiced/wiced.mk b/port/wiced/wiced.mk index 34b1db25f..b76c09cf0 100644 --- a/port/wiced/wiced.mk +++ b/port/wiced/wiced.mk @@ -33,7 +33,7 @@ $(NAME)_SOURCES += \ ../../src/hci_dump.c \ ../../src/l2cap.c \ ../../src/l2cap_signaling.c \ - ../../src/memory_pool.c \ + ../../src/btstack_memory_pool.c \ ../../src/run_loop.c \ ../../src/utils.c \ diff --git a/src/btstack.h b/src/btstack.h index d56f6608b..bc8661ab5 100644 --- a/src/btstack.h +++ b/src/btstack.h @@ -60,7 +60,7 @@ #include "l2cap.h" #include "l2cap_signaling.h" #include "btstack_linked_list.h" -#include "memory_pool.h" +#include "btstack_memory_pool.h" #include "run_loop.h" #include "run_loop_private.h" #include "utils.h" diff --git a/src/btstack_memory.c b/src/btstack_memory.c index b11aca12e..866f79758 100644 --- a/src/btstack_memory.c +++ b/src/btstack_memory.c @@ -46,7 +46,7 @@ */ #include "btstack_memory.h" -#include "memory_pool.h" +#include "btstack_memory_pool.h" #include diff --git a/src/memory_pool.c b/src/btstack_memory_pool.c similarity index 98% rename from src/memory_pool.c rename to src/btstack_memory_pool.c index 38e121342..c455fd3e2 100644 --- a/src/memory_pool.c +++ b/src/btstack_memory_pool.c @@ -36,7 +36,7 @@ */ /* - * memory_pool.c + * btstack_memory_pool.c * * Fixed-size block allocation * @@ -44,7 +44,7 @@ * */ -#include "memory_pool.h" +#include "btstack_memory_pool.h" #include #include "btstack_debug.h" diff --git a/src/memory_pool.h b/src/btstack_memory_pool.h similarity index 99% rename from src/memory_pool.h rename to src/btstack_memory_pool.h index 57d65bab4..8a69cbac9 100644 --- a/src/memory_pool.h +++ b/src/btstack_memory_pool.h @@ -36,7 +36,7 @@ */ /* - * memory_pool.h + * btstack_memory_pool.h * * @Brief Fixed-size block allocation * diff --git a/test/ble_client/Makefile b/test/ble_client/Makefile index deae7f653..bda0806cb 100644 --- a/test/ble_client/Makefile +++ b/test/ble_client/Makefile @@ -18,7 +18,7 @@ COMMON = \ hci.c \ hci_cmds.c \ hci_dump.c \ - memory_pool.c \ + btstack_memory_pool.c \ run_loop.c \ run_loop_posix.c \ utils.c \ diff --git a/test/gatt_client/Makefile b/test/gatt_client/Makefile index f3c296536..ad1a951e9 100644 --- a/test/gatt_client/Makefile +++ b/test/gatt_client/Makefile @@ -21,7 +21,7 @@ COMMON = \ hci_cmds.c \ hci_dump.c \ le_device_db_memory.c \ - memory_pool.c \ + btstack_memory_pool.c \ mock.c \ utils.c \ diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 492b29f23..1c7b1d0c8 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -17,7 +17,7 @@ COMMON = \ hci_dump.c \ l2cap.c \ l2cap_signaling.c \ - memory_pool.c \ + btstack_memory_pool.c \ remote_device_db_memory.c \ rfcomm.c \ run_loop.c \ @@ -36,7 +36,7 @@ MOCK = \ btstack_memory.c \ hci_cmds.c \ hci_dump.c \ - memory_pool.c \ + btstack_memory_pool.c \ remote_device_db_memory.c \ sdp_util.c \ utils.c \ diff --git a/test/remote_device_db/Makefile b/test/remote_device_db/Makefile index 300b8da4b..f0f143efc 100644 --- a/test/remote_device_db/Makefile +++ b/test/remote_device_db/Makefile @@ -24,7 +24,7 @@ FS = \ MEMORY = \ utils.c \ - memory_pool.c \ + btstack_memory_pool.c \ btstack_memory.c \ hci_dump.c \ remote_device_db_memory.c \ diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile index ec8a64e9f..bd7a73c44 100644 --- a/test/security_manager/Makefile +++ b/test/security_manager/Makefile @@ -15,7 +15,7 @@ VPATH += ${BTSTACK_ROOT}/platform/posix COMMON = \ utils.c \ btstack_memory.c \ - memory_pool.c \ + btstack_memory_pool.c \ btstack_linked_list.c \ run_loop.c \ run_loop_posix.c \ diff --git a/tool/btstack_memory_generator.py b/tool/btstack_memory_generator.py index 1caffb1cb..92ccbcd7e 100755 --- a/tool/btstack_memory_generator.py +++ b/tool/btstack_memory_generator.py @@ -102,7 +102,7 @@ cfile_header_begin = """ */ #include "btstack_memory.h" -#include "memory_pool.h" +#include "btstack_memory_pool.h" #include