Changeset 510fbfc3 in rtems


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

sh: Remove use of proc_ptr

Update #3585.

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • bsps/sh/gensh1/start/cpu_asm.c

    red9da8e r510fbfc3  
    4141#include <rtems/score/iosh7032.h>
    4242#include <rtems/score/sh_io.h>
    43 
    44 /* from cpu_isps.c */
    45 extern proc_ptr         _Hardware_isr_Table[];
    4643
    4744unsigned long *_old_stack_ptr;
  • bsps/sh/gensh1/start/ispsh7032.c

    red9da8e r510fbfc3  
    2626 */
    2727
    28 #include <rtems/system.h>
     28#include <rtems/score/cpu.h>
    2929#include <rtems/score/ispsh7032.h>
    3030
     
    3434 * It has the same structure like the actual vector table (vectab)
    3535 */
    36 proc_ptr _Hardware_isr_Table[256]={
     36CPU_ISR_raw_handler _Hardware_isr_Table[256]={
    3737_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
    3838_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
  • bsps/sh/gensh2/start/cpu_asm.c

    red9da8e r510fbfc3  
    3939#include <rtems/score/iosh7045.h>
    4040#include <rtems/score/sh_io.h>
    41 
    42 /* from cpu_isps.c */
    43 extern proc_ptr         _Hardware_isr_Table[];
    4441
    4542unsigned long *_old_stack_ptr;
  • bsps/sh/gensh2/start/ispsh7045.c

    red9da8e r510fbfc3  
    3838 */
    3939
    40 #include <rtems/system.h>
     40#include <rtems/score/cpu.h>
    4141
    4242/*
     
    5050#include <rtems/score/ispsh7045.h>
    5151
    52 proc_ptr _Hardware_isr_Table[256]={
     52CPU_ISR_raw_handler _Hardware_isr_Table[256]={
    5353_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,         /* PWRon Reset, Maual Reset,...*/
    5454_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
  • bsps/sh/gensh4/start/cpu_asm.c

    red9da8e r510fbfc3  
    3939#include <rtems/score/sh4_regs.h>
    4040#include <rtems/score/sh_io.h>
    41 
    42 /* from cpu_isps.c */
    43 extern proc_ptr         _Hardware_isr_Table[];
    4441
    4542unsigned long *_old_stack_ptr;
  • bsps/sh/shared/start/setvec.c

    red9da8e r510fbfc3  
    4949    rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr );
    5050  else {
    51     _CPU_ISR_install_raw_handler( vector, handler, (proc_ptr*) &previous_isr );
     51    _CPU_ISR_install_raw_handler( vector, handler, &previous_isr );
    5252  }
    5353
  • bsps/sh/shsim/start/ispshgdb.c

    red9da8e r510fbfc3  
    2828 */
    2929
    30 #include <rtems/system.h>
     30#include <rtems/score/cpu.h>
    3131
    3232/*
     
    3838void _dummy_isp(uint32_t);
    3939
    40 proc_ptr _Hardware_isr_Table[256]={
     40CPU_ISR_raw_handler _Hardware_isr_Table[256]={
    4141_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp, /* PWRon Reset, Maual Reset,...*/
    4242_dummy_isp, _dummy_isp, _dummy_isp, _dummy_isp,
  • cpukit/score/cpu/sh/cpu.c

    red9da8e r510fbfc3  
    3838
    3939/* referenced in start.S */
    40 extern proc_ptr vectab[] ;
    41 
    42 proc_ptr vectab[256] ;
    43 
    44 extern proc_ptr _Hardware_isr_Table[];
     40CPU_ISR_raw_handler vectab[256] ;
    4541
    4642#if SH_HAS_FPU
     
    9995}
    10096
    101 /*
    102  *  _CPU_ISR_install_raw_handler
    103  */
     97void _CPU_ISR_install_raw_handler(
     98  uint32_t             vector,
     99  CPU_ISR_raw_handler  new_handler,
     100  CPU_ISR_raw_handler *old_handler
     101)
    104102
    105 void _CPU_ISR_install_raw_handler(
    106   uint32_t    vector,
    107   proc_ptr    new_handler,
    108   proc_ptr   *old_handler
    109 )
    110103{
    111104  /*
     
    113106   *  table used by the CPU to dispatch interrupt handlers.
    114107   */
    115   volatile proc_ptr     *vbr ;
     108  volatile CPU_ISR_raw_handler *vbr ;
    116109
    117110#if SH_PARANOID_ISR
     
    132125}
    133126
    134 
    135 /*
    136  *  _CPU_ISR_install_vector
    137  *
    138  *  This kernel routine installs the RTEMS handler for the
    139  *  specified vector.
    140  *
    141  *  Input parameters:
    142  *    vector      - interrupt vector number
    143  *    old_handler - former ISR for this vector number
    144  *    new_handler - replacement ISR for this vector number
    145  *
    146  *  Output parameters:  NONE
    147  *
    148  */
    149 
    150127void _CPU_ISR_install_vector(
    151   uint32_t    vector,
    152   proc_ptr    new_handler,
    153   proc_ptr  *old_handler
     128  uint32_t         vector,
     129  CPU_ISR_handler  new_handler,
     130  CPU_ISR_handler *old_handler
    154131)
    155132{
    156133#if defined(__sh1__) || defined(__sh2__)
    157    proc_ptr ignored ;
     134   CPU_ISR_raw_handler ignored ;
    158135#endif
    159136   *old_handler = _ISR_Vector_table[ vector ];
  • cpukit/score/cpu/sh/include/rtems/score/cpu.h

    red9da8e r510fbfc3  
    547547void _CPU_Initialize(void);
    548548
    549 /*
    550  *  _CPU_ISR_install_raw_handler
    551  *
    552  *  This routine installs a "raw" interrupt handler directly into the
    553  *  processor's vector table.
    554  */
     549typedef void ( *CPU_ISR_raw_handler )( void );
     550
     551extern CPU_ISR_raw_handler _Hardware_isr_Table[];
    555552
    556553void _CPU_ISR_install_raw_handler(
    557   uint32_t    vector,
    558   proc_ptr    new_handler,
    559   proc_ptr  *old_handler
     554  uint32_t             vector,
     555  CPU_ISR_raw_handler  new_handler,
     556  CPU_ISR_raw_handler *old_handler
    560557);
    561558
    562 /*
    563  *  _CPU_ISR_install_vector
    564  *
    565  *  This routine installs an interrupt vector.
    566  */
     559typedef void ( *CPU_ISR_handler )( uint32_t );
    567560
    568561void _CPU_ISR_install_vector(
    569   uint32_t    vector,
    570   proc_ptr    new_handler,
    571   proc_ptr  *old_handler
     562  uint32_t         vector,
     563  CPU_ISR_handler  new_handler,
     564  CPU_ISR_handler *old_handler
    572565);
    573566
Note: See TracChangeset for help on using the changeset viewer.