From d997dafb6ca1644fdb07fa9850b72eb178ba45d4 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Tue, 18 Jun 2013 16:15:07 +0200
Subject: fuzeplus: drop audio routing driver in favor of the generic one

Change-Id: I89828ef858606bf09e115ff9c27ff9ecc8bf8b8e
---
 firmware/SOURCES                                   |  4 +-
 firmware/target/arm/imx233/audio-imx233.h          |  2 +-
 .../arm/imx233/sansa-fuzeplus/audio-fuzeplus.c     | 55 ----------------------
 .../arm/imx233/sansa-fuzeplus/audio-target.h       | 24 ++++++++++
 4 files changed, 26 insertions(+), 59 deletions(-)
 delete mode 100644 firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c
 create mode 100644 firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h

(limited to 'firmware')

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 5843002bcf..154fefb0c9 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -547,6 +547,7 @@ target/arm/imx233/usb-imx233.c
 #ifdef HAVE_IMX233_CODEC
 target/arm/imx233/audioout-imx233.c
 target/arm/imx233/audioin-imx233.c
+target/arm/imx233/audio-imx233.c
 target/arm/imx233/pcm-imx233.c
 drivers/audio/imx233-codec.c
 #endif
@@ -1393,9 +1394,6 @@ target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
 target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c
-#ifndef BOOTLOADER
-target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c
-#endif
 #endif
 
 #ifdef SANSA_CLIPZIP
diff --git a/firmware/target/arm/imx233/audio-imx233.h b/firmware/target/arm/imx233/audio-imx233.h
index dd0cdeb63a..035bf357e1 100644
--- a/firmware/target/arm/imx233/audio-imx233.h
+++ b/firmware/target/arm/imx233/audio-imx233.h
@@ -17,7 +17,7 @@
  * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
  * KIND, either express or implied.
  *
- ****************************************************************************/ 
+ ****************************************************************************/
 #ifndef __audio_imx233__
 #define __audio_imx233__
 
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c
deleted file mode 100644
index 57a3efd642..0000000000
--- a/firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2011 by Amaury Pouly
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#include "config.h"
-#include "system.h"
-#include "audiohw.h"
-#include "audio.h"
-#include "audioout-imx233.h"
-#include "audioin-imx233.h"
-
-static int input_source = AUDIO_SRC_PLAYBACK;
-static unsigned input_flags = 0;
-static int output_source = AUDIO_SRC_PLAYBACK;
-
-static void select_audio_path(void)
-{
-    if(input_source == AUDIO_SRC_PLAYBACK)
-        imx233_audioout_select_hp_input(false);
-    else
-        imx233_audioout_select_hp_input(true);
-}
-
-void audio_input_mux(int source, unsigned flags)
-{
-    (void) source;
-    (void) flags;
-    input_source = source;
-    input_flags = flags;
-    select_audio_path();
-}
-  
-void audio_set_output_source(int source)
-{
-    (void) source;
-    output_source = source;
-    select_audio_path();
-}
-
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
new file mode 100644
index 0000000000..afa3d9649b
--- /dev/null
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
@@ -0,0 +1,24 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2013 by Amaury Pouly
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef __audio_target__
+#define __audio_target__
+
+#endif /* __audio_target__ */
-- 
cgit v1.2.3