Changeset 5c6edee in rtems


Ignore:
Timestamp:
Nov 8, 2018, 2:44:56 PM (9 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
b6be8f33
Parents:
0e16fa45
git-author:
Sebastian Huber <sebastian.huber@…> (11/08/18 14:44:56)
git-committer:
Sebastian Huber <sebastian.huber@…> (11/12/18 12:25:43)
Message:

m68k: Remove use of proc_ptr

Update #3585.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • bsps/m68k/gen68340/console/console.c

    r0e16fa45 r5c6edee  
    309309           /*
    310310           {
    311             proc_ptr ignored;
     311            CPU_ISR_raw_handler ignored;
    312312            _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored );
    313313           }
     
    392392           /*
    393393           {
    394             proc_ptr ignored;
     394            CPU_ISR_raw_handler ignored;
    395395            _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored );
    396396           }
  • bsps/m68k/shared/fpsp/rtems_fpsp.c

    r0e16fa45 r5c6edee  
    77 * User exception handlers
    88 */
    9 proc_ptr M68040FPSPUserExceptionHandlers[9];
     9CPU_ISR_raw_handler M68040FPSPUserExceptionHandlers[9];
    1010
    1111/*
     
    1414 */
    1515static int
    16 FPSP_install_raw_handler (uint32_t   vector, proc_ptr new_handler, proc_ptr *old_handler)
     16FPSP_install_raw_handler(
     17  uint32_t vector,
     18  CPU_ISR_raw_handler new_handler,
     19  CPU_ISR_raw_handler *old_handler
     20)
    1721{
    1822  int fpspVector;
     
    7276  };
    7377  int i;
    74   proc_ptr oldHandler;
     78  CPU_ISR_raw_handler oldHandler;
    7579
    7680  for (i = 0 ; i < sizeof fpspHandlers / sizeof fpspHandlers[0] ; i++) {
  • cpukit/score/cpu/m68k/cpu.c

    r0e16fa45 r5c6edee  
    5151int (*_FPSP_install_raw_handler)(
    5252  uint32_t   vector,
    53   proc_ptr new_handler,
    54   proc_ptr *old_handler
     53  CPU_ISR_raw_handler new_handler,
     54  CPU_ISR_raw_handler *old_handler
    5555);
    5656#endif
     
    9898}
    9999
    100 /*
    101  *  _CPU_ISR_install_raw_handler
    102  */
    103 
    104100void _CPU_ISR_install_raw_handler(
    105   uint32_t    vector,
    106   proc_ptr    new_handler,
    107   proc_ptr  *old_handler
     101  uint32_t             vector,
     102  CPU_ISR_raw_handler  new_handler,
     103  CPU_ISR_raw_handler *old_handler
    108104)
    109105{
    110   proc_ptr *interrupt_table = NULL;
     106#if ( M68K_HAS_VBR == 1 )
     107  CPU_ISR_raw_handler *interrupt_table = NULL;
     108#else
     109  _CPU_ISR_handler_entry *interrupt_table = NULL;
     110#endif
    111111
    112112#if (M68K_HAS_FPSP_PACKAGE == 1)
     
    142142   */
    143143
    144   *old_handler = (proc_ptr) _CPU_ISR_jump_table[vector].isr_handler;
     144  *old_handler = (CPU_ISR_raw_handler) _CPU_ISR_jump_table[vector].isr_handler;
    145145  _CPU_ISR_jump_table[vector].isr_handler = (uint32_t) new_handler;
    146146  if ( (uint32_t) interrupt_table != 0xFFFFFFFF )
    147     interrupt_table[ vector ] = (proc_ptr) &_CPU_ISR_jump_table[vector];
     147    interrupt_table[ vector ] = &_CPU_ISR_jump_table[vector];
    148148#endif /* M68K_HAS_VBR */
    149149}
    150150
    151151void _CPU_ISR_install_vector(
    152   uint32_t    vector,
    153   proc_ptr    new_handler,
    154   proc_ptr  *old_handler
     152  uint32_t         vector,
     153  CPU_ISR_handler  new_handler,
     154  CPU_ISR_handler *old_handler
    155155)
    156156{
    157   proc_ptr ignored = 0;  /* to avoid warning */
     157  CPU_ISR_raw_handler ignored = 0;  /* to avoid warning */
    158158
    159159  *old_handler = _ISR_Vector_table[ vector ];
  • cpukit/score/cpu/m68k/include/rtems/score/cpu.h

    r0e16fa45 r5c6edee  
    565565void _CPU_Initialize(void);
    566566
    567 /*
    568  *  _CPU_ISR_install_raw_handler
    569  *
    570  *  This routine installs a "raw" interrupt handler directly into the
    571  *  processor's vector table.
    572  */
     567typedef void ( *CPU_ISR_raw_handler )( void );
    573568
    574569void _CPU_ISR_install_raw_handler(
    575   uint32_t    vector,
    576   proc_ptr    new_handler,
    577   proc_ptr   *old_handler
    578 );
    579 
    580 /*
    581  *  _CPU_ISR_install_vector
    582  *
    583  *  This routine installs an interrupt vector.
    584  */
     570  uint32_t             vector,
     571  CPU_ISR_raw_handler  new_handler,
     572  CPU_ISR_raw_handler *old_handler
     573);
     574
     575typedef void ( *CPU_ISR_handler )( uint32_t );
    585576
    586577void _CPU_ISR_install_vector(
    587578  uint32_t         vector,
    588   proc_ptr         new_handler,
    589   proc_ptr        *old_handler
     579  CPU_ISR_handler  new_handler,
     580  CPU_ISR_handler *old_handler
    590581);
    591582
     
    678669extern int (*_FPSP_install_raw_handler)(
    679670  uint32_t   vector,
    680   proc_ptr new_handler,
    681   proc_ptr *old_handler
     671  CPU_ISR_raw_handler new_handler,
     672  CPU_ISR_raw_handler *old_handler
    682673);
    683674
Note: See TracChangeset for help on using the changeset viewer.