From 590501cfe404b5463adecc70628e5bc7c8f142a2 Mon Sep 17 00:00:00 2001
From: Will Robertson <aliask@rockbox.org>
Date: Fri, 21 Sep 2007 15:51:53 +0000
Subject: Merge the Gigabeat S branch back into trunk. Fingers crossed nothing
 breaks.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/target/arm/imx31/gigabeat-s/adc-imx31.c | 52 ++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 firmware/target/arm/imx31/gigabeat-s/adc-imx31.c

(limited to 'firmware/target/arm/imx31/gigabeat-s/adc-imx31.c')

diff --git a/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c b/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c
new file mode 100644
index 0000000000..1fd2247ef1
--- /dev/null
+++ b/firmware/target/arm/imx31/gigabeat-s/adc-imx31.c
@@ -0,0 +1,52 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Wade Brown
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "cpu.h"
+#include "adc-target.h"
+#include "kernel.h"
+
+/* prototypes */
+static unsigned short __adc_read(int channel);
+static void adc_tick(void);
+
+void adc_init(void) 
+{
+}
+
+/* Called to get the recent ADC reading */
+inline unsigned short adc_read(int channel)
+{
+    (void)channel;
+    return 0;
+}
+
+/** 
+  * Read the ADC by polling
+  * @param channel The ADC channel to read
+  * @return 10bit reading from ADC channel or ADC_READ_ERROR if timeout
+  */
+static unsigned short __adc_read(int channel) 
+{
+    (void)channel;
+    return 0;
+}
+
+/* add this to the tick so that the ADC converts are done in the background */
+static void adc_tick(void)
+{
+}
-- 
cgit v1.2.3