[ros-diffs] [pschweitzer] 63147: [HALX86] Properly declare with FORCEINLINE

Author: pschweitzer
Date: Sun May  4 09:39:44 2014
New Revision: 63147

URL: http://svn.reactos.org/svn/reactos?rev=63147&view=rev
Log:
[HALX86]
Properly declare with FORCEINLINE

Modified:
    trunk/reactos/hal/halx86/apic/apic.c
    trunk/reactos/hal/halx86/apic/apic.h
    trunk/reactos/hal/halx86/apic/rtctimer.c
    trunk/reactos/hal/halx86/up/pic.c

Modified: trunk/reactos/hal/halx86/apic/apic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev…
==============================================================================
--- trunk/reactos/hal/halx86/apic/apic.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/apic.c	[iso-8859-1] Sun May  4 09:39:44 2014
@@ -89,8 +89,8 @@
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
+FORCEINLINE
 ULONG
-FORCEINLINE
 IOApicRead(UCHAR Register)
 {
     /* Select the register, then do the read */
@@ -98,8 +98,8 @@
     return *(volatile ULONG *)(IOAPIC_BASE + IOAPIC_IOWIN);
 }
 
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 IOApicWrite(UCHAR Register, ULONG Value)
 {
     /* Select the register, then do the write */
@@ -107,8 +107,8 @@
     *(volatile ULONG *)(IOAPIC_BASE + IOAPIC_IOWIN) = Value;
 }
 
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 ApicWriteIORedirectionEntry(
     UCHAR Index,
     IOAPIC_REDIRECTION_REGISTER ReDirReg)
@@ -117,8 +117,8 @@
     IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1);
 }
 
+FORCEINLINE
 IOAPIC_REDIRECTION_REGISTER
-FORCEINLINE
 ApicReadIORedirectionEntry(
     UCHAR Index)
 {
@@ -130,8 +130,8 @@
     return ReDirReg;
 }
 
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 ApicRequestInterrupt(IN UCHAR Vector, UCHAR TriggerMode)
 {
     APIC_COMMAND_REGISTER CommandRegister;
@@ -147,24 +147,24 @@
     ApicWrite(APIC_ICR0, CommandRegister.Long0);
 }
 
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 ApicSendEOI(void)
 {
     //ApicWrite(APIC_EOI, 0);
     HackEoi();
 }
 
+FORCEINLINE
 KIRQL
-FORCEINLINE
 ApicGetProcessorIrql(VOID)
 {
     /* Read the TPR and convert it to an IRQL */
     return TprToIrql(ApicRead(APIC_PPR));
 }
 
+FORCEINLINE
 KIRQL
-FORCEINLINE
 ApicGetCurrentIrql(VOID)
 {
 #ifdef _M_AMD64
@@ -184,8 +184,8 @@
 #endif
 }
 
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 ApicSetIrql(KIRQL Irql)
 {
 #ifdef _M_AMD64
@@ -200,8 +200,8 @@
 #define ApicRaiseIrql ApicSetIrql
 
 #ifdef APIC_LAZY_IRQL
-VOID
-FORCEINLINE
+FORCEINLINE
+VOID
 ApicLowerIrql(KIRQL Irql)
 {
     __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql);

Modified: trunk/reactos/hal/halx86/apic/apic.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.h?rev…
==============================================================================
--- trunk/reactos/hal/halx86/apic/apic.h	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/apic.h	[iso-8859-1] Sun May  4 09:39:44 2014
@@ -258,15 +258,15 @@
     };
 } IOAPIC_REDIRECTION_REGISTER;
 
+FORCEINLINE
 ULONG
-FORCEINLINE
 ApicRead(ULONG Offset)
 {
     return *(volatile ULONG *)(APIC_BASE + Offset);
 }
 
+FORCEINLINE
 VOID
-FORCEINLINE
 ApicWrite(ULONG Offset, ULONG Value)
 {
     *(volatile ULONG *)(APIC_BASE + Offset) = Value;

Modified: trunk/reactos/hal/halx86/apic/rtctimer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c…
==============================================================================
--- trunk/reactos/hal/halx86/apic/rtctimer.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/rtctimer.c	[iso-8859-1] Sun May  4 09:39:44 2014
@@ -25,8 +25,8 @@
 static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3.9 ms */
 
 
+FORCEINLINE
 ULONG
-FORCEINLINE
 RtcClockRateToIncrement(UCHAR Rate)
 {
     ULONG Freqency = ((32768 << 1) >> Rate);

Modified: trunk/reactos/hal/halx86/up/pic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=63…
==============================================================================
--- trunk/reactos/hal/halx86/up/pic.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/up/pic.c	[iso-8859-1] Sun May  4 09:39:44 2014
@@ -782,8 +782,8 @@
 
 /* EDGE INTERRUPT DISMISSAL FUNCTIONS *****************************************/
 
+FORCEINLINE
 BOOLEAN
-FORCEINLINE
 _HalpDismissIrqGeneric(IN KIRQL Irql,
                        IN ULONG Irq,
                        OUT PKIRQL OldIrql)
@@ -925,8 +925,8 @@
 
 /* LEVEL INTERRUPT DISMISSAL FUNCTIONS ****************************************/
 
+FORCEINLINE
 BOOLEAN
-FORCEINLINE
 _HalpDismissIrqLevel(IN KIRQL Irql,
                      IN ULONG Irq,
                      OUT PKIRQL OldIrql)
@@ -1248,8 +1248,8 @@
 
 /* SOFTWARE INTERRUPT TRAPS ***************************************************/
 
+FORCEINLINE
 VOID
-FORCEINLINE
 DECLSPEC_NORETURN
 _HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame)
 {
@@ -1304,8 +1304,8 @@
     _HalpApcInterruptHandler(TrapFrame);
 }
 
+FORCEINLINE
 KIRQL
-FORCEINLINE
 _HalpDispatchInterruptHandler(VOID)
 {
     KIRQL CurrentIrql;