Mercurial > mplayer.hg

changeset 34653:958431e2cde0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make inline keyword handling consistent. Replace __inline__ and __inline by inline and move it after the static keyword.
author diego
date Sun, 19 Feb 2012 15:21:28 +0000
parents 4e7cc799cf54
children ef4ff507a341
files drivers/radeon_vid.c libmpdemux/demux_avs.c vidix/mach64_vid.c vidix/pci.c vidix/radeon_vid.c vidix/sysdep/AsmMacros_arm32.h vidix/sysdep/AsmMacros_powerpc.h vidix/sysdep/AsmMacros_sparc.h vidix/sysdep/AsmMacros_x86.h vidix/sysdep/pci_386bsd.c vidix/sysdep/pci_bsdi.c vidix/sysdep/pci_freebsd.c vidix/sysdep/pci_isc.c vidix/sysdep/pci_linux.c vidix/sysdep/pci_lynx.c vidix/sysdep/pci_mach386.c vidix/sysdep/pci_netbsd.c vidix/sysdep/pci_openbsd.c vidix/sysdep/pci_os2.c vidix/sysdep/pci_sco.c vidix/sysdep/pci_svr4.c vidix/sysdep/pci_win32.c
diffstat 22 files changed, 72 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/radeon_vid.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/drivers/radeon_vid.c	Sun Feb 19 15:21:28 2012 +0000
@@ -421,7 +421,7 @@
   return (INREG(CRTC_GEN_CNTL))&CRTC_INTERLACE_EN;
 }
 
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
 {
 	int i;
 
@@ -436,7 +436,7 @@
 }
 
 
-static __inline__ void radeon_fifo_wait (int entries)
+static inline void radeon_fifo_wait(int entries)
 {
 	int i;
 
@@ -446,7 +446,7 @@
 }
 
 
