Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1bbc76 authored by Lakshmipathi K's avatar Lakshmipathi K Committed by android-build-merger
Browse files

LE Periodic Advertising - advertiser interface am: 3a3e2ef5 

am: 4a7730e0

Change-Id: Ic58562c45d8f9336664afb6d143b94ae90c40c2b
parents efdd5424 4a7730e0

system/stack/btm/ble_advertiser_hci_interface.cc

+86 −0
Original line number Diff line number Diff line
@@ -203,6 +203,24 @@ class BleAdvertiserVscHciInterfaceImpl : public BleAdvertiserHciInterface { 
               command_complete);

  }



  void SetPeriodicAdvertisingParameters(uint8_t, uint16_t, uint16_t, uint16_t,

                                        status_cb command_complete) override {

    LOG(INFO) << __func__ << " VSC can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }



  void SetPeriodicAdvertisingData(uint8_t, uint8_t, uint8_t, uint8_t*,

                                  status_cb command_complete) override {

    LOG(INFO) << __func__ << " VSC can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }



  void SetPeriodicAdvertisingEnable(uint8_t, uint8_t,

                                    status_cb command_complete) override {

    LOG(INFO) << __func__ << " VSC can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }



  bool QuirkAdvertiserZeroHandle() override {

    // Android BT HCI Requirements version 0.96 and below specify that handle 0

    // is equal to standard HCI interface, and should be accessed using non-VSC
@@ -368,6 +386,24 @@ class BleAdvertiserLegacyHciInterfaceImpl : public BleAdvertiserHciInterface { 
    SendAdvCmd(FROM_HERE, HCI_BLE_WRITE_ADV_ENABLE, param,

               HCIC_PARAM_SIZE_WRITE_ADV_ENABLE, command_complete);

  }



  void SetPeriodicAdvertisingParameters(uint8_t, uint16_t, uint16_t, uint16_t,

                                        status_cb command_complete) override {

    LOG(INFO) << __func__ << "Legacy can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }



  void SetPeriodicAdvertisingData(uint8_t, uint8_t, uint8_t, uint8_t*,

                                  status_cb command_complete) override {

    LOG(INFO) << __func__ << "Legacy can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }



  void SetPeriodicAdvertisingEnable(uint8_t, uint8_t,

                                    status_cb command_complete) override {

    LOG(INFO) << __func__ << "Legacy can't do periodic advertising";

    command_complete.Run(HCI_ERR_ILLEGAL_COMMAND);

  }

};



class BleAdvertiserHciExtendedImpl : public BleAdvertiserHciInterface {
@@ -505,6 +541,56 @@ class BleAdvertiserHciExtendedImpl : public BleAdvertiserHciInterface { 
               command_complete);

  }



  void SetPeriodicAdvertisingParameters(uint8_t handle,

                                        uint16_t periodic_adv_int_min,

                                        uint16_t periodic_adv_int_max,

                                        uint16_t periodic_properties,

                                        status_cb command_complete) override {

    VLOG(1) << __func__;

    const uint16_t HCI_LE_SET_PRIODIC_ADVERTISING_PARAM_LEN = 7;

    uint8_t param[HCI_LE_SET_PRIODIC_ADVERTISING_PARAM_LEN];

    memset(param, 0, HCI_LE_SET_PRIODIC_ADVERTISING_PARAM_LEN);



    uint8_t* pp = param;

    UINT8_TO_STREAM(pp, handle);

    UINT16_TO_STREAM(pp, periodic_properties);

    UINT16_TO_STREAM(pp, periodic_adv_int_min);

    UINT16_TO_STREAM(pp, periodic_adv_int_max);



    SendAdvCmd(FROM_HERE, HCI_LE_SET_PERIODIC_ADVERTISING_PARAM, param,

               HCI_LE_SET_PRIODIC_ADVERTISING_PARAM_LEN, command_complete);

  }



  void SetPeriodicAdvertisingData(uint8_t handle, uint8_t operation,

                                  uint8_t adv_data_length, uint8_t* adv_data,

                                  status_cb command_complete) override {

    VLOG(1) << __func__;

    const uint16_t HCI_LE_SET_PRIODIC_ADVERTISING_DATA_LEN =

        3 + adv_data_length;

    uint8_t param[HCI_LE_SET_PRIODIC_ADVERTISING_DATA_LEN];

    memset(param, 0, HCI_LE_SET_PRIODIC_ADVERTISING_DATA_LEN);

    uint8_t* pp = param;

    UINT8_TO_STREAM(pp, handle);

    UINT8_TO_STREAM(pp, operation);

    UINT8_TO_STREAM(pp, adv_data_length);

    ARRAY_TO_STREAM(pp, adv_data, adv_data_length);

    SendAdvCmd(FROM_HERE, HCI_LE_SET_PERIODIC_ADVERTISING_DATA, param,

               HCI_LE_SET_PRIODIC_ADVERTISING_DATA_LEN, command_complete);

  }



  void SetPeriodicAdvertisingEnable(uint8_t enable, uint8_t handle,

                                    status_cb command_complete) override {

    VLOG(1) << __func__;

    const uint16_t HCI_LE_ENABLE_PRIODIC_ADVERTISEMENT_LEN = 2;

    uint8_t param[HCI_LE_ENABLE_PRIODIC_ADVERTISEMENT_LEN];

    memset(param, 0, HCI_LE_ENABLE_PRIODIC_ADVERTISEMENT_LEN);

    uint8_t* pp = param;

    UINT8_TO_STREAM(pp, enable);

    UINT8_TO_STREAM(pp, handle);

    SendAdvCmd(FROM_HERE, HCI_LE_SET_PERIODIC_ADVERTISING_ENABLE, param,

               HCI_LE_ENABLE_PRIODIC_ADVERTISEMENT_LEN, command_complete);

  }



 public:

  void OnAdvertisingSetTerminated(uint8_t length, uint8_t* p) {

    VLOG(1) << __func__;

system/stack/btm/ble_advertiser_hci_interface.h

+11 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ class BleAdvertiserHciInterface { 
  virtual void Enable(uint8_t enable, uint8_t handle, uint16_t duration,

                      uint8_t max_extended_advertising_events,

                      status_cb command_complete) = 0;

  virtual void SetPeriodicAdvertisingParameters(uint8_t handle,

                                                uint16_t periodic_adv_int_min,

                                                uint16_t periodic_adv_int_max,

                                                uint16_t periodic_properties,

                                                status_cb command_complete) = 0;

  virtual void SetPeriodicAdvertisingData(uint8_t handle, uint8_t operation,

                                          uint8_t adv_data_length,

                                          uint8_t* adv_data,

                                          status_cb command_complete) = 0;

  virtual void SetPeriodicAdvertisingEnable(uint8_t enable, uint8_t handle,

                                            status_cb command_complete) = 0;



  // Some implementation don't behave well when handle value 0 is used.

  virtual bool QuirkAdvertiserZeroHandle() { return 0; }

system/stack/include/hcidefs.h

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ 
#define HCI_LE_READ_MAXIMUM_ADVERTISING_DATA_LENGTH (0x003A | HCI_GRP_BLE_CMDS)

#define HCI_LE_READ_NUMBER_OF_SUPPORTED_ADVERTISING_SETS \

  (0x003B | HCI_GRP_BLE_CMDS)

#define HCI_LE_REMOVE_ADVERTISING_SET (0x003C | HCI_GRP_BLE_CMDS)

#define HCI_LE_CLEAR_ADVERTISING_SETS (0x003D | HCI_GRP_BLE_CMDS)

#define HCI_LE_SET_PERIODIC_ADVERTISING_PARAM (0x003E | HCI_GRP_BLE_CMDS)

#define HCI_LE_SET_PERIODIC_ADVERTISING_DATA (0x003F | HCI_GRP_BLE_CMDS)

#define HCI_LE_SET_PERIODIC_ADVERTISING_ENABLE (0x0040 | HCI_GRP_BLE_CMDS)

#define HCI_LE_SET_EXTENDED_SCAN_PARAMETERS (0x0041 | HCI_GRP_BLE_CMDS)

#define HCI_LE_SET_EXTENDED_SCAN_ENABLE (0x0042 | HCI_GRP_BLE_CMDS)

#define HCI_LE_EXTENDED_CREATE_CONNECTION (0x0043 | HCI_GRP_BLE_CMDS)

system/stack/test/ble_advertiser_test.cc

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ class AdvertiserHciMock : public BleAdvertiserHciInterface { 
               void(uint8_t, uint8_t, uint8_t, uint8_t, uint8_t*, status_cb));

  MOCK_METHOD3(SetRandomAddress, void(uint8_t, BD_ADDR, status_cb));

  MOCK_METHOD5(Enable, void(uint8_t, uint8_t, uint16_t, uint8_t, status_cb));

  MOCK_METHOD5(SetPeriodicAdvertisingParameters,

               void(uint8_t, uint16_t, uint16_t, uint16_t, status_cb));

  MOCK_METHOD5(SetPeriodicAdvertisingData,

               void(uint8_t, uint8_t, uint8_t, uint8_t*, status_cb));

  MOCK_METHOD3(SetPeriodicAdvertisingEnable, void(uint8_t, uint8_t, status_cb));



  MOCK_METHOD9(SetParameters1,

               void(uint8_t, uint16_t, uint32_t, uint32_t, uint8_t, uint8_t,