Changeset 37f9717a in rtems


Ignore:
Timestamp:
Oct 5, 2009, 2:39:26 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
456a776
Parents:
b3e228e
Message:

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

  • libchip/ide/ata.c: Revert previous change. Not all ARM BSPs use a shared irq.h yet and this breaks a significant number of them.
Location:
c/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    rb3e228e r37f9717a  
     12009-10-05      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libchip/ide/ata.c: Revert previous change. Not all ARM BSPs use a
     4        shared irq.h yet and this breaks a significant number of them.
     5
    162009-10-01      Joel Sherrill <joel.sherrill@oarcorp.com>
    27
  • c/src/libchip/ide/ata.c

    rb3e228e r37f9717a  
    3333#endif
    3434
    35 #if (CPU_SIMPLE_VECTORED_INTERRUPTS != TRUE)
     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)
    3648#include <bsp/irq.h>
    3749#define ATA_IRQ_CHAIN_MAX_CNT 4 /* support up to 4 ATA devices */
     
    141153static rtems_id ata_queue_id;
    142154
    143 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     155#if defined (ATA_USE_OLD_EXCEPTIONS)
    144156/* Mapping of interrupt vectors to devices */
    145157static rtems_chain_control ata_int_vec[ATA_MAX_RTEMS_INT_VEC_NUMBER + 1];
     
    661673 *     NONE
    662674 */
    663 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     675#if defined(ATA_USE_OLD_EXCEPTIONS)
    664676rtems_isr
    665677ata_interrupt_handler(rtems_vector_number vec)
     
    10861098    ata_int_st_t      *int_st;
    10871099
    1088 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     1100#if defined(ATA_USE_OLD_EXCEPTIONS)
    10891101    rtems_isr_entry    old_isr;
    10901102#else
     
    11711183        ata_devs[i].device = ATA_UNDEFINED_VALUE;
    11721184
    1173 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     1185#if defined(ATA_USE_OLD_EXCEPTIONS)
    11741186    /* prepare ATA driver for handling  interrupt driven devices */
    11751187    for (i = 0; i < ATA_MAX_RTEMS_INT_VEC_NUMBER; i++)
     
    12171229
    12181230            int_st->ctrl_minor = ctrl_minor;
    1219 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     1231#if defined(ATA_USE_OLD_EXCEPTIONS)
    12201232            status = rtems_interrupt_catch(
    12211233                         ata_interrupt_handler,
     
    12691281                return status;
    12701282            }
    1271 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
     1283#if defined(ATA_USE_OLD_EXCEPTIONS)
    12721284            rtems_chain_append(
    12731285                &ata_int_vec[IDE_Controller_Table[ctrl_minor].int_vec],
Note: See TracChangeset for help on using the changeset viewer.