diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2012-05-19 13:28:41 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-05-19 16:10:52 +0200 |
commit | 068443caaf101bccfa5ff44b44e6f98e6612b27f (patch) | |
tree | 174bc3b0099455a54e911a6315be4718ab094fb9 /firmware/export | |
parent | 9ced006c06a4240cbd2a9ebe9196d9a0658810f9 (diff) | |
download | rockbox-068443caaf101bccfa5ff44b44e6f98e6612b27f.tar.gz rockbox-068443caaf101bccfa5ff44b44e6f98e6612b27f.zip |
imx233: move away timer defines from imx233.h
Change-Id: I9f721ae12a3ddf72c4e90ad0754a5c2b819847bb
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/imx233.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/firmware/export/imx233.h b/firmware/export/imx233.h index d672137a48..58e1d48de6 100644 --- a/firmware/export/imx233.h +++ b/firmware/export/imx233.h | |||
@@ -64,13 +64,6 @@ | |||
64 | /* Timer runs at APBX speed which is derived from ref_xtal@24MHz */ | 64 | /* Timer runs at APBX speed which is derived from ref_xtal@24MHz */ |
65 | #define TIMER_FREQ 24000000 | 65 | #define TIMER_FREQ 24000000 |
66 | 66 | ||
67 | #ifdef SANSA_FUZEPLUS | ||
68 | #define TICK_TIMER_NR 0 | ||
69 | #define USER_TIMER_NR 1 | ||
70 | #else | ||
71 | #error Select timers ! | ||
72 | #endif | ||
73 | |||
74 | /* USBOTG */ | 67 | /* USBOTG */ |
75 | #define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(2048))) | 68 | #define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(2048))) |
76 | #define USB_NUM_ENDPOINTS 5 | 69 | #define USB_NUM_ENDPOINTS 5 |
@@ -84,6 +77,8 @@ | |||
84 | #define __REG_SET(reg) (*((volatile uint32_t *)(® + 1))) | 77 | #define __REG_SET(reg) (*((volatile uint32_t *)(® + 1))) |
85 | #define __REG_CLR(reg) (*((volatile uint32_t *)(® + 2))) | 78 | #define __REG_CLR(reg) (*((volatile uint32_t *)(® + 2))) |
86 | #define __REG_TOG(reg) (*((volatile uint32_t *)(® + 3))) | 79 | #define __REG_TOG(reg) (*((volatile uint32_t *)(® + 3))) |
80 | #define __REG_SET_CLR(reg, set) \ | ||
81 | (*((volatile uint32_t *)(® + (set ? 1 : 2)))) | ||
87 | 82 | ||
88 | #define __BLOCK_SFTRST (1 << 31) | 83 | #define __BLOCK_SFTRST (1 << 31) |
89 | #define __BLOCK_CLKGATE (1 << 30) | 84 | #define __BLOCK_CLKGATE (1 << 30) |
@@ -93,5 +88,6 @@ | |||
93 | #define __XTRACT(reg, field) ((reg & reg##__##field##_BM) >> reg##__##field##_BP) | 88 | #define __XTRACT(reg, field) ((reg & reg##__##field##_BM) >> reg##__##field##_BP) |
94 | #define __XTRACT_EX(val, field) (((val) & field##_BM) >> field##_BP) | 89 | #define __XTRACT_EX(val, field) (((val) & field##_BM) >> field##_BP) |
95 | #define __FIELD_SET(reg, field, val) reg = (reg & ~reg##__##field##_BM) | (val << reg##__##field##_BP) | 90 | #define __FIELD_SET(reg, field, val) reg = (reg & ~reg##__##field##_BM) | (val << reg##__##field##_BP) |
91 | #define __FIELD_SET_CLR(reg, field, set) __REG_SET_CLR(reg, set) = reg##__##field | ||
96 | 92 | ||
97 | #endif /* __IMX233_H__ */ | 93 | #endif /* __IMX233_H__ */ |