mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 10:23:23 +02:00
Common: Remove the BIT macro
When the macro was introduced in 326ec51261
it wasn't noticed that it conflicted in name with a heavily used macro
inside of dyncom. This causes some compiler warnings. Since it's only
lightly used, it was opted to simply remove the new macro.
This commit is contained in:
parent
e35e72d0a5
commit
b700b55696
@ -15,8 +15,6 @@
|
|||||||
#define b32(x) (b16(x) | (b16(x) >>16) )
|
#define b32(x) (b16(x) | (b16(x) >>16) )
|
||||||
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
|
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
|
||||||
|
|
||||||
#define BIT(x) (1U << (x))
|
|
||||||
|
|
||||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
|
||||||
|
|
||||||
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
|
/// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
|
||||||
|
@ -62,8 +62,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
|
|||||||
AddressMapping mapping;
|
AddressMapping mapping;
|
||||||
mapping.address = descriptor << 12;
|
mapping.address = descriptor << 12;
|
||||||
mapping.size = (end_desc << 12) - mapping.address;
|
mapping.size = (end_desc << 12) - mapping.address;
|
||||||
mapping.writable = descriptor & BIT(20);
|
mapping.writable = descriptor & (1 << 20);
|
||||||
mapping.unk_flag = end_desc & BIT(20);
|
mapping.unk_flag = end_desc & (1 << 20);
|
||||||
|
|
||||||
address_mappings.push_back(mapping);
|
address_mappings.push_back(mapping);
|
||||||
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F
|
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F
|
||||||
|
Loading…
Reference in New Issue
Block a user