devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

imx233: move away timer defines from imx233.h

Browse source 
Change-Id: I9f721ae12a3ddf72c4e90ad0754a5c2b819847bb
This commit is contained in:
Amaury Pouly 2012-05-19 13:28:41 +02:00
parent 9ced006c06
commit 068443caaf
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/export/imx233.h
View file

@ -64,13 +64,6 @@
/* Timer runs at APBX speed which is derived from ref_xtal@24MHz */ /* Timer runs at APBX speed which is derived from ref_xtal@24MHz */
#define TIMER_FREQ 24000000 #define TIMER_FREQ 24000000
#ifdef SANSA_FUZEPLUS
#define TICK_TIMER_NR 0
#define USER_TIMER_NR 1
#else
#error Select timers !
#endif
/* USBOTG */ /* USBOTG */
#define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(2048))) #define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(2048)))
#define USB_NUM_ENDPOINTS 5 #define USB_NUM_ENDPOINTS 5
@ -84,6 +77,8 @@
#define __REG_SET(reg) (*((volatile uint32_t *)(&reg + 1))) #define __REG_SET(reg) (*((volatile uint32_t *)(&reg + 1)))
#define __REG_CLR(reg) (*((volatile uint32_t *)(&reg + 2))) #define __REG_CLR(reg) (*((volatile uint32_t *)(&reg + 2)))
#define __REG_TOG(reg) (*((volatile uint32_t *)(&reg + 3))) #define __REG_TOG(reg) (*((volatile uint32_t *)(&reg + 3)))
#define __REG_SET_CLR(reg, set) \
(*((volatile uint32_t *)(&reg + (set ? 1 : 2))))
#define __BLOCK_SFTRST (1 << 31) #define __BLOCK_SFTRST (1 << 31)
#define __BLOCK_CLKGATE (1 << 30) #define __BLOCK_CLKGATE (1 << 30)
@ -93,5 +88,6 @@
#define __XTRACT(reg, field) ((reg & reg##__##field##_BM) >> reg##__##field##_BP) #define __XTRACT(reg, field) ((reg & reg##__##field##_BM) >> reg##__##field##_BP)
#define __XTRACT_EX(val, field) (((val) & field##_BM) >> field##_BP) #define __XTRACT_EX(val, field) (((val) & field##_BM) >> field##_BP)
#define __FIELD_SET(reg, field, val) reg = (reg & ~reg##__##field##_BM) | (val << reg##__##field##_BP) #define __FIELD_SET(reg, field, val) reg = (reg & ~reg##__##field##_BM) | (val << reg##__##field##_BP)
#define __FIELD_SET_CLR(reg, field, set) __REG_SET_CLR(reg, set) = reg##__##field
#endif /* __IMX233_H__ */ #endif /* __IMX233_H__ */

10
firmware/target/arm/imx233/kernel-imx233.c
View file

@ -23,6 +23,16 @@
#include "clkctrl-imx233.h" #include "clkctrl-imx233.h"
#include "kernel-imx233.h" #include "kernel-imx233.h"
#ifdef SANSA_FUZEPLUS
#define TICK_TIMER_NR 0
#elif defined(CREATIVE_ZENXFI2)
#define TICK_TIMER_NR 0
#elif defined(CREATIVE_ZENXFI3)
#define TICK_TIMER_NR 0
#else
#error Select tick timer !
#endif
static void tick_timer(void) static void tick_timer(void)
{ {
/* Run through the list of tick tasks */ /* Run through the list of tick tasks */

10
firmware/target/arm/imx233/timer-imx233.c
View file

@ -22,6 +22,16 @@
#include "timrot-imx233.h" #include "timrot-imx233.h"
#include "timer.h" #include "timer.h"
#ifdef SANSA_FUZEPLUS
#define USER_TIMER_NR 1
#elif defined(CREATIVE_ZENXFI2)
#define USER_TIMER_NR 1
#elif defined(CREATIVE_ZENXFI3)
#define USER_TIMER_NR 1
#else
#error Select user timer !
#endif
static long timer_cycles = 0; static long timer_cycles = 0;
static void timer_fn(void) static void timer_fn(void)