Module Name: xsrc Committed By: skrll Date: Sun Nov 28 10:27:02 UTC 2010
Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h Log Message: Fix merge and ARM define handling. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.7 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.6 Tue Nov 23 07:08:05 2010 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Sun Nov 28 10:27:02 2010 @@ -707,7 +707,7 @@ : "r" (val), "r" (addr), "i" (ASI_PL)); } -# elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +# elif defined(__mips__) || ((defined(__arm32__) || defined(__arm__)) && !defined(__linux__)) # ifdef __arm32__ # define PORT_SIZE long # else @@ -746,61 +746,6 @@ return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase); } -#if 0 -static __inline__ void stw_u(unsigned long val, unsigned short *p) -{ -# if defined(__GNUC__) - struct __una_u16 *ptr = (struct __una_u16 *) p; - ptr->x = val; -# else - unsigned short tmp = val; - memmove(p, &tmp, sizeof(*p)); -# endif -} - -# define mem_barrier() /* XXX: nop for now */ -# define write_mem_barrier() /* XXX: nop for now */ - -# elif defined(__mips__) || ((defined(__arm32__) || defined(__arm__)) && !defined(__linux__)) -# if defined(__arm32__) || defined(__arm__) -# define PORT_SIZE long -# else -# define PORT_SIZE short -# endif - -unsigned int IOPortBase; /* Memory mapped I/O port area */ - -static __inline__ void -outb(unsigned PORT_SIZE port, unsigned char val) -{ - *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -} - -static __inline__ void -outw(unsigned PORT_SIZE port, unsigned short val) -{ - *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -} - -static __inline__ void -outl(unsigned PORT_SIZE port, unsigned int val) -{ - *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val; -} - -static __inline__ unsigned int -inb(unsigned PORT_SIZE port) -{ - return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase); -} - -static __inline__ unsigned int -inw(unsigned PORT_SIZE port) -{ - return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase); -} -#endif - static __inline__ unsigned int inl(unsigned PORT_SIZE port) { @@ -837,19 +782,6 @@ # endif /* !linux */ # endif /* __mips__ */ -#if 0 -# if defined(__arm32__) || defined(__arm__) -# define ldq_u(p) (*((unsigned long *)(p))) -# define ldl_u(p) (*((unsigned int *)(p))) -# define ldw_u(p) (*((unsigned short *)(p))) -# define stq_u(v,p) (*(unsigned long *)(p)) = (v) -# define stl_u(v,p) (*(unsigned int *)(p)) = (v) -# define stw_u(v,p) (*(unsigned short *)(p)) = (v) -# define mem_barrier() /* NOP */ -# define write_mem_barrier() /* NOP */ -# endif /* __arm32__ || __arm__ */ -#endif - # elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) # ifndef MAP_FAILED