Changeset 569fd50 in rtems


Ignore:
Timestamp:
Jan 2, 2018, 10:56:36 AM (18 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
4e100058
Parents:
3b392b6
git-author:
Sebastian Huber <sebastian.huber@…> (01/02/18 10:56:36)
git-committer:
Sebastian Huber <sebastian.huber@…> (01/02/18 13:49:56)
Message:

sparc: Remove BSP specifics from <pci/irq.h>

Update #3254.
Update #3260.
Update #3269.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/erc32/include/bsp.h

    r3b392b6 r569fd50  
    178178int console_inbyte_nonblocking(int port);
    179179
    180 /* BSP PCI Interrupt support - to avoid warnings by libpci */
    181 #define BSP_PCI_shared_interrupt_register    BSP_shared_interrupt_register
    182 #define BSP_PCI_shared_interrupt_unregister  BSP_shared_interrupt_unregister
    183 #define BSP_PCI_shared_interrupt_unmask      BSP_shared_interrupt_unmask
    184 #define BSP_PCI_shared_interrupt_mask        BSP_shared_interrupt_mask
    185 #define BSP_PCI_shared_interrupt_clear       BSP_shared_interrupt_clear
    186 
    187180#ifdef __cplusplus
    188181}
  • c/src/lib/libbsp/sparc/leon2/include/bsp.h

    r3b392b6 r569fd50  
    202202int cchip1_register(void);
    203203
    204 /* BSP PCI Interrupt support */
    205 #define BSP_PCI_shared_interrupt_register    BSP_shared_interrupt_register
    206 #define BSP_PCI_shared_interrupt_unregister  BSP_shared_interrupt_unregister
    207 #define BSP_PCI_shared_interrupt_unmask      BSP_shared_interrupt_unmask
    208 #define BSP_PCI_shared_interrupt_mask        BSP_shared_interrupt_mask
    209 #define BSP_PCI_shared_interrupt_clear       BSP_shared_interrupt_clear
    210 
    211204/* AT697 has PCI defined as big endian */
    212205#define BSP_PCI_BIG_ENDIAN
  • c/src/lib/libbsp/sparc/leon3/include/bsp.h

    r3b392b6 r569fd50  
    234234#endif
    235235
    236 /* BSP PCI Interrupt support */
    237 #define BSP_PCI_shared_interrupt_register    BSP_shared_interrupt_register
    238 #define BSP_PCI_shared_interrupt_unregister  BSP_shared_interrupt_unregister
    239 #define BSP_PCI_shared_interrupt_unmask      BSP_shared_interrupt_unmask
    240 #define BSP_PCI_shared_interrupt_mask        BSP_shared_interrupt_mask
    241 #define BSP_PCI_shared_interrupt_clear       BSP_shared_interrupt_clear
    242 
    243236/* Common driver build-time configurations. On small systems undefine
    244237 * [DRIVER]_INFO_AVAIL to avoid info routines get dragged in. It is good
  • cpukit/libpci/pci/irq.h

    r3b392b6 r569fd50  
    1515#define __PCI_IRQ_H__
    1616
    17 #include <bsp.h>
    1817#include <rtems/irq-extension.h>
    1918#include <rtems/score/basedefs.h>
     19
     20/*
     21 * FIXME: This should be available via the IRQ extensions API.
     22 *
     23 * https://devel.rtems.org/ticket/3269
     24 */
     25void BSP_shared_interrupt_clear(int irq);
     26void BSP_shared_interrupt_unmask(int irq);
     27void BSP_shared_interrupt_mask(int irq);
    2028
    2129/* PCI Handler (ISR) called when IRQ is generated by any of the PCI devices
     
    4452                                                pci_isr isr, void *arg)
    4553{
    46         return BSP_PCI_shared_interrupt_register(irq, info, isr, arg);
     54        return rtems_interrupt_handler_install(irq, info,
     55                                               RTEMS_INTERRUPT_SHARED, isr,
     56                                               arg);
    4757}
    4858
     
    5767                                                  void *arg)
    5868{
    59         return BSP_PCI_shared_interrupt_unregister(irq, isr, arg);
     69        return rtems_interrupt_handler_remove(irq, isr, arg);
    6070}
    6171
     
    7383RTEMS_INLINE_ROUTINE void pci_interrupt_unmask(int irq)
    7484{
    75         BSP_PCI_shared_interrupt_unmask(irq);
     85        BSP_shared_interrupt_unmask(irq);
    7686}
    7787
     
    8999RTEMS_INLINE_ROUTINE void pci_interrupt_mask(int irq)
    90100{
    91         BSP_PCI_shared_interrupt_mask(irq);
     101        BSP_shared_interrupt_mask(irq);
    92102}
    93103
     
    103113RTEMS_INLINE_ROUTINE void pci_interrupt_clear(int irq)
    104114{
    105         BSP_PCI_shared_interrupt_clear(irq);
     115        BSP_shared_interrupt_clear(irq);
    106116}
    107117
Note: See TracChangeset for help on using the changeset viewer.