-static __inline__ void radeon_engine_idle ( void )
+static inline void radeon_engine_idle(void)
 {
 	int i;
 
--- a/libmpdemux/demux_avs.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/libmpdemux/demux_avs.c	Sun Feb 19 15:21:28 2012 +0000
@@ -146,7 +146,7 @@
 
 /* Implement RGB MODES ?? */
 #if 0
-static __inline int get_mmioFOURCC(const AVS_VideoInfo *v)
+static inline int get_mmioFOURCC(const AVS_VideoInfo *v)
 {
     if (avs_is_rgb(v)) return mmioFOURCC(8, 'R', 'G', 'B');
     if (avs_is_rgb24(v)) return mmioFOURCC(24, 'R', 'G', 'B');
--- a/vidix/mach64_vid.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/mach64_vid.c	Sun Feb 19 15:21:28 2012 +0000
@@ -160,13 +160,13 @@
 		OUTREG(addr, _tmp);					\
 	} while (0)
 
-static __inline__ int ATIGetMach64LCDReg(int _Index)
+static inline int ATIGetMach64LCDReg(int _Index)
 {
         OUTREG8(LCD_INDEX, _Index);
         return INREG(LCD_DATA);
 }
 
-static __inline__ uint32_t INPLL(uint32_t addr)
+static inline uint32_t INPLL(uint32_t addr)
 {
     uint32_t res;
     uint32_t in;
@@ -180,7 +180,7 @@
     return res;
 }
 
-static __inline__ void OUTPLL(uint32_t addr,uint32_t val)
+static inline void OUTPLL(uint32_t addr, uint32_t val)
 {
 //FIXME buggy but its not used
     /* write addr byte */
--- a/vidix/pci.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/pci.c	Sun Feb 19 15:21:28 2012 +0000
@@ -104,7 +104,7 @@
 
 static unsigned char *pciConfBase;
 
-static __inline__ unsigned long
+static inline unsigned long
 static swapl(unsigned long val)
 {
 	unsigned char *p = (unsigned char *)&val;
--- a/vidix/radeon_vid.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/radeon_vid.c	Sun Feb 19 15:21:28 2012 +0000
@@ -547,7 +547,7 @@
 		OUTREG(addr, _tmp);					\
 	} while (0)
 
-static __inline__ uint32_t INPLL(uint32_t addr)
+static inline uint32_t INPLL(uint32_t addr)
 {
 	OUTREG8(CLOCK_CNTL_INDEX, addr & 0x0000001f);
 	return INREG(CLOCK_CNTL_DATA);
@@ -712,7 +712,7 @@
 #define radeon_engine_idle()		_radeon_engine_idle()
 #define radeon_fifo_wait(entries)	_radeon_fifo_wait(entries)
 /* Flush all dirty data in the Pixel Cache to memory. */
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
 {
     unsigned i;
 
@@ -750,7 +750,7 @@
 }
 #else
 
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
 {
 	int i;
 
@@ -1434,7 +1434,7 @@
   { IMGFMT_BGR32, 775 }
 };
 
-__inline__ static int is_supported_fourcc(uint32_t fourcc)
+static inline int is_supported_fourcc(uint32_t fourcc)
 {
   unsigned i;
   for(i=0;i<sizeof(supported_fourcc)/sizeof(fourcc_desc_t);i++)
--- a/vidix/sysdep/AsmMacros_arm32.h	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/AsmMacros_arm32.h	Sun Feb 19 15:21:28 2012 +0000
@@ -64,37 +64,37 @@
 
 unsigned int IOPortBase;  /* Memory mapped I/O port area */
 
-static __inline__ void outb(short port,char val)
+static inline void outb(short port, char val)
 {
 	 if ((unsigned short)port >= 0x400) return;
 	*(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val;
 }
 
-static __inline__ void outw(short port,short val)
+static inline void outw(short port, short val)
 {
 	 if ((unsigned short)port >= 0x400) return;
 	*(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val;
 }
 
-static __inline__ void outl(short port,int val)
+static inline void outl(short port, int val)
 {
 	 if ((unsigned short)port >= 0x400) return;
 	*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val;
 }
 
-static __inline__ unsigned int inb(short port)
+static inline unsigned int inb(short port)
 {
 	if ((unsigned short)port >= 0x400) return (unsigned int)-1;
 	return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase);
 }
 
-static __inline__ unsigned int inw(short port)
+static inline unsigned int inw(short port)
 {
 	if ((unsigned short)port >= 0x400) return (unsigned int)-1;
 	return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase);
 }
 
-static __inline__ unsigned int inl(short port)
+static inline unsigned int inl(short port)
 {
 	if ((unsigned short)port >= 0x400) return (unsigned int)-1;
 	return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase);
--- a/vidix/sysdep/AsmMacros_powerpc.h	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/AsmMacros_powerpc.h	Sun Feb 19 15:21:28 2012 +0000
@@ -66,41 +66,41 @@
 
 extern unsigned char *ioBase;
 
-static __inline__ volatile void eieio(void)
+static inline volatile void eieio(void)
 {
 	__asm__ volatile ("eieio");
 }
 
-static __inline__ void outb(short port, unsigned char value)
+static inline void outb(short port, unsigned char value)
 {
 	*(unsigned char *)(ioBase + port) = value; eieio();
 }
 
-static __inline__ void outw(short port, unsigned short value)
+static inline void outw(short port, unsigned short value)
 {
 	*(unsigned short *)(ioBase + port) = value; eieio();
 }
 
-static __inline__ void outl(short port, unsigned short value)
+static inline void outl(short port, unsigned short value)
 {
 	*(unsigned long *)(ioBase + port) = value; eieio();
 }
 
-static __inline__ unsigned char inb(short port)
+static inline unsigned char inb(short port)
 {
 	unsigned char val;
 	val = *((unsigned char *)(ioBase + port)); eieio();
 	return val;
 }
 
-static __inline__ unsigned short inw(short port)
+static inline unsigned short inw(short port)
 {
 	unsigned short val;
 	val = *((unsigned short *)(ioBase + port)); eieio();
 	return val;
 }
 
-static __inline__ unsigned long inl(short port)
+static inline unsigned long inl(short port)
 {
 	unsigned long val;
 	val = *((unsigned long *)(ioBase + port)); eieio();
--- a/vidix/sysdep/AsmMacros_sparc.h	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/AsmMacros_sparc.h	Sun Feb 19 15:21:28 2012 +0000
@@ -66,36 +66,36 @@
 #define ASI_PL 0x88
 #endif
 
-static __inline__ void outb(unsigned long port, char val)
+static inline void outb(unsigned long port, char val)
 {
   __asm__ volatile("stba %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
 }
 
-static __inline__ void outw(unsigned long port, char val)
+static inline void outw(unsigned long port, char val)
 {
   __asm__ volatile("stha %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
 }
 
-static __inline__ void outl(unsigned long port, char val)
+static inline void outl(unsigned long port, char val)
 {
   __asm__ volatile("sta %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
 }
 
-static __inline__ unsigned int inb(unsigned long port)
+static inline unsigned int inb(unsigned long port)
 {
    unsigned char ret;
    __asm__ volatile("lduba [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
    return ret;
 }
 
-static __inline__ unsigned int inw(unsigned long port)
+static inline unsigned int inw(unsigned long port)
 {
    unsigned char ret;
    __asm__ volatile("lduha [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
    return ret;
 }
 
-static __inline__ unsigned int inl(unsigned long port)
+static inline unsigned int inl(unsigned long port)
 {
    unsigned char ret;
    __asm__ volatile("lda [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
--- a/vidix/sysdep/AsmMacros_x86.h	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/AsmMacros_x86.h	Sun Feb 19 15:21:28 2012 +0000
@@ -89,7 +89,7 @@
 extern int svgahelper_fd;
 extern int svgahelper_initialized;
 
-static __inline__ void svga_outb(short port, char value)
+static inline void svga_outb(short port, char value)
 {
     io_t iov;
 
@@ -98,7 +98,7 @@
     ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTB, &iov);
 }
 
-static __inline__ void svga_outw(short port, char value)
+static inline void svga_outw(short port, char value)
 {
     io_t iov;
 
@@ -107,7 +107,7 @@
     ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTW, &iov);
 }
 
-static __inline__ void svga_outl(short port, unsigned int value)
+static inline void svga_outl(short port, unsigned int value)
 {
     io_t iov;
 
@@ -116,7 +116,7 @@
     ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTL, &iov);
 }
 
-static __inline__ unsigned int svga_inb(short port)
+static inline unsigned int svga_inb(short port)
 {
     io_t iov;
 
@@ -126,7 +126,7 @@
     return iov.val;
 }
 
-static __inline__ unsigned int svga_inw(short port)
+static inline unsigned int svga_inw(short port)
 {
     io_t iov;
 
@@ -136,7 +136,7 @@
     return iov.val;
 }
 
-static __inline__ unsigned int svga_inl(short port)
+static inline unsigned int svga_inl(short port)
 {
     io_t iov;
 
@@ -147,7 +147,7 @@
 }
 #endif /* CONIFG_SVGAHELPER */
 
-static __inline__ void outb(short port,char val)
+static inline void outb(short port, char val)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
@@ -175,7 +175,7 @@
     return;
 }
 
-static __inline__ void outw(short port,short val)
+static inline void outw(short port, short val)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
@@ -203,7 +203,7 @@
     return;
 }
 
-static __inline__ void outl(short port,unsigned int val)
+static inline void outl(short port, unsigned int val)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
@@ -231,7 +231,7 @@
     return;
 }
 
-static __inline__ unsigned int inb(short port)
+static inline unsigned int inb(short port)
 {
    unsigned char ret = 0;
 
@@ -261,7 +261,7 @@
    return ret;
 }
 
-static __inline__ unsigned int inw(short port)
+static inline unsigned int inw(short port)
 {
    unsigned short ret = 0;
 
@@ -291,7 +291,7 @@
    return ret;
 }
 
-static __inline__ unsigned int inl(short port)
+static inline unsigned int inl(short port)
 {
    unsigned int ret = 0;
 
@@ -321,7 +321,7 @@
    return ret;
 }
 
-static __inline__ void intr_disable(void)
+static inline void intr_disable(void)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
@@ -330,7 +330,7 @@
   __asm__ volatile("cli");
 }
 
-static __inline__ void intr_enable(void)
+static inline void intr_enable(void)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
--- a/vidix/sysdep/pci_386bsd.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_386bsd.c	Sun Feb 19 15:21:28 2012 +0000
@@ -35,7 +35,7 @@
 
 static int io_fd;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     io_fd = -1 ;
     if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -49,7 +49,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
     if (ioctl(io_fd, KDDISABIO, 0) < 0) {
         perror("ioctl(KDDISABIO)");
--- a/vidix/sysdep/pci_bsdi.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_bsdi.c	Sun Feb 19 15:21:28 2012 +0000
@@ -13,7 +13,7 @@
 
 static int io_fd;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     io_fd = -1 ;
     if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -27,7 +27,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
     if (ioctl(io_fd, PCCONDISABIOPL, 0) < 0) {
         perror("ioctl(PCCONDISABIOPL)");
--- a/vidix/sysdep/pci_freebsd.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_freebsd.c	Sun Feb 19 15:21:28 2012 +0000
@@ -35,7 +35,7 @@
 
 static int io_fd;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     io_fd = -1 ;
     if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -49,7 +49,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
     if (ioctl(io_fd, KDDISABIO, 0) < 0) {
         perror("ioctl(KDDISABIO)");
--- a/vidix/sysdep/pci_isc.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_isc.c	Sun Feb 19 15:21:28 2012 +0000
@@ -34,7 +34,7 @@
 #include <sys/sysi86.h>
 #include <sys/v86.h>
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 3);
@@ -44,7 +44,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 0);
--- a/vidix/sysdep/pci_linux.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_linux.c	Sun Feb 19 15:21:28 2012 +0000
@@ -88,7 +88,7 @@
 }
 #endif /* CONFIG_SVGAHELPER */
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
 #ifdef CONFIG_SVGAHELPER
     svgahelper_fd = open(DEV_SVGA, O_RDWR);
@@ -119,7 +119,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 #ifdef CONFIG_SVGAHELPER
     if (svgahelper_initialized == 1)
--- a/vidix/sysdep/pci_lynx.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_lynx.c	Sun Feb 19 15:21:28 2012 +0000
@@ -38,7 +38,7 @@
 
 static unsigned char *pciConfBase;
 
-static __inline__ void enable_os_io(void)
+static inline void enable_os_io(void)
 {
     pciConfBase = (unsigned char *) smem_create("PCI-CONF",
     	    (char *)0x80800000, 64*1024, SM_READ|SM_WRITE);
@@ -46,7 +46,7 @@
         exit(1);
 }
 
-static __inline__ void disable_os_io(void)
+static inline void disable_os_io(void)
 {
     smem_create(NULL, (char *) pciConfBase, 0, SM_DETACH);
     smem_remove("PCI-CONF");
@@ -57,7 +57,7 @@
 
 static unsigned char *pciConfBase;
 
-static __inline__ unsigned long
+static inline unsigned long
 static swapl(unsigned long val)
 {
 	unsigned char *p = (unsigned char *)&val;
--- a/vidix/sysdep/pci_mach386.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_mach386.c	Sun Feb 19 15:21:28 2012 +0000
@@ -30,7 +30,7 @@
 
 static int io_fd;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     io_fd = -1 ;
     if ((io_fd = open("/dev/iopl", O_RDWR, 0)) < 0) {
@@ -40,7 +40,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
     close(io_fd);
     return 0;
--- a/vidix/sysdep/pci_netbsd.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_netbsd.c	Sun Feb 19 15:21:28 2012 +0000
@@ -36,7 +36,7 @@
 
 static int io_fd;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     io_fd = -1 ;
 #if !defined(USE_I386_IOPL)
@@ -53,7 +53,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 #if !defined(USE_I386_IOPL)
     close(io_fd);
--- a/vidix/sysdep/pci_openbsd.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_openbsd.c	Sun Feb 19 15:21:28 2012 +0000
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <machine/sysarch.h>
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     if (i386_iopl(1) < 0) {
 	perror("i386_iopl");
@@ -41,7 +41,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
  /* Nothing to do */
     return 0;
--- a/vidix/sysdep/pci_os2.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_os2.c	Sun Feb 19 15:21:28 2012 +0000
@@ -31,7 +31,7 @@
 
 static USHORT callgate[3] = {0,0,0};
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
 	HFILE hfd;
 	ULONG dlen,action;
@@ -71,7 +71,7 @@
 	return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 /* Nothing to do */
         return 0;
--- a/vidix/sysdep/pci_sco.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_sco.c	Sun Feb 19 15:21:28 2012 +0000
@@ -35,7 +35,7 @@
 #include <sys/sysi86.h>
 #include <sys/v86.h>
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 3);
@@ -45,7 +45,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 0);
--- a/vidix/sysdep/pci_svr4.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_svr4.c	Sun Feb 19 15:21:28 2012 +0000
@@ -44,7 +44,7 @@
 # include <sys/psw.h>
 #endif
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 3);
@@ -54,7 +54,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
 #if defined(SI86IOPL)
     sysi86(SI86IOPL, 0);
--- a/vidix/sysdep/pci_win32.c	Sun Feb 19 15:21:23 2012 +0000
+++ b/vidix/sysdep/pci_win32.c	Sun Feb 19 15:21:28 2012 +0000
@@ -33,7 +33,7 @@
 
 static HANDLE hDriver;
 
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
 {
     if(IsWinNT()){
       DWORD dwBytesReturned;
@@ -46,7 +46,7 @@
     return 0;
 }
 
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
 {
     if(IsWinNT()){
       DWORD dwBytesReturned;