diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2009-03-22 02:27:20 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2009-03-22 02:27:20 +0000 |
commit | e48cece75cc0ab3b0ebe970cb5603f8452931bd2 (patch) | |
tree | ae47b952e2e69ecab646fde47229a3937310d64f | |
parent | ba71cc540cea33806ff6c2c2e8fe5fe5defa2463 (diff) | |
download | rockbox-e48cece75cc0ab3b0ebe970cb5603f8452931bd2.tar.gz rockbox-e48cece75cc0ab3b0ebe970cb5603f8452931bd2.zip |
imx31: Oops. Fix a misplaced comma in wmcodec-imx31.c. Add a couple parentheses in statment (just to be clearer). Should take care of things for now :).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20444 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/timer-imx31.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c b/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c index 4ed3b3053b..775f5cebf0 100644 --- a/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/kernel-imx31.c | |||
@@ -53,8 +53,8 @@ void tick_start(unsigned int interval_in_ms) | |||
53 | * Compare interrupt enabled, | 53 | * Compare interrupt enabled, |
54 | * Count from load value */ | 54 | * Count from load value */ |
55 | EPITCR1 = EPITCR_CLKSRC_IPG_CLK | EPITCR_WAITEN | EPITCR_IOVW | | 55 | EPITCR1 = EPITCR_CLKSRC_IPG_CLK | EPITCR_WAITEN | EPITCR_IOVW | |
56 | (2640-1) << EPITCR_PRESCALER_POS | EPITCR_RLD | EPITCR_OCIEN | | 56 | ((2640-1) << EPITCR_PRESCALER_POS) | EPITCR_RLD | |
57 | EPITCR_ENMOD; | 57 | EPITCR_OCIEN | EPITCR_ENMOD; |
58 | 58 | ||
59 | EPITLR1 = interval_in_ms*25; /* Count down from interval */ | 59 | EPITLR1 = interval_in_ms*25; /* Count down from interval */ |
60 | EPITCMPR1 = 0; /* Event when counter reaches 0 */ | 60 | EPITCMPR1 = 0; /* Event when counter reaches 0 */ |
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c index 9de3a9e9ec..d97743b0b8 100644 --- a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c | |||
@@ -77,7 +77,7 @@ bool _timer_set(long cycles, bool start) | |||
77 | * Reload from modulus register, | 77 | * Reload from modulus register, |
78 | * Count from load value */ | 78 | * Count from load value */ |
79 | EPITCR2 = EPITCR_CLKSRC_IPG_CLK | EPITCR_WAITEN | EPITCR_IOVW | | 79 | EPITCR2 = EPITCR_CLKSRC_IPG_CLK | EPITCR_WAITEN | EPITCR_IOVW | |
80 | (1-1) << EPITCR_PRESCALER_POS | EPITCR_RLD | EPITCR_ENMOD; | 80 | ((1-1) << EPITCR_PRESCALER_POS) | EPITCR_RLD | EPITCR_ENMOD; |
81 | EPITLR2 = cycles; | 81 | EPITLR2 = cycles; |
82 | /* Event when counter reaches 0 */ | 82 | /* Event when counter reaches 0 */ |
83 | EPITCMPR2 = 0; | 83 | EPITCMPR2 = 0; |
diff --git a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c index 2572b88fee..06bb4d6306 100644 --- a/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/wmcodec-imx31.c | |||
@@ -55,8 +55,8 @@ void audiohw_init(void) | |||
55 | imx31_regmod32(&CCM_PDR1, | 55 | imx31_regmod32(&CCM_PDR1, |
56 | ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) | | 56 | ((1-1) << CCM_PDR1_SSI1_PRE_PODF_POS) | |
57 | ((5-1) << CCM_PDR1_SSI1_PODF_POS) | | 57 | ((5-1) << CCM_PDR1_SSI1_PODF_POS) | |
58 | ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS), | 58 | ((8-1) << CCM_PDR1_SSI2_PRE_PODF_POS) | |
59 | ((64-1) << CCM_PDR1_SSI2_PODF_POS) | | 59 | ((64-1) << CCM_PDR1_SSI2_PODF_POS), |
60 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | | 60 | CCM_PDR1_SSI1_PODF | CCM_PDR1_SSI2_PODF | |
61 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); | 61 | CCM_PDR1_SSI1_PRE_PODF | CCM_PDR1_SSI2_PRE_PODF); |
62 | 62 | ||