mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-12 09:54:36 +01:00
Fix to be able to get typeof of an array member.
This commit is contained in:
parent
f537645cec
commit
32332dd157
24
rEFIt_UEFI/Platform/FixBiosDsdt.cpp
Normal file → Executable file
24
rEFIt_UEFI/Platform/FixBiosDsdt.cpp
Normal file → Executable file
@ -1046,8 +1046,8 @@ VOID findCPU(UINT8* dsdt, UINT32 length)
|
||||
}
|
||||
|
||||
if (add_name) {
|
||||
acpi_cpu_name[acpi_cpu_count] = (__typeof__(acpi_cpu_name[acpi_cpu_count]))AllocateZeroPool(5);
|
||||
CopyMem(acpi_cpu_name[acpi_cpu_count], dsdt+offset, 4);
|
||||
acpi_cpu_name[acpi_cpu_count] = (__typeof_am__(acpi_cpu_name[acpi_cpu_count]))AllocateZeroPool(5);
|
||||
CopyMem(acpi_cpu_name[acpi_cpu_count], dsdt+offset, 4);
|
||||
acpi_cpu_processor_id[acpi_cpu_count] = dsdt[offset + 4];
|
||||
i = offset + 5;
|
||||
|
||||
@ -1068,7 +1068,7 @@ VOID findCPU(UINT8* dsdt, UINT32 length)
|
||||
|
||||
if (!acpi_cpu_count) {
|
||||
for (i=0; i < acpi_cpu_max; i++) {
|
||||
acpi_cpu_name[i] = (__typeof__(acpi_cpu_name[i]))AllocateZeroPool(5);
|
||||
acpi_cpu_name[i] = (__typeof_am__(acpi_cpu_name[i]))AllocateZeroPool(5);
|
||||
AsciiSPrint(acpi_cpu_name[i], 5, "CPU%1x", i);
|
||||
acpi_cpu_processor_id[i] = (UINT8)(i & 0x7F);
|
||||
}
|
||||
@ -2396,7 +2396,7 @@ UINT32 FIXLPCB (UINT8 *dsdt, UINT32 len)
|
||||
continue;
|
||||
}
|
||||
LPCBSIZE = get_size(dsdt, LPCBADR);
|
||||
device_name[3] = (__typeof__(device_name[3]))AllocateZeroPool(5);
|
||||
device_name[3] = (__typeof_am__(device_name[3]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[3], dsdt + j, 4);
|
||||
MsgLog("found LPCB device NAME(_ADR,0x001F0000) at %x And Name is %a\n", j,
|
||||
device_name[3]);
|
||||
@ -2817,7 +2817,7 @@ UINT32 AddHDMI (UINT8 *dsdt, UINT32 len)
|
||||
if (!devadr1) {
|
||||
continue;
|
||||
}
|
||||
device_name[11] = (__typeof__(device_name[11]))AllocateZeroPool(5);
|
||||
device_name[11] = (__typeof_am__(device_name[11]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[11], dsdt+k, 4);
|
||||
DBG("found HDMI device [0x%08x:%x] at %x and Name is %a\n",
|
||||
HDMIADR1, HDMIADR2, devadr1, device_name[11]);
|
||||
@ -2992,7 +2992,7 @@ UINT32 FIXNetwork (UINT8 *dsdt, UINT32 len, UINT32 card)
|
||||
continue;
|
||||
}
|
||||
|
||||
device_name[1] = (__typeof__(device_name[1]))AllocateZeroPool(5);
|
||||
device_name[1] = (__typeof_am__(device_name[1]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[1], dsdt+k, 4);
|
||||
DBG("found NetWork device [0x%08x:%x] at %x and Name is %a\n",
|
||||
NetworkADR1[card], NetworkADR2[card], NetworkADR, device_name[1]);
|
||||
@ -3192,7 +3192,7 @@ UINT32 FIXAirport (UINT8 *dsdt, UINT32 len)
|
||||
if (!ArptADR) {
|
||||
continue;
|
||||
}
|
||||
device_name[9] = (__typeof__(device_name[9]))AllocateZeroPool(5);
|
||||
device_name[9] = (__typeof_am__(device_name[9]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[9], dsdt+k, 4);
|
||||
DBG("found Airport device [%08x:%x] at %x And Name is %a\n",
|
||||
ArptADR1, ArptADR2, ArptADR, device_name[9]);
|
||||
@ -3637,7 +3637,7 @@ UINT32 FIXFirewire (UINT8 *dsdt, UINT32 len)
|
||||
continue;
|
||||
}
|
||||
|
||||
device_name[2] = (__typeof__(device_name[2]))AllocateZeroPool(5);
|
||||
device_name[2] = (__typeof_am__(device_name[2]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[2], dsdt+k, 4);
|
||||
DBG("found Firewire device NAME(_ADR,0x%08x) at %x And Name is %a\n",
|
||||
FirewireADR2, k, device_name[2]);
|
||||
@ -3780,7 +3780,7 @@ UINT32 AddHDEF (UINT8 *dsdt, UINT32 len, CHAR8* OSVersion)
|
||||
}
|
||||
|
||||
// BridgeSize = get_size(dsdt, HDAADR);
|
||||
device_name[4] = (__typeof__(device_name[4]))AllocateZeroPool(5);
|
||||
device_name[4] = (__typeof_am__(device_name[4]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[4], dsdt+i, 4);
|
||||
DBG("found HDA device NAME(_ADR,0x%08x) And Name is %a\n",
|
||||
HDAADR1, device_name[4]);
|
||||
@ -4058,7 +4058,7 @@ UINT32 FIXUSB (UINT8 *dsdt, UINT32 len)
|
||||
for (j = 0x20; len >= 4 && j < len - 4; j++) {
|
||||
if (CmpAdr(dsdt, j, USBADR[i])) { //j+4 -> _ADR
|
||||
XhciName = FALSE;
|
||||
UsbName[i] = (__typeof__(UsbName[i]))AllocateZeroPool(5);
|
||||
UsbName[i] = (__typeof_am__(UsbName[i]))AllocateZeroPool(5);
|
||||
// DBG("found USB at 0x%x\n", j);
|
||||
adr1 = devFind(dsdt, j + 2);
|
||||
if (!adr1) {
|
||||
@ -4075,7 +4075,7 @@ UINT32 FIXUSB (UINT8 *dsdt, UINT32 len)
|
||||
continue;
|
||||
}
|
||||
|
||||
device_name[10] = (__typeof__(device_name[10]))AllocateZeroPool(5);
|
||||
device_name[10] = (__typeof_am__(device_name[10]))AllocateZeroPool(5);
|
||||
CopyMem(device_name[10], dsdt+k, 4);
|
||||
DBG("found USB device [%08x:%x] at %x and Name was %a ->",
|
||||
USBADR[i], USBADR2[i], k, device_name[10]);
|
||||
@ -4195,7 +4195,7 @@ UINT32 FIXUSB (UINT8 *dsdt, UINT32 len)
|
||||
}
|
||||
//NFORCE_USB_START
|
||||
else if (CmpAdr(dsdt, j, USBADR3[i])) {
|
||||
UsbName[i] = (__typeof__(UsbName[i]))AllocateZeroPool(5);
|
||||
UsbName[i] = (__typeof_am__(UsbName[i]))AllocateZeroPool(5);
|
||||
CopyMem(UsbName[i], dsdt+j, 4);
|
||||
|
||||
adr1 = devFind(dsdt, j);
|
||||
|
2
rEFIt_UEFI/Platform/Platform.h
Normal file → Executable file
2
rEFIt_UEFI/Platform/Platform.h
Normal file → Executable file
@ -97,9 +97,11 @@ extern "C" {
|
||||
#define PCAT_RTC_ADDRESS_REGISTER 0x70
|
||||
#define PCAT_RTC_DATA_REGISTER 0x71
|
||||
|
||||
#include "../cpp_util/remove_ref.h"
|
||||
#ifdef _MSC_VER
|
||||
#define __typeof__(x) decltype(x)
|
||||
#endif
|
||||
#define __typeof_am__(x) remove_ref<decltype(x)>::type
|
||||
|
||||
|
||||
/* XML Tags */
|
||||
|
19
rEFIt_UEFI/cpp_util/remove_ref.h
Normal file
19
rEFIt_UEFI/cpp_util/remove_ref.h
Normal file
@ -0,0 +1,19 @@
|
||||
|
||||
// STRUCT TEMPLATE remove_reference
|
||||
template<class _Ty>
|
||||
struct remove_ref
|
||||
{ // remove reference
|
||||
using type = _Ty;
|
||||
};
|
||||
|
||||
template<class _Ty>
|
||||
struct remove_ref<_Ty&>
|
||||
{ // remove reference
|
||||
using type = _Ty;
|
||||
};
|
||||
//
|
||||
//template<class _Ty>
|
||||
// struct remove_ref<_Ty&&>
|
||||
// { // remove rvalue reference
|
||||
// using type = _Ty;
|
||||
// };
|
Loading…
Reference in New Issue
Block a user