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

Commit d37981d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reference the chipset capability in LE_Set_Data_Length" am: 304016ff 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1675765

Change-Id: I9d89c0bd8e0b99c6abad4e9297884e3bbcc94034
parents 0d01019f 304016ff

system/device/include/controller.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ typedef struct controller_t { 


  uint16_t (*get_ble_default_data_packet_length)(void);

  uint16_t (*get_ble_maximum_tx_data_length)(void);

  uint16_t (*get_ble_maximum_tx_time)(void);

  uint16_t (*get_ble_maxium_advertising_data_length)(void);

  uint8_t (*get_ble_number_of_supported_advertising_sets)(void);

  uint8_t (*get_ble_periodic_advertiser_list_size)(void);

system/device/src/controller.cc

+7 −0
Original line number Diff line number Diff line
@@ -665,6 +665,12 @@ static uint16_t get_ble_maximum_tx_data_length(void) { 
  return ble_supported_max_tx_octets;

}



static uint16_t get_ble_maximum_tx_time(void) {

  CHECK(readable);

  CHECK(ble_supported);

  return ble_supported_max_tx_time;

}



static uint16_t get_ble_maxium_advertising_data_length(void) {

  CHECK(readable);

  CHECK(ble_supported);
@@ -799,6 +805,7 @@ static const controller_t interface = { 


    get_ble_suggested_default_data_length,

    get_ble_maximum_tx_data_length,

    get_ble_maximum_tx_time,

    get_ble_maxium_advertising_data_length,

    get_ble_number_of_supported_advertising_sets,

    get_ble_periodic_advertiser_list_size,

system/gd/hci/controller_test.cc

+2 −0
Original line number Diff line number Diff line
@@ -307,7 +307,9 @@ TEST_F(ControllerTest, read_controller_info) { 
  ASSERT_EQ(controller_->GetLeBufferSize().total_num_le_packets_, 0x08);

  ASSERT_EQ(controller_->GetLeSupportedStates(), 0x001f123456789abe);

  ASSERT_EQ(controller_->GetLeMaximumDataLength().supported_max_tx_octets_, 0x12);

  ASSERT_EQ(controller_->GetLeMaximumDataLength().supported_max_tx_time_, 0x34);

  ASSERT_EQ(controller_->GetLeMaximumDataLength().supported_max_rx_octets_, 0x56);

  ASSERT_EQ(controller_->GetLeMaximumDataLength().supported_max_rx_time_, 0x78);

  ASSERT_EQ(controller_->GetLeMaximumAdvertisingDataLength(), 0x0672);

  ASSERT_EQ(controller_->GetLeNumberOfSupportedAdverisingSets(), 0xF0);

}

system/gd/rust/shim/src/bridge.rs

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ pub mod ffi { 
        fn controller_get_iso_buffer_length(c: &Controller) -> u16;

        fn controller_get_le_suggested_default_data_length(c: &Controller) -> u16;

        fn controller_get_le_maximum_tx_data_length(c: &Controller) -> u16;

        fn controller_get_le_maximum_tx_time(c: &Controller) -> u16;

        fn controller_get_le_max_advertising_data_length(c: &Controller) -> u16;

        fn controller_get_le_supported_advertising_sets(c: &Controller) -> u8;

        fn controller_get_le_periodic_advertiser_list_size(c: &Controller) -> u8;

system/gd/rust/shim/src/controller.rs

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ pub fn controller_get_le_maximum_tx_data_length(c: &Controller) -> u16 { 
    c.le_max_data_length.supported_max_tx_octets

}



pub fn controller_get_le_maximum_tx_time(c: &Controller) -> u16 {

    c.le_max_data_length.supported_max_tx_time

}



pub fn controller_get_address(c: &Controller) -> String {

    c.address.to_string()

}