* device/include/pic16/adc.h,

device/include/lib/pic16/libio/adc/adcopen.c: applied patch #1364387
and fixed bug #1364390

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4218 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index b85ebeccfc450928fedbaf7e0f9234d8cf9f02dc..a9564d6ec0386287f890f2ae9f1c1cb0fa1c3a11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 
        * src/pic16/gen.c (genCast): fixed bug with assignment of a pointer
        to a char variable. Fixed bug #1504211
+       * device/include/pic16/adc.h,
+       device/include/lib/pic16/libio/adc/adcopen.c: applied patch #1364387
+       and fixed bug #1364390
 
 2006-06-10 Borut Razem <borut.razem AT siol.net>
 

diff --git a/device/include/pic16/adc.h b/device/include/pic16/adc.h
index 333e99090cb662cffcf5caf7c820e2615a61eda3..68a685e2aee932885820a0f727a8e9f243eb0818 100644 (file)
--- a/device/include/pic16/adc.h
+++ b/device/include/pic16/adc.h
@@ -44,11 +44,12 @@
 
 /* oscillator frequency */
 #define ADC_FOSC_2     0x00
-#define ADC_FOSC_4     0x10
-#define ADC_FOSC_16    0x11
+#define ADC_FOSC_4     0x04
+#define ADC_FOSC_8     0x01
+#define ADC_FOSC_16    0x05
 #define ADC_FOSC_32    0x02
-#define ADC_FOSC_64    0x12
-#define ADC_FOSC_RC    0x03
+#define ADC_FOSC_64    0x06
+#define ADC_FOSC_RC    0x07
 
 
 /* channel selection */

diff --git a/device/lib/pic16/libio/adc/adcopen.c b/device/lib/pic16/libio/adc/adcopen.c
index 1842eb10c172a7c004b4a83d9805252557fc5a3f..980cac5cfbbdb60f37a2654e3f481129a4ed04a9 100644 (file)
--- a/device/lib/pic16/libio/adc/adcopen.c
+++ b/device/lib/pic16/libio/adc/adcopen.c
@@ -54,7 +54,7 @@ void adc_open(unsigned char channel, unsigned char fosc, unsigned char pcfg, uns
   /* setup reference and pins */
   ADCON1 |= pcfg & 0x0f;
   
-  ADCON0 |= (config & ADC_FRM_RJUST);
+  ADCON1 |= (config & ADC_FRM_RJUST);
   
   if(config & ADC_INT_ON) {
     PIR1bits.ADIF = 0;