Skip to content

Commit eb5f65c

Browse files
committed
pci: fix: operator precedence
1 parent 5a6b8c6 commit eb5f65c

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

src/pci.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
#define PCI_ENUM_TYPE_64bit (0x1 << 1)
8181
#define PCI_ENUM_TYPE_32bit (0x1)
8282
#define PCI_ENUM_IS_PREFETCH (0x1 << 3)
83-
#define PCI_ENUM_MM_BAR_MASK ~(0xf)
84-
#define PCI_ENUM_IO_BAR_MASK ~(0x3)
83+
#define PCI_ENUM_MM_BAR_MASK (~0xfU)
84+
#define PCI_ENUM_IO_BAR_MASK (~0x3U)
8585

8686
#define CAPID0_A_0_0_0_PCI (0xE4)
8787
#define DEVICE_ENABLE (0x54)
@@ -139,8 +139,8 @@ static uint32_t pci_align32_address(uint32_t addr, int *aligned)
139139
static uint32_t pci_config_ecam_make_address(uint8_t bus, uint8_t dev,
140140
uint8_t func, uint8_t off)
141141
{
142-
return (PCI_ECAM_BASE +
143-
((bus&0xff) << 20) |
142+
return PCI_ECAM_BASE +
143+
(((bus&0xff) << 20) |
144144
((dev&0x1f) << 15) |
145145
((func&0x07) << 12) |
146146
(off & 0xfff));
@@ -198,11 +198,11 @@ static void pci_ecam_config_write16(uint8_t bus, uint8_t dev, uint8_t fun,
198198
#define PCI_IO_CONFIG_ADDR(bus, dev, fn, off) \
199199
(uint32_t)( \
200200
(1UL << PCI_CONFIG_ADDRESS_ENABLE_BIT_SHIFT) | \
201-
(bus << PCI_CONFIG_ADDRESS_BUS_SHIFT) | \
202-
(dev << PCI_CONFIG_ADDRESS_DEVICE_SHIFT) | \
203-
(fn << PCI_CONFIG_ADDRESS_FUNCTION_SHIFT) | \
204-
((off & 0xF00) << 16) | \
205-
(off & PCI_CONFIG_ADDRESS_OFFSET_MASK))
201+
((bus) << PCI_CONFIG_ADDRESS_BUS_SHIFT) | \
202+
((dev) << PCI_CONFIG_ADDRESS_DEVICE_SHIFT) | \
203+
((fn) << PCI_CONFIG_ADDRESS_FUNCTION_SHIFT) | \
204+
(((off) & 0xF00) << 16) | \
205+
((off) & PCI_CONFIG_ADDRESS_OFFSET_MASK))
206206

207207
static uint32_t pci_io_config_read32(uint32_t bus, uint32_t dev, uint32_t func,
208208
uint32_t off)

0 commit comments

Comments
 (0)