GitHub/internalblue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
master
internalblue/android/android6_0_1/android_receive_diagnostics.diff
T
Jiska Classen 79acb79d34 rewrote and restructured the documentation
2020-04-14 17:23:28 +02:00

231 lines
8.3 KiB
Diff
Raw Permalink Blame History

diff --git a/hci/include/hci_hal.h b/hci/include/hci_hal.h
index b0b3c67fb..3dce3a56e 100644
--- a/hci/include/hci_hal.h
+++ b/hci/include/hci_hal.h
@@ -28,7 +28,8 @@ typedef enum {
DATA_TYPE_COMMAND = 1,
DATA_TYPE_ACL = 2,
DATA_TYPE_SCO = 3,
- DATA_TYPE_EVENT = 4
+ DATA_TYPE_EVENT = 4,
+ DATA_TYPE_DIAG = 7
} serial_data_type_t;
typedef void (*data_ready_cb)(serial_data_type_t type);
diff --git a/hci/include/hci_internals.h b/hci/include/hci_internals.h
index 6b9fb014b..c453b5655 100644
--- a/hci/include/hci_internals.h
+++ b/hci/include/hci_internals.h
@@ -26,3 +26,5 @@
#define HCI_SCO_PREAMBLE_SIZE 3
// 1 byte for event code, 1 byte for parameter length (Volume 2, Part E, 5.4.4)
#define HCI_EVENT_PREAMBLE_SIZE 2
+// 1 byte for diagnostic command type
+#define HCI_DIAG_PREAMBLE_SIZE 2
diff --git a/hci/include/hci_layer.h b/hci/include/hci_layer.h
index bdc468146..095762133 100644
--- a/hci/include/hci_layer.h
+++ b/hci/include/hci_layer.h
@@ -46,6 +46,7 @@ static const char HCI_MODULE[] = "hci_module";
#define MSG_STACK_TO_HC_HCI_ACL 0x2100 /* eq. BT_EVT_TO_LM_HCI_ACL */
#define MSG_STACK_TO_HC_HCI_SCO 0x2200 /* eq. BT_EVT_TO_LM_HCI_SCO */
#define MSG_STACK_TO_HC_HCI_CMD 0x2000 /* eq. BT_EVT_TO_LM_HCI_CMD */
+#define MSG_STACK_TO_LM_DIAG 0x2c00 /* Diagnostics */
/* Local Bluetooth Controller ID for BR/EDR */
#define LOCAL_BR_EDR_CONTROLLER_ID 0
diff --git a/hci/src/btsnoop.c b/hci/src/btsnoop.c
index 7b6b97f30..e92ff4836 100644
--- a/hci/src/btsnoop.c
+++ b/hci/src/btsnoop.c
@@ -43,7 +43,8 @@ typedef enum {
kCommandPacket = 1,
kAclPacket = 2,
kScoPacket = 3,
- kEventPacket = 4
+ kEventPacket = 4,
+ kDiagPacket = 7
} packet_type_t;
// Epoch in microseconds since 01/01/0000.
@@ -61,7 +62,7 @@ void btsnoop_net_open();
void btsnoop_net_close();
void btsnoop_net_write(const void *data, size_t length);
-static void btsnoop_write_packet(packet_type_t type, const uint8_t *packet, bool is_received);
+static void btsnoop_write_packet(packet_type_t type, const uint8_t *packet, bool is_received, int length_he);
static void update_logging();
// Module lifecycle functions
@@ -109,18 +110,21 @@ static void capture(const BT_HDR *buffer, bool is_received) {
switch (buffer->event & MSG_EVT_MASK) {
case MSG_HC_TO_STACK_HCI_EVT:
- btsnoop_write_packet(kEventPacket, p, false);
+ btsnoop_write_packet(kEventPacket, p, false, 0);
break;
case MSG_HC_TO_STACK_HCI_ACL:
case MSG_STACK_TO_HC_HCI_ACL:
- btsnoop_write_packet(kAclPacket, p, is_received);
+ btsnoop_write_packet(kAclPacket, p, is_received, 0);
break;
case MSG_HC_TO_STACK_HCI_SCO:
case MSG_STACK_TO_HC_HCI_SCO:
- btsnoop_write_packet(kScoPacket, p, is_received);
+ btsnoop_write_packet(kScoPacket, p, is_received, 0);
break;
case MSG_STACK_TO_HC_HCI_CMD:
- btsnoop_write_packet(kCommandPacket, p, true);
+ btsnoop_write_packet(kCommandPacket, p, true, 0);
+ break;
+ case MSG_STACK_TO_LM_DIAG:
+ btsnoop_write_packet(kDiagPacket, p, true, buffer->len + 1); //1 byte header 0x07 + data
break;
}
}
@@ -193,8 +197,9 @@ static void btsnoop_write(const void *data, size_t length) {
btsnoop_net_write(data, length);
}
-static void btsnoop_write_packet(packet_type_t type, const uint8_t *packet, bool is_received) {
- int length_he = 0;
+/* Pass length_he=0 for packets with automatic length detection (everything except DIAG)
+ */
+static void btsnoop_write_packet(packet_type_t type, const uint8_t *packet, bool is_received, int length_he) {
int length;
int flags;
int drops = 0;
@@ -215,6 +220,9 @@ static void btsnoop_write_packet(packet_type_t type, const uint8_t *packet, bool
length_he = packet[1] + 3;
flags = 3;
break;
+ case kDiagPacket:
+ flags = 3;
+ break;
}
uint64_t timestamp = btsnoop_timestamp();
diff --git a/hci/src/hci_hal_h4.c b/hci/src/hci_hal_h4.c
index fc0d27838..8c79717ff 100644
--- a/hci/src/hci_hal_h4.c
+++ b/hci/src/hci_hal_h4.c
@@ -113,7 +113,8 @@ static void hal_close() {
}
static size_t read_data(serial_data_type_t type, uint8_t *buffer, size_t max_size, bool block) {
- if (type < DATA_TYPE_ACL || type > DATA_TYPE_EVENT) {
+
+ if ((type < DATA_TYPE_ACL || type > DATA_TYPE_EVENT) && type != DATA_TYPE_DIAG) {
LOG_ERROR("%s invalid data type: %d", __func__, type);
return 0;
} else if (!stream_has_interpretation) {
@@ -136,11 +137,12 @@ static void packet_finished(serial_data_type_t type) {
stream_has_interpretation = false;
}
+
static uint16_t transmit_data(serial_data_type_t type, uint8_t *data, uint16_t length) {
assert(data != NULL);
assert(length > 0);
- if (type < DATA_TYPE_COMMAND || type > DATA_TYPE_SCO) {
+ if ((type < DATA_TYPE_COMMAND || type > DATA_TYPE_SCO) && type != DATA_TYPE_DIAG) {
LOG_ERROR("%s invalid data type: %d", __func__, type);
return 0;
}
@@ -230,7 +232,7 @@ static void event_uart_has_bytes(eager_reader_t *reader, UNUSED_ATTR void *conte
if (stream_corrupted_during_le_scan_workaround(type_byte))
return;
- if (type_byte < DATA_TYPE_ACL || type_byte > DATA_TYPE_EVENT) {
+ if ((type_byte < DATA_TYPE_ACL || type_byte > DATA_TYPE_EVENT) && type_byte != DATA_TYPE_DIAG) {
LOG_ERROR("%s Unknown HCI message type. Dropping this byte 0x%x, min %x, max %x", __func__, type_byte, DATA_TYPE_ACL, DATA_TYPE_EVENT);
return;
}
diff --git a/hci/src/hci_inject.c b/hci/src/hci_inject.c
index 8ba5f989a..5e82ce3e3 100644
--- a/hci/src/hci_inject.c
+++ b/hci/src/hci_inject.c
@@ -38,6 +38,7 @@ typedef enum {
HCI_PACKET_ACL_DATA = 2,
HCI_PACKET_SCO_DATA = 3,
HCI_PACKET_EVENT = 4,
+ HCI_PACKET_DIAG = 7,
} hci_packet_t;
typedef struct {
@@ -117,6 +118,8 @@ static int hci_packet_to_event(hci_packet_t packet) {
return MSG_STACK_TO_HC_HCI_ACL;
case HCI_PACKET_SCO_DATA:
return MSG_STACK_TO_HC_HCI_SCO;
+ case HCI_PACKET_DIAG:
+ return MSG_STACK_TO_LM_DIAG;
default:
LOG_ERROR("%s unsupported packet type: %d", __func__, packet);
return -1;
diff --git a/hci/src/hci_layer.c b/hci/src/hci_layer.c
index 16f72c606..1a9e9a05a 100644
--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -50,7 +50,7 @@
#include <hardware/bluetooth.h>
bt_bdaddr_t btif_local_bd_addr;
-#define INBOUND_PACKET_TYPE_COUNT 3
+#define INBOUND_PACKET_TYPE_COUNT 6
#define PACKET_TYPE_TO_INBOUND_INDEX(type) ((type) - 2)
#define PACKET_TYPE_TO_INDEX(type) ((type) - 1)
@@ -61,7 +61,10 @@ static const uint8_t preamble_sizes[] = {
HCI_COMMAND_PREAMBLE_SIZE,
HCI_ACL_PREAMBLE_SIZE,
HCI_SCO_PREAMBLE_SIZE,
- HCI_EVENT_PREAMBLE_SIZE
+ HCI_EVENT_PREAMBLE_SIZE,
+ 0,
+ 0,
+ HCI_DIAG_PREAMBLE_SIZE,
};
static const uint16_t outbound_event_types[] =
@@ -69,7 +72,10 @@ static const uint16_t outbound_event_types[] =
MSG_HC_TO_STACK_HCI_ERR,
MSG_HC_TO_STACK_HCI_ACL,
MSG_HC_TO_STACK_HCI_SCO,
- MSG_HC_TO_STACK_HCI_EVT
+ MSG_HC_TO_STACK_HCI_EVT,
+ 0x0000,
+ 0x0000,
+ MSG_STACK_TO_LM_DIAG
};
typedef enum {
@@ -548,6 +554,10 @@ static void hal_says_data_ready(serial_data_type_t type) {
// For event and sco preambles, the last byte we read is the length
incoming->bytes_remaining = (type == DATA_TYPE_ACL) ? RETRIEVE_ACL_LENGTH(incoming->preamble) : byte;
+ if (type == DATA_TYPE_DIAG) {
+ incoming->bytes_remaining = HCIT_LM_DIAG_LENGTH - 2; // minus header
+ }
+
size_t buffer_size = BT_HDR_SIZE + incoming->index + incoming->bytes_remaining;
incoming->buffer = (BT_HDR *)buffer_allocator->alloc(buffer_size);
@@ -563,7 +573,6 @@ static void hal_says_data_ready(serial_data_type_t type) {
incoming->buffer->layer_specific = 0;
incoming->buffer->event = outbound_event_types[PACKET_TYPE_TO_INDEX(type)];
memcpy(incoming->buffer->data, incoming->preamble, incoming->index);
-
incoming->state = incoming->bytes_remaining > 0 ? BODY : FINISHED;
}
@@ -715,6 +724,8 @@ static serial_data_type_t event_to_data_type(uint16_t event) {
return DATA_TYPE_SCO;
else if (event == MSG_STACK_TO_HC_HCI_CMD)
return DATA_TYPE_COMMAND;
+ else if (event == MSG_STACK_TO_LM_DIAG)
+ return DATA_TYPE_DIAG;
else
LOG_ERROR("%s invalid event type, could not translate 0x%x", __func__, event);
Reference in New Issue View Git Blame Copy Permalink