Changeset fae3ab43 in rtems


Ignore:
Timestamp:
Apr 7, 2010, 3:04:07 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
2583672
Parents:
7417f7b7
Message:

2010-04-07 Joel Sherrill <joel.sherrill@…>

  • libchip/ide/ata.c: Use correct macro from RTEMS to determine whether simple or PIC interrupt model.
Location:
c/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    r7417f7b7 rfae3ab43  
     12010-04-07      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libchip/ide/ata.c: Use correct macro from RTEMS to determine whether
     4        simple or PIC interrupt model.
     5
    162010-04-02      Ralf Corsépius <ralf.corsepius@rtems.org>
    27
  • c/src/libchip/ide/ata.c

    r7417f7b7 rfae3ab43  
    3636#endif
    3737
    38 /*
    39  * FIXME: make this better...
    40  * find out, which exception model is used
    41  * assume, that all i386 BSPs use new exception handling
    42  * assume, that some PPC BSPs use new exception handling
    43  * assume, that all other BSPs use old exception handling
    44  */
    45 #if defined(_OLD_EXCEPTIONS) || (!defined(__i386__) && !defined(__PPC__))
    46 
    47 #define ATA_USE_OLD_EXCEPTIONS
    48 #endif
    49 
    50 #if !defined(ATA_USE_OLD_EXCEPTIONS)
    51 #include <bsp/irq.h>
     38#if !defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
     39#include <rtems/irq.h>
    5240#define ATA_IRQ_CHAIN_MAX_CNT 4 /* support up to 4 ATA devices */
    5341typedef struct {
     
    156144static rtems_id ata_queue_id;
    157145
    158 #if defined (ATA_USE_OLD_EXCEPTIONS)
     146#if defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
    159147/* Mapping of interrupt vectors to devices */
    160148static rtems_chain_control ata_int_vec[ATA_MAX_RTEMS_INT_VEC_NUMBER + 1];
     
    653641 *     NONE
    654642 */
    655 #if defined(ATA_USE_OLD_EXCEPTIONS)
     643#if defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
    656644rtems_isr
    657645ata_interrupt_handler(rtems_vector_number vec)
     
    10811069    ata_int_st_t      *int_st;
    10821070
    1083 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1071#if defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
    10841072    rtems_isr_entry    old_isr;
    10851073#else
     
    12121200
    12131201            int_st->ctrl_minor = ctrl_minor;
    1214 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1202#if defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
    12151203            status = rtems_interrupt_catch(
    12161204                         ata_interrupt_handler,
     
    12641252                return status;
    12651253            }
    1266 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1254#if defined(CPU_SIMPLE_VECTORED_INTERRUPTS)
    12671255            rtems_chain_append(
    12681256                &ata_int_vec[IDE_Controller_Table[ctrl_minor].int_vec],
Note: See TracChangeset for help on using the changeset viewer.