* src/pic16/device.c (Pics16[]): added devices 18F2550, 18F4331,

[fw/sdcc] / device / lib / pic16 / libio / adc / adcread.c

diff --git a/device/lib/pic16/libio/adc/adcread.c b/device/lib/pic16/libio/adc/adcread.c
index 445854f13cc8c76ec750ea91cede213d9047799c..b3072bb7db2d8f0ae5c1c6d81d8424359a37d05b 100644 (file)
--- a/device/lib/pic16/libio/adc/adcread.c
+++ b/device/lib/pic16/libio/adc/adcread.c
@@ -1,18 +1,42 @@
 
+/*
+ * adcread - read value of convertion
+ *
+ * written by Vangelis Rokas, 2004 <vrokas AT otenet.gr>
+ *
+ * Devices implemented:
+ *     PIC18F[24][45][28]
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*
+** $Id$
+*/
+
 #include <pic18fregs.h>
 
 #include <adc.h>
 
 
-int adc_read(void)
+int adc_read(void) _naked
 {
-  union {
-       int ri;
-       char rb[2];
-  } result;
-
-       result.rb[0] = ADRESL;
-       result.rb[1] = ADRESH;
-
-  return (result.ri);
+  _asm
+    movff       _ADRESH, _PRODL
+    movf        _ADRESL, w
+    return
+  _endasm;
 }