Changeset 3926b05 in rtems


Ignore:
Timestamp:
Oct 1, 2009, 8:56:32 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
73d04fe
Parents:
f98ce8b8
Message:

2009-10-01 Joel Sherrill <joel.sherrill@…>

  • libchip/ide/ata.c: Use simple vectored CPU macro to select interrupt model.
Location:
c/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rf98ce8b8 r3926b05  
     12009-10-01      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libchip/ide/ata.c: Use simple vectored CPU macro to select interrupt
     4        model.
     5
    162009-09-30      Ralf Corsépius <ralf.corsepius@rtems.org>
    27
  • c/src/libchip/ide/ata.c

    rf98ce8b8 r3926b05  
    3333#endif
    3434
    35 /*
    36  * FIXME: make this better...
    37  * find out, which exception model is used
    38  * assume, that all i386 BSPs use new exception handling
    39  * assume, that some PPC BSPs use new exception handling
    40  * assume, that all other BSPs use old exception handling
    41  */
    42 #if defined(_OLD_EXCEPTIONS) || (!defined(__i386__) && !defined(__PPC__))
    43 
    44 #define ATA_USE_OLD_EXCEPTIONS
    45 #endif
    46 
    47 #if !defined(ATA_USE_OLD_EXCEPTIONS)
     35#if (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
    4836#include <bsp/irq.h>
    4937#define ATA_IRQ_CHAIN_MAX_CNT 4 /* support up to 4 ATA devices */
     
    153141static rtems_id ata_queue_id;
    154142
    155 #if defined (ATA_USE_OLD_EXCEPTIONS)
     143#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    156144/* Mapping of interrupt vectors to devices */
    157145static rtems_chain_control ata_int_vec[ATA_MAX_RTEMS_INT_VEC_NUMBER + 1];
     
    673661 *     NONE
    674662 */
    675 #if defined(ATA_USE_OLD_EXCEPTIONS)
     663#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    676664rtems_isr
    677665ata_interrupt_handler(rtems_vector_number vec)
     
    10981086    ata_int_st_t      *int_st;
    10991087
    1100 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1088#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    11011089    rtems_isr_entry    old_isr;
    11021090#else
     
    11831171        ata_devs[i].device = ATA_UNDEFINED_VALUE;
    11841172
    1185 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1173#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    11861174    /* prepare ATA driver for handling  interrupt driven devices */
    11871175    for (i = 0; i < ATA_MAX_RTEMS_INT_VEC_NUMBER; i++)
     
    12291217
    12301218            int_st->ctrl_minor = ctrl_minor;
    1231 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1219#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    12321220            status = rtems_interrupt_catch(
    12331221                         ata_interrupt_handler,
     
    12811269                return status;
    12821270            }
    1283 #if defined(ATA_USE_OLD_EXCEPTIONS)
     1271#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
    12841272            rtems_chain_append(
    12851273                &ata_int_vec[IDE_Controller_Table[ctrl_minor].int_vec],
Note: See TracChangeset for help on using the changeset viewer.