mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-15 22:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

add HAVE_POSIX_FILE_IO to suitable ports and use in hci_dump

Browse Source
This commit is contained in:
Matthias Ringwald 2016-01-21 22:09:01 +01:00
parent 0d529a9fd2
commit eb443d3d86
8 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
port/ios/btstack_config.h
View File

@ -9,6 +9,7 @@
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_PLATFORM_IPHONE_OS
#define HAVE_POSIX_FILE_IO
#define HAVE_SO_NOSIGPIPE
#define HAVE_TIME

3
port/mtk/btstack_config.h
View File

@ -8,9 +8,9 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
// #define HAVE_SO_NOSIGPIPE
#define HAVE_TIME
#define HAVE_TRANSPORT_H4
// BTstack features that can be enabled
#define ENABLE_BLE
@ -25,6 +25,7 @@
// Daemon configuration
#define ENABLE_SDP
#define ENABLE_RFCOMM
#define HAVE_TRANSPORT_H4
#define BTSTACK_LOG_FILE "/data/btstack/hci_dump.pklg"
#define BTSTACK_UNIX "/data/btstack/BTstack"
#define REMOTE_DEVICE_DB remote_device_db_memory

1
port/posix-cc2564b/btstack_config.h
View File

@ -8,6 +8,7 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
#define HAVE_SCO
#define HAVE_SO_NOSIGPIPE
#define HAVE_TIME

1
port/posix-csr/btstack_config.h
View File

@ -8,6 +8,7 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
#define HAVE_SCO
// #define HAVE_SCO_OVER_HCI
#define HAVE_SO_NOSIGPIPE

1
port/posix-h4/btstack_config.h
View File

@ -8,6 +8,7 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
// #define HAVE_SCO
// #define HAVE_SCO_OVER_HCI
#define HAVE_SO_NOSIGPIPE

1
port/posix-stlc2500d/btstack_config.h
View File

@ -8,6 +8,7 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
#define HAVE_SCO
// #define HAVE_SCO_OVER_HCI
#define HAVE_SO_NOSIGPIPE

1
port/posix-tc35661/btstack_config.h
View File

@ -8,6 +8,7 @@
// Port related features
#define HAVE_BZERO
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
// #define HAVE_SCO
// #define HAVE_SCO_OVER_HCI
#define HAVE_SO_NOSIGPIPE

51
src/hci_dump.c
View File

@ -56,7 +56,7 @@
#include "btstack_run_loop.h"
#include <stdio.h>
#ifndef EMBEDDED
#ifdef HAVE_POSIX_FILE_IO
#include <fcntl.h> // open
#include <unistd.h> // write
#include <time.h>
@ -88,7 +88,7 @@ pktlog_hdr;
#define PKTLOG_HDR_SIZE 13
static int dump_file = -1;
#ifndef EMBEDDED
#ifdef HAVE_POSIX_FILE_IO
static int dump_format;
static uint8_t header_bluez[HCIDUMP_HDR_SIZE];
static uint8_t header_packetlogger[PKTLOG_HDR_SIZE];
@ -102,23 +102,25 @@ static char log_message_buffer[256];
static int log_level_enabled[3] = { 1, 1, 1};
void hci_dump_open(const char *filename, hci_dump_format_t format){
#ifdef EMBEDDED
dump_file = 1;
#else
#ifdef HAVE_POSIX_FILE_IO
dump_format = format;
if (dump_format == HCI_DUMP_STDOUT) {
dump_file = fileno(stdout);
} else {
#ifdef _WIN32
# ifdef _WIN32
dump_file = open(filename, O_WRONLY | O_CREAT | O_TRUNC);
#else
# else
dump_file = open(filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
#endif
# endif
}
#else
dump_file = 1;
#endif
}
#ifndef EMBEDDED
#ifdef HAVE_POSIX_FILE_IO
void hci_dump_set_max_packets(int packets){
max_nr_packets = packets;
}
@ -152,13 +154,8 @@ void hci_dump_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t
if (dump_file < 0) return; // not activated yet
#ifdef EMBEDDED
// #ifdef HAVE_TICK
// uint32_t time_ms = btstack_run_loop_embedded_get_time_ms();
// printf("[%06u] ", time_ms);
// #endif
printf_packet(packet_type, in, packet, len);
#else
#ifdef HAVE_POSIX_FILE_IO
// don't grow bigger than max_nr_packets
if (dump_format != HCI_DUMP_STDOUT && max_nr_packets > 0){
if (nr_packets >= max_nr_packets){
@ -239,6 +236,14 @@ void hci_dump_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t
default:
break;
}
#else
// #ifdef HAVE_TICK
// uint32_t time_ms = btstack_run_loop_embedded_get_time_ms();
// printf("[%06u] ", time_ms);
// #endif
printf_packet(packet_type, in, packet, len);
#endif
}
@ -252,14 +257,14 @@ void hci_dump_log(int log_level, const char * format, ...){
if (!hci_dump_log_level_active(log_level)) return;
va_list argptr;
va_start(argptr, format);
#ifdef EMBEDDED
#ifdef HAVE_POSIX_FILE_IO
int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr);
hci_dump_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len);
#else
printf("LOG -- ");
vprintf(format, argptr);
printf("\n");
#else
int len = vsnprintf(log_message_buffer, sizeof(log_message_buffer), format, argptr);
hci_dump_packet(LOG_MESSAGE_PACKET, 0, (uint8_t*) log_message_buffer, len);
#endif
#endif
va_end(argptr);
}
@ -276,10 +281,10 @@ void hci_dump_log_P(int log_level, PGM_P format, ...){
#endif
void hci_dump_close(void){
#ifndef EMBEDDED
#ifdef HAVE_POSIX_FILE_IO
close(dump_file);
dump_file = -1;
#endif
dump_file = -1;
}
void hci_dump_enable_log_level(int log_level, int enable){