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

Commit 489ef4ce authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "HCI: Add deprecated PARK commands to PDL" am: 00b51e33 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2621429



Change-Id: Ie3bcc5896c7678cfa54ce49eb47b16abdc3d2dba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50a5243b 00b51e33

system/gd/hci/controller.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -751,6 +751,8 @@ struct Controller::impl { 
      OP_CODE_MAPPING(HOLD_MODE)

      OP_CODE_MAPPING(HOLD_MODE)

      OP_CODE_MAPPING(SNIFF_MODE)

      OP_CODE_MAPPING(SNIFF_MODE)

      OP_CODE_MAPPING(EXIT_SNIFF_MODE)

      OP_CODE_MAPPING(EXIT_SNIFF_MODE)

      OP_CODE_MAPPING(PARK_STATE)

      OP_CODE_MAPPING(EXIT_PARK_STATE)

      OP_CODE_MAPPING(QOS_SETUP)

      OP_CODE_MAPPING(QOS_SETUP)

      OP_CODE_MAPPING(ROLE_DISCOVERY)

      OP_CODE_MAPPING(ROLE_DISCOVERY)

      OP_CODE_MAPPING(SWITCH_ROLE)

      OP_CODE_MAPPING(SWITCH_ROLE)

system/gd/hci/hci_packets.pdl

+24 −1
Original line number Original line Diff line number Diff line
@@ -163,6 +163,8 @@ enum OpCode : 16 { 
  HOLD_MODE = 0x0801,

  HOLD_MODE = 0x0801,

  SNIFF_MODE = 0x0803,

  SNIFF_MODE = 0x0803,

  EXIT_SNIFF_MODE = 0x0804,

  EXIT_SNIFF_MODE = 0x0804,

  PARK_STATE = 0x0805,

  EXIT_PARK_STATE = 0x0806,

  QOS_SETUP = 0x0807,

  QOS_SETUP = 0x0807,

  ROLE_DISCOVERY = 0x0809,

  ROLE_DISCOVERY = 0x0809,

  SWITCH_ROLE = 0x080B,

  SWITCH_ROLE = 0x080B,
@@ -477,6 +479,8 @@ enum OpCodeIndex : 16 { 
  HOLD_MODE = 41,

  HOLD_MODE = 41,

  SNIFF_MODE = 42,

  SNIFF_MODE = 42,

  EXIT_SNIFF_MODE = 43,

  EXIT_SNIFF_MODE = 43,

  PARK_STATE = 44,

  EXIT_PARK_STATE = 45,

  QOS_SETUP = 46,

  QOS_SETUP = 46,

  ROLE_DISCOVERY = 47,

  ROLE_DISCOVERY = 47,

  SWITCH_ROLE = 50,

  SWITCH_ROLE = 50,
@@ -1608,7 +1612,6 @@ packet HoldMode : ConnectionManagementCommand (op_code = HOLD_MODE) { 
packet HoldModeStatus : CommandStatus (command_op_code = HOLD_MODE) {

packet HoldModeStatus : CommandStatus (command_op_code = HOLD_MODE) {

}

}







packet SniffMode : ConnectionManagementCommand (op_code = SNIFF_MODE) {

packet SniffMode : ConnectionManagementCommand (op_code = SNIFF_MODE) {

  connection_handle : 12,

  connection_handle : 12,

  _reserved_ : 4,

  _reserved_ : 4,
@@ -1630,6 +1633,26 @@ packet ExitSniffMode : ConnectionManagementCommand (op_code = EXIT_SNIFF_MODE) { 
packet ExitSniffModeStatus : CommandStatus (command_op_code = EXIT_SNIFF_MODE) {

packet ExitSniffModeStatus : CommandStatus (command_op_code = EXIT_SNIFF_MODE) {

}

}





// ParkState and ExitParkState are deprecated

packet ParkState : ConnectionManagementCommand (op_code = PARK_STATE) {

  connection_handle : 12,

  _reserved_ : 4,

  beacon_max_interval: 16, // 0x000E-0x1000 (8.75ms-40.9s)

  beacon_min_interval: 16, // 0x000E-0x1000 (8.75ms-40.9s)

}



packet ParkStateStatus : CommandStatus (command_op_code = PARK_STATE) {

}





packet ExitParkState : ConnectionManagementCommand (op_code = EXIT_PARK_STATE) {

  connection_handle : 12,

  _reserved_ : 4,

}



packet ExitParkStateStatus : CommandStatus (command_op_code = EXIT_PARK_STATE) {

}



enum ServiceType : 8 {

enum ServiceType : 8 {

  NO_TRAFFIC = 0x00,

  NO_TRAFFIC = 0x00,

  BEST_EFFORT = 0x01,

  BEST_EFFORT = 0x01,