Changeset 2d0d029 in rtems


Ignore:
Timestamp:
Apr 15, 2005, 5:52:46 PM (15 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
8a463b4
Parents:
c1e7b3f
Message:

2005-04-15 Jennifer Averett <jennifer.averett@…>

PR 779/bsp

  • clock/p_clock.c, console/console.c, console/uart.c, console/uart.h, irq/irq.c, irq/irq.h, irq/irq_init.c: powerpc: add parameter to new exception interrupt handlers
Location:
c/src/lib/libbsp/powerpc/shared
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/shared/clock/p_clock.c

    rc1e7b3f r2d0d029  
    2121static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER,
    2222                                              clockIsr,
     23                                              NULL,
    2324                                              (rtems_irq_enable)clockOn,
    2425                                              (rtems_irq_disable)clockOff,
  • c/src/lib/libbsp/powerpc/shared/console/console.c

    rc1e7b3f r2d0d029  
    5555
    5656typedef struct TtySTblRec_ {
    57                 char    *name;
    58                 void    (*isr)(void); /* STUPID API doesn't pass a parameter :-( */
    59 } TtySTblRec, *TtySTbl;
     57                char          *name;
     58                rtems_irq_hdl isr;
     59} TtySTblRec, *TtySTbl;               
    6060
    6161static TtySTblRec ttyS[]={
  • c/src/lib/libbsp/powerpc/shared/console/uart.c

    rc1e7b3f r2d0d029  
    693693}
    694694
    695 void
    696 BSP_uart_termios_isr_com1(void)
     695/*
     696 * XXX - Note that this can now be one isr with the uart
     697 *       passed as the parameter.
     698 */
     699void
     700BSP_uart_termios_isr_com1(void *unused)
    697701{
    698702        BSP_uart_termios_isr_com(BSP_UART_COM1);
     
    700704
    701705void
    702 BSP_uart_termios_isr_com2(void)
     706BSP_uart_termios_isr_com2(void *unused)
    703707{
    704708        BSP_uart_termios_isr_com(BSP_UART_COM2);
  • c/src/lib/libbsp/powerpc/shared/console/uart.h

    rc1e7b3f r2d0d029  
    2626void BSP_uart_termios_set(int uart, void *ttyp);
    2727int  BSP_uart_termios_write_com(int minor, const char *buf, int len);
    28 void BSP_uart_termios_isr_com1();
    29 void BSP_uart_termios_isr_com2();
     28void BSP_uart_termios_isr_com1(void *unused);
     29void BSP_uart_termios_isr_com2(void *unused);
    3030void BSP_uart_dbgisr_com1(void);
    3131void BSP_uart_dbgisr_com2(void);
  • c/src/lib/libbsp/powerpc/shared/irq/irq.c

    rc1e7b3f r2d0d029  
    519519    _CPU_MSR_SET(new_msr);
    520520
    521     rtems_hdl_tbl[BSP_DECREMENTER].hdl();
     521    rtems_hdl_tbl[BSP_DECREMENTER].hdl(rtems_hdl_tbl[BSP_DECREMENTER].handle);
    522522
    523523    _CPU_MSR_SET(msr);
     
    551551  _CPU_MSR_SET(new_msr);
    552552
    553   /* rtems_hdl_tbl[irq].hdl(); */
     553  /* rtems_hdl_tbl[irq].hdl(rtems_hdl_tbl[irq].handle); */
    554554  {
    555555     rtems_irq_connect_data* vchain;
     
    558558          vchain = (rtems_irq_connect_data*)vchain->next_handler )
    559559     {
    560         vchain->hdl();
     560        vchain->hdl(vchain->handle);
    561561     }
    562562  }
  • c/src/lib/libbsp/powerpc/shared/irq/irq.h

    rc1e7b3f r2d0d029  
    148148struct  __rtems_irq_connect_data__;     /* forward declaratiuon */
    149149
    150 typedef void (*rtems_irq_hdl)           (void);
     150typedef void *rtems_irq_hdl_param;
     151typedef void (*rtems_irq_hdl)           (rtems_irq_hdl_param);
    151152typedef void (*rtems_irq_enable)        (const struct __rtems_irq_connect_data__*);
    152153typedef void (*rtems_irq_disable)       (const struct __rtems_irq_connect_data__*);
     
    162163       */
    163164      rtems_irq_hdl                     hdl;
     165     /*
     166      * Handler handle to store private data
     167      */
     168      rtems_irq_hdl_param               handle;
    164169      /*
    165170       * function for enabling interrupts at device level (ONLY!).
  • c/src/lib/libbsp/powerpc/shared/irq/irq_init.c

    rc1e7b3f r2d0d029  
    6060static rtems_irq_global_settings        initial_config;
    6161static rtems_irq_connect_data           defaultIrq = {
    62   /* vectorIdex,         hdl            , on            , off           , isOn */
    63   0,                     nop_func       , nop_func      , nop_func      , not_connected
     62  /* vectorIdex,         hdl            , handle        , on            , off           , isOn */
     63  0,                     nop_func       , NULL          , nop_func      , nop_func      , not_connected
    6464};
    6565static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={
Note: See TracChangeset for help on using the changeset viewer.