fix missing bstack_ for struct data_source and struct timer. utils->btstack_util

This commit is contained in:
Matthias Ringwald 2016-01-20 16:10:07 +01:00
parent ec820d7756
commit eb8860135e
84 changed files with 111 additions and 111 deletions

View File

@ -50,7 +50,7 @@
#include "btstack_control.h"
#include "btstack_debug.h"
#include "utils.h"
#include "btstack_util.h"
// minimal CSR init script to configure PSKEYs and activate them
static const uint8_t init_script[] = {

View File

@ -71,7 +71,7 @@ void prepare_packet(void){
for (i=4;i<PACKET_SIZE;i++)
packet[i] = i-4;
}
void timer_handler(struct timer *ts){
void timer_handler(struct btstack_timer_source *ts){
bt_send_cmd(&hci_read_bd_addr);
btstack_run_loop_set_timer(&timer, 3000);
btstack_run_loop_add_timer(&timer);

View File

@ -13,6 +13,7 @@ CORE += \
btstack_linked_list.c \
btstack_memory_pool.c \
btstack_run_loop.c \
btstack_util.c \
COMMON += \
hci.c \
@ -22,7 +23,6 @@ COMMON += \
l2cap_signaling.c \
remote_device_db_memory.c \
sdp_util.c \
utils.c \
rfcomm.c \
bnep.c \
sdp.c \

View File

@ -47,7 +47,7 @@
#include <string.h>
#include "btstack_run_loop.h"
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack-config.h"
#include "btstack_debug.h"

View File

@ -57,7 +57,7 @@
#include <string.h>
#include "btstack_run_loop.h"
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack-config.h"

View File

@ -89,7 +89,7 @@ static btstack_timer_source_t heartbeat;
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
static uint16_t att_read_callback(uint16_t con_handle, uint16_t att_handle, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
static int att_write_callback(uint16_t con_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size);
static void heartbeat_handler(struct timer *ts);
static void heartbeat_handler(struct btstack_timer_source *ts);
const uint8_t adv_data[] = {
// Flags general discoverable
@ -161,7 +161,7 @@ static int counter = 0;
static char counter_string[30];
static int counter_string_len;
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
if (le_notification_enabled) {
counter++;
counter_string_len = sprintf(counter_string, "BTstack counter %04u", counter);

View File

@ -269,7 +269,7 @@ static int tap_alloc(char *dev, bd_addr_t bd_addr)
*/
/* LISTING_START(processTapData): Process incoming network packets */
static int process_tap_dev_data(struct data_source *ds)
static int process_tap_dev_data(struct btstack_data_source *ds)
{
ssize_t len;
len = read(ds->fd, network_buffer, sizeof(network_buffer));

View File

@ -212,7 +212,7 @@ static int att_write_callback(uint16_t con_handle, uint16_t att_handle, uint16_t
*/
/* LISTING_START(heartbeat): Combined Heartbeat handler */
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
counter++;
counter_string_len = sprintf(counter_string, "BTstack counter %04u\n", counter);

View File

@ -116,7 +116,7 @@ static void spp_service_setup(void){
/* LISTING_START(PeriodicCounter): Periodic Counter */
static btstack_timer_source_t heartbeat;
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
static int counter = 0;
if (rfcomm_channel_id){

View File

@ -114,7 +114,7 @@ static void spp_service_setup(void){
static btstack_timer_source_t heartbeat;
/* LISTING_START(hbhManual): Heartbeat handler with manual credit management */
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
if (rfcomm_send_credit){
rfcomm_grant_credits(rfcomm_channel_id, 1);
rfcomm_send_credit = 0;

View File

@ -50,7 +50,7 @@
#include "hci_cmds.h"
#include "daemon_cmds.h"
#include "btstack_run_loop.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack-config.h"

View File

@ -259,7 +259,7 @@ static void dummy_bluetooth_status_handler(BLUETOOTH_STATE state){
log_info("Bluetooth status: %u\n", state);
};
static void daemon_no_connections_timeout(struct timer *ts){
static void daemon_no_connections_timeout(struct btstack_timer_source *ts){
if (clients_require_power_on()) return; // false alarm :)
log_info("No active client connection for %u seconds -> POWER OFF\n", DAEMON_NO_ACTIVE_CLIENT_TIMEOUT/1000);
hci_power_control(HCI_POWER_OFF);

View File

@ -42,7 +42,7 @@
#include "btstack_memory.h"
#include "btstack_debug.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_linked_list.h"
// This lists should be only accessed by tests.

View File

@ -92,7 +92,7 @@ struct sockaddr_un {
#define MAX_PENDING_CONNECTIONS 10
/** prototypes */
static int socket_connection_hci_process(struct data_source *ds);
static int socket_connection_hci_process(struct btstack_data_source *ds);
static int socket_connection_dummy_handler(connection_t *connection, uint16_t packet_type, uint16_t channel, uint8_t *data, uint16_t length);
/** globals */
@ -201,7 +201,7 @@ void static socket_connection_emit_nr_connections(void){
// log_info("Nr connections changed,.. new %u", nr_connections);
}
int socket_connection_hci_process(struct data_source *ds) {
int socket_connection_hci_process(struct btstack_data_source *ds) {
connection_t *conn = (connection_t *) ds;
int bytes_read = read(ds->fd, &conn->buffer[conn->bytes_read], conn->bytes_to_read);
@ -286,7 +286,7 @@ int socket_connection_has_parked_connections(void){
return parked != NULL;
}
static int socket_connection_accept(struct data_source *socket_ds) {
static int socket_connection_accept(struct btstack_data_source *socket_ds) {
struct sockaddr_storage ss;
socklen_t slen = sizeof(ss);

View File

@ -79,7 +79,7 @@ typedef struct hci_transport_h4 {
} hci_transport_h4_t;
// prototypes
static int h4_process(struct data_source *ds);
static int h4_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
static void h4_block_received(void);
static void h4_block_sent(void);
@ -236,7 +236,7 @@ static void h4_register_packet_handler(void (*handler)(uint8_t packet_type, uint
packet_handler = handler;
}
static int h4_process(struct data_source *ds) {
static int h4_process(struct btstack_data_source *ds) {
// notify about packet sent
if (tx_state == TX_DONE){

View File

@ -102,7 +102,7 @@ typedef struct hci_transport_h4 {
} hci_transport_h4_t;
// prototypes
static int h4_process(struct data_source *ds);
static int h4_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
static void h4_block_received(void);
static void h4_block_sent(void);
@ -390,7 +390,7 @@ static void h4_block_sent(void){
}
}
static int h4_process(struct data_source *ds) {
static int h4_process(struct btstack_data_source *ds) {
// reset tx state before emitting packet sent event
// to allow for positive can_send_now

View File

@ -61,7 +61,7 @@
#error HCI_OUTGOING_PRE_BUFFER_SIZE not defined. Please update hci.h
#endif
static int h4_process(struct data_source *ds);
static int h4_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
typedef enum {
@ -310,7 +310,7 @@ static void h4_statemachine(void){
}
}
static int h4_process(struct data_source *ds) {
static int h4_process(struct btstack_data_source *ds) {
if (hci_transport_h4->uart_fd == 0) return -1;
int read_now = bytes_to_read;

View File

@ -79,7 +79,7 @@ static int bt_filedesc = 0;
// single instance
static hci_transport_h5_t * hci_transport_h5 = NULL;
static int h5_process(struct data_source *ds);
static int h5_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, int size);
static void (*packet_handler)(uint8_t packet_type, uint8_t *packet, int size) = dummy_handler;
@ -281,7 +281,7 @@ static void h5_slip_process( h5_slip_t * sm, uint8_t input, uint8_t in){
}
static int h5_process(struct data_source *ds) {
static int h5_process(struct btstack_data_source *ds) {
if (hci_transport_h5->ds->fd == 0) return -1;
// read up to bytes_to_read data in

View File

@ -43,7 +43,7 @@
#include "classic/remote_device_db.h"
#include "btstack_debug.h"
#include "utils.h"
#include "btstack_util.h"
#define LINK_KEY_PATH "/tmp/"
#define LINK_KEY_PREFIX "btstack_link_key_"

View File

@ -19,7 +19,7 @@
#include "hal_tick.h"
#include "hal_cpu.h"
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_run_loop.h"
#include "btstack_run_loop_embedded.h"
#include "classic/sdp_util.h"

View File

@ -4,7 +4,7 @@
#pragma once
#include "ble/att.h"
#include "utils.h"
#include "btstack_util.h"
#include "ble/gatt_client.h"
#include "hci.h"
#include <stdint.h>

View File

@ -10,7 +10,7 @@ BTSTACK_PACKAGE=/tmp/btstack
ARCHIVE=btstack-arduino-${VERSION}.zip
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
SRC_FILES += hci_dump.c hci.c hci_cmds.c btstack_util.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
PORT_FILES = btstack-config.h bsp_arduino_em9301.cpp BTstack.cpp BTstack.h

View File

@ -33,7 +33,7 @@ libBTstack_SOURCES = \
btstack_linked_list.c \
btstack_run_loop.c \
sdp_util.c \
utils.c \
btstack_util.c \
$(btstack_run_loop_sources) \
BTdaemon_SOURCES = \

View File

@ -47,7 +47,7 @@ CORE = \
btstack_memory_pool.c \
btstack_run_loop.c \
btstack_run_loop_embedded.c \
utils.c \
btstack_util.c \
COMMON = \
hal_uart_dma.c \

View File

@ -60,7 +60,7 @@
#include "hci_cmds.h"
#include "btstack_run_loop.h"
#include "classic/sdp_util.h"
#include "utils.h"
#include "btstack_util.h"
#include "hci.h"
#include "l2cap.h"
@ -193,7 +193,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
}
}
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
if (rfcomm_channel_id){
static int counter = 0;

View File

@ -36,7 +36,7 @@
//
#import <Foundation/Foundation.h>
#include "utils.h"
#include "btstack_util.h"
#define kCODHID 0x2540
#define kCODZeeMote 0x584

View File

@ -27,7 +27,7 @@ libBTstack_FILES = \
hci_dump.c \
sdp_util.c \
socket_connection.c \
utils.c \
btstack_util.c \
libBTstack_CFLAGS = -I$(BTSTACK_ROOT)/src/ble -I$(BTSTACK_ROOT)/src -I..

View File

@ -707,7 +707,7 @@ static void MySleepCallBack( void * refCon, io_service_t service, natural_t mess
}
}
static int power_notification_process(struct data_source *ds) {
static int power_notification_process(struct btstack_data_source *ds) {
if (!power_notification_callback) return -1;

View File

@ -82,13 +82,13 @@
#include "hci.h"
#include "hci_transport.h"
static int h4_process(struct data_source *ds);
static int h4_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
static hci_transport_config_uart_t *hci_transport_config_uart;
static void h4_enforce_wake_on(void);
static void h4_enforce_wake_off(void);
static void h4_enforce_wake_timeout(struct timer *ts);
static void h4_enforce_wake_timeout(struct btstack_timer_source *ts);
typedef enum {
H4_W4_PACKET_TYPE,
@ -317,7 +317,7 @@ static void h4_statemachine(void){
}
}
static int h4_process(struct data_source *ds) {
static int h4_process(struct btstack_data_source *ds) {
if (hci_transport_h4->uart_fd == 0) return -1;
int read_now = bytes_to_read;
@ -362,7 +362,7 @@ static void h4_enforce_wake_off(void)
}
}
static void h4_enforce_wake_timeout(struct timer *ts)
static void h4_enforce_wake_timeout(struct btstack_timer_source *ts)
{
h4_enforce_wake_off();
}

View File

@ -388,7 +388,7 @@ static void handle_completed_transfer(struct libusb_transfer *transfer){
}
}
static int usb_process_ds(struct data_source *ds) {
static int usb_process_ds(struct btstack_data_source *ds) {
if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return -1;
// log_info("begin usb_process_ds");
@ -425,7 +425,7 @@ static void usb_process_ts(btstack_timer_source_t *timer) {
if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return;
// actually handled the packet in the pollfds function
usb_process_ds((struct data_source *) NULL);
usb_process_ds((struct btstack_data_source *) NULL);
// Get the amount of time until next event is due
long msec = AYSNC_POLLING_INTERVAL_MS;

View File

@ -47,7 +47,7 @@ CORE = \
hal_usb.c \
hci_dump.c \
main.c \
utils.c \
btstack_util.c \
COMMON = \
hal_uart_dma.c \

View File

@ -60,7 +60,7 @@
#include "hci_cmds.h"
#include "btstack_run_loop.h"
#include "classic/sdp_util.h"
#include "utils.h"
#include "btstack_util.h"
#include "hci.h"
#include "l2cap.h"
@ -193,7 +193,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
}
}
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
if (rfcomm_channel_id){
static int counter = 0;

View File

@ -49,7 +49,7 @@ CORE = \
hci_dump.c \
linked_list.c \
main.c \
utils.c \
btstack_util.c \
COMMON = \
hal_uart_dma.c \

View File

@ -54,7 +54,7 @@
#include "hci.h"
#include "hci_transport.h"
static int h4_process(struct data_source *ds);
static int h4_process(struct btstack_data_source *ds);
static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
typedef struct hci_transport_h4 {
@ -121,7 +121,7 @@ static void h4_register_packet_handler(void (*handler)(uint8_t packet_type, ui
packet_handler = handler;
}
static int h4_process(struct data_source *ds) {
static int h4_process(struct btstack_data_source *ds) {
if (hci_transport_h4->ds->fd == 0) return -1;
// read up to bytes_to_read data in

View File

@ -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/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_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/btstack_run_loop.c ../../../src/btstack_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/btstack_util.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/btstack_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/btstack_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/btstack_memory_pool.c ../../../src/pan.c ../../../src/remote_device_db_memory.c ../../../src/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/btstack_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/btstack_run_loop.c ../../../src/btstack_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/btstack_util.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=
@ -256,11 +256,11 @@ ${OBJECTDIR}/_ext/1386528437/sdp_util.o: ../../../src/sdp_util.c nbproject/Make
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp_util.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp_util.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/sdp_util.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ../../../src/sdp_util.c
${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/utils.c nbproject/Makefile-${CND_CONF}.mk
${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/btstack_util.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
@${RM} ${OBJECTDIR}/_ext/1386528437/utils.o.d
@${RM} ${OBJECTDIR}/_ext/1386528437/utils.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/utils.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/utils.o.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/utils.c
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/utils.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/utils.o.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/btstack_util.c
${OBJECTDIR}/_ext/1880736137/drv_tmr.o: ../../../../driver/tmr/src/dynamic/drv_tmr.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1880736137"
@ -515,11 +515,11 @@ ${OBJECTDIR}/_ext/1386528437/sdp_util.o: ../../../src/sdp_util.c nbproject/Make
@${RM} ${OBJECTDIR}/_ext/1386528437/sdp_util.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/sdp_util.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/sdp_util.o.d" -o ${OBJECTDIR}/_ext/1386528437/sdp_util.o ../../../src/sdp_util.c
${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/utils.c nbproject/Makefile-${CND_CONF}.mk
${OBJECTDIR}/_ext/1386528437/utils.o: ../../../src/btstack_util.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386528437"
@${RM} ${OBJECTDIR}/_ext/1386528437/utils.o.d
@${RM} ${OBJECTDIR}/_ext/1386528437/utils.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/utils.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/utils.o.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/utils.c
@${FIXDEPS} "${OBJECTDIR}/_ext/1386528437/utils.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/utils.o.d" -o ${OBJECTDIR}/_ext/1386528437/utils.o ../../../src/btstack_util.c
${OBJECTDIR}/_ext/1880736137/drv_tmr.o: ../../../../driver/tmr/src/dynamic/drv_tmr.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1880736137"

View File

@ -38,7 +38,7 @@
<itemPath>../../../src/btstack_linked_list.h</itemPath>
<itemPath>../../../src/btstack_memory_pool.h</itemPath>
<itemPath>../../../src/run_loop.h</itemPath>
<itemPath>../../../src/utils.h</itemPath>
<itemPath>../../../src/btstack_util.h</itemPath>
<itemPath>../../../src/bnep.h</itemPath>
<itemPath>../../../src/bt_control.h</itemPath>
<itemPath>../../../src/btstack_memory.h</itemPath>
@ -139,7 +139,7 @@
<itemPath>../../../src/classic/sdp_query_rfcomm.c</itemPath>
<itemPath>../../../src/classic/sdp_query_util.c</itemPath>
<itemPath>../../../src/classic/sdp_util.c</itemPath>
<itemPath>../../../src/utils.c</itemPath>
<itemPath>../../../src/btstack_util.c</itemPath>
</logicalFolder>
</logicalFolder>
<logicalFolder name="f2" displayName="framework" projectFiles="true">

View File

@ -36,7 +36,7 @@ COMMON = \
rfcomm.c \
sdp.c \
sdp_util.c \
utils.c \
btstack_util.c \
sdp_parser.c \
sdp_client.c \
sdp_query_util.c \

View File

@ -35,7 +35,7 @@ $(NAME)_SOURCES += \
../../src/l2cap_signaling.c \
../../src/btstack_memory_pool.c \
../../src/run_loop.c \
../../src/utils.c \
../../src/btstack_util.c \
# WICED port incl. support for Broadcom chipset
$(NAME)_SOURCES += \

View File

@ -47,7 +47,7 @@
#include <stdlib.h>
#include <string.h>
#include "utils.h"
#include "btstack_util.h"
#include "classic/sdp_util.h"
#include "hci_cmds.h"

View File

@ -42,7 +42,7 @@
#include "bluetooth.h"
#include "ble/att.h"
#include "btstack_debug.h"
#include "utils.h"
#include "btstack_util.h"
// Buetooth Base UUID 00000000-0000-1000-8000-00805F9B34FB in little endian
static const uint8_t bluetooth_base_uuid[] = { 0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

View File

@ -40,7 +40,7 @@
#include "att_db_util.h"
#include "ble/att.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_debug.h"
#include "bluetooth.h"

View File

@ -43,7 +43,7 @@
#ifndef __ATT_DISPATCH_H
#define __ATT_DISPATCH_H
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -41,7 +41,7 @@
#include <string.h>
#include "btstack_run_loop.h"
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "classic/sdp_util.h"
#include "btstack-config.h"

View File

@ -38,7 +38,7 @@
#ifndef __LE_DEVICE_DB_H
#define __LE_DEVICE_DB_H
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -39,7 +39,7 @@
#define __SM_H
#include <stdint.h>
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -62,7 +62,7 @@
#include "btstack_linked_list.h"
#include "btstack_memory_pool.h"
#include "btstack_run_loop.h"
#include "utils.h"
#include "btstack_util.h"
#include "version.h"
#ifdef HAVE_BLE

View File

@ -48,7 +48,7 @@
#define __BT_CONTROL_H
#include <stdint.h>
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -61,10 +61,10 @@ extern "C" {
typedef struct btstack_data_source {
btstack_linked_item_t item;
int fd; // <-- file descriptor to watch or 0
int (*process)(struct data_source *ds); // <-- do processing
int (*process)(struct btstack_data_source *ds); // <-- do processing
} btstack_data_source_t;
typedef struct btstack_timer {
typedef struct btstack_timer_source {
btstack_linked_item_t item;
#ifdef HAVE_TIME
struct timeval timeout; // <-- next timeout
@ -72,7 +72,7 @@ typedef struct btstack_timer {
#if defined(HAVE_TICK) || defined(HAVE_TIME_MS)
uint32_t timeout; // timeout in system ticks (HAVE_TICK) or millis (HAVE_TIME_MS)
#endif
void (*process)(struct timer *ts); // <-- do processing
void (*process)(struct btstack_timer_source *ts); // <-- do processing
} btstack_timer_source_t;
//

View File

@ -36,7 +36,7 @@
*/
/*
* utils.c
* btstack_util.c
*
* General utility functions
*
@ -44,7 +44,7 @@
*/
#include "btstack-config.h"
#include "utils.h"
#include "btstack_util.h"
#include <stdio.h>
#include <string.h>
#include "btstack_debug.h"

View File

@ -36,7 +36,7 @@
*/
/*
* utils.h
* btstack_util.h
*
* General utility functions
*

View File

@ -47,7 +47,7 @@
#include <stdint.h>
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "classic/sdp_util.h"
#include "btstack_memory.h"

View File

@ -44,7 +44,7 @@
#ifndef __BNEP_H
#define __BNEP_H
#include "utils.h"
#include "btstack_util.h"
#include <stdint.h>

View File

@ -42,7 +42,7 @@
#ifndef __REMOTE_DEVICE_DB_H
#define __REMOTE_DEVICE_DB_H
#include "utils.h"
#include "btstack_util.h"
#include "gap.h"
#if defined __cplusplus

View File

@ -42,7 +42,7 @@
#include "btstack_memory.h"
#include "btstack_debug.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_linked_list.h"
// This lists should be only accessed by tests.

View File

@ -45,9 +45,9 @@
#include <stdint.h>
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_memory.h"
#include "hci.h"
#include "hci_dump.h"

View File

@ -42,7 +42,7 @@
#ifndef __RFCOMM_H
#define __RFCOMM_H
#include "utils.h"
#include "btstack_util.h"
#include <stdint.h>

View File

@ -44,7 +44,7 @@
#include "btstack-config.h"
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -50,7 +50,7 @@
#include <string.h>
#include "classic/sdp_util.h"
#include "utils.h"
#include "btstack_util.h"
#if defined __cplusplus
extern "C" {

View File

@ -42,7 +42,7 @@
#ifndef __SDP_QUERY_RFCOMM_H
#define __SDP_QUERY_RFCOMM_H
#include "utils.h"
#include "btstack_util.h"
#include "classic/sdp_parser.h"
#include "classic/sdp_query_util.h"

View File

@ -40,7 +40,7 @@
*/
#include "classic/sdp_util.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack-config.h"
#include "bluetooth.h"

View File

@ -43,7 +43,7 @@ extern "C" {
#endif
#include "btstack_defines.h"
#include "utils.h"
#include "btstack_util.h"
typedef enum {

View File

@ -53,7 +53,7 @@
#include "hci_cmds.h"
#include "hci_transport.h"
#include "btstack_linked_list.h"
#include "utils.h"
#include "btstack_util.h"
#include <stdint.h>
#include <stdlib.h>

View File

@ -48,7 +48,7 @@
#include "hci.h"
#include "l2cap_signaling.h"
#include "utils.h"
#include "btstack_util.h"
#include "bluetooth.h"
#if defined __cplusplus

View File

@ -46,7 +46,7 @@
#include <stdint.h>
#include <stdarg.h>
#include "utils.h"
#include "btstack_util.h"
#include "hci_cmds.h"
#if defined __cplusplus

View File

@ -16,7 +16,7 @@ VPATH += ${BTSTACK_ROOT}/src/ble
VPATH += ${BTSTACK_ROOT}/platform/posix
COMMON = \
utils.c \
btstack_util.c \
hci_dump.c \
att_db_util.c \

View File

@ -52,7 +52,7 @@
#include "ble/att.h"
#include "ble/att_db_util.h"
#include "utils.h"
#include "btstack_util.h"
#include "bluetooth.h"
#include "le_counter.h"

View File

@ -21,7 +21,7 @@ COMMON = \
btstack_memory_pool.c \
run_loop.c \
btstack_run_loop_posix.c \
utils.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)

View File

@ -14,7 +14,7 @@ VPATH += ${BTSTACK_ROOT}/platform/posix
COMMON = \
sdp_util.c \
hci_dump.c \
utils.c
btstack_util.c
COMMON_OBJ = $(COMMON:.c=.o)

View File

@ -23,7 +23,7 @@ COMMON = \
le_device_db_memory.c \
btstack_memory_pool.c \
mock.c \
utils.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)

View File

@ -26,7 +26,7 @@ COMMON = \
sdp_parser.c \
sdp_query_util.c \
sdp_util.c \
utils.c \
btstack_util.c \
MOCK = \
@ -39,7 +39,7 @@ MOCK = \
btstack_memory_pool.c \
remote_device_db_memory.c \
sdp_util.c \
utils.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)
MOCK_OBJ = $(MOCK:.c=.o)

View File

@ -1603,7 +1603,7 @@ static void ui_process_command(char buffer){
}
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -262,7 +262,7 @@ static int att_attribute_for_handle(uint16_t aHandle){
}
static void heartbeat_handler(struct timer *ts){
static void heartbeat_handler(struct btstack_timer_source *ts){
// restart timer
btstack_run_loop_set_timer(ts, HEARTBEAT_PERIOD_MS);
btstack_run_loop_add_timer(ts);
@ -711,7 +711,7 @@ static void update_auth_req(void){
sm_set_authentication_requirements(auth_req);
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -566,7 +566,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -471,7 +471,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -349,7 +349,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
read(ds->fd, &cmd, 1);
switch (cmd){
case 'a':

View File

@ -173,7 +173,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
read(ds->fd, &cmd, 1);
if (cmd >= '0' && cmd <= '9'){

View File

@ -94,7 +94,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -193,7 +193,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);

View File

@ -65,7 +65,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);
switch (buffer){

View File

@ -118,7 +118,7 @@ static void show_usage(void){
printf("---\n");
}
static int stdin_process(struct data_source *ds){
static int stdin_process(struct btstack_data_source *ds){
char buffer;
read(ds->fd, &buffer, 1);
switch (buffer){

View File

@ -17,13 +17,13 @@ VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/platform/posix
FS = \
utils.c \
btstack_util.c \
hci_dump.c \
remote_device_db_fs.c
MEMORY = \
utils.c \
btstack_util.c \
btstack_memory_pool.c \
btstack_memory.c \
hci_dump.c \

View File

@ -17,7 +17,7 @@ COMMON = \
sdp_util.c \
sdp_parser.c \
hci_dump.c \
utils.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)

View File

@ -24,7 +24,7 @@ COMMON = \
mock.c \
rijndael.c \
sm.c \
utils.c \
btstack_util.c \
COMMON_OBJ = $(COMMON:.c=.o)

View File

@ -17,7 +17,7 @@
#include "btstack_run_loop_posix.h"
#include "hci_cmds.h"
#include "utils.h"
#include "btstack_util.h"
#include "btstack_memory.h"
#include "hci.h"