michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: monitor: Update to new protocol format

Browse source 
The updated "monitor over UART" protocol looks like:

    uint16  data_len
    uint16  opcode
    uint8   flags
    uint8   hdr_len
    uint8   extra_hdr[hdr_len];
    uint8   payload[data_len - 4 - hdr_len]

Change-Id: I5fceafe69489a5bfc940d113066f100016f74bc3
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-04-27 14:42:57 +03:00
commit 48338958e6
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
net/bluetooth/monitor.c
View file

@ -53,15 +53,13 @@ static void monitor_send(const void *data, size_t len)
}
}
static void send_hdr(uint16_t opcode, uint16_t index, uint16_t len)
static inline void encode_hdr(struct bt_monitor_hdr *hdr, uint16_t opcode,
uint16_t len)
{
struct bt_monitor_hdr hdr;
hdr.opcode = sys_cpu_to_le16(opcode);
hdr.index = sys_cpu_to_le16(index);
hdr.len = sys_cpu_to_le16(len);
monitor_send(&hdr, sizeof(hdr));
hdr->data_len = sys_cpu_to_le16(4 + len);
hdr->opcode = sys_cpu_to_le16(opcode);
hdr->flags = 0;
hdr->hdr_len = 0;
}
static int log_out(int c, void *unused)
@ -73,6 +71,7 @@ static int log_out(int c, void *unused)
void bt_log(int prio, const char *fmt, ...)
{
struct bt_monitor_user_logging log;
struct bt_monitor_hdr hdr;
const char id[] = "bt";
va_list ap;
int len, key;
@ -88,10 +87,12 @@ void bt_log(int prio, const char *fmt, ...)
log.priority = prio;
log.ident_len = sizeof(id);
encode_hdr(&hdr, BT_MONITOR_USER_LOGGING,
sizeof(log) + sizeof(id) + len + 1);
key = irq_lock();
send_hdr(BT_MONITOR_USER_LOGGING, 0,
sizeof(log) + sizeof(id) + len + 1);
monitor_send(&hdr, sizeof(hdr));
monitor_send(&log, sizeof(log));
monitor_send(id, sizeof(id));
@ -107,11 +108,14 @@ void bt_log(int prio, const char *fmt, ...)
void bt_monitor_send(uint16_t opcode, const void *data, size_t len)
{
struct bt_monitor_hdr hdr;
int key;
encode_hdr(&hdr, opcode, len);
key = irq_lock();
send_hdr(opcode, 0, len);
monitor_send(&hdr, sizeof(hdr));
monitor_send(data, len);
irq_unlock(key);

7
net/bluetooth/monitor.h
View file

@ -40,9 +40,10 @@
#define BT_MONITOR_TYPE_AMP 1
struct bt_monitor_hdr {
uint16_t opcode;
uint16_t index;
uint16_t len;
uint16_t data_len;
uint16_t opcode;
uint8_t flags;
uint8_t hdr_len;
} __packed;
struct bt_monitor_new_index {