Mercurial > mplayer.hg
comparison vidix/sysdep/AsmMacros_powerpc.h @ 34653:958431e2cde0
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 | eda346733b8c |
children |
comparison
equal
deleted
inserted
replaced
34652:4e7cc799cf54 | 34653:958431e2cde0 |
---|---|
64 | 64 |
65 #if defined(Lynx) || defined(__OpenBSD__) | 65 #if defined(Lynx) || defined(__OpenBSD__) |
66 | 66 |
67 extern unsigned char *ioBase; | 67 extern unsigned char *ioBase; |
68 | 68 |
69 static __inline__ volatile void eieio(void) | 69 static inline volatile void eieio(void) |
70 { | 70 { |
71 __asm__ volatile ("eieio"); | 71 __asm__ volatile ("eieio"); |
72 } | 72 } |
73 | 73 |
74 static __inline__ void outb(short port, unsigned char value) | 74 static inline void outb(short port, unsigned char value) |
75 { | 75 { |
76 *(unsigned char *)(ioBase + port) = value; eieio(); | 76 *(unsigned char *)(ioBase + port) = value; eieio(); |
77 } | 77 } |
78 | 78 |
79 static __inline__ void outw(short port, unsigned short value) | 79 static inline void outw(short port, unsigned short value) |
80 { | 80 { |
81 *(unsigned short *)(ioBase + port) = value; eieio(); | 81 *(unsigned short *)(ioBase + port) = value; eieio(); |
82 } | 82 } |
83 | 83 |
84 static __inline__ void outl(short port, unsigned short value) | 84 static inline void outl(short port, unsigned short value) |
85 { | 85 { |
86 *(unsigned long *)(ioBase + port) = value; eieio(); | 86 *(unsigned long *)(ioBase + port) = value; eieio(); |
87 } | 87 } |
88 | 88 |
89 static __inline__ unsigned char inb(short port) | 89 static inline unsigned char inb(short port) |
90 { | 90 { |
91 unsigned char val; | 91 unsigned char val; |
92 val = *((unsigned char *)(ioBase + port)); eieio(); | 92 val = *((unsigned char *)(ioBase + port)); eieio(); |
93 return val; | 93 return val; |
94 } | 94 } |
95 | 95 |
96 static __inline__ unsigned short inw(short port) | 96 static inline unsigned short inw(short port) |
97 { | 97 { |
98 unsigned short val; | 98 unsigned short val; |
99 val = *((unsigned short *)(ioBase + port)); eieio(); | 99 val = *((unsigned short *)(ioBase + port)); eieio(); |
100 return val; | 100 return val; |
101 } | 101 } |
102 | 102 |
103 static __inline__ unsigned long inl(short port) | 103 static inline unsigned long inl(short port) |
104 { | 104 { |
105 unsigned long val; | 105 unsigned long val; |
106 val = *((unsigned long *)(ioBase + port)); eieio(); | 106 val = *((unsigned long *)(ioBase + port)); eieio(); |
107 return val; | 107 return val; |
108 } | 108 } |