Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Merge upstream main (2.4.1) into guest-audio

Jackyac8943805823
diff --cc VPhoneExecutable/VPhoneCommand/FirmwarePatcher/PatchSets/FirmwareDeviceTreePatchSet.swift
index 72673351,dad52640..0d9b4e35
--- a/VPhoneExecutable/VPhoneCommand/FirmwarePatcher/PatchSets/FirmwareDeviceTreePatchSet.swift
+++ b/VPhoneExecutable/VPhoneCommand/FirmwarePatcher/PatchSets/FirmwareDeviceTreePatchSet.swift
@@@ -167,17 -166,8 +167,18 @@@ public enum FirmwareDeviceTreePatchSet
"Sets the ISP round-trip buffer flags for the camera pipeline.",
),
+ // MARK: Removed Nodes
+ //
+ // Written to every guest's tree, iPhone and iPad, whatever the variant.
+
+ property(
+ "devicetree-cfw-product_haptics_node",
+ "Haptics node",
+ "Removes the Taptic Engine no VM has, so tones play without the haptic track it cannot drive.",
+ ),
+
// MARK: iPad Guest
+
//
// Written only to an iPad guest's installed tree (an iPhone guest
// never produces these records). See DeviceTreeGuestDevicePatches.swift.
diff --cc VPhoneExecutable/VPhoneCommand/FirmwarePatcher/Pipeline/FirmwarePipelineComponents.swift
index 32c2e738,ec0ed6ec..3ab2a310
--- a/VPhoneExecutable/VPhoneCommand/FirmwarePatcher/Pipeline/FirmwarePipelineComponents.swift
+++ b/VPhoneExecutable/VPhoneCommand/FirmwarePatcher/Pipeline/FirmwarePipelineComponents.swift
@@@ -276,10 -276,7 +276,10 @@@ extension FirmwarePipeline
includeIdentityPatches: dtIncludeIdentity,
device: guestDevice,
role: .installed,
- sourceTree: self.loader.load(from: boardTreeURL),
+ // Read through the originals stash, which keeps a copy: the
+ // restore tree goes once the VM boots, and `cfw install` and
+ // the environment update take the board's audio node from it.
- sourceTree: try self.loader.load(from: self.pristineInput(for: boardTreeURL).url),
++ sourceTree: self.loader.load(from: self.pristineInput(for: boardTreeURL).url),
)
p.gate = gate
return p
diff --cc VPhoneExecutable/VPhoneVirtualization/Resources/Info.plist
index ab893329,2a00703d..feb94e9c
--- a/VPhoneExecutable/VPhoneVirtualization/Resources/Info.plist
+++ b/VPhoneExecutable/VPhoneVirtualization/Resources/Info.plist
@@@ -9,10 -9,8 +9,10 @@@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleVersion</key>
- <string>27</string>
+ <string>28</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.0</string>
+ <string>2.4.1</string>
+ <key>NSMicrophoneUsageDescription</key>
+ <string>Shares this Mac's microphone with the virtual iPhone so apps running inside it can record.</string>
</dict>
</plist>