LIBPCI: use RTEMS_INLINE_ROUTINE

1 files changed, 13 insertions, 9 deletions

diff --git a/cpukit/libpci/pci/irq.h b/cpukit/libpci/pci/irq.h
index 3a7dfe4318..d8cb0a219b 100644
--- a/cpukit/libpci/pci/irq.h
+++ b/cpukit/libpci/pci/irq.h
@@ -1,8 +1,5 @@
 /* PCI IRQ Library
  *
- * IRQ handling does not have so much with PCI to do, this library depends
- * on the BSP to implement shared interrupts.
- *
  * COPYRIGHT (c) 2010 Cobham Gaisler AB.
  *
  * The license and distribution terms for this file may be
@@ -10,13 +7,19 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
+/* IRQ handling does not have so much with PCI to do, this library depends
+ * on the BSP to implement shared interrupts.
+ */
+
 #ifndef __PCI_IRQ_H__
 #define __PCI_IRQ_H__
 
 #include <bsp.h>
+#include <rtems/irq-extension.h>
+#include <rtems/score/basedefs.h>
 
 /* PCI Handler (ISR) called when IRQ is generated by any of the PCI devices
- * connected to the same PCI IRQ Pin. This is been defined the same way as
+ * connected to the same PCI IRQ Pin. This has been defined the same way as
  * rtems_interrupt_handler in order for BSPs to "direct-map" the register
  * and unregister functions rtems_interrupt_handler_install/remove
  */
@@ -37,7 +40,7 @@ extern int pci_dev_irq(pci_dev_t dev);
  *  isr       Function pointer to the ISR
  *  arg       Second argument to function isr
  */
-static inline int pci_interrupt_register(int irq, const char *info,
+RTEMS_INLINE_ROUTINE int pci_interrupt_register(int irq, const char *info,
 						pci_isr isr, void *arg)
 {
 	return BSP_PCI_shared_interrupt_register(irq, info, isr, arg);
@@ -50,7 +53,8 @@ static inline int pci_interrupt_register(int irq, const char *info,
  *  isr       Function pointer to the ISR
  *  arg       Second argument to function isr
  */
-static inline int pci_interrupt_unregister(int irq, pci_isr isr, void *arg)
+RTEMS_INLINE_ROUTINE int pci_interrupt_unregister(int irq, pci_isr isr,
+						  void *arg)
 {
 	return BSP_PCI_shared_interrupt_unregister(irq, isr, arg);
 }
@@ -66,7 +70,7 @@ static inline int pci_interrupt_unregister(int irq, pci_isr isr, void *arg)
  *  isr       Function pointer to the ISR
  *  arg       Second argument to function isr
  */
-static inline void pci_interrupt_unmask(int irq)
+RTEMS_INLINE_ROUTINE void pci_interrupt_unmask(int irq)
 {
 	BSP_PCI_shared_interrupt_unmask(irq);
 }
@@ -82,7 +86,7 @@ static inline void pci_interrupt_unmask(int irq)
  *  isr       Function pointer to the ISR
  *  arg       Second argument to function isr
  */
-static inline void pci_interrupt_mask(int irq)
+RTEMS_INLINE_ROUTINE void pci_interrupt_mask(int irq)
 {
 	BSP_PCI_shared_interrupt_mask(irq);
 }
@@ -96,7 +100,7 @@ static inline void pci_interrupt_mask(int irq)
  *  isr       Function pointer to the ISR
  *  arg       Second argument to function isr
  */
-static inline void pci_interrupt_clear(int irq)
+RTEMS_INLINE_ROUTINE void pci_interrupt_clear(int irq)
 {
 	BSP_PCI_shared_interrupt_clear(irq);
 }