diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-03-05 22:14:53 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-03-05 22:14:53 +0000 |
commit | bb2f15ca7d6eeedbf5634c93609da9dc61824d3c (patch) | |
tree | a654da63f0d308f5aa601d999ff8618ad72b91cd /firmware/drivers/adc.c | |
parent | 03b8708f9e7d79189326795785d87f57367fc78c (diff) | |
download | rockbox-bb2f15ca7d6eeedbf5634c93609da9dc61824d3c.tar.gz rockbox-bb2f15ca7d6eeedbf5634c93609da9dc61824d3c.zip |
Finer grained irq masking, blocking for i2c, plus a mutex to prevent conflicting read/writes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8922 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/adc.c')
-rw-r--r-- | firmware/drivers/adc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/firmware/drivers/adc.c b/firmware/drivers/adc.c index f4bdb7a54f..f1a6d7e667 100644 --- a/firmware/drivers/adc.c +++ b/firmware/drivers/adc.c | |||
@@ -294,10 +294,7 @@ static struct adc_struct adcdata[NUM_ADC_CHANNELS]; | |||
294 | 294 | ||
295 | static unsigned short adc_scan(struct adc_struct *adc) | 295 | static unsigned short adc_scan(struct adc_struct *adc) |
296 | { | 296 | { |
297 | /* Disable interrupts during the I2C transaction */ | ||
298 | int old_irq_level = set_irq_level(HIGHEST_IRQ_LEVEL); | ||
299 | unsigned short data = pcf50605_a2d_read(adc->channelnum); | 297 | unsigned short data = pcf50605_a2d_read(adc->channelnum); |
300 | set_irq_level(old_irq_level); | ||
301 | /* This gives us a 13 bit value corresponding to 0-5.4 volts | 298 | /* This gives us a 13 bit value corresponding to 0-5.4 volts |
302 | * The range of the value is 13FB-17FA */ | 299 | * The range of the value is 13FB-17FA */ |
303 | data = (data<<2)+0x13FB; | 300 | data = (data<<2)+0x13FB; |