From 7af1132166c91e29bdd97e97882202f17519476d Mon Sep 17 00:00:00 2001 From: PMheart <17109513+PMheart@users.noreply.github.com> Date: Sun, 31 Oct 2021 11:41:27 +0100 Subject: [PATCH] Codestyle and changelog fix --- BrcmPatchRAM/BlueToolFixup.cpp | 21 ++++++++++----------- Changelog.md | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp index 9c9ef0a..a6e3c69 100644 --- a/BrcmPatchRAM/BlueToolFixup.cpp +++ b/BrcmPatchRAM/BlueToolFixup.cpp @@ -46,20 +46,20 @@ bool BlueToolFixup::start(IOService *provider) { #pragma mark - Patches static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate"; -static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi"; +static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi"; static const uint8_t kVendorCheckOriginal[] = { - 0x81, 0xFA, // cmp edx + 0x81, 0xFA, // cmp edx 0x5C, 0x0A, 0x00, 0x00, // Vendor BRCM, - 0x74 // jnz short + 0x74 // jnz short }; static const uint8_t kVendorCheckPatched[] = { - 0x81, 0xFA, // cmp edx + 0x81, 0xFA, // cmp edx 0x5C, 0x0A, 0x00, 0x00, // Vendor BRCM, - 0xEB // jmp short + 0xEB // jmp short }; // Workaround for bugged chipset range check that @@ -68,22 +68,21 @@ static const uint8_t kVendorCheckPatched[] = // See https://github.com/acidanthera/BrcmPatchRAM/pull/18 for more details. static const uint8_t kBadChipsetCheckOriginal[] = { - 0x81, 0xF9, // cmp ecx + 0x81, 0xF9, // cmp ecx 0xCF, 0x07, 0x00, 0x00, // int 1999 - 0x72 // jb short + 0x72 // jb short }; static const uint8_t kBadChipsetCheckPatched[] = { - 0x81, 0xF9, // cmp ecx + 0x81, 0xF9, // cmp ecx 0xCF, 0x07, 0x00, 0x00, // int 1999 - 0xEB // jmp short + 0xEB // jmp short }; static bool shouldPatchBoardId = false; -static const size_t kBoardIdSize = sizeof( - "Mac-F60DEB81FF30ACF6"); +static const size_t kBoardIdSize = sizeof("Mac-F60DEB81FF30ACF6"); static const char boardIdsWithUSBBluetooth[][kBoardIdSize] = { "Mac-F60DEB81FF30ACF6", diff --git a/Changelog.md b/Changelog.md index 3063710..1cf9191 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,7 @@ BrcmPatchRAM Changelog #### v2.6.1 - Improved BlueToolFixup compatibility with macOS 12b10 (thx @dhinakg, @williambj1) - Fixed bluetooth support on MBP15,4 and other similar boards (thx @dhinakg, @usr-sse2) -- Fixed bluetooth not working on macOS 12 after wake (thx @williambj1) +- Fixed bluetooth not working on macOS 12 after the first power cycle (thx @williambj1, @zxystd) #### v2.6.0 - Added BlueToolFixup for macOS 12 compatibility