Changeset 5564b5a in rtems


Ignore:
Timestamp:
Apr 7, 2015, 2:04:13 PM (5 years ago)
Author:
Daniel Hellstrom <daniel@…>
Branches:
4.11, master
Children:
159ee990
Parents:
9b292ea
git-author:
Daniel Hellstrom <daniel@…> (04/07/15 14:04:13)
git-committer:
Daniel Hellstrom <daniel@…> (04/16/15 23:10:27)
Message:

leon3: timer config updated to use proper naming

To be merged with "leon3: make timer initialization configurable"

Location:
c/src/lib/libbsp/sparc/leon3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/amba/amba.c

    r9b292ea r5564b5a  
    7272/* Pointers to Interrupt Controller configuration registers */
    7373volatile struct irqmp_regs *LEON3_IrqCtrl_Regs;
    74 struct ambapp_dev *irqmp_dev;
    75 struct ambapp_dev *timer_dev;
     74struct ambapp_dev *LEON3_IrqCtrl_Adev;
     75struct ambapp_dev *LEON3_Timer_Adev;
    7676
    7777/*
     
    110110
    111111  LEON3_IrqCtrl_Regs = (volatile struct irqmp_regs *)DEV_TO_APB(adev)->start;
    112   irqmp_dev = adev;
     112  LEON3_IrqCtrl_Adev = adev;
    113113  if ((LEON3_IrqCtrl_Regs->ampctrl >> 28) > 0) {
    114114    /* IRQ Controller has support for multiple IRQ Controllers, each
     
    140140  if (adev) {
    141141    LEON3_Timer_Regs = (volatile struct gptimer_regs *)DEV_TO_APB(adev)->start;
    142     timer_dev = adev;
     142    LEON3_Timer_Adev = adev;
    143143
    144144    /* Register AMBA Bus Frequency */
    145145    ambapp_freq_init(
    146146      &ambapp_plb,
    147       timer_dev,
     147      LEON3_Timer_Adev,
    148148      (LEON3_Timer_Regs->scaler_reload + 1)
    149149        * LEON3_GPTIMER_0_FREQUENCY_SET_BY_BOOT_LOADER
  • c/src/lib/libbsp/sparc/leon3/include/leon.h

    r9b292ea r5564b5a  
    132132/* LEON3 Interrupt Controller */
    133133extern volatile struct irqmp_regs *LEON3_IrqCtrl_Regs;
    134 extern struct ambapp_dev *irqmp_dev;
     134extern struct ambapp_dev *LEON3_IrqCtrl_Adev;
    135135
    136136/* LEON3 GP Timer */
    137137extern volatile struct gptimer_regs *LEON3_Timer_Regs;
    138 extern struct ambapp_dev *timer_dev;
     138extern struct ambapp_dev *LEON3_Timer_Adev;
    139139
    140140/* LEON3 CPU Index of boot CPU */
Note: See TracChangeset for help on using the changeset viewer.