Mercurial > mplayer.hg
comparison vidix/sysdep/AsmMacros_arm32.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 | 502f04b67653 |
children |
comparison
equal
deleted
inserted
replaced
34652:4e7cc799cf54 | 34653:958431e2cde0 |
---|---|
62 #ifndef MPLAYER_ASMMACROS_ARM32_H | 62 #ifndef MPLAYER_ASMMACROS_ARM32_H |
63 #define MPLAYER_ASMMACROS_ARM32_H | 63 #define MPLAYER_ASMMACROS_ARM32_H |
64 | 64 |
65 unsigned int IOPortBase; /* Memory mapped I/O port area */ | 65 unsigned int IOPortBase; /* Memory mapped I/O port area */ |
66 | 66 |
67 static __inline__ void outb(short port,char val) | 67 static inline void outb(short port, char val) |
68 { | 68 { |
69 if ((unsigned short)port >= 0x400) return; | 69 if ((unsigned short)port >= 0x400) return; |
70 *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val; | 70 *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val; |
71 } | 71 } |
72 | 72 |
73 static __inline__ void outw(short port,short val) | 73 static inline void outw(short port, short val) |
74 { | 74 { |
75 if ((unsigned short)port >= 0x400) return; | 75 if ((unsigned short)port >= 0x400) return; |
76 *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val; | 76 *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val; |
77 } | 77 } |
78 | 78 |
79 static __inline__ void outl(short port,int val) | 79 static inline void outl(short port, int val) |
80 { | 80 { |
81 if ((unsigned short)port >= 0x400) return; | 81 if ((unsigned short)port >= 0x400) return; |
82 *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val; | 82 *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val; |
83 } | 83 } |
84 | 84 |
85 static __inline__ unsigned int inb(short port) | 85 static inline unsigned int inb(short port) |
86 { | 86 { |
87 if ((unsigned short)port >= 0x400) return (unsigned int)-1; | 87 if ((unsigned short)port >= 0x400) return (unsigned int)-1; |
88 return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase); | 88 return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase); |
89 } | 89 } |
90 | 90 |
91 static __inline__ unsigned int inw(short port) | 91 static inline unsigned int inw(short port) |
92 { | 92 { |
93 if ((unsigned short)port >= 0x400) return (unsigned int)-1; | 93 if ((unsigned short)port >= 0x400) return (unsigned int)-1; |
94 return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase); | 94 return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase); |
95 } | 95 } |
96 | 96 |
97 static __inline__ unsigned int inl(short port) | 97 static inline unsigned int inl(short port) |
98 { | 98 { |
99 if ((unsigned short)port >= 0x400) return (unsigned int)-1; | 99 if ((unsigned short)port >= 0x400) return (unsigned int)-1; |
100 return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase); | 100 return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase); |
101 } | 101 } |
102 | 102 |