summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-15 19:44:54 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-15 19:44:54 +0000
commit6f6dffa4a6511b2054c3f65ff37fe07f196429ea (patch)
treee7c9cea20e05e2b2e8b5a47f119a55966e4ff9c2 /firmware
parentf6a17bdbd4cd007ad89285624e5a53d7b9d819d0 (diff)
downloadrockbox-6f6dffa4a6511b2054c3f65ff37fe07f196429ea.tar.gz
rockbox-6f6dffa4a6511b2054c3f65ff37fe07f196429ea.tar.bz2
rockbox-6f6dffa4a6511b2054c3f65ff37fe07f196429ea.zip
adc-as3514.c: cosmetics
reduce indentation level, return early on error condition git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26063 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/adc-as3514.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/firmware/target/arm/adc-as3514.c b/firmware/target/arm/adc-as3514.c
index 77d65455fb..8c661eb133 100644
--- a/firmware/target/arm/adc-as3514.c
+++ b/firmware/target/arm/adc-as3514.c
@@ -28,36 +28,36 @@ unsigned short adc_read(int channel)
{
unsigned short data = 0;
- if ((unsigned)channel < NUM_ADC_CHANNELS)
- {
- ascodec_lock();
+ if ((unsigned)channel >= NUM_ADC_CHANNELS)
+ return 0;
- /* Select channel */
- if (ascodec_write(AS3514_ADC_0, (channel << 4)) >= 0)
- {
- unsigned char buf[2];
+ ascodec_lock();
- /*
- * The AS3514 ADC will trigger an interrupt when the conversion
- * is finished, if the corresponding enable bit in IRQ_ENRD2
- * is set.
- * Previously the code did not wait and this apparently did
- * not pose any problems, but this should be more correct.
- * Without the wait the data read back may be completely or
- * partially (first one of the two bytes) stale.
- */
- ascodec_wait_adc_finished();
+ /* Select channel */
+ if (ascodec_write(AS3514_ADC_0, (channel << 4)) >= 0)
+ {
+ unsigned char buf[2];
+ /*
+ * The AS3514 ADC will trigger an interrupt when the conversion
+ * is finished, if the corresponding enable bit in IRQ_ENRD2
+ * is set.
+ * Previously the code did not wait and this apparently did
+ * not pose any problems, but this should be more correct.
+ * Without the wait the data read back may be completely or
+ * partially (first one of the two bytes) stale.
+ */
+ ascodec_wait_adc_finished();
- /* Read data */
- if (ascodec_readbytes(AS3514_ADC_0, 2, buf) >= 0)
- {
- data = (((buf[0] & 0x3) << 8) | buf[1]);
- }
- }
- ascodec_unlock();
+ /* Read data */
+ if (ascodec_readbytes(AS3514_ADC_0, 2, buf) >= 0)
+ {
+ data = (((buf[0] & 0x3) << 8) | buf[1]);
+ }
}
+
+ ascodec_unlock();
return data;
}