diff vidix/sysdep/AsmMacros_x86.h @ 27757:b5a46071062a

Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'. We were using an inconsistent mix of the three variants and 'volatile' should be the most correct and portable variant.
author diego
date Thu, 16 Oct 2008 20:17:56 +0000
parents a15f6e3b669c
children eda346733b8c
line wrap: on
line diff
--- a/vidix/sysdep/AsmMacros_x86.h	Thu Oct 16 19:24:21 2008 +0000
+++ b/vidix/sysdep/AsmMacros_x86.h	Thu Oct 16 20:17:56 2008 +0000
@@ -171,7 +171,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
+   __asm__ volatile("outb %0,%1" : :"a" (val), "d" (port));
     return;
 }
 
@@ -199,7 +199,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
+   __asm__ volatile("outw %0,%1" : :"a" (val), "d" (port));
     return;
 }
 
@@ -227,7 +227,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
+   __asm__ volatile("outl %0,%1" : :"a" (val), "d" (port));
     return;
 }
 
@@ -255,7 +255,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("inb %1,%0" :
+   __asm__ volatile("inb %1,%0" :
        "=a" (ret) :
        "d" (port));
    return ret;
@@ -285,7 +285,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("inw %1,%0" :
+   __asm__ volatile("inw %1,%0" :
        "=a" (ret) :
        "d" (port));
    return ret;
@@ -315,7 +315,7 @@
     }
     else
 #endif
-   __asm__ __volatile__("inl %1,%0" :
+   __asm__ volatile("inl %1,%0" :
        "=a" (ret) :
        "d" (port));
    return ret;
@@ -327,7 +327,7 @@
     if (svgahelper_initialized == 1)
 	return;
 #endif
-  __asm__ __volatile__("cli");
+  __asm__ volatile("cli");
 }
 
 static __inline__ void intr_enable()
@@ -336,7 +336,7 @@
     if (svgahelper_initialized == 1)
 	return;
 #endif
-  __asm__ __volatile__("sti");
+  __asm__ volatile("sti");
 }
 
 #endif /* MPLAYER_ASMMACROS_X86_H */