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

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

Merge "HCI: Add OobExtendedDataRequestReply" am: 14c83f0b am: 2d0e21d6 am: 1540661d 

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

Change-Id: Iae9a850f2fb1542b9f8af4953da781decab84aea
parents f17dc56a 1540661d

system/gd/hci/controller.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -642,6 +642,7 @@ struct Controller::impl { 
      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(SEND_KEYPRESS_NOTIFICATION)

      OP_CODE_MAPPING(SEND_KEYPRESS_NOTIFICATION)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY)

      OP_CODE_MAPPING(READ_ENCRYPTION_KEY_SIZE)

      OP_CODE_MAPPING(READ_ENCRYPTION_KEY_SIZE)

      OP_CODE_MAPPING(READ_DATA_BLOCK_SIZE)

      OP_CODE_MAPPING(READ_DATA_BLOCK_SIZE)

      OP_CODE_MAPPING(READ_LE_HOST_SUPPORT)

      OP_CODE_MAPPING(READ_LE_HOST_SUPPORT)

system/gd/hci/hci_packets.pdl

+15 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,7 @@ enum OpCode : 16 { 
  IO_CAPABILITY_REQUEST_NEGATIVE_REPLY = 0x0434,

  IO_CAPABILITY_REQUEST_NEGATIVE_REPLY = 0x0434,

  ENHANCED_SETUP_SYNCHRONOUS_CONNECTION = 0x043D,

  ENHANCED_SETUP_SYNCHRONOUS_CONNECTION = 0x043D,

  ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION = 0x043E,

  ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION = 0x043E,

  REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY = 0x0445,





  // LINK_POLICY

  // LINK_POLICY

  HOLD_MODE = 0x0801,

  HOLD_MODE = 0x0801,
@@ -523,6 +524,7 @@ enum OpCodeIndex : 16 { 
  ENHANCED_SETUP_SYNCHRONOUS_CONNECTION = 293,

  ENHANCED_SETUP_SYNCHRONOUS_CONNECTION = 293,

  ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION = 294,

  ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION = 294,

  READ_LOCAL_SUPPORTED_CODECS_V1 = 295,

  READ_LOCAL_SUPPORTED_CODECS_V1 = 295,

  REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY = 321,

  READ_SECURE_CONNECTIONS_HOST_SUPPORT = 322,

  READ_SECURE_CONNECTIONS_HOST_SUPPORT = 322,

  WRITE_SECURE_CONNECTIONS_HOST_SUPPORT = 323,

  WRITE_SECURE_CONNECTIONS_HOST_SUPPORT = 323,

  READ_LOCAL_OOB_EXTENDED_DATA = 326,

  READ_LOCAL_OOB_EXTENDED_DATA = 326,
@@ -1204,6 +1206,19 @@ packet EnhancedAcceptSynchronousConnection : ScoConnectionCommand (op_code = ENH 
  _payload_,  // placeholder (unimplemented)

  _payload_,  // placeholder (unimplemented)

}

}





packet RemoteOobExtendedDataRequestReply : SecurityCommand (op_code = REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY) {

  bd_addr : Address,

  c_192 : 8[16],

  r_192 : 8[16],

  c_256 : 8[16],

  r_256 : 8[16],

}



packet RemoteOobExtendedDataRequestReplyComplete : CommandComplete (command_op_code = REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY) {

  status : ErrorCode,

  bd_addr : Address,

}







  // LINK_POLICY

  // LINK_POLICY

packet HoldMode : ConnectionManagementCommand (op_code = HOLD_MODE) {

packet HoldMode : ConnectionManagementCommand (op_code = HOLD_MODE) {