HD200 - fix button readings afrer PLL settings change

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26186 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 7 insertions, 7 deletions

diff --git a/firmware/target/coldfire/mpio/hd200/adc-hd200.c b/firmware/target/coldfire/mpio/hd200/adc-hd200.c
index 3e162a2251..656d82e721 100644
--- a/firmware/target/coldfire/mpio/hd200/adc-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/adc-hd200.c
@@ -40,7 +40,7 @@ void ADC(void)
 {
     static unsigned char channel IBSS_ATTR;
     /* read current value */
-    adc_data[(channel & 0x03)] = ADVALUE;
+    adc_data[((channel&0x01)+1)] = ADVALUE;
 
     /* switch channel
      *
@@ -52,9 +52,9 @@ void ADC(void)
     channel++;
 
     and_l(~(3<<24),&ADCONFIG);
-    or_l( (((channel & 0x03) << 8 )|(1<<7))<<16, &ADCONFIG);
+    or_l( ((((channel&0x01)+1) << 8 )|(1<<7))<<16, &ADCONFIG);
     
-    if ( (channel & 0x03) == 0 )
+    if ( (channel & 0x01) == 0 )
         /* disable ADC interrupt */
         and_l((~(1<<6))<<16,&ADCONFIG);
 }
@@ -84,7 +84,7 @@ void adc_init(void)
      * ADCLK_SEL = 011 (busclk/8)
      */
 
-    ADCONFIG = (1<<10)|(1<<7)|(1<<1)|(1<<0);
+    ADCONFIG = (1<<10)|(1<<8)|(1<<7)|0x03;
 
     /* ADC interrupt level 4.0 */
     or_l((4<<28), &INTPRI8);
diff --git a/firmware/target/coldfire/mpio/hd200/system-hd200.c b/firmware/target/coldfire/mpio/hd200/system-hd200.c
index beab29961d..2ebc5e8165 100644
--- a/firmware/target/coldfire/mpio/hd200/system-hd200.c
+++ b/firmware/target/coldfire/mpio/hd200/system-hd200.c
@@ -81,7 +81,7 @@ void cf_set_cpu_frequency(long frequency)
         IDECONFIG2 = (1<<18)|(1<<16)|(1<<8)|(1<<0); /* TA /CS2 enable + CS2wait */
 
         and_l(~(0x07<<16), &ADCONFIG);
-        or_l(((1<<7)|(1<<2)|(1<<0))<<16, &ADCONFIG); /* adclk = busclk/32 */
+        or_l((0x06)<<16, &ADCONFIG); /* adclk = busclk/64 */
         break;
 
     case CPUFREQ_NORMAL:
@@ -101,7 +101,7 @@ void cf_set_cpu_frequency(long frequency)
         IDECONFIG2 = (1<<18)|(1<<16);
 
         and_l(~(0x07<<16), &ADCONFIG);
-        or_l(((1<<7)|(1<<1)|(1<<0))<<16, &ADCONFIG); /* adclk = busclk/8 */
+        or_l((0x03)<<16, &ADCONFIG); /* adclk = busclk/8 */
         break;
 
     default:
@@ -119,7 +119,7 @@ void cf_set_cpu_frequency(long frequency)
         IDECONFIG2 = (1<<18)|(1<<16);
 
         and_l(~(0x07<<16), &ADCONFIG);
-        or_l(((1<<7)|(1<<0))<<16, &ADCONFIG); /* adclk = busclk/2 */
+        or_l((0x01)<<16, &ADCONFIG); /* adclk = busclk/2 */
         break;
     }
 }