Skip to content
Open
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
26 changes: 23 additions & 3 deletions ASFW.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
47C7D2797F3974490450A45A /* AVCNestedChannelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB92C50A509F45F51EFD3F03 /* AVCNestedChannelTests.swift */; };
47F41CED6EB2EE793A31B6E5 /* ASFWAudioDriverControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 018751CF8CA051FDDE9B2B06 /* ASFWAudioDriverControls.cpp */; };
48359CD69DF9A8F5868E12C0 /* ASFWMCPLiveDriverControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1391A71639068D8291B32AF /* ASFWMCPLiveDriverControl.swift */; };
49F6698714AAE6DA7A1CE7AE /* RMEFireface800Protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B80BA7172EA0EC366CA7C8EC /* RMEFireface800Protocol.cpp */; };
4A7F808CC9DBBBED16B2F07A /* ConfigROMBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290CF8A5D9D6CABD1B3BF37A /* ConfigROMBuilder.cpp */; };
4B85BC02C027180D070F4DFF /* DICETcatProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B6A6E8C021FEF7B9569D79A /* DICETcatProtocol.cpp */; };
4C587E86B66E99AA77CF17A1 /* ASFWDriverUserClient.iig in Sources */ = {isa = PBXBuildFile; fileRef = AF46E21DCF97D1A3F7DFDA09 /* ASFWDriverUserClient.iig */; };
Expand Down Expand Up @@ -334,6 +335,7 @@
F118D01B178AD54981507B90 /* ROMScanSessionIRM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D1606D8DEE1120C1646AB8D /* ROMScanSessionIRM.cpp */; };
F193984E9950C4C137BFAD6D /* MCPDiceTcatToolsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26B7F3D2FEC0DA11D8D9F0AC /* MCPDiceTcatToolsTests.swift */; };
F302759145BDF336C186D2BC /* HardwareInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7E564F41599A92B7D55B12 /* HardwareInterface.cpp */; };
F34A587E2B103749D7490B97 /* ASFWMCPContinuousTxTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE56C6DD9B345116DD0699B /* ASFWMCPContinuousTxTools.swift */; };
F3EC20E3CDECF9FD90E56995 /* ASFWSCSIController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3558EAA4E19D859BC8594170 /* ASFWSCSIController.cpp */; };
F4A99690858D37ACCC9CECB6 /* SystemLogsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB2E35051CCCFD3E4CD6E2F /* SystemLogsView.swift */; };
F576426B7995BB3474228911 /* ASFWDriverUserClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5364BA023A0C10D7791261A1 /* ASFWDriverUserClient.cpp */; };
Expand Down Expand Up @@ -557,8 +559,10 @@
3B0597EE0A4E4C496E0C2EA6 /* ASFWAudioDriverZts.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ASFWAudioDriverZts.cpp; sourceTree = "<group>"; };
3B294E73813DAE348F5D045A /* IDeviceManager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = IDeviceManager.hpp; sourceTree = "<group>"; };
3B6A6E8C021FEF7B9569D79A /* DICETcatProtocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DICETcatProtocol.cpp; sourceTree = "<group>"; };
3BA650C15D778F327D36918D /* RMEAudioProfiles.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = RMEAudioProfiles.hpp; sourceTree = "<group>"; };
3BC1BCBC9E52B53B87DEEA69 /* CIPHeader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CIPHeader.hpp; sourceTree = "<group>"; };
3CCCE7A077DAD59020AD49F2 /* BusResetCoordinatorActions.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BusResetCoordinatorActions.cpp; sourceTree = "<group>"; };
3CE56C6DD9B345116DD0699B /* ASFWMCPContinuousTxTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASFWMCPContinuousTxTools.swift; sourceTree = "<group>"; };
3CF6AA538A8321AEB7DDB655 /* MCPHardwareSmokeRunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCPHardwareSmokeRunnerTests.swift; sourceTree = "<group>"; };
3D1606D8DEE1120C1646AB8D /* ROMScanSessionIRM.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ROMScanSessionIRM.cpp; sourceTree = "<group>"; };
3D26D51E676FCE0D7C7747FD /* InterruptDispatcher.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InterruptDispatcher.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -913,6 +917,7 @@
B7E03EB5573EA30EB8F2D42B /* PingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PingView.swift; sourceTree = "<group>"; };
B7E5492B36B350E48E9214A8 /* AudioNubPublisher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioNubPublisher.cpp; sourceTree = "<group>"; };
B808B46CF106706A04C126DB /* ASFWMCPAvcFcpTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASFWMCPAvcFcpTools.swift; sourceTree = "<group>"; };
B80BA7172EA0EC366CA7C8EC /* RMEFireface800Protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RMEFireface800Protocol.cpp; sourceTree = "<group>"; };
B8B02346383E39CA66366AAE /* AudioDriverConfig.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioDriverConfig.cpp; sourceTree = "<group>"; };
B9E220CDF43AD389BD345A8F /* DriverKitOwnership.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DriverKitOwnership.hpp; sourceTree = "<group>"; };
BA6781D8E0522CE83CECCD4F /* Error.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Error.hpp; sourceTree = "<group>"; };
Expand All @@ -926,6 +931,7 @@
BCD6B302DCC686B9FD46CE06 /* RolePolicy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RolePolicy.cpp; sourceTree = "<group>"; };
BD88A8D5D9A4D4FDC7E5A71A /* ConfigROMParser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ConfigROMParser.hpp; sourceTree = "<group>"; };
BD92B955A8BFE30B33FB1F45 /* ATManagerImpl.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ATManagerImpl.hpp; sourceTree = "<group>"; };
BDCF2C69EC4FAB205B581D26 /* RMEFireface800Protocol.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = RMEFireface800Protocol.hpp; sourceTree = "<group>"; };
BE308A43E548024E6623D4A8 /* bump.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = bump.sh; sourceTree = "<group>"; };
BF49A4417B0371208665ECA7 /* StreamFormatParser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = StreamFormatParser.hpp; sourceTree = "<group>"; };
BF9FE813F630AD0832D9E674 /* FWDevice.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = FWDevice.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1650,6 +1656,7 @@
4D2DB64009F93C974F2DF20F /* DICE */,
FD14F207887135CE102F8ACA /* Duplex */,
6DF35E1146D265DA8C2B7611 /* Oxford */,
83A156BB194E66B40C582BD8 /* RME */,
);
path = Protocols;
sourceTree = "<group>";
Expand Down Expand Up @@ -1807,6 +1814,7 @@
077468963C2F7E7BB91E28CB /* ASFWMCPBeBoBTools.swift */,
9D6A93FFD51132B2A4F8B00E /* ASFWMCPBusResetTools.swift */,
969C58B339AB3E30DB3B3E45 /* ASFWMCPCmpTools.swift */,
3CE56C6DD9B345116DD0699B /* ASFWMCPContinuousTxTools.swift */,
0417EE4C83805D8B15818D95 /* ASFWMCPCore.swift */,
EE503DDF07D0510DECCEBD3B /* ASFWMCPDiceTcatTools.swift */,
42FD0F9803524954295461C0 /* ASFWMCPDriverControl.swift */,
Expand Down Expand Up @@ -1993,6 +2001,15 @@
path = Discovery;
sourceTree = "<group>";
};
83A156BB194E66B40C582BD8 /* RME */ = {
isa = PBXGroup;
children = (
B80BA7172EA0EC366CA7C8EC /* RMEFireface800Protocol.cpp */,
BDCF2C69EC4FAB205B581D26 /* RMEFireface800Protocol.hpp */,
);
path = RME;
sourceTree = "<group>";
};
8416E8873F248937DC1F725E /* Config */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2631,6 +2648,7 @@
F1BF9794C22F3E1693A6CCF0 /* FocusriteAudioProfiles.hpp */,
ADA183665D23E96057546B82 /* MidasAudioProfiles.hpp */,
0C844DC3BD4E0AE7D1081F52 /* PreSonusAudioProfiles.hpp */,
3BA650C15D778F327D36918D /* RMEAudioProfiles.hpp */,
C9474A3E174E5254247327C6 /* TerraTecAudioProfiles.hpp */,
);
path = Vendors;
Expand Down Expand Up @@ -2884,8 +2902,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
EE5A446B3669D0171F9606EE /* ASFW */,
0EB9A8DA75D08971084A440A /* ASFWDriver */,
EE5A446B3669D0171F9606EE /* ASFW */,
348672D607701677ABCB567C /* ASFWTests */,
);
};
Expand Down Expand Up @@ -3099,6 +3117,7 @@
3ECDDF5924BE520E1750A8FF /* PostResetTimingCoordinator.cpp in Sources */,
270027C27155433C83E72998 /* PowerLinkPolicyCoordinator.cpp in Sources */,
AE6B45BB973CF543649B851E /* PreSonusStudioLiveProfile.cpp in Sources */,
49F6698714AAE6DA7A1CE7AE /* RMEFireface800Protocol.cpp in Sources */,
3455F76072D6ED0ED7E7B77E /* ROMReader.cpp in Sources */,
55D2ED0B592528E5950795D3 /* ROMScanSession.cpp in Sources */,
3125B234BDC6F30DF047EC94 /* ROMScanSessionDetails.cpp in Sources */,
Expand Down Expand Up @@ -3191,6 +3210,7 @@
86AAAB1DA5BB95E96BAFFBB7 /* ASFWMCPBeBoBTools.swift in Sources */,
6FA31DB6C2C615B5E0AFBB7C /* ASFWMCPBusResetTools.swift in Sources */,
963574C5C0B791D8C9BC3322 /* ASFWMCPCmpTools.swift in Sources */,
F34A587E2B103749D7490B97 /* ASFWMCPContinuousTxTools.swift in Sources */,
7A904CEDE54313921506AFCB /* ASFWMCPControlViewModel.swift in Sources */,
EE252C976DEC6C30E860638C /* ASFWMCPCore.swift in Sources */,
960F055B6D7B32200D416CDB /* ASFWMCPDiceTcatTools.swift in Sources */,
Expand Down Expand Up @@ -3410,7 +3430,7 @@
CODE_SIGN_ENTITLEMENTS = "$(ASFW_DEXT_ENTITLEMENTS_$(ASFW_ENABLE_SCSI))";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 100;
DEVELOPMENT_TEAM = F6YA6B56LR;
DRIVERKIT_DEPLOYMENT_TARGET = 25.0;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down Expand Up @@ -3492,7 +3512,7 @@
CODE_SIGN_ENTITLEMENTS = "$(ASFW_DEXT_ENTITLEMENTS_$(ASFW_ENABLE_SCSI))";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 100;
DEVELOPMENT_TEAM = F6YA6B56LR;
DRIVERKIT_DEPLOYMENT_TARGET = 25.0;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand Down
22 changes: 15 additions & 7 deletions ASFW.xcodeproj/xcshareddata/xcschemes/ASFWDriver.xcscheme
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
version = "1.3">
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
buildImplicitDependencies = "YES"
runPostActionsOnFailure = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand All @@ -15,7 +16,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EB9A8DA75D08971084A440A"
BuildableName = "net.mrmidi.ASFW.ASFWDriver.dext"
BuildableName = "ASFWDriver.dext"
BlueprintName = "ASFWDriver"
ReferencedContainer = "container:ASFW.xcodeproj">
</BuildableReference>
Expand All @@ -26,18 +27,21 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
onlyGenerateCoverageForSpecifiedTargets = "NO">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EB9A8DA75D08971084A440A"
BuildableName = "net.mrmidi.ASFW.ASFWDriver.dext"
BuildableName = "ASFWDriver.dext"
BlueprintName = "ASFWDriver"
ReferencedContainer = "container:ASFW.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
<CommandLineArguments>
</CommandLineArguments>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -54,11 +58,13 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EB9A8DA75D08971084A440A"
BuildableName = "net.mrmidi.ASFW.ASFWDriver.dext"
BuildableName = "ASFWDriver.dext"
BlueprintName = "ASFWDriver"
ReferencedContainer = "container:ASFW.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand All @@ -71,11 +77,13 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EB9A8DA75D08971084A440A"
BuildableName = "net.mrmidi.ASFW.ASFWDriver.dext"
BuildableName = "ASFWDriver.dext"
BlueprintName = "ASFWDriver"
ReferencedContainer = "container:ASFW.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
</CommandLineArguments>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
9 changes: 4 additions & 5 deletions ASFW.xctestplan
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
{
"configurations" : [
{
"id" : "68101470-79D0-48C5-ACA4-8865D9C3B598",
"id" : "50727156-0551-43F8-87AB-D75879B2CA5B",
"name" : "Test Scheme Action",
"options" : {

}
}
],
"defaultOptions" : {
"codeCoverage" : false,
"performanceAntipatternCheckerEnabled" : true,
"targetForVariableExpansion" : {
"codeCoverage" : false,
"performanceAntipatternCheckerEnabled" : true,
"targetForVariableExpansion" : {
"containerPath" : "container:ASFW.xcodeproj",
"identifier" : "EE5A446B3669D0171F9606EE",
"name" : "ASFW"
}
},
"testTargets" : [
{
"parallelizable" : true,
"target" : {
"containerPath" : "container:ASFW.xcodeproj",
"identifier" : "348672D607701677ABCB567C",
Expand Down
4 changes: 4 additions & 0 deletions ASFW/ASFWDriverConnector.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ final class ASFWDriverConnector: ObservableObject {
case requestUserBusReset = 61
case startAudioStreaming = 62
case stopAudioStreaming = 63
// Stage 6 (dev-only): continuous silent isoch TX cadence.
case startContinuousIsochTxSilence = 64
case stopContinuousIsochTxSilence = 65
case getContinuousIsochTxHealth = 66
}

// MARK: - Re-exported Models
Expand Down
93 changes: 93 additions & 0 deletions ASFW/DriverConnector+Status.swift
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,97 @@ extension ASFWDriverConnector {
}
return message
}

// MARK: - Stage 6 (dev-only continuous silence)

/// Starts a continuous (not bounded-to-100ms) silent isoch TX cadence for
/// a device protocol that implements it (currently only RME Fireface
/// 800). Never reachable through real CoreAudio StartIO.
func startContinuousIsochTxSilence(guid: UInt64) -> Bool {
guard isConnected else {
log("startContinuousIsochTxSilence: Not connected", level: .warning)
return false
}

var input: [UInt64] = [guid]
let kr = IOConnectCallScalarMethod(
connection,
Method.startContinuousIsochTxSilence.rawValue,
&input,
UInt32(input.count),
nil,
nil
)
guard kr == KERN_SUCCESS else {
let message = "startContinuousIsochTxSilence failed: \(interpretIOReturn(kr))"
log(message, level: .error)
lastError = message
return false
}
return true
}

func stopContinuousIsochTxSilence(guid: UInt64) -> Bool {
guard isConnected else {
log("stopContinuousIsochTxSilence: Not connected", level: .warning)
return false
}

var input: [UInt64] = [guid]
let kr = IOConnectCallScalarMethod(
connection,
Method.stopContinuousIsochTxSilence.rawValue,
&input,
UInt32(input.count),
nil,
nil
)
guard kr == KERN_SUCCESS else {
let message = "stopContinuousIsochTxSilence failed: \(interpretIOReturn(kr))"
log(message, level: .error)
lastError = message
return false
}
return true
}

struct ContinuousIsochTxHealth: Equatable {
let running: Bool
let dead: Bool
let eventError: Bool
let anchorExecutions: UInt32
let lastAnchorTimestamp: UInt16
}

func getContinuousIsochTxHealth(guid: UInt64) -> ContinuousIsochTxHealth? {
guard isConnected else {
log("getContinuousIsochTxHealth: Not connected", level: .warning)
return nil
}

var input: [UInt64] = [guid]
var output = [UInt64](repeating: 0, count: 5)
var outputCount: UInt32 = 5
let kr = IOConnectCallScalarMethod(
connection,
Method.getContinuousIsochTxHealth.rawValue,
&input,
UInt32(input.count),
&output,
&outputCount
)
guard kr == KERN_SUCCESS, outputCount == 5 else {
let message = "getContinuousIsochTxHealth failed: \(interpretIOReturn(kr))"
log(message, level: .error)
lastError = message
return nil
}
return ContinuousIsochTxHealth(
running: output[0] != 0,
dead: output[1] != 0,
eventError: output[2] != 0,
anchorExecutions: UInt32(truncatingIfNeeded: output[3]),
lastAnchorTimestamp: UInt16(truncatingIfNeeded: output[4])
)
}
}
Loading