From 09b7e7ea53d6abc13ff2d4c05fff50e12b39b9d9 Mon Sep 17 00:00:00 2001
From: Nick Chan <towinchenmi@gmail.com>
Date: Mon, 30 Jan 2023 19:16:53 +0800
Subject: [PATCH] fix HEAD~1

---
 src/dfuhelper.c    | 7 +++++--
 src/pongo_helper.c | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/dfuhelper.c b/src/dfuhelper.c
index 15cf490..5a64845 100644
--- a/src/dfuhelper.c
+++ b/src/dfuhelper.c
@@ -30,7 +30,7 @@
 #define FORMAT_KEY_VALUE 1
 #define FORMAT_XML 2
 
-#define NOHOME (info->cpid == 0x8015 || (info->cpid == 0x8010 && (info->bdid == 0x08 || info->bdid == 0x0a || info->bdid == 0x0c || info->bdid == 0x0e)))
+#define NOHOME (cpid == 0x8015 || (cpid == 0x8010 && (bdid == 0x08 || bdid == 0x0a || bdid == 0x0c || bdid == 0x0e)))
 
 int spin = 1;
 uint64_t ecid_wait_for_dfu = 0;
@@ -88,6 +88,10 @@ static bool conditional(uint64_t ecid) {
 void* connected_recovery_mode(struct irecv_device_info* info) {
 	int ret;
 	uint64_t ecid;
+	uint32_t cpid, bdid;
+	cpid = info->cpid;
+	ecid = info->ecid;
+	bdid = info->bdid;
 	if (!cpid_is_arm64(info->cpid)) {
 		LOG(LOG_WARNING, "Ignoring non-arm64 device...");
 		return NULL;
@@ -105,7 +109,6 @@ void* connected_recovery_mode(struct irecv_device_info* info) {
 	else
 		step(4, 2, "Hold Home + Power Button", NULL, 0);
 	ecid_wait_for_dfu = info->ecid;
-	ecid = info->ecid;
 	ret = exitrecv_cmd(info->ecid);
 	info = NULL;
 	if (ret) {
diff --git a/src/pongo_helper.c b/src/pongo_helper.c
index 0625f8d..5213108 100644
--- a/src/pongo_helper.c
+++ b/src/pongo_helper.c
@@ -45,8 +45,8 @@ void *pongo_usb_callback(void *arg) {
 	issue_pongo_command(handle, palerain_flags_cmd);
 	if (enable_rootful)
 	{
-		issue_pongo_command(handle, rootfs_cmd);
-		issue_pongo_command(handle, dtpatch_cmd);
+		issue_pongo_command(handle, "rootfs");
+		// issue_pongo_command(handle, dtpatch_cmd);
 	}
 	upload_pongo_file(handle, **ramdisk_to_upload, ramdisk_dmg_len);
 	issue_pongo_command(handle, "ramdisk");