Skip to content
Snippets Groups Projects
Commit 49a89efb authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Fix "no space between function name and open parenthesis" warnings.


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 10cc3529
No related merge requests found
Showing
with 433 additions and 433 deletions
...@@ -65,9 +65,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) ...@@ -65,9 +65,9 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#if defined (__MIPSEB__) #if defined(__MIPSEB__)
# include <linux/byteorder/big_endian.h> # include <linux/byteorder/big_endian.h>
#elif defined (__MIPSEL__) #elif defined(__MIPSEL__)
# include <linux/byteorder/little_endian.h> # include <linux/byteorder/little_endian.h>
#else #else
# error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???" # error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
......
...@@ -319,7 +319,7 @@ do { \ ...@@ -319,7 +319,7 @@ do { \
struct task_struct; struct task_struct;
extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs); extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs);
extern int dump_task_regs (struct task_struct *, elf_gregset_t *); extern int dump_task_regs(struct task_struct *, elf_gregset_t *);
extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
#define ELF_CORE_COPY_REGS(elf_regs, regs) \ #define ELF_CORE_COPY_REGS(elf_regs, regs) \
......
...@@ -60,8 +60,8 @@ enum fixed_addresses { ...@@ -60,8 +60,8 @@ enum fixed_addresses {
__end_of_fixed_addresses __end_of_fixed_addresses
}; };
extern void __set_fixmap (enum fixed_addresses idx, extern void __set_fixmap(enum fixed_addresses idx,
unsigned long phys, pgprot_t flags); unsigned long phys, pgprot_t flags);
#define set_fixmap(idx, phys) \ #define set_fixmap(idx, phys) \
__set_fixmap(idx, phys, PAGE_KERNEL) __set_fixmap(idx, phys, PAGE_KERNEL)
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
} }
static inline int static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr) futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
{ {
int op = (encoded_op >> 28) & 7; int op = (encoded_op >> 28) & 7;
int cmp = (encoded_op >> 24) & 15; int cmp = (encoded_op >> 24) & 15;
......
...@@ -17,8 +17,8 @@ typedef struct inventory_s { ...@@ -17,8 +17,8 @@ typedef struct inventory_s {
extern int inventory_items; extern int inventory_items;
extern void add_to_inventory (int class, int type, int controller, int unit, int state); extern void add_to_inventory(int class, int type, int controller, int unit, int state);
extern int dump_inventory_to_user (void __user *userbuf, int size); extern int dump_inventory_to_user(void __user *userbuf, int size);
extern int __init init_inventory(void); extern int __init init_inventory(void);
#endif /* __ASM_INVENTORY_H */ #endif /* __ASM_INVENTORY_H */
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/hazards.h> #include <asm/hazards.h>
__asm__ ( __asm__(
" .macro raw_local_irq_enable \n" " .macro raw_local_irq_enable \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
...@@ -65,7 +65,7 @@ static inline void raw_local_irq_enable(void) ...@@ -65,7 +65,7 @@ static inline void raw_local_irq_enable(void)
* *
* Workaround: mask EXL bit of the result or place a nop before mfc0. * Workaround: mask EXL bit of the result or place a nop before mfc0.
*/ */
__asm__ ( __asm__(
" .macro raw_local_irq_disable\n" " .macro raw_local_irq_disable\n"
" .set push \n" " .set push \n"
" .set noat \n" " .set noat \n"
...@@ -96,7 +96,7 @@ static inline void raw_local_irq_disable(void) ...@@ -96,7 +96,7 @@ static inline void raw_local_irq_disable(void)
: "memory"); : "memory");
} }
__asm__ ( __asm__(
" .macro raw_local_save_flags flags \n" " .macro raw_local_save_flags flags \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
...@@ -113,7 +113,7 @@ __asm__ __volatile__( \ ...@@ -113,7 +113,7 @@ __asm__ __volatile__( \
"raw_local_save_flags %0" \ "raw_local_save_flags %0" \
: "=r" (x)) : "=r" (x))
__asm__ ( __asm__(
" .macro raw_local_irq_save result \n" " .macro raw_local_irq_save result \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
...@@ -145,7 +145,7 @@ __asm__ __volatile__( \ ...@@ -145,7 +145,7 @@ __asm__ __volatile__( \
: /* no inputs */ \ : /* no inputs */ \
: "memory") : "memory")
__asm__ ( __asm__(
" .macro raw_local_irq_restore flags \n" " .macro raw_local_irq_restore flags \n"
" .set push \n" " .set push \n"
" .set noreorder \n" " .set noreorder \n"
......
This diff is collapsed.
...@@ -136,7 +136,7 @@ void auide_outl(u32 addr, unsigned long port); ...@@ -136,7 +136,7 @@ void auide_outl(u32 addr, unsigned long port);
void auide_outsw(unsigned long port, void *addr, u32 count); void auide_outsw(unsigned long port, void *addr, u32 count);
void auide_outsl(unsigned long port, void *addr, u32 count); void auide_outsl(unsigned long port, void *addr, u32 count);
static void auide_tune_drive(ide_drive_t *drive, byte pio); static void auide_tune_drive(ide_drive_t *drive, byte pio);
static int auide_tune_chipset (ide_drive_t *drive, u8 speed); static int auide_tune_chipset(ide_drive_t *drive, u8 speed);
static int auide_ddma_init( _auide_hwif *auide ); static int auide_ddma_init( _auide_hwif *auide );
static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif); static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif);
int __init auide_probe(void); int __init auide_probe(void);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __ASM_MACH_IP32_KMALLOC_H #define __ASM_MACH_IP32_KMALLOC_H
#if defined(CONFIG_CPU_R5000) || defined (CONFIG_CPU_RM7000) #if defined(CONFIG_CPU_R5000) || defined(CONFIG_CPU_RM7000)
#define ARCH_KMALLOC_MINALIGN 32 #define ARCH_KMALLOC_MINALIGN 32
#else #else
#define ARCH_KMALLOC_MINALIGN 128 #define ARCH_KMALLOC_MINALIGN 128
......
...@@ -32,38 +32,38 @@ ...@@ -32,38 +32,38 @@
#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1) #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1)
#define PB1000_PCR 0xBE000000 #define PB1000_PCR 0xBE000000
#define PCR_SLOT_0_VPP0 (1<<0) # define PCR_SLOT_0_VPP0 (1<<0)
#define PCR_SLOT_0_VPP1 (1<<1) # define PCR_SLOT_0_VPP1 (1<<1)
#define PCR_SLOT_0_VCC0 (1<<2) # define PCR_SLOT_0_VCC0 (1<<2)
#define PCR_SLOT_0_VCC1 (1<<3) # define PCR_SLOT_0_VCC1 (1<<3)
#define PCR_SLOT_0_RST (1<<4) # define PCR_SLOT_0_RST (1<<4)
#define PCR_SLOT_1_VPP0 (1<<8) # define PCR_SLOT_1_VPP0 (1<<8)
#define PCR_SLOT_1_VPP1 (1<<9) # define PCR_SLOT_1_VPP1 (1<<9)
#define PCR_SLOT_1_VCC0 (1<<10) # define PCR_SLOT_1_VCC0 (1<<10)
#define PCR_SLOT_1_VCC1 (1<<11) # define PCR_SLOT_1_VCC1 (1<<11)
#define PCR_SLOT_1_RST (1<<12) # define PCR_SLOT_1_RST (1<<12)
#define PB1000_MDR 0xBE000004 #define PB1000_MDR 0xBE000004
#define MDR_PI (1<<5) /* pcmcia int latch */ # define MDR_PI (1<<5) /* pcmcia int latch */
#define MDR_EPI (1<<14) /* enable pcmcia int */ # define MDR_EPI (1<<14) /* enable pcmcia int */
#define MDR_CPI (1<<15) /* clear pcmcia int */ # define MDR_CPI (1<<15) /* clear pcmcia int */
#define PB1000_ACR1 0xBE000008 #define PB1000_ACR1 0xBE000008
#define ACR1_SLOT_0_CD1 (1<<0) /* card detect 1 */ # define ACR1_SLOT_0_CD1 (1<<0) /* card detect 1 */
#define ACR1_SLOT_0_CD2 (1<<1) /* card detect 2 */ # define ACR1_SLOT_0_CD2 (1<<1) /* card detect 2 */
#define ACR1_SLOT_0_READY (1<<2) /* ready */ # define ACR1_SLOT_0_READY (1<<2) /* ready */
#define ACR1_SLOT_0_STATUS (1<<3) /* status change */ # define ACR1_SLOT_0_STATUS (1<<3) /* status change */
#define ACR1_SLOT_0_VS1 (1<<4) /* voltage sense 1 */ # define ACR1_SLOT_0_VS1 (1<<4) /* voltage sense 1 */
#define ACR1_SLOT_0_VS2 (1<<5) /* voltage sense 2 */ # define ACR1_SLOT_0_VS2 (1<<5) /* voltage sense 2 */
#define ACR1_SLOT_0_INPACK (1<<6) /* inpack pin status */ # define ACR1_SLOT_0_INPACK (1<<6) /* inpack pin status */
#define ACR1_SLOT_1_CD1 (1<<8) /* card detect 1 */ # define ACR1_SLOT_1_CD1 (1<<8) /* card detect 1 */
#define ACR1_SLOT_1_CD2 (1<<9) /* card detect 2 */ # define ACR1_SLOT_1_CD2 (1<<9) /* card detect 2 */
#define ACR1_SLOT_1_READY (1<<10) /* ready */ # define ACR1_SLOT_1_READY (1<<10) /* ready */
#define ACR1_SLOT_1_STATUS (1<<11) /* status change */ # define ACR1_SLOT_1_STATUS (1<<11) /* status change */
#define ACR1_SLOT_1_VS1 (1<<12) /* voltage sense 1 */ # define ACR1_SLOT_1_VS1 (1<<12) /* voltage sense 1 */
#define ACR1_SLOT_1_VS2 (1<<13) /* voltage sense 2 */ # define ACR1_SLOT_1_VS2 (1<<13) /* voltage sense 2 */
#define ACR1_SLOT_1_INPACK (1<<14) /* inpack pin status */ # define ACR1_SLOT_1_INPACK (1<<14) /* inpack pin status */
#define CPLD_AUX0 0xBE00000C #define CPLD_AUX0 0xBE00000C
#define CPLD_AUX1 0xBE000010 #define CPLD_AUX1 0xBE000010
......
...@@ -29,44 +29,44 @@ ...@@ -29,44 +29,44 @@
#define PB1100_IDENT 0xAE000000 #define PB1100_IDENT 0xAE000000
#define BOARD_STATUS_REG 0xAE000004 #define BOARD_STATUS_REG 0xAE000004
#define PB1100_ROM_SEL (1<<15) # define PB1100_ROM_SEL (1<<15)
#define PB1100_ROM_SIZ (1<<14) # define PB1100_ROM_SIZ (1<<14)
#define PB1100_SWAP_BOOT (1<<13) # define PB1100_SWAP_BOOT (1<<13)
#define PB1100_FLASH_WP (1<<12) # define PB1100_FLASH_WP (1<<12)
#define PB1100_ROM_H_STS (1<<11) # define PB1100_ROM_H_STS (1<<11)
#define PB1100_ROM_L_STS (1<<10) # define PB1100_ROM_L_STS (1<<10)
#define PB1100_FLASH_H_STS (1<<9) # define PB1100_FLASH_H_STS (1<<9)
#define PB1100_FLASH_L_STS (1<<8) # define PB1100_FLASH_L_STS (1<<8)
#define PB1100_SRAM_SIZ (1<<7) # define PB1100_SRAM_SIZ (1<<7)
#define PB1100_TSC_BUSY (1<<6) # define PB1100_TSC_BUSY (1<<6)
#define PB1100_PCMCIA_VS_MASK (3<<4) # define PB1100_PCMCIA_VS_MASK (3<<4)
#define PB1100_RS232_CD (1<<3) # define PB1100_RS232_CD (1<<3)
#define PB1100_RS232_CTS (1<<2) # define PB1100_RS232_CTS (1<<2)
#define PB1100_RS232_DSR (1<<1) # define PB1100_RS232_DSR (1<<1)
#define PB1100_RS232_RI (1<<0) # define PB1100_RS232_RI (1<<0)
#define PB1100_IRDA_RS232 0xAE00000C #define PB1100_IRDA_RS232 0xAE00000C
#define PB1100_IRDA_FULL (0<<14) /* full power */ # define PB1100_IRDA_FULL (0<<14) /* full power */
#define PB1100_IRDA_SHUTDOWN (1<<14) # define PB1100_IRDA_SHUTDOWN (1<<14)
#define PB1100_IRDA_TT (2<<14) /* 2/3 power */ # define PB1100_IRDA_TT (2<<14) /* 2/3 power */
#define PB1100_IRDA_OT (3<<14) /* 1/3 power */ # define PB1100_IRDA_OT (3<<14) /* 1/3 power */
#define PB1100_IRDA_FIR (1<<13) # define PB1100_IRDA_FIR (1<<13)
#define PCMCIA_BOARD_REG 0xAE000010 #define PCMCIA_BOARD_REG 0xAE000010
#define PB1100_SD_WP1_RO (1<<15) /* read only */ # define PB1100_SD_WP1_RO (1<<15) /* read only */
#define PB1100_SD_WP0_RO (1<<14) /* read only */ # define PB1100_SD_WP0_RO (1<<14) /* read only */
#define PB1100_SD_PWR1 (1<<11) /* applies power to SD1 */ # define PB1100_SD_PWR1 (1<<11) /* applies power to SD1 */
#define PB1100_SD_PWR0 (1<<10) /* applies power to SD0 */ # define PB1100_SD_PWR0 (1<<10) /* applies power to SD0 */
#define PB1100_SEL_SD_CONN1 (1<<9) # define PB1100_SEL_SD_CONN1 (1<<9)
#define PB1100_SEL_SD_CONN0 (1<<8) # define PB1100_SEL_SD_CONN0 (1<<8)
#define PC_DEASSERT_RST (1<<7) # define PC_DEASSERT_RST (1<<7)
#define PC_DRV_EN (1<<4) # define PC_DRV_EN (1<<4)
#define PB1100_G_CONTROL 0xAE000014 /* graphics control */ #define PB1100_G_CONTROL 0xAE000014 /* graphics control */
#define PB1100_RST_VDDI 0xAE00001C #define PB1100_RST_VDDI 0xAE00001C
#define PB1100_SOFT_RESET (1<<15) /* clear to reset the board */ # define PB1100_SOFT_RESET (1<<15) /* clear to reset the board */
#define PB1100_VDDI_MASK (0x1F) # define PB1100_VDDI_MASK (0x1F)
#define PB1100_LEDS 0xAE000018 #define PB1100_LEDS 0xAE000018
......
...@@ -200,10 +200,10 @@ pr4450_instr_cache_invalidated: ...@@ -200,10 +200,10 @@ pr4450_instr_cache_invalidated:
icache_invd_loop: icache_invd_loop:
/* 9 == register t1 */ /* 9 == register t1 */
.word (CACHE_OPC | (9 << 21) | (Index_Invalidate_I << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Invalidate_I << 16) | \
(0 * ICACHE_SET_SIZE)) /* invalidate inst cache WAY0 */ (0 * ICACHE_SET_SIZE) /* invalidate inst cache WAY0 */
.word (CACHE_OPC | (9 << 21) | (Index_Invalidate_I << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Invalidate_I << 16) | \
(1 * ICACHE_SET_SIZE)) /* invalidate inst cache WAY1 */ (1 * ICACHE_SET_SIZE) /* invalidate inst cache WAY1 */
addiu t1, t1, ICACHE_LINE_SIZE /* T1 = next cache line index */ addiu t1, t1, ICACHE_LINE_SIZE /* T1 = next cache line index */
bne t2, zero, icache_invd_loop /* T2 = 0 if all sets invalidated */ bne t2, zero, icache_invd_loop /* T2 = 0 if all sets invalidated */
...@@ -235,14 +235,14 @@ pr4450_instr_cache_invalidated: ...@@ -235,14 +235,14 @@ pr4450_instr_cache_invalidated:
dcache_wbinvd_loop: dcache_wbinvd_loop:
/* 9 == register t1 */ /* 9 == register t1 */
.word (CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \
(0 * DCACHE_SET_SIZE)) /* writeback/invalidate WAY0 */ (0 * DCACHE_SET_SIZE) /* writeback/invalidate WAY0 */
.word (CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \
(1 * DCACHE_SET_SIZE)) /* writeback/invalidate WAY1 */ (1 * DCACHE_SET_SIZE) /* writeback/invalidate WAY1 */
.word (CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \
(2 * DCACHE_SET_SIZE)) /* writeback/invalidate WAY2 */ (2 * DCACHE_SET_SIZE) /* writeback/invalidate WAY2 */
.word (CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \ .word CACHE_OPC | (9 << 21) | (Index_Writeback_Inv_D << 16) | \
(3 * DCACHE_SET_SIZE)) /* writeback/invalidate WAY3 */ (3 * DCACHE_SET_SIZE) /* writeback/invalidate WAY3 */
addiu t1, t1, DCACHE_LINE_SIZE /* T1 = next data cache line index */ addiu t1, t1, DCACHE_LINE_SIZE /* T1 = next data cache line index */
bne t2, zero, dcache_wbinvd_loop /* T2 = 0 when wbinvd entire cache */ bne t2, zero, dcache_wbinvd_loop /* T2 = 0 when wbinvd entire cache */
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#ifndef _ASM_PARPORT_H #ifndef _ASM_PARPORT_H
#define _ASM_PARPORT_H #define _ASM_PARPORT_H
static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma);
static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
{ {
return parport_pc_find_isa_ports (autoirq, autodma); return parport_pc_find_isa_ports(autoirq, autodma);
} }
#endif /* _ASM_PARPORT_H */ #endif /* _ASM_PARPORT_H */
...@@ -36,6 +36,6 @@ struct prda { ...@@ -36,6 +36,6 @@ struct prda {
#define t_sys prda_sys #define t_sys prda_sys
ptrdiff_t prctl (int op, int v1, int v2); ptrdiff_t prctl(int op, int v1, int v2);
#endif #endif
...@@ -51,18 +51,18 @@ struct semaphore { ...@@ -51,18 +51,18 @@ struct semaphore {
#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) #define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1)
#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0) #define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name, 0)
static inline void sema_init (struct semaphore *sem, int val) static inline void sema_init(struct semaphore *sem, int val)
{ {
atomic_set(&sem->count, val); atomic_set(&sem->count, val);
init_waitqueue_head(&sem->wait); init_waitqueue_head(&sem->wait);
} }
static inline void init_MUTEX (struct semaphore *sem) static inline void init_MUTEX(struct semaphore *sem)
{ {
sema_init(sem, 1); sema_init(sem, 1);
} }
static inline void init_MUTEX_LOCKED (struct semaphore *sem) static inline void init_MUTEX_LOCKED(struct semaphore *sem)
{ {
sema_init(sem, 0); sema_init(sem, 0);
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
#define save_static_function(symbol) \ #define save_static_function(symbol) \
__asm__ ( \ __asm__( \
".text\n\t" \ ".text\n\t" \
".globl\t" #symbol "\n\t" \ ".globl\t" #symbol "\n\t" \
".align\t2\n\t" \ ".align\t2\n\t" \
...@@ -46,7 +46,7 @@ __asm__ ( \ ...@@ -46,7 +46,7 @@ __asm__ ( \
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
#define save_static_function(symbol) \ #define save_static_function(symbol) \
__asm__ ( \ __asm__( \
".text\n\t" \ ".text\n\t" \
".globl\t" #symbol "\n\t" \ ".globl\t" #symbol "\n\t" \
".align\t2\n\t" \ ".align\t2\n\t" \
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#define TO_NODE_ADDRSPACE(_pa) (UINT64_CAST (_pa) & NODE_ADDRSPACE_MASK) #define TO_NODE_ADDRSPACE(_pa) (UINT64_CAST (_pa) & NODE_ADDRSPACE_MASK)
#define CHANGE_ADDR_NASID(_pa, _nasid) \ #define CHANGE_ADDR_NASID(_pa, _nasid) \
((UINT64_CAST (_pa) & ~NASID_MASK) | \ ((UINT64_CAST(_pa) & ~NASID_MASK) | \
(UINT64_CAST(_nasid) << NASID_SHFT)) (UINT64_CAST(_nasid) << NASID_SHFT))
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#define RAW_NODE_SWIN_BASE(nasid, widget) \ #define RAW_NODE_SWIN_BASE(nasid, widget) \
(NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS)) (NODE_IO_BASE(nasid) + (UINT64_CAST(widget) << SWIN_SIZE_BITS))
#define WIDGETID_GET(addr) ((unsigned char)((addr >> SWIN_SIZE_BITS) & 0xff)) #define WIDGETID_GET(addr) ((unsigned char)((addr >> SWIN_SIZE_BITS) & 0xff))
...@@ -192,21 +192,21 @@ ...@@ -192,21 +192,21 @@
#define BDDIR_ENTRY_LO(_pa) ((HSPEC_BASE + \ #define BDDIR_ENTRY_LO(_pa) ((HSPEC_BASE + \
NODE_ADDRSPACE_SIZE * 3 / 4 + \ NODE_ADDRSPACE_SIZE * 3 / 4 + \
0x200) | \ 0x200) | \
UINT64_CAST (_pa) & NASID_MASK | \ UINT64_CAST(_pa) & NASID_MASK | \
UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK | \ UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK | \
UINT64_CAST (_pa) >> 3 & 0x1f << 4) UINT64_CAST(_pa) >> 3 & 0x1f << 4)
#define BDDIR_ENTRY_HI(_pa) ((HSPEC_BASE + \ #define BDDIR_ENTRY_HI(_pa) ((HSPEC_BASE + \
NODE_ADDRSPACE_SIZE * 3 / 4 + \ NODE_ADDRSPACE_SIZE * 3 / 4 + \
0x208) | \ 0x208) | \
UINT64_CAST (_pa) & NASID_MASK | \ UINT64_CAST(_pa) & NASID_MASK | \
UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK | \ UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK | \
UINT64_CAST (_pa) >> 3 & 0x1f << 4) UINT64_CAST(_pa) >> 3 & 0x1f << 4)
#define BDPRT_ENTRY(_pa, _rgn) ((HSPEC_BASE + \ #define BDPRT_ENTRY(_pa, _rgn) ((HSPEC_BASE + \
NODE_ADDRSPACE_SIZE * 3 / 4) | \ NODE_ADDRSPACE_SIZE * 3 / 4) | \
UINT64_CAST (_pa) & NASID_MASK | \ UINT64_CAST(_pa) & NASID_MASK | \
UINT64_CAST (_pa) >> 2 & BDDIR_UPPER_MASK | \ UINT64_CAST(_pa) >> 2 & BDDIR_UPPER_MASK | \
(_rgn) << 3) (_rgn) << 3)
#define BDPRT_ENTRY_ADDR(_pa,_rgn) (BDPRT_ENTRY((_pa),(_rgn))) #define BDPRT_ENTRY_ADDR(_pa,_rgn) (BDPRT_ENTRY((_pa),(_rgn)))
#define BDPRT_ENTRY_S(_pa,_rgn,_val) (*(__psunsigned_t *)BDPRT_ENTRY((_pa),(_rgn))=(_val)) #define BDPRT_ENTRY_S(_pa,_rgn,_val) (*(__psunsigned_t *)BDPRT_ENTRY((_pa),(_rgn))=(_val))
...@@ -214,9 +214,9 @@ ...@@ -214,9 +214,9 @@
#define BDECC_ENTRY(_pa) ((HSPEC_BASE + \ #define BDECC_ENTRY(_pa) ((HSPEC_BASE + \
NODE_ADDRSPACE_SIZE / 2) | \ NODE_ADDRSPACE_SIZE / 2) | \
UINT64_CAST (_pa) & NASID_MASK | \ UINT64_CAST(_pa) & NASID_MASK | \
UINT64_CAST (_pa) >> 2 & BDECC_UPPER_MASK | \ UINT64_CAST(_pa) >> 2 & BDECC_UPPER_MASK | \
UINT64_CAST (_pa) >> 3 & 3) UINT64_CAST(_pa) >> 3 & 3)
/* /*
* Macro to convert a back door directory or protection address into the * Macro to convert a back door directory or protection address into the
...@@ -225,16 +225,16 @@ ...@@ -225,16 +225,16 @@
#define BDADDR_IS_DIR(_ba) ((UINT64_CAST (_ba) & 0x200) != 0) #define BDADDR_IS_DIR(_ba) ((UINT64_CAST (_ba) & 0x200) != 0)
#define BDADDR_IS_PRT(_ba) ((UINT64_CAST (_ba) & 0x200) == 0) #define BDADDR_IS_PRT(_ba) ((UINT64_CAST (_ba) & 0x200) == 0)
#define BDDIR_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \ #define BDDIR_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \
(UINT64_CAST (_ba) & BDDIR_UPPER_MASK)<<2 | \ (UINT64_CAST(_ba) & BDDIR_UPPER_MASK)<<2 | \
(UINT64_CAST (_ba) & 0x1f << 4) << 3) (UINT64_CAST(_ba) & 0x1f << 4) << 3)
#define BDPRT_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \ #define BDPRT_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \
(UINT64_CAST (_ba) & BDDIR_UPPER_MASK)<<2) (UINT64_CAST(_ba) & BDDIR_UPPER_MASK)<<2)
#define BDECC_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \ #define BDECC_TO_MEM(_ba) (UINT64_CAST (_ba) & NASID_MASK | \
(UINT64_CAST (_ba) & BDECC_UPPER_MASK)<<2 | \ (UINT64_CAST(_ba) & BDECC_UPPER_MASK)<<2 | \
(UINT64_CAST (_ba) & 3) << 3) (UINT64_CAST(_ba) & 3) << 3)
#endif /* CONFIG_SGI_IP27 */ #endif /* CONFIG_SGI_IP27 */
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
* the base of the register space. * the base of the register space.
*/ */
#define HUB_REG_PTR(_base, _off) \ #define HUB_REG_PTR(_base, _off) \
(HUBREG_CAST ((__psunsigned_t)(_base) + (__psunsigned_t)(_off))) (HUBREG_CAST((__psunsigned_t)(_base) + (__psunsigned_t)(_off)))
#define HUB_REG_PTR_L(_base, _off) \ #define HUB_REG_PTR_L(_base, _off) \
HUB_L(HUB_REG_PTR((_base), (_off))) HUB_L(HUB_REG_PTR((_base), (_off)))
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef _ASM_SN_IO_H #ifndef _ASM_SN_IO_H
#define _ASM_SN_IO_H #define _ASM_SN_IO_H
#if defined (CONFIG_SGI_IP27) #if defined(CONFIG_SGI_IP27)
#include <asm/sn/sn0/hubio.h> #include <asm/sn/sn0/hubio.h>
#endif #endif
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
*/ */
#define SYMMON_STACK_SIZE 0x8000 #define SYMMON_STACK_SIZE 0x8000
#if defined (PROM) #if defined(PROM)
/* /*
* These defines are prom version dependent. No code other than the IP27 * These defines are prom version dependent. No code other than the IP27
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
: RAW_NODE_SWIN_BASE(nasid, widget)) : RAW_NODE_SWIN_BASE(nasid, widget))
#else /* __ASSEMBLY__ */ #else /* __ASSEMBLY__ */
#define NODE_SWIN_BASE(nasid, widget) \ #define NODE_SWIN_BASE(nasid, widget) \
(NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS)) (NODE_IO_BASE(nasid) + (UINT64_CAST(widget) << SWIN_SIZE_BITS))
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
/* /*
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
#define BWIN_WIDGET_MASK 0x7 #define BWIN_WIDGET_MASK 0x7
#define NODE_BWIN_BASE0(nasid) (NODE_IO_BASE(nasid) + BWIN_SIZE) #define NODE_BWIN_BASE0(nasid) (NODE_IO_BASE(nasid) + BWIN_SIZE)
#define NODE_BWIN_BASE(nasid, bigwin) (NODE_BWIN_BASE0(nasid) + \ #define NODE_BWIN_BASE(nasid, bigwin) (NODE_BWIN_BASE0(nasid) + \
(UINT64_CAST (bigwin) << BWIN_SIZE_BITS)) (UINT64_CAST(bigwin) << BWIN_SIZE_BITS))
#define BWIN_WIDGETADDR(addr) ((addr) & BWIN_SIZEMASK) #define BWIN_WIDGETADDR(addr) ((addr) & BWIN_SIZEMASK)
#define BWIN_WINDOWNUM(addr) (((addr) >> BWIN_SIZE_BITS) & BWIN_WIDGET_MASK) #define BWIN_WINDOWNUM(addr) (((addr) >> BWIN_SIZE_BITS) & BWIN_WIDGET_MASK)
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
* CACHE_ERR_SP_PTR could either contain an address to the stack, or * CACHE_ERR_SP_PTR could either contain an address to the stack, or
* the stack could start at CACHE_ERR_SP_PTR * the stack could start at CACHE_ERR_SP_PTR
*/ */
#if defined (HUB_ERR_STS_WAR) #if defined(HUB_ERR_STS_WAR)
#define CACHE_ERR_EFRAME 0x480 #define CACHE_ERR_EFRAME 0x480
#else /* HUB_ERR_STS_WAR */ #else /* HUB_ERR_STS_WAR */
#define CACHE_ERR_EFRAME 0x400 #define CACHE_ERR_EFRAME 0x400
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
#define _ARCSPROM #define _ARCSPROM
#if defined (HUB_ERR_STS_WAR) #if defined(HUB_ERR_STS_WAR)
#define ERR_STS_WAR_REGISTER IIO_IIBUSERR #define ERR_STS_WAR_REGISTER IIO_IIBUSERR
#define ERR_STS_WAR_ADDR LOCAL_HUB_ADDR(IIO_IIBUSERR) #define ERR_STS_WAR_ADDR LOCAL_HUB_ADDR(IIO_IIBUSERR)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment