OcBootManagementLib: Fix USB -> Apple HID enums by
@@ -349,16 +349,16 @@ OcWaitForAppleKeyIndex (
return OC_INPUT_BOTTOM;
}
- STATIC_ASSERT (UsbHidUsageIdKbKpKeyF1 + 11 == UsbHidUsageIdKbKpKeyF12, "Unexpected encoding");
- if (Keys[0] >= UsbHidUsageIdKbKpKeyF1 && Keys[0] <= UsbHidUsageIdKbKpKeyF12) {
+ STATIC_ASSERT (AppleHidUsbKbUsageKeyF1 + 11 == AppleHidUsbKbUsageKeyF12, "Unexpected encoding");
+ if (Keys[0] >= AppleHidUsbKbUsageKeyF1 && Keys[0] <= AppleHidUsbKbUsageKeyF12) {
OcKeyMapFlush (KeyMap, Keys[0], TRUE);
- return OC_INPUT_FUNCTIONAL (Keys[0] - UsbHidUsageIdKbKpKeyF1 + 1);
+ return OC_INPUT_FUNCTIONAL (Keys[0] - AppleHidUsbKbUsageKeyF1 + 1);
}
- STATIC_ASSERT (UsbHidUsageIdKbKpKeyF13 + 11 == UsbHidUsageIdKbKpKeyF24, "Unexpected encoding");
- if (Keys[0] >= UsbHidUsageIdKbKpKeyF13 && Keys[0] <= UsbHidUsageIdKbKpKeyF24) {
+ STATIC_ASSERT (AppleHidUsbKbUsageKeyF13 + 11 == AppleHidUsbKbUsageKeyF24, "Unexpected encoding");
+ if (Keys[0] >= AppleHidUsbKbUsageKeyF13 && Keys[0] <= AppleHidUsbKbUsageKeyF24) {
OcKeyMapFlush (KeyMap, Keys[0], TRUE);
- return OC_INPUT_FUNCTIONAL (Keys[0] - UsbHidUsageIdKbKpKeyF13 + 13);
+ return OC_INPUT_FUNCTIONAL (Keys[0] - AppleHidUsbKbUsageKeyF13 + 13);
}
STATIC_ASSERT (AppleHidUsbKbUsageKeyOne + 8 == AppleHidUsbKbUsageKeyNine, "Unexpected encoding");
