diff options
| -rw-r--r-- | src/include/cpu/x86/lapic.h | 2 | ||||
| -rw-r--r-- | src/include/device/azalia_device.h | 8 | ||||
| -rw-r--r-- | src/include/device/pci_rom.h | 2 | ||||
| -rw-r--r-- | src/include/device/resource.h | 2 | ||||
| -rw-r--r-- | src/include/swab.h | 6 | ||||
| -rw-r--r-- | src/include/symbols.h | 2 | ||||
| -rw-r--r-- | src/include/trace.h | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 69a6738c8c..3448ced2d0 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -25,7 +25,7 @@ static inline __attribute__((always_inline)) void lapic_write(unsigned long reg, static inline __attribute__((always_inline)) void lapic_wait_icr_idle(void) { - do { } while ( lapic_read( LAPIC_ICR ) & LAPIC_ICR_BUSY ); + do { } while (lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY); } static inline void enable_lapic(void) diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h index 6aedf4b14f..2ca881cb13 100644 --- a/src/include/device/azalia_device.h +++ b/src/include/device/azalia_device.h @@ -37,10 +37,10 @@ extern const u32 pc_beep_verbs_size; const u32 cim_verb_data_size = sizeof(cim_verb_data) #define AZALIA_PIN_CFG(codec, pin, val) \ - (((codec) << 28) | ((pin) << 20) | ( 0x71c << 8) | ((val) & 0xff)), \ - (((codec) << 28) | ((pin) << 20) | ( 0x71d << 8) | (((val) >> 8) & 0xff)), \ - (((codec) << 28) | ((pin) << 20) | ( 0x71e << 8) | (((val) >> 16) & 0xff)), \ - (((codec) << 28) | ((pin) << 20) | ( 0x71f << 8) | (((val) >> 24) & 0xff)) + (((codec) << 28) | ((pin) << 20) | (0x71c << 8) | ((val) & 0xff)), \ + (((codec) << 28) | ((pin) << 20) | (0x71d << 8) | (((val) >> 8) & 0xff)), \ + (((codec) << 28) | ((pin) << 20) | (0x71e << 8) | (((val) >> 16) & 0xff)), \ + (((codec) << 28) | ((pin) << 20) | (0x71f << 8) | (((val) >> 24) & 0xff)) #define AZALIA_SUBVENDOR(codec, val) \ (((codec) << 28) | (0x01720 << 8) | ((val) & 0xff)), \ diff --git a/src/include/device/pci_rom.h b/src/include/device/pci_rom.h index decd806e94..7266a8f34e 100644 --- a/src/include/device/pci_rom.h +++ b/src/include/device/pci_rom.h @@ -5,7 +5,7 @@ #include <arch/acpi.h> #define PCI_ROM_HDR 0xAA55 -#define PCI_DATA_HDR ((uint32_t) ( ('R' << 24) | ('I' << 16) | ('C' << 8) | 'P' )) +#define PCI_DATA_HDR ((uint32_t) (('R' << 24) | ('I' << 16) | ('C' << 8) | 'P')) #define PCI_RAM_IMAGE_START 0xD0000 #define PCI_VGA_RAM_IMAGE_START 0xC0000 diff --git a/src/include/device/resource.h b/src/include/device/resource.h index 1a8c451982..947bcddb65 100644 --- a/src/include/device/resource.h +++ b/src/include/device/resource.h @@ -50,7 +50,7 @@ struct resource { #define IOINDEX_SUBTRACTIVE_LINK(IDX) (IDX & 0xff) #define IOINDEX(IDX, LINK) (((LINK) << 16) + IDX) -#define IOINDEX_LINK(IDX) (( IDX & 0xf0000) >> 16) +#define IOINDEX_LINK(IDX) ((IDX & 0xf0000) >> 16) #define IOINDEX_IDX(IDX) (IDX & 0xffff) /* Generic resource helper functions */ diff --git a/src/include/swab.h b/src/include/swab.h index 8a7dabaa0a..a372797f7c 100644 --- a/src/include/swab.h +++ b/src/include/swab.h @@ -21,14 +21,14 @@ #define swab16(x) \ ((unsigned short)( \ (((unsigned short)(x) & (unsigned short)0x00ffU) << 8) | \ - (((unsigned short)(x) & (unsigned short)0xff00U) >> 8) )) + (((unsigned short)(x) & (unsigned short)0xff00U) >> 8))) #define swab32(x) \ ((unsigned int)( \ (((unsigned int)(x) & (unsigned int)0x000000ffUL) << 24) | \ (((unsigned int)(x) & (unsigned int)0x0000ff00UL) << 8) | \ (((unsigned int)(x) & (unsigned int)0x00ff0000UL) >> 8) | \ - (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) )) + (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24))) #define swab64(x) \ ((uint64_t)( \ @@ -39,6 +39,6 @@ (((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >> 8) | \ (((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \ (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ - (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )) + (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56))) #endif /* _SWAB_H */ diff --git a/src/include/symbols.h b/src/include/symbols.h index ea4429316d..ada7fa70df 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -111,6 +111,6 @@ extern u8 _eframebuffer[]; * values from that definition will be used. If not, start, end and size will * all evaluate to 0. (We can't explicitly assign the symbols to 0 in the * assembly due to https://sourceware.org/bugzilla/show_bug.cgi?id=1038.) */ -#define DECLARE_OPTIONAL_REGION(name) asm (".weak _" #name ", _e" #name ) +#define DECLARE_OPTIONAL_REGION(name) asm (".weak _" #name ", _e" #name) #endif /* __SYMBOLS_H */ diff --git a/src/include/trace.h b/src/include/trace.h index 362a361f10..8745966bc4 100644 --- a/src/include/trace.h +++ b/src/include/trace.h @@ -27,10 +27,10 @@ #if CONFIG_TRACE && !defined(__SMM__) -void __cyg_profile_func_enter( void *, void * ) +void __cyg_profile_func_enter(void *, void *) __attribute__ ((no_instrument_function)); -void __cyg_profile_func_exit( void *, void * ) +void __cyg_profile_func_exit(void *, void *) __attribute__ ((no_instrument_function)); extern volatile int trace_dis; |