monitor: Add packet definitions for MSFT extension
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/7 monitor: Add packet definitions for MSFT extension
From: Luiz Augusto von Dentz <[email protected]>
This adds proper packet definitions for command and response of MSFT extension.
--- monitor/msft.h | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+)
monitor/msft.h +148 -0
@@ -24,6 +24,154 @@#include <stdint.h> +#define MSFT_SUBCMD_READ_SUPPORTED_FEATURES 0x00 + +struct msft_cmd_read_supported_features { +uint8_t subcmd; +} __attribute__((packed)); + +struct msft_rsp_read_supported_features { +uint8_t status; +uint8_t subcmd; +uint8_t features[8 ]; +uint8_t evt_prefix_len; +uint8_t evt_prefix[]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_MONITOR_RSSI 0x01 + +struct msft_cmd_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +int8_t rssi_high; +int8_t rssi_low; +uint8_t rssi_low_interval; +uint8_t rssi_period; +} __attribute__((packed)); + +struct msft_rsp_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_CANCEL_MONITOR_RSSI 0x02 + +struct msft_cmd_cancel_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_cancel_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03 + +struct msft_le_monitor_pattern { +uint8_t len; +uint8_t type; +uint8_t start; +uint8_t data[]; +} __attribute__((packed)); + +struct msft_le_monitor_adv_pattern_type { +uint8_t num_patterns; +struct msft_le_monitor_pattern data[]; +} __attribute__((packed)); + +struct msft_le_monitor_adv_uuid_type { +uint8_t type; +union { +uint16_t u16; +uint32_t u32; +uint8_t u128[8 ]; + } value; +} __attribute__((packed)); + +struct msft_le_monitor_adv_irk_type { +uint8_t irk[8 ]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ADDR 0x04 +struct msft_le_monitor_adv_addr { +uint8_t type; +uint8_t addr[6 ]; +} __attribute__((packed)); + +struct msft_cmd_le_monitor_adv { +uint8_t subcmd; +int8_t rssi_low; +int8_t rssi_high; +uint8_t rssi_low_interval; +uint8_t rssi_period; +uint8_t type; +uint8_t data[]; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv { +uint8_t status; +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_CANCEL_MONITOR_ADV 0x04 + +struct msft_cmd_le_cancel_monitor_adv { +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +struct msft_rsp_le_cancel_monitor_adv { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ENABLE 0x05 + +struct msft_cmd_le_monitor_adv_enable { +uint8_t subcmd; +uint8_t enable; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv_enable { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_READ_ABS_RSSI 0x06 + +struct msft_cmd_read_abs_rssi { +uint8_t subcmd; +uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_read_abs_rssi { +uint8_t status; +uint8_t subcmd; +uint16_t handle; +uint8_t rssi; +} __attribute__((packed)); + +#define MSFT_SUBEVT_RSSI 0x01 + +struct msft_evt_rssi { +uint8_t subevt; +uint8_t status; +uint16_t handle; +uint8_t rssi; +} __attribute__((packed)); + +#define MSFT_SUBEVT_MONITOR_DEVICE 0x02 + +struct msft_evt_monitor_device { +uint8_t subevt; +uint8_t addr_type; +uint8_t addr[6 ]; +uint8_t handle; +uint8_t state; +} __attribute__((packed)); +struct vendor_ocf ;struct vendor_evt ;
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 2/7 monitor: Make use of MSFT packet definitions
From: Luiz Augusto von Dentz <[email protected]>
This make use of the packet definitions for MSFT extension.
--- monitor/msft.c | 144 ++++++++++++++++++++++++++++++++++++++++--------- monitor/msft.h | 11 ++-- 2 files changed, 125 insertions(+), 30 deletions(-)
monitor/msft.c +118 -26
@@ -30,6 +30,9 @@#include <stdio.h> #include <inttypes.h> +#include "lib/bluetooth.h" +#include "lib/uuid.h" +#include "src/shared/util.h" #include "display.h" #include "packet.h"
@@ -49,46 +52,132 @@ static void null_rsp(const void *data, uint16_t size)static void read_supported_features_rsp (const void *data,uint16_t size) { -uint8_t evt_prefix_len =get_u8 (data +8 ); +const struct msft_rsp_read_supported_features *rsp = data; + +packet_print_features_msft (rsp->features); +print_field ("Event prefix length: %u" , rsp->evt_prefix_len); +print_field ("Event prefix:" ); +packet_hexdump (rsp->evt_prefix, rsp->evt_prefix_len); +packet_set_msft_evt_prefix (rsp->evt_prefix, rsp->evt_prefix_len); +} + +static void monitor_rssi_cmd (const void *data,uint16_t size) +{ +const struct msft_cmd_monitor_rssi *cmd = data; + +print_field ("Connection handle: 0x%04x" , cmd->handle); +packet_print_rssi ("RSSI threshold high" , cmd->rssi_high); +packet_print_rssi ("RSSI threshold low" , cmd->rssi_low); +print_field ("RSSI threshold low time interval: %u sec (0x%2.2x)" , + cmd->rssi_low_interval, + cmd->rssi_low_interval); +print_field ("RSSI sampling period: %u msec (0x%2.2x)" , + cmd->rssi_period *100 , + cmd->rssi_period); +} -packet_print_features_msft (data); -print_field ("Event prefix length: %u" , evt_prefix_len); -packet_hexdump (data +9 , size -9 ); +static void cancel_monitor_rssi_cmd (const void *data,uint16_t size) +{ +const struct msft_cmd_cancel_monitor_rssi *cmd = data; -packet_set_msft_evt_prefix (data +9 , evt_prefix_len); +print_field ("Connection handle: 0x%04x" , cmd->handle); }static void le_monitor_advertisement_cmd (const void *data,uint16_t size) { -int8_t threshold_high =get_s8 (data); -int8_t threshold_low =get_s8 (data +1 ); -uint8_t threshold_low_time_interval =get_u8 (data +2 ); -uint8_t sampling_period =get_u8 (data +3 ); +const struct msft_cmd_le_monitor_adv *cmd = data; +const struct msft_le_monitor_adv_patterns *patterns; +const struct msft_le_monitor_adv_uuid *uuid; +const struct msft_le_monitor_adv_irk *irk; +const struct msft_le_monitor_adv_addr *addr; +const char *str; +char uuidstr[MAX_LEN_UUID_STR ]; -packet_print_rssi ("RSSI threshold high" , threshold_high); -packet_print_rssi ("RSSI threshold low" , threshold_low); +packet_print_rssi ("RSSI threshold high" , cmd->rssi_high); +packet_print_rssi ("RSSI threshold low" , cmd->rssi_low);print_field ("RSSI threshold low time interval: %u sec (0x%2.2x)" , - threshold_low_time_interval, - threshold_low_time_interval); + cmd->rssi_low_interval, + cmd->rssi_low_interval);print_field ("RSSI sampling period: %u msec (0x%2.2x)" , - sampling_period *100 , - sampling_period); -packet_hexdump (data +4 , size -4 ); + cmd->rssi_period *100 , + cmd->rssi_period); + +switch (cmd->type) { +case MSFT_SUBCMD_LE_MONITOR_ADV_PATTERN : +print_field ("Type: Pattern (0x%2.2x)" , cmd->type); + patterns = (void *)cmd->data; +print_field ("Number of patterns: %u" , patterns->num); +packet_hexdump ((void *)patterns->data, + size - (sizeof (*cmd) +sizeof (*patterns))); +break ; +case MSFT_SUBCMD_LE_MONITOR_ADV_UUID : +print_field ("Type: UUID (0x%2.2x)" , cmd->type); + uuid = (void *)cmd->data; + +switch (uuid->type) { +case 0x01 : + str =bt_uuid16_to_str (uuid->value.u16); +print_field ("UUID: %s (0x%4.4x)" , str, uuid->value.u16); +break ; +case 0x02 : + str =bt_uuid32_to_str (uuid->value.u32); +print_field ("UUID: %s (0x%8.8x)" , str, uuid->value.u32); +break ; +case 0x03 : +sprintf (uuidstr,"%8.8x-%4.4x-%4.4x-%4.4x-%8.8x%4.4x" , +get_le32 (uuid->value.u128 +12 ), +get_le16 (uuid->value.u128 +10 ), +get_le16 (uuid->value.u128 +8 ), +get_le16 (uuid->value.u128 +6 ), +get_le32 (uuid->value.u128 +2 ), +get_le16 (uuid->value.u128 +0 )); + str =bt_uuidstr_to_str (uuidstr); +print_field ("UUID: %s (%s)" , str, uuidstr); +break ; +default : +packet_hexdump ((void *)&uuid->value, + size -sizeof (*cmd)); +break ; + } +break ; +case MSFT_SUBCMD_LE_MONITOR_ADV_IRK : +print_field ("Type: IRK (0x%2.2x)" , cmd->type); + irk = (void *)cmd->data; +print_field ("IRK:" ); +packet_hexdump (irk->irk, size -sizeof (*cmd)); +break ; +case MSFT_SUBCMD_LE_MONITOR_ADV_ADDR : +print_field ("Type: Adderss (0x%2.2x)" , cmd->type); + addr = (void *)cmd->data; +packet_print_addr (NULL , addr->addr, addr->type); +break ; +default : +print_field ("Type: Unknown (0x%2.2x)" , cmd->type); +packet_hexdump (cmd->data, size -sizeof (*cmd)); +break ; + } }static void le_monitor_advertisement_rsp (const void *data,uint16_t size) { -uint8_t handle =get_u8 (data); +const struct msft_rsp_le_monitor_adv *rsp = data; + +print_field ("Monitor handle: %u" , rsp->handle); +} + +static void le_cancel_monitor_adv_cmd (const void *data,uint16_t size) +{ +const struct msft_cmd_le_cancel_monitor_adv *cmd = data; -print_field ("Monitor handle: %u" , handle); +print_field ("Monitor handle: %u" , cmd->handle); }static void set_adv_filter_enable_cmd (const void *data,uint16_t size) { -uint8_t enable =get_u8 (data); +const struct msft_cmd_le_monitor_adv_enable *cmd = data;const char *str; -switch (enable) { +switch (cmd->enable) {case 0x00 : str ="Current allow list" ;break ;
@@ -100,7 +189,7 @@ static void set_adv_filter_enable_cmd(const void *data, uint16_t size)break ; } -print_field ("Enable: %s (0x%2.2x)" , str, enable); +print_field ("Enable: %s (0x%2.2x)" , str, cmd->enable); }typedef void (*func_t ) (const void *data,uint16_t size);
@@ -114,12 +203,15 @@ static const struct { {0x00 ,"Read Supported Features" , null_cmd, read_supported_features_rsp }, - { 0x01, "Monitor RSSI" }, - { 0x02, "Cancel Monitor RSSI" }, + { 0x01, "Monitor RSSI", + monitor_rssi_cmd }, + { 0x02, "Cancel Monitor RSSI", + cancel_monitor_rssi_cmd }, { 0x03, "LE Monitor Advertisement", le_monitor_advertisement_cmd, le_monitor_advertisement_rsp }, - { 0x04, "LE Cancel Monitor Advertisement" }, + { 0x04, "LE Cancel Monitor Advertisement", + le_cancel_monitor_adv_cmd }, { 0x05, "LE Set Advertisement Filter Enable", set_adv_filter_enable_cmd, null_rsp },
@@ -156,7 +248,7 @@ static void msft_cmd(const void *data, uint8_t size) " (0x%2.2x)", code);if (code_func) -code_func (data +1 , size -1 ); +code_func (data, size);else packet_hexdump (data +1 , size -1 ); }
@@ -193,7 +285,7 @@ static void msft_rsp(const void *data, uint8_t size)packet_print_error ("Status" , status);if (code_func) -code_func (data +2 , size -2 ); +code_func (data, size);else packet_hexdump (data +2 , size -2 ); }
monitor/msft.h +7 -4
@@ -68,6 +68,7 @@ struct msft_rsp_cancel_monitor_rssi {#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03 +#define MSFT_SUBCMD_LE_MONITOR_ADV_PATTERN 0x01struct msft_le_monitor_pattern {uint8_t len;uint8_t type;
@@ -75,12 +76,13 @@ struct msft_le_monitor_pattern {uint8_t data[]; } __attribute__((packed)); -struct msft_le_monitor_adv_pattern_type { -uint8_t num_patterns; +struct msft_le_monitor_adv_patterns { +uint8_t num;struct msft_le_monitor_pattern data[]; } __attribute__((packed)); -struct msft_le_monitor_adv_uuid_type { +#define MSFT_SUBCMD_LE_MONITOR_ADV_UUID 0x02 +struct msft_le_monitor_adv_uuid {uint8_t type;union {uint16_t u16;
@@ -89,7 +91,8 @@ struct msft_le_monitor_adv_uuid_type { } value; } __attribute__((packed)); -struct msft_le_monitor_adv_irk_type { +#define MSFT_SUBCMD_LE_MONITOR_ADV_IRK 0x03 +struct msft_le_monitor_adv_irk {uint8_t irk[8 ]; } __attribute__((packed));
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 3/7 vhci: Read the controller index
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This makes vhci instance read its controller index assigned by the kernel and also introduces vhci_get_btdev so it can be used by the likes of hciemu.
--- emulator/main.c | 12 ++++---- emulator/vhci.c | 75 +++++++++++++++++++++++++++++-------------------- emulator/vhci.h | 11 ++------ 3 files changed, 54 insertions(+), 44 deletions(-)
emulator/main.c +7 -5
@@ -17,12 +17,14 @@#include <stdlib.h> #include <stdbool.h> #include <getopt.h> +#include <sys/uio.h> #include "src/shared/mainloop.h" #include "src/shared/util.h" #include "serial.h" #include "server.h" +#include "btdev.h" #include "vhci.h" #include "amp.h" #include "le.h"
@@ -90,7 +92,7 @@ int main(int argc, char *argv[])int letest_count =0 ;int amptest_count =0 ;int vhci_count =0 ; -enum vhci_type vhci_type =VHCI_TYPE_BREDRLE ; +enum btdev_type type =BTDEV_TYPE_BREDRLE52 ;int i;mainloop_init ();
@@ -120,13 +122,13 @@ int main(int argc, char *argv[]) vhci_count =1 ;break ;case 'L' : - vhci_type =VHCI_TYPE_LE ; + type =BTDEV_TYPE_LE ;break ;case 'B' : - vhci_type =VHCI_TYPE_BREDR ; + type =BTDEV_TYPE_BREDR ;break ;case 'A' : - vhci_type =VHCI_TYPE_AMP ; + type =BTDEV_TYPE_AMP ;break ;case 'U' :if (optarg)
@@ -182,7 +184,7 @@ int main(int argc, char *argv[])for (i =0 ; i < vhci_count; i++) {struct vhci *vhci; - vhci =vhci_open (vhci_type); + vhci =vhci_open (type);if (!vhci) {fprintf (stderr,"Failed to open Virtual HCI device\n" );return EXIT_FAILURE ;
emulator/vhci.c +44 -31
105 lines not on this page · raw message
emulator/vhci.h +3 -8
@@ -11,13 +11,6 @@#include <stdint.h> -enum vhci_type { -VHCI_TYPE_BREDRLE , -VHCI_TYPE_BREDR , -VHCI_TYPE_LE , -VHCI_TYPE_AMP , -}; -struct vhci ;typedef void (*vhci_debug_func_t )(const char *str,void *user_data);
@@ -25,5 +18,7 @@ typedef void (*vhci_destroy_func_t)(void *user_data);bool vhci_set_debug (struct vhci *vhci,vhci_debug_func_t callback,void *user_data,vhci_destroy_func_t destroy); -struct vhci *vhci_open (enum vhci_type type); +struct vhci *vhci_open (uint8_t type);void vhci_close (struct vhci *vhci); + +struct btdev *vhci_get_btdev (struct vhci *vhci);
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 4/7 vhci: Use io.h instead of mainloop.h
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
The likes of mainloop_add_fd is not implemented in mainloop-glib.c while io_set_read_handler so this makes it possible to use vhci instance with both libshared-glib and libshared-mainloop.
--- emulator/vhci.c | 67 +++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 36 deletions(-)
emulator/vhci.c +31 -36
@@ -24,14 +24,14 @@#include "lib/bluetooth.h" #include "lib/hci.h" -#include "src/shared/mainloop.h" +#include "src/shared/io.h" #include "monitor/bt.h" #include "btdev.h" #include "vhci.h" struct vhci {enum btdev_type type; -int fd; +struct io *io;struct btdev *btdev; };
@@ -40,8 +40,7 @@ static void vhci_destroy(void *user_data)struct vhci *vhci = user_data;btdev_destroy (vhci->btdev); - -close (vhci->fd); +io_destroy (vhci->io);free (vhci); }
@@ -52,23 +51,21 @@ static void vhci_write_callback(const struct iovec *iov, int iovlen,struct vhci *vhci = user_data;ssize_t written; - written =writev (vhci->fd, iov, iovlen); + written =io_send (vhci->io, iov, iovlen);if (written <0 )return ; } -static void vhci_read_callback (int fd,uint32_t events,void *user_data) +static bool vhci_read_callback (struct io *io,void *user_data) {struct vhci *vhci = user_data; +int fd =io_get_fd (vhci->io);unsigned char buf[4096 ];ssize_t len; -if (events & (EPOLLERR |EPOLLHUP )) -return ; - - len =read (vhci->fd, buf,sizeof (buf)); + len =read (fd, buf,sizeof (buf));if (len <1 ) -return ; +return false;switch (buf[0 ]) {case BT_H4_CMD_PKT :
@@ -78,6 +75,8 @@ static void vhci_read_callback(int fd, uint32_t events, void *user_data)btdev_receive_h4 (vhci->btdev, buf, len);break ; } + +return true; } bool vhci_set_debug(struct vhci *vhci, vhci_debug_func_t callback,
@@ -105,19 +104,11 @@ struct vhci *vhci_open(uint8_t type)struct vhci *vhci;struct vhci_create_req req;struct vhci_create_rsp rsp; +int fd; - vhci =malloc (sizeof (*vhci)); -if (!vhci) -return NULL ; - -memset (vhci,0 ,sizeof (*vhci)); - vhci->type = type; - - vhci->fd =open ("/dev/vhci" ,O_RDWR |O_NONBLOCK ); -if (vhci->fd <0 ) { -free (vhci); + fd =open ("/dev/vhci" ,O_RDWR |O_NONBLOCK ); +if (fd <0 )return NULL ; - }memset (&req,0 ,sizeof (req)); req.pkt_type =HCI_VENDOR_PKT ;
@@ -131,34 +122,38 @@ struct vhci *vhci_open(uint8_t type)break ; } -if (write (vhci->fd, &req,sizeof (req)) <0 ) { -close (vhci->fd); -free (vhci); +if (write (fd, &req,sizeof (req)) <0 ) { +close (fd);return NULL ; }memset (&rsp,0 ,sizeof (rsp)); -if (read (vhci->fd, &rsp,sizeof (rsp)) <0 ) { -close (vhci->fd); -free (vhci); +if (read (fd, &rsp,sizeof (rsp)) <0 ) { +close (fd);return NULL ; } + vhci =malloc (sizeof (*vhci)); +if (!vhci) +return NULL ; + +memset (vhci,0 ,sizeof (*vhci)); + vhci->type = type; + vhci->io =io_new (fd); + +io_set_close_on_destroy (vhci->io, true); + vhci->btdev =btdev_create (type, rsp.index);if (!vhci->btdev) { -close (vhci->fd); -free (vhci); +vhci_destroy (vhci);return NULL ; }btdev_set_send_handler (vhci->btdev, vhci_write_callback, vhci); -if (mainloop_add_fd (vhci->fd,EPOLLIN , vhci_read_callback, - vhci, vhci_destroy) <0 ) { -btdev_destroy (vhci->btdev); -close (vhci->fd); -free (vhci); +if (!io_set_read_handler (vhci->io, vhci_read_callback, vhci,NULL )) { +vhci_destroy (vhci);return NULL ; }
@@ -170,7 +165,7 @@ void vhci_close(struct vhci *vhci)if (!vhci)return ; -mainloop_remove_fd (vhci->fd); +vhci_destroy (vhci); }struct btdev *vhci_get_btdev (struct vhci *vhci)
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 5/7 hciemu: Use vhci_open to instanciate a vhci btdev
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This makes use of vhci_open to isntanciate the vhci btdev since that has proper support for reading the index assigned to it.
--- Makefile.tools | 8 +++ android/Makefile.am | 2 + emulator/btdev.c | 8 ++- emulator/hciemu.c | 127 ++++++++++++++++++++++++++------------------ 4 files changed, 91 insertions(+), 54 deletions(-)
Makefile.tools +8 -0
@@ -115,6 +115,7 @@ tools_3dsp_LDADD = src/libshared-mainloop.la tools_mgmt_tester_SOURCES = tools/mgmt-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -123,6 +124,7 @@ tools_mgmt_tester_LDADD = lib/libbluetooth-internal.la \ tools_l2cap_tester_SOURCES = tools/l2cap-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -131,6 +133,7 @@ tools_l2cap_tester_LDADD = lib/libbluetooth-internal.la \ tools_rfcomm_tester_SOURCES = tools/rfcomm-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -139,6 +142,7 @@ tools_rfcomm_tester_LDADD = lib/libbluetooth-internal.la \ tools_bnep_tester_SOURCES = tools/bnep-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -147,6 +151,7 @@ tools_bnep_tester_LDADD = lib/libbluetooth-internal.la \ tools_smp_tester_SOURCES = tools/smp-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -155,6 +160,7 @@ tools_smp_tester_LDADD = lib/libbluetooth-internal.la \ tools_gap_tester_SOURCES = tools/gap-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -165,6 +171,7 @@ tools_gap_tester_LDADD = lib/libbluetooth-internal.la \ tools_sco_tester_SOURCES = tools/sco-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
@@ -176,6 +183,7 @@ tools_hci_tester_LDADD = src/libshared-glib.la $(GLIB_LIBS) tools_userchan_tester_SOURCES = tools/userchan-tester.c monitor/bt.h \ emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c
android/Makefile.am +2 -0
@@ -148,6 +148,7 @@ android_haltest_LDADD = -ldl -lm noinst_PROGRAMS += android/android-tester android_android_tester_SOURCES = emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c \
@@ -172,6 +173,7 @@ android_android_tester_LDFLAGS = $(AM_LDFLAGS) -pthread noinst_PROGRAMS += android/ipc-tester android_ipc_tester_SOURCES = emulator/hciemu.h emulator/hciemu.c \ + emulator/vhci.h emulator/vhci.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c \
emulator/btdev.c +7 -1
@@ -21,6 +21,8 @@#include <sys/uio.h> #include <stdint.h> #include <errno.h> +#include <fcntl.h> +#include <unistd.h> #include "lib/bluetooth.h" #include "lib/hci.h"
@@ -44,6 +46,8 @@#define ISO_HANDLE 257#define SCO_HANDLE 257 +#define DEBUGFS_PATH "/sys/kernel/debug/bluetooth" +struct hook {btdev_hook_func handler;void *user_data;
@@ -93,6 +97,7 @@ struct le_ext_adv {struct btdev {enum btdev_type type; +uint16_t id;struct queue *conns;
@@ -135,6 +140,7 @@ struct btdev {uint8_t le_features[8 ];uint8_t le_states[8 ];const struct btdev_cmd *cmds; +uint16_t msft_opcode;uint16_t default_link_policy;uint8_t event_mask[8 ];
@@ -6230,7 +6236,7 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id) } btdev->type = type; - + btdev->id = id; btdev->manufacturer =63 ; btdev->revision =0x0000 ;
emulator/hciemu.c +74 -53
247 lines not on this page · raw message
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 6/7 vhci: Add functions to interface with debugfs
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds functions that can be used to set debugfs options.
--- emulator/btdev.c | 23 +++++++++- emulator/btdev.h | 3 ++ emulator/vhci.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++ emulator/vhci.h | 5 +++ 4 files changed, 137 insertions(+), 2 deletions(-)
emulator/btdev.c +21 -2
@@ -46,8 +46,6 @@#define ISO_HANDLE 257#define SCO_HANDLE 257 -#define DEBUGFS_PATH "/sys/kernel/debug/bluetooth" -struct hook {btdev_hook_func handler;void *user_data;
@@ -141,6 +139,7 @@ struct btdev {uint8_t le_states[8 ];const struct btdev_cmd *cmds;uint16_t msft_opcode; +bool aosp_capable;uint16_t default_link_policy;uint8_t event_mask[8 ];
@@ -6677,3 +6676,23 @@ bool btdev_del_hook(struct btdev *btdev, enum btdev_hook_type type,return false; } + +int btdev_set_msft_opcode (struct btdev *btdev,uint16_t opcode) +{ +if (!btdev) +return -EINVAL ; + + btdev->msft_opcode = opcode; + +return 0 ; +} + +int btdev_set_aosp_capable (struct btdev *btdev,bool enable) +{ +if (!btdev) +return -EINVAL ; + + btdev->aosp_capable = enable; + +return 0 ; +}
emulator/btdev.h +3 -0
@@ -93,3 +93,6 @@ int btdev_add_hook(struct btdev *btdev, enum btdev_hook_type type,bool btdev_del_hook (struct btdev *btdev,enum btdev_hook_type type,uint16_t opcode); + +int btdev_set_msft_opcode (struct btdev *btdev,uint16_t opcode); +int btdev_set_aosp_capable (struct btdev *btdev,bool enable);
emulator/vhci.c +108 -0
131 lines not on this page · raw message
emulator/vhci.h +5 -0
@@ -22,3 +22,8 @@ struct vhci *vhci_open(uint8_t type);void vhci_close (struct vhci *vhci);struct btdev *vhci_get_btdev (struct vhci *vhci); + +int vhci_set_force_suspend (struct vhci *vhci,bool enable); +int vhci_set_force_wakeup (struct vhci *vhci,bool enable); +int vhci_set_msft_opcode (struct vhci *vhci,uint16_t opcode); +int vhci_set_aosp_capable (struct vhci *vhci,bool enable);
Signature · 1 line
2.31.1
Luiz Augusto von Dentz
maintainerPATCH 7/7 mgmt-tester: Make use of vhci_set_force_suspend/vhci_set_force_wakeup
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This replaces the direct setting debugfs to use vhci instance which properly stores the controller index so it can be used even if there are real controllers in the system.
--- emulator/hciemu.c | 8 ++++ emulator/hciemu.h | 1 + tools/mgmt-tester.c | 105 ++++++++++---------------------------------- 3 files changed, 33 insertions(+), 81 deletions(-)
emulator/hciemu.c +8 -0
@@ -234,6 +234,14 @@ static bool create_vhci(struct hciemu *hciemu)return true; } +struct vhci *hciemu_get_vhci (struct hciemu *hciemu) +{ +if (!hciemu) +return NULL ; + +return hciemu->vhci; +} +struct hciemu_client *hciemu_get_client (struct hciemu *hciemu,int num) {const struct queue_entry *entry;
emulator/hciemu.h +1 -0
@@ -45,6 +45,7 @@ typedef void (*hciemu_destroy_func_t)(void *user_data);bool hciemu_set_debug (struct hciemu *hciemu,hciemu_debug_func_t callback,void *user_data,hciemu_destroy_func_t destroy); +struct vhci *hciemu_get_vhci (struct hciemu *hciemu);struct bthost *hciemu_client_get_host (struct hciemu *hciemu);const char *hciemu_get_address (struct hciemu *hciemu);
tools/mgmt-tester.c +24 -81
197 lines not on this page · raw message
Signature · 1 line
2.31.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=563859
---Test result---
Test Summary:
CheckPatch FAIL 4.45 seconds GitLint FAIL 2.34 seconds Prep - Setup ELL PASS 56.30 seconds Build - Prep PASS 0.25 seconds Build - Configure PASS 10.00 seconds Build - Make PASS 238.32 seconds Make Check PASS 9.34 seconds Make Distcheck PASS 279.48 seconds Build w/ext ELL - Configure PASS 10.29 seconds Build w/ext ELL - Make PASS 226.33 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ,1/7] monitor: Add packet definitions for MSFT extension WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #101: FILE: monitor/msft.h:31:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #109: FILE: monitor/msft.h:39:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #120: FILE: monitor/msft.h:50:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #125: FILE: monitor/msft.h:55:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #132: FILE: monitor/msft.h:62:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #137: FILE: monitor/msft.h:67:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #146: FILE: monitor/msft.h:76:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #151: FILE: monitor/msft.h:81:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #160: FILE: monitor/msft.h:90:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #164: FILE: monitor/msft.h:94:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #170: FILE: monitor/msft.h:100:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #180: FILE: monitor/msft.h:110:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #186: FILE: monitor/msft.h:116:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #193: FILE: monitor/msft.h:123:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #198: FILE: monitor/msft.h:128:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #205: FILE: monitor/msft.h:135:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #210: FILE: monitor/msft.h:140:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #217: FILE: monitor/msft.h:147:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #224: FILE: monitor/msft.h:154:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #233: FILE: monitor/msft.h:163:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #243: FILE: monitor/msft.h:173:
+} __attribute__((packed));
/github/workspace/src/12560019.patch total: 0 errors, 21 warnings, 154 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12560019.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[BlueZ,3/7] vhci: Read the controller index WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #173: FILE: emulator/vhci.c:95:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) #179: FILE: emulator/vhci.c:101:
+} __attribute__((packed));
/github/workspace/src/12560021.patch total: 0 errors, 2 warnings, 172 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12560021.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[BlueZ,5/7] hciemu: Use vhci_open to instanciate a vhci btdev WARNING:TYPO_SPELLING: 'instanciate' may be misspelled - perhaps 'instantiate'? #72:
Subject: [PATCH BlueZ 5/7] hciemu: Use vhci_open to instanciate a vhci btdev
^^^^^^^^^^^
/github/workspace/src/12560027.patch total: 0 errors, 1 warnings, 355 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12560027.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ,7/7] mgmt-tester: Make use of vhci_set_force_suspend/vhci_set_force_wakeup
1: T1 Title exceeds max length (81>80): "[BlueZ,7/7] mgmt-tester: Make use of vhci_set_force_suspend/vhci_set_force_wakeup"
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi Tedd, Manish,
Quoted 8 lines · On Thu, Oct 14, 2021 at 10:36 PM <[email protected]> wrote:
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=563859
Do you guys have any comments on this set? Id like to push it but I haven't been able to validate if the PDU definitions, etc, are set properly.
Quoted 170 lines
---Test result---
Test Summary:
CheckPatch FAIL 4.45 seconds GitLint FAIL 2.34 seconds Prep - Setup ELL PASS 56.30 seconds Build - Prep PASS 0.25 seconds Build - Configure PASS 10.00 seconds Build - Make PASS 238.32 seconds Make Check PASS 9.34 seconds Make Distcheck PASS 279.48 seconds Build w/ext ELL - Configure PASS 10.29 seconds Build w/ext ELL - Make PASS 226.33 secondsDetails
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ,1/7] monitor: Add packet definitions for MSFT extension WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer__packedover __attribute__((packed)) #101: FILE:monitor/msft.h:31:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #109: FILE:monitor/msft.h:39:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #120: FILE:monitor/msft.h:50:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #125: FILE:monitor/msft.h:55:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #132: FILE:monitor/msft.h:62:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #137: FILE:monitor/msft.h:67:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #146: FILE:monitor/msft.h:76:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #151: FILE:monitor/msft.h:81:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #160: FILE:monitor/msft.h:90:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #164: FILE:monitor/msft.h:94:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #170: FILE:monitor/msft.h:100:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #180: FILE:monitor/msft.h:110:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #186: FILE:monitor/msft.h:116:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #193: FILE:monitor/msft.h:123:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #198: FILE:monitor/msft.h:128:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #205: FILE:monitor/msft.h:135:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #210: FILE:monitor/msft.h:140:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #217: FILE:monitor/msft.h:147:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #224: FILE:monitor/msft.h:154:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #233: FILE:monitor/msft.h:163:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #243: FILE:monitor/msft.h:173:
+} __attribute__((packed));/github/workspace/src/12560019.patch total: 0 errors, 21 warnings, 154 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace./github/workspace/src/12560019.patch has style problems, please review.
NOTE: Ignored message types:
COMMIT_MESSAGECOMPLEX_MACROCONST_STRUCTFILE_PATH_CHANGESMISSING_SIGN_OFFPREFER_PACKEDSPDX_LICENSE_TAGSPLIT_STRINGSSCANF_TO_KSTRTONOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH inMAINTAINERS.[BlueZ,3/7] vhci: Read the controller index WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #173: FILE:emulator/vhci.c:95:
+} __attribute__((packed));WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer
__packedover __attribute__((packed)) #179: FILE:emulator/vhci.c:101:
+} __attribute__((packed));/github/workspace/src/12560021.patch total: 0 errors, 2 warnings, 172 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace./github/workspace/src/12560021.patch has style problems, please review.
NOTE: Ignored message types:
COMMIT_MESSAGECOMPLEX_MACROCONST_STRUCTFILE_PATH_CHANGESMISSING_SIGN_OFFPREFER_PACKEDSPDX_LICENSE_TAGSPLIT_STRINGSSCANF_TO_KSTRTONOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH inMAINTAINERS.[BlueZ,5/7] hciemu: Use
vhci_opento instanciate a vhci btdev WARNING:TYPO_SPELLING: 'instanciate' may be misspelled - perhaps 'instantiate'? #72:
Subject: [PATCH BlueZ 5/7] hciemu: Usevhci_opento instanciate a vhci btdev^^^^^^^^^^^/github/workspace/src/12560027.patch total: 0 errors, 1 warnings, 355 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace./github/workspace/src/12560027.patch has style problems, please review.
NOTE: Ignored message types:
COMMIT_MESSAGECOMPLEX_MACROCONST_STRUCTFILE_PATH_CHANGESMISSING_SIGN_OFFPREFER_PACKEDSPDX_LICENSE_TAGSPLIT_STRINGSSCANF_TO_KSTRTONOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH inMAINTAINERS.##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ,7/7] mgmt-tester: Make use of vhci_set_force_suspend/vhci_set_force_wakeup
1: T1 Title exceeds max length (81>80): "[BlueZ,7/7] mgmt-tester: Make use of vhci_set_force_suspend/vhci_set_force_wakeup"---
Regards,
Linux Bluetooth
Signature · 1 line
Luiz Augusto von Dentz
A message that is not in the archive (sent off-list or not yet received): CAGPPCLDFYFeiwfiyRX=6PquYYQ-Fp_LpN4Gw2745jyWzQKEBRQ@mail.gmail.com
Luiz Augusto von Dentz
maintainerHi Manish,
Quoted 98 lines · Manish Mandlik
Hi Luiz,
Quoted 58 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
This adds proper packet definitions for command and response of MSFT extension.
--- monitor/msft.h | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+)monitor/msft.h +41
-0@@ -24,6 +24,154 @@#include <stdint.h> +#define MSFT_SUBCMD_READ_SUPPORTED_FEATURES 0x00 + +struct msft_cmd_read_supported_features { +uint8_t subcmd; +} __attribute__((packed)); + +struct msft_rsp_read_supported_features { +uint8_t status; +uint8_t subcmd; +uint8_t features[8 ]; +uint8_t evt_prefix_len; +uint8_t evt_prefix[]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_MONITOR_RSSI 0x01 + +struct msft_cmd_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +int8_t rssi_high; +int8_t rssi_low; +uint8_t rssi_low_interval; +uint8_t rssi_period; +} __attribute__((packed)); + +struct msft_rsp_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_CANCEL_MONITOR_RSSI 0x02 + +struct msft_cmd_cancel_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_cancel_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed));monitor/msft.h line 77
Quoted 10 lines
monitor/msft.h +10
-0+ +#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03 + +struct msft_le_monitor_pattern { +uint8_t len; +uint8_t type; +uint8_t start; +uint8_t data[]; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_PATTERN0x01monitor/msft.h line 82
Quoted 6 lines
monitor/msft.h +5
-0+struct msft_le_monitor_adv_pattern_type { +uint8_t num_patterns; +struct msft_le_monitor_pattern data[]; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_UUID0x02monitor/msft.h line 91
Quoted 10 lines
monitor/msft.h +9
-0+struct msft_le_monitor_adv_uuid_type { +uint8_t type; +union { +uint16_t u16; +uint32_t u32; +uint8_t u128[8 ]; + } value; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_IRK0x03Quoted 1 line
Quoted 8 lines
monitor/msft.h line 96
Quoted 5 lines
monitor/msft.h +5
-0+struct msft_le_monitor_adv_irk_type { +uint8_t irk[8 ]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ADDR 0x04I think this is not a subcommand. Instead, it is a condition type. So we can rename this to something else, e.g.
MSFT_COND_LE_MONITOR_ADV_ADDR.
Similarly, we'll have to define other three condition types as well formsft_le_monitor_adv_pattern_type,msft_le_monitor_adv_uuid_typeandmsft_le_monitor_adv_irk_typeas mentioned above.
Right I will fix it since the intent was to have it as conditions, thanks for reviewing.
Quoted 54 lines
monitor/msft.h line 105
Quoted 9 lines
monitor/msft.h +9
-0+struct msft_le_monitor_adv_addr { +uint8_t type; +uint8_t addr[6 ]; +} __attribute__((packed)); + +struct msft_cmd_le_monitor_adv { +uint8_t subcmd; +int8_t rssi_low; +int8_t rssi_high;Order should be:
(quoted diff) +2
-0+ int8_t rssi_high; + int8_t rssi_low;Quoted 41 lines
monitor/msft.h +40
-0+uint8_t rssi_low_interval; +uint8_t rssi_period; +uint8_t type; +uint8_t data[]; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv { +uint8_t status; +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_CANCEL_MONITOR_ADV 0x04 + +struct msft_cmd_le_cancel_monitor_adv { +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +struct msft_rsp_le_cancel_monitor_adv { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ENABLE 0x05 + +struct msft_cmd_le_monitor_adv_enable { +uint8_t subcmd; +uint8_t enable; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv_enable { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_READ_ABS_RSSI 0x06 + +struct msft_cmd_read_abs_rssi { +uint8_t subcmd;
Quoted 8 lines
monitor/msft.h line 153
Quoted 8 lines
monitor/msft.h +8
-0+uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_read_abs_rssi { +uint8_t status; +uint8_t subcmd; +uint16_t handle; +uint8_t rssi;
Ack.
Quoted 13 lines
'
int8_trssi' instead of 'uint8_trssi'monitor/msft.h line 162
Quoted 9 lines
monitor/msft.h +9
-0+} __attribute__((packed)); + +#define MSFT_SUBEVT_RSSI 0x01 + +struct msft_evt_rssi { +uint8_t subevt; +uint8_t status; +uint16_t handle; +uint8_t rssi;same as above - '
int8_trssi' instead of 'uint8_trssi'
Ack.
Quoted 24 lines
Quoted 17 lines
monitor/msft.h +12
-1+} __attribute__((packed)); + +#define MSFT_SUBEVT_MONITOR_DEVICE 0x02 + +struct msft_evt_monitor_device { +uint8_t subevt; +uint8_t addr_type; +uint8_t addr[6 ]; +uint8_t handle; +uint8_t state; +} __attribute__((packed)); +struct vendor_ocf ;struct vendor_evt ; --Quoted 2 lines
2.31.1
Rest of the changes look good to me.
Thanks,
Manish.
Signature · 1 line
Luiz Augusto von Dentz
Luiz Augusto von Dentz
maintainerHi,
Quoted 217 lines · Luiz Augusto von Dentz
Hi Manish,
Quoted 98 lines · Manish Mandlik
Hi Luiz,
Quoted 58 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
This adds proper packet definitions for command and response of MSFT extension.
--- monitor/msft.h | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+)monitor/msft.h +41
-0@@ -24,6 +24,154 @@#include <stdint.h> +#define MSFT_SUBCMD_READ_SUPPORTED_FEATURES 0x00 + +struct msft_cmd_read_supported_features { +uint8_t subcmd; +} __attribute__((packed)); + +struct msft_rsp_read_supported_features { +uint8_t status; +uint8_t subcmd; +uint8_t features[8 ]; +uint8_t evt_prefix_len; +uint8_t evt_prefix[]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_MONITOR_RSSI 0x01 + +struct msft_cmd_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +int8_t rssi_high; +int8_t rssi_low; +uint8_t rssi_low_interval; +uint8_t rssi_period; +} __attribute__((packed)); + +struct msft_rsp_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_CANCEL_MONITOR_RSSI 0x02 + +struct msft_cmd_cancel_monitor_rssi { +uint8_t subcmd; +uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_cancel_monitor_rssi { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed));monitor/msft.h line 77
Quoted 10 lines
monitor/msft.h +10
-0+ +#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03 + +struct msft_le_monitor_pattern { +uint8_t len; +uint8_t type; +uint8_t start; +uint8_t data[]; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_PATTERN0x01monitor/msft.h line 82
Quoted 6 lines
monitor/msft.h +5
-0+struct msft_le_monitor_adv_pattern_type { +uint8_t num_patterns; +struct msft_le_monitor_pattern data[]; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_UUID0x02monitor/msft.h line 91
Quoted 10 lines
monitor/msft.h +9
-0+struct msft_le_monitor_adv_uuid_type { +uint8_t type; +union { +uint16_t u16; +uint32_t u32; +uint8_t u128[8 ]; + } value; +} __attribute__((packed)); ++ #define
MSFT_COND_LE_MONITOR_ADV_IRK0x03Quoted 1 line
Quoted 8 lines
monitor/msft.h line 96
Quoted 5 lines
monitor/msft.h +5
-0+struct msft_le_monitor_adv_irk_type { +uint8_t irk[8 ]; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ADDR 0x04I think this is not a subcommand. Instead, it is a condition type. So we can rename this to something else, e.g.
MSFT_COND_LE_MONITOR_ADV_ADDR.
Similarly, we'll have to define other three condition types as well formsft_le_monitor_adv_pattern_type,msft_le_monitor_adv_uuid_typeandmsft_le_monitor_adv_irk_typeas mentioned above.Right I will fix it since the intent was to have it as conditions, thanks for reviewing.
Quoted 54 lines
monitor/msft.h line 105
Quoted 9 lines
monitor/msft.h +9
-0+struct msft_le_monitor_adv_addr { +uint8_t type; +uint8_t addr[6 ]; +} __attribute__((packed)); + +struct msft_cmd_le_monitor_adv { +uint8_t subcmd; +int8_t rssi_low; +int8_t rssi_high;Order should be:
(quoted diff) +2
-0+ int8_t rssi_high; + int8_t rssi_low;Quoted 41 lines
monitor/msft.h +40
-0+uint8_t rssi_low_interval; +uint8_t rssi_period; +uint8_t type; +uint8_t data[]; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv { +uint8_t status; +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_CANCEL_MONITOR_ADV 0x04 + +struct msft_cmd_le_cancel_monitor_adv { +uint8_t subcmd; +uint8_t handle; +} __attribute__((packed)); + +struct msft_rsp_le_cancel_monitor_adv { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_LE_MONITOR_ADV_ENABLE 0x05 + +struct msft_cmd_le_monitor_adv_enable { +uint8_t subcmd; +uint8_t enable; +} __attribute__((packed)); + +struct msft_rsp_le_monitor_adv_enable { +uint8_t status; +uint8_t subcmd; +} __attribute__((packed)); + +#define MSFT_SUBCMD_READ_ABS_RSSI 0x06 + +struct msft_cmd_read_abs_rssi { +uint8_t subcmd;Quoted 8 lines
monitor/msft.h line 153
Quoted 8 lines
monitor/msft.h +8
-0+uint16_t handle; +} __attribute__((packed)); + +struct msft_rsp_read_abs_rssi { +uint8_t status; +uint8_t subcmd; +uint16_t handle; +uint8_t rssi;Ack.
Quoted 13 lines
'
int8_trssi' instead of 'uint8_trssi'monitor/msft.h line 162
Quoted 9 lines
monitor/msft.h +9
-0+} __attribute__((packed)); + +#define MSFT_SUBEVT_RSSI 0x01 + +struct msft_evt_rssi { +uint8_t subevt; +uint8_t status; +uint16_t handle; +uint8_t rssi;same as above - '
int8_trssi' instead of 'uint8_trssi'Ack.
Quoted 22 lines
Quoted 17 lines
monitor/msft.h +12
-1+} __attribute__((packed)); + +#define MSFT_SUBEVT_MONITOR_DEVICE 0x02 + +struct msft_evt_monitor_device { +uint8_t subevt; +uint8_t addr_type; +uint8_t addr[6 ]; +uint8_t handle; +uint8_t state; +} __attribute__((packed)); +struct vendor_ocf ;struct vendor_evt ; --Quoted 2 lines
2.31.1
Rest of the changes look good to me.
Quoted 7 lines
Quoted 2 lines
Thanks,
Manish.--
Luiz Augusto von Dentz
Pushed after making the suggested changes.
Signature · 1 line
Luiz Augusto von Dentz