Skip to content

Merge Fix #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2020
Merged

Merge Fix #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9e59d2
Add new iPad and iPhone models. (#483)
ivanhernandez13 Oct 19, 2020
862f0c2
fix script generation to not comment out the first line (#481)
Ukalnins Oct 19, 2020
5308dfe
Allocate ref on stack instead of the type itself for AFC service star…
Ukalnins Oct 20, 2020
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
2 changes: 1 addition & 1 deletion ios-deploy.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "echo \"\\\"# AUTO-GENERATED - DO NOT MODIFY\\\"\" > src/ios-deploy/lldb.py.h\nawk '{ print \"\\\"\"$0\"\\\\n\\\"\"}' src/scripts/lldb.py >> src/ios-deploy/lldb.py.h\n";
shellScript = "echo \"\\\"# AUTO-GENERATED - DO NOT MODIFY\\\\\\n\\\"\" > src/ios-deploy/lldb.py.h\nawk '{ print \"\\\"\"$0\"\\\\n\\\"\"}' src/scripts/lldb.py >> src/ios-deploy/lldb.py.h\n";
};
C0CD3D981F59D20100F954DB /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
4 changes: 2 additions & 2 deletions src/ios-deploy/MobileDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ mach_error_t AMDeviceStartSession(struct am_device *device);
*/

mach_error_t AMDeviceStartService(struct am_device *device, CFStringRef
service_name, ServiceConnRef handle, unsigned int *
service_name, ServiceConnRef * handle, unsigned int *
unknown);

mach_error_t AMDeviceStartHouseArrestService(struct am_device *device, CFStringRef identifier, void *unknown, ServiceConnRef handle, unsigned int *what);
Expand All @@ -290,7 +290,7 @@ mach_error_t AMDeviceStopSession(struct am_device *device);
* MDERR_AFC_OUT_OF_MEMORY if malloc() failed
*/

afc_error_t AFCConnectionOpen(service_conn_t handle, unsigned int io_timeout,
afc_error_t AFCConnectionOpen(ServiceConnRef handle, unsigned int io_timeout,
AFCConnectionRef *conn);

/* Pass in a pointer to an afc_device_info structure. It will be filled. */
Expand Down
8 changes: 8 additions & 0 deletions src/ios-deploy/device_db.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ device_desc device_db[] = {
ADD_DEVICE("J218AP", "iPad Air 3 (Cellular)", "iphoneos", "arm64e"),
ADD_DEVICE("J171AP", "iPad 7", "iphoneos", "arm64"),
ADD_DEVICE("J172AP", "iPad 7 (Cellular)", "iphoneos", "arm64"),
ADD_DEVICE("J171aAP", "iPad 8", "iphoneos", "arm64e"),
ADD_DEVICE("J172aAP", "iPad 8 (Cellular)", "iphoneos", "arm64e"),
ADD_DEVICE("J307AP", "iPad Air 4", "iphoneos", "arm64e"),
ADD_DEVICE("J308AP", "iPad Air 4 (Cellular)", "iphoneos", "arm64e"),

// iPad Pro

Expand Down Expand Up @@ -147,6 +151,10 @@ device_desc device_db[] = {
ADD_DEVICE("D421AP", "iPhone 11 Pro", "iphoneos", "arm64e"),
ADD_DEVICE("D431AP", "iPhone 11 Pro Max", "iphoneos", "arm64e"),
ADD_DEVICE("D79AP", "iPhone SE 2G", "iphoneos", "arm64e"),
ADD_DEVICE("D52gAP", "iPhone 12 Mini", "iphoneos", "arm64e"),
ADD_DEVICE("D53gAP", "iPhone 12", "iphoneos", "arm64e"),
ADD_DEVICE("D53pAP", "iPhone 12 Pro", "iphoneos", "arm64e"),
ADD_DEVICE("D54pAP", "iPhone 12 Pro Max", "iphoneos", "arm64e"),

// Apple TV

Expand Down
2 changes: 1 addition & 1 deletion src/ios-deploy/ios-deploy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ AFCConnectionRef start_afc_service(AMDeviceRef device) {
check_error(AMDeviceStartSession(device));

AFCConnectionRef conn = NULL;
service_conn_t serviceConn;
ServiceConnRef serviceConn = NULL;

if (AMDeviceStartService(device, AMSVC_AFC, &serviceConn, 0) != MDERR_OK) {
on_error(@"Unable to start file service!");
Expand Down