Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Sources/BluetoothHCI/HCIIOCapabilityRequestReply.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ public extension BluetoothHostControllerInterface {
func ioCapabilityRequestReply(
address: BluetoothAddress,
ioCapability: HCIIOCapabilityRequestReply.IOCapability,
obbDataPresent: HCIIOCapabilityRequestReply.OBBDataPresent,
oobDataPresent: HCIIOCapabilityRequestReply.OOBDataPresent,
authenticationRequirements: HCIIOCapabilityRequestReply.AuthenticationRequirements,
timeout: HCICommandTimeout = .default
) async throws -> BluetoothAddress {

let command = HCIIOCapabilityRequestReply(
address: address,
ioCapability: ioCapability,
obbDataPresent: obbDataPresent,
oobDataPresent: oobDataPresent,
authenticationRequirements: authenticationRequirements)

return try await deviceRequest(command, HCIIOCapabilityRequestReplyReturn.self, timeout: timeout).address
Expand All @@ -54,20 +54,20 @@ public struct HCIIOCapabilityRequestReply: HCICommandParameter {

public var ioCapability: IOCapability

public var obbDataPresent: OBBDataPresent
public var oobDataPresent: OOBDataPresent

public var authenticationRequirements: AuthenticationRequirements

public init(
address: BluetoothAddress,
ioCapability: IOCapability,
obbDataPresent: OBBDataPresent,
oobDataPresent: OOBDataPresent,
authenticationRequirements: AuthenticationRequirements
) {

self.address = address
self.ioCapability = ioCapability
self.obbDataPresent = obbDataPresent
self.oobDataPresent = oobDataPresent
self.authenticationRequirements = authenticationRequirements
}

Expand All @@ -83,7 +83,7 @@ public struct HCIIOCapabilityRequestReply: HCICommandParameter {
addressBytes.4,
addressBytes.5,
ioCapability.rawValue,
obbDataPresent.rawValue,
oobDataPresent.rawValue,
authenticationRequirements.rawValue
])
}
Expand All @@ -106,7 +106,7 @@ extension HCIIOCapabilityRequestReply {
case noInputNoOutput = 0x03
}

public enum OBBDataPresent: UInt8 {
public enum OOBDataPresent: UInt8 {

/// OOB authentication data not present
case oobDataNotPresent = 0x00
Expand Down
8 changes: 4 additions & 4 deletions Sources/BluetoothHCI/HCIIOCapabilityResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Foundation
public struct HCIIOCapabilityResponse: HCIEventParameter {

public typealias IOCapability = HCIIOCapabilityRequestReply.IOCapability
public typealias OBBDataPresent = HCIIOCapabilityRequestReply.OBBDataPresent
public typealias OOBDataPresent = HCIIOCapabilityRequestReply.OOBDataPresent
public typealias AuthenticationRequirements = HCIIOCapabilityRequestReply.AuthenticationRequirements

public static let event = HCIGeneralEvent.ioCapabilityResponse
Expand All @@ -24,7 +24,7 @@ public struct HCIIOCapabilityResponse: HCIEventParameter {

public var ioCapability: IOCapability

public var obbDataPresent: OBBDataPresent
public var oobDataPresent: OOBDataPresent

public var authenticationRequirements: AuthenticationRequirements

Expand All @@ -38,15 +38,15 @@ public struct HCIIOCapabilityResponse: HCIEventParameter {
guard let ioCapability = IOCapability(rawValue: data[6])
else { return nil }

guard let obbDataPresent = OBBDataPresent(rawValue: data[7])
guard let oobDataPresent = OOBDataPresent(rawValue: data[7])
else { return nil }

guard let authenticationRequirements = AuthenticationRequirements(rawValue: data[8])
else { return nil }

self.address = address
self.ioCapability = ioCapability
self.obbDataPresent = obbDataPresent
self.oobDataPresent = oobDataPresent
self.authenticationRequirements = authenticationRequirements
}
}
4 changes: 2 additions & 2 deletions Tests/BluetoothTests/HCITests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2961,7 +2961,7 @@ import Foundation
return
}

guard let dataPresent = HCIIOCapabilityRequestReply.OBBDataPresent(rawValue: 0x00)
guard let dataPresent = HCIIOCapabilityRequestReply.OOBDataPresent(rawValue: 0x00)
else {
Issue.record("Cannot init daatPresent")
return
Expand All @@ -2976,7 +2976,7 @@ import Foundation
let eventAddress = try await hostController.ioCapabilityRequestReply(
address: address,
ioCapability: ioCapability,
obbDataPresent: dataPresent,
oobDataPresent: dataPresent,
authenticationRequirements: authenticationRequeriments
)
#expect(eventAddress == address)
Expand Down
Loading