len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

MPIO HD200/HD300: Decrease ADC scanrate.

Browse source 
The adclk is decreased 4x. This solves problems with battery
readout drop during system startup.

Change-Id: I46d7c4b9ffcfdc812a6dd2a932c9e397d33c1168
This commit is contained in:
Marcin Bukat 2012-01-24 11:53:22 +01:00
parent 2ab2857b58
commit e94d1b0ab0
2 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
firmware/target/coldfire/mpio/adc-mpio.c
View file

@ -28,17 +28,11 @@
volatile unsigned short adc_data[NUM_ADC_CHANNELS] IBSS_ATTR; volatile unsigned short adc_data[NUM_ADC_CHANNELS] IBSS_ATTR;
/* Reading takes 4096 adclk ticks
* 1) tick task is created that enables ADC interrupt
* 2) On interrupt single channel is readed and
* ADC is prepared for next channel
* 3) When all 4 channels are scanned ADC interrupt is disabled
*/
void ADC(void) __attribute__ ((interrupt_handler,section(".icode"))); void ADC(void) __attribute__ ((interrupt_handler,section(".icode")));
void ADC(void) void ADC(void)
{ {
static unsigned char channel IBSS_ATTR; static unsigned char channel IBSS_ATTR;
/* read current value */ /* read current value */
adc_data[(channel&0x03)] = ADVALUE; adc_data[(channel&0x03)] = ADVALUE;
@ -48,15 +42,10 @@ void ADC(void)
* ADCONFIG is 16bit wide so we have to shift data by 16bits left * ADCONFIG is 16bit wide so we have to shift data by 16bits left
* thats why we shift <<24 instead of <<8 * thats why we shift <<24 instead of <<8
*/ */
channel++; channel++;
and_l(~(0x03<<24),&ADCONFIG); and_l(~(0x03<<24),&ADCONFIG);
or_l( (((channel&0x03) << 8 )|(1<<7))<<16, &ADCONFIG); or_l( (((channel&0x03) << 8 )|(1<<7))<<16, &ADCONFIG);
if ( (channel & 0x03) == 0 )
/* disable ADC interrupt */
and_l((~(1<<6))<<16,&ADCONFIG);
} }
unsigned short adc_scan(int channel) unsigned short adc_scan(int channel)
@ -65,12 +54,6 @@ unsigned short adc_scan(int channel)
return adc_data[(channel&0x03)]; return adc_data[(channel&0x03)];
} }
void adc_tick(void)
{
/* enable ADC interrupt */
or_l( ((1<<6))<<16, &ADCONFIG);
}
void adc_init(void) void adc_init(void)
{ {
/* GPIO38 GPIO39 */ /* GPIO38 GPIO39 */
@ -79,19 +62,16 @@ void adc_init(void)
/* ADOUT_SEL = 01 /* ADOUT_SEL = 01
* SOURCE SELECT = 000 * SOURCE SELECT = 000
* CLEAR INTERRUPT FLAG * CLEAR INTERRUPT FLAG
* ENABLE INTERRUPT = 0 * ENABLE INTERRUPT = 1
* ADOUT_DRIVE = 00 * ADOUT_DRIVE = 00
* ADCLK_SEL = 011 (busclk/8) * ADCLK_SEL = 011 (busclk/64)
*/ */
ADCONFIG = (1<<10)|(1<<8)|(1<<7)|0x03; ADCONFIG = (1<<10)|(1<<7)|(1<<6)|0x06;
/* ADC interrupt level 4.0 */ /* ADC interrupt level 4.0 */
or_l((4<<28), &INTPRI8); or_l((4<<28), &INTPRI8);
/* create tick task which enables ADC interrupt */
tick_add_task(adc_tick);
/* let the interrupt handler fill readout array */ /* let the interrupt handler fill readout array */
sleep(2); sleep(HZ/10);
} }

12
firmware/target/coldfire/mpio/system-mpio.c
View file

@ -80,8 +80,8 @@ void cf_set_cpu_frequency(long frequency)
/* BUFEN2 enable on /CS2 | CS2Post 1 clock| CS2Pre 3 clocks*/ /* BUFEN2 enable on /CS2 | CS2Post 1 clock| CS2Pre 3 clocks*/
IDECONFIG2 = (1<<18)|(1<<16)|(1<<8)|(1<<0); /* TA /CS2 enable + CS2wait */ IDECONFIG2 = (1<<18)|(1<<16)|(1<<8)|(1<<0); /* TA /CS2 enable + CS2wait */
and_l(~(0x07<<16), &ADCONFIG); and_l(~(0x0f<<16), &ADCONFIG);
or_l((0x05)<<16, &ADCONFIG); /* adclk = busclk/32 */ or_l((0x08)<<16, &ADCONFIG); /* adclk = busclk/256 */
break; break;
case CPUFREQ_NORMAL: case CPUFREQ_NORMAL:
@ -100,8 +100,8 @@ void cf_set_cpu_frequency(long frequency)
IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
IDECONFIG2 = (1<<18)|(1<<16); IDECONFIG2 = (1<<18)|(1<<16);
and_l(~(0x07<<16), &ADCONFIG); and_l(~(0x0f<<16), &ADCONFIG);
or_l((0x03)<<16, &ADCONFIG); /* adclk = busclk/8 */ or_l((0x06)<<16, &ADCONFIG); /* adclk = busclk/64 */
break; break;
default: default:
@ -118,8 +118,8 @@ void cf_set_cpu_frequency(long frequency)
IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10); IDECONFIG1 = (1<<28)|(1<<20)|(1<<18)|(1<<13)|(1<<10);
IDECONFIG2 = (1<<18)|(1<<16); IDECONFIG2 = (1<<18)|(1<<16);
and_l(~(0x07<<16), &ADCONFIG); and_l(~(0x0f<<16), &ADCONFIG);
or_l((0x01)<<16, &ADCONFIG); /* adclk = busclk/2 */ or_l((0x04)<<16, &ADCONFIG); /* adclk = busclk/16 */
break; break;
} }
} }