From eaf178e3f417a1c9576c5d77ca578e332c356dbc Mon Sep 17 00:00:00 2001 From: mocchi Date: Mon, 28 Oct 2013 03:53:08 +0000 Subject: [PATCH] [FFADO/MAudio] obsolete ENABLE_MAUDIO build option and remove related files As long as FFADO developers confirmed, MAudio devices use BeBoB chipset or Dice chipset. This commit obsolete ENABLE_MAUDIO build option and maudio_avdevice class because it's no meaning. The resources related to Firewire 410 and Firewire Audiophile are going to be moved to under /src/bebob/maudio/. git-svn-id: svn+ssh://ffado.org/ffado/trunk@2450 2be59082-3212-0410-8809-b0798e1608f0 --- libffado/SConstruct | 2 - libffado/deb/SConscript | 6 +- libffado/src/SConscript | 18 +-- libffado/src/{ => bebob}/maudio/fw410.xml | 0 libffado/src/{ => bebob}/maudio/fwap.xml | 0 libffado/src/{ => bebob}/maudio/refdesign.xml | 0 libffado/src/devicemanager.cpp | 11 -- libffado/src/libutil/Configuration.cpp | 2 - libffado/src/libutil/Configuration.h | 1 - libffado/src/maudio/maudio_avdevice.cpp | 185 -------------------------- libffado/src/maudio/maudio_avdevice.h | 79 ----------- 11 files changed, 6 insertions(+), 298 deletions(-) rename libffado/src/{ => bebob}/maudio/fw410.xml (100%) rename libffado/src/{ => bebob}/maudio/fwap.xml (100%) rename libffado/src/{ => bebob}/maudio/refdesign.xml (100%) delete mode 100644 libffado/src/maudio/maudio_avdevice.cpp delete mode 100644 libffado/src/maudio/maudio_avdevice.h diff --git a/libffado/SConstruct b/libffado/SConstruct index ba3af4da..e19e5828 100644 --- a/libffado/SConstruct +++ b/libffado/SConstruct @@ -61,7 +61,6 @@ Toggle debug-build. DEBUG means \"-g -Wall\" and more, otherwise we will use BoolVariable( "ENABLE_METRIC_HALO", "Enable/Disable support for the Metric Halo platform.", False ), BoolVariable( "ENABLE_RME", "Enable/Disable support for the RME platform.", True ), BoolVariable( "ENABLE_DIGIDESIGN", "Enable/Disable support for Digidesign interfaces.", False ), - BoolVariable( "ENABLE_MAUDIO", "Enable/Disable support for the M-Audio custom BeBoB devices.", False ), BoolVariable( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE device.", False ), BoolVariable( "ENABLE_GENERICAVC", """\ Enable/Disable the the generic avc part (mainly used by apple). @@ -430,7 +429,6 @@ if env['ENABLE_ALL']: env['ENABLE_RME'] = True env['ENABLE_DIGIDESIGN'] = True env['ENABLE_BOUNCE'] = True - env['ENABLE_MAUDIO'] = True env['BUILD_STATIC_LIB'] = False diff --git a/libffado/deb/SConscript b/libffado/deb/SConscript index b4ab9f0b..5e201cc6 100644 --- a/libffado/deb/SConscript +++ b/libffado/deb/SConscript @@ -55,9 +55,9 @@ DEBFILES.append(("usr/share/libffado/ffado_driver_genericavc.txt", "#src/generi if env['ENABLE_BEBOB']: DEBFILES.append(("usr/share/libffado/ffado_driver_bebob.txt", "#src/bebob/ffado_driver_bebob.txt")) DEBFILES.append(("usr/bin/ffado-bridgeco-downloader", "#support/firmware/ffado-bridgeco-downloader")) - #DEBFILES.append(("usr/share/libffado/fw410.xml", "#src/maudio/fw410.xml")) - #DEBFILES.append(("usr/share/libffado/fwap.xml","#src/maudio/fwap.xml")) - #DEBFILES.append(("usr/share/libffado/refdesign.xml","#src/maudio/refdesign.xml")) + #DEBFILES.append(("usr/share/libffado/fw410.xml", "#src/bebob/maudio/fw410.xml")) + #DEBFILES.append(("usr/share/libffado//fwap.xml","#src/bebob/maudio/fwap.xml")) + #DEBFILES.append(("usr/share/libffado//refdesign.xml","#src/bebob/maudio/refdesign.xml")) if env['ENABLE_FIREWORKS']: DEBFILES.append(("usr/share/libffado/ffado_driver_fireworks.txt", "#src/fireworks/ffado_driver_fireworks.txt")) DEBFILES.append(("usr/bin/ffado-fireworks-downloader", "#support/firmware/ffado-fireworks-downloader")) diff --git a/libffado/src/SConscript b/libffado/src/SConscript index 686a3842..4bb7276d 100644 --- a/libffado/src/SConscript +++ b/libffado/src/SConscript @@ -101,18 +101,11 @@ bebob_source = env.Split( '\ ' ) bebob_pkgdata = env.Split( '\ - maudio/refdesign.xml \ - maudio/fw410.xml \ - maudio/fwap.xml \ + bebob/maudio/refdesign.xml \ + bebob/maudio/fw410.xml \ + bebob/maudio/fwap.xml \ ' ) -maudio_source = env.Split( '\ - maudio/maudio_avdevice.cpp \ -' ) - -maudio_pkgdata = env.Split( '\ -' ) - genericavc_source = env.Split( '\ genericavc/avc_avdevice.cpp \ genericavc/stanton/scs.cpp \ @@ -244,11 +237,6 @@ if env['ENABLE_BEBOB']: libenv.MergeFlags( "-DENABLE_BEBOB" ) source += bebob_source pkgdata += bebob_pkgdata -if env['ENABLE_MAUDIO']: - env['ENABLE_GENERICAVC'] = True - libenv.MergeFlags( "-DENABLE_MAUDIO" ) - source += maudio_source - pkgdata += maudio_pkgdata if env['ENABLE_FIREWORKS']: env['ENABLE_GENERICAVC'] = True libenv.MergeFlags( "-DENABLE_FIREWORKS" ) diff --git a/libffado/src/maudio/fw410.xml b/libffado/src/bebob/maudio/fw410.xml similarity index 100% rename from libffado/src/maudio/fw410.xml rename to libffado/src/bebob/maudio/fw410.xml diff --git a/libffado/src/maudio/fwap.xml b/libffado/src/bebob/maudio/fwap.xml similarity index 100% rename from libffado/src/maudio/fwap.xml rename to libffado/src/bebob/maudio/fwap.xml diff --git a/libffado/src/maudio/refdesign.xml b/libffado/src/bebob/maudio/refdesign.xml similarity index 100% rename from libffado/src/maudio/refdesign.xml rename to libffado/src/bebob/maudio/refdesign.xml diff --git a/libffado/src/devicemanager.cpp b/libffado/src/devicemanager.cpp index 3ce82131..79ef2abb 100644 --- a/libffado/src/devicemanager.cpp +++ b/libffado/src/devicemanager.cpp @@ -44,10 +44,6 @@ #include "bebob/bebob_avdevice.h" #endif -#ifdef ENABLE_MAUDIO -#include "maudio/maudio_avdevice.h" -#endif - #ifdef ENABLE_GENERICAVC #include "genericavc/avc_avdevice.h" #endif @@ -1053,13 +1049,6 @@ DeviceManager::getDriverForDeviceDo( ConfigRom *configRom, } #endif -#ifdef ENABLE_MAUDIO - debugOutput( DEBUG_LEVEL_VERBOSE, "Trying M-Audio...\n" ); - if ( MAudio::Device::probe( getConfiguration(), *configRom, generic ) ) { - return MAudio::Device::createDevice( *this, std::auto_ptr( configRom ) ); - } -#endif - // we want to try the non-generic AV/C platforms before trying the generic ones #ifdef ENABLE_GENERICAVC debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Generic AV/C...\n" ); diff --git a/libffado/src/libutil/Configuration.cpp b/libffado/src/libutil/Configuration.cpp index 5b428148..581e4208 100644 --- a/libffado/src/libutil/Configuration.cpp +++ b/libffado/src/libutil/Configuration.cpp @@ -501,8 +501,6 @@ Configuration::convertDriver(const std::string& driver) const { return eD_GenericAVC; if(driver == "OXFORD") return eD_Oxford; - if(driver == "MAUDIO") - return eD_MAudio; if(driver == "MOTU") return eD_MOTU; if(driver == "DICE") diff --git a/libffado/src/libutil/Configuration.h b/libffado/src/libutil/Configuration.h index ba068c15..7eebe3f8 100644 --- a/libffado/src/libutil/Configuration.h +++ b/libffado/src/libutil/Configuration.h @@ -48,7 +48,6 @@ public: eD_FireWorks = 2, eD_GenericAVC = 3, eD_Oxford = 4, - eD_MAudio = 5, eD_MOTU = 10, eD_DICE = 20, eD_MetricHalo = 30, diff --git a/libffado/src/maudio/maudio_avdevice.cpp b/libffado/src/maudio/maudio_avdevice.cpp deleted file mode 100644 index c63ac660..00000000 --- a/libffado/src/maudio/maudio_avdevice.cpp +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (C) 2005-2008 by Daniel Wagner - * - * This file is part of FFADO - * FFADO = Free Firewire (pro-)audio drivers for linux - * - * FFADO is based upon FreeBoB. - * - * 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) version 3 of the License. - * - * This program 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, see . - * - */ - -#warning M-Audio support is currently useless - -#include "maudio/maudio_avdevice.h" - -#include "libieee1394/configrom.h" -#include "libieee1394/ieee1394service.h" - -#include "libavc/avc_definitions.h" - -#include "debugmodule/debugmodule.h" - -#include "devicemanager.h" - -#include -#include - -namespace MAudio { - -Device::Device( DeviceManager& d, std::auto_ptr( configRom )) - : FFADODevice( d, configRom) -{ - debugOutput( DEBUG_LEVEL_VERBOSE, "Created MAudio::Device (NodeID %d)\n", - getConfigRom().getNodeId() ); -} - -Device::~Device() -{ -} - -bool -Device::probe( Util::Configuration& c, ConfigRom& configRom, bool generic ) -{ - if(generic) { - return false; - } else { - // check if device is in supported devices list - unsigned int vendorId = configRom.getNodeVendorId(); - unsigned int modelId = configRom.getModelId(); - - Util::Configuration::VendorModelEntry vme = c.findDeviceVME( vendorId, modelId ); - return c.isValid(vme) && vme.driver == Util::Configuration::eD_MAudio; - } -} - -FFADODevice * -Device::createDevice(DeviceManager& d, std::auto_ptr( configRom )) -{ - return new Device( d, configRom ); -} - -bool -Device::discover() -{ - unsigned int vendorId = getConfigRom().getNodeVendorId(); - unsigned int modelId = getConfigRom().getModelId(); - - Util::Configuration &c = getDeviceManager().getConfiguration(); - Util::Configuration::VendorModelEntry vme = c.findDeviceVME( vendorId, modelId ); - - if (c.isValid(vme) && vme.driver == Util::Configuration::eD_MAudio) { - debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n", - vme.vendor_name.c_str(), - vme.model_name.c_str()); - } else { - debugWarning("Using generic M-Audio support for unsupported device '%s %s'\n", - getConfigRom().getVendorName().c_str(), getConfigRom().getModelName().c_str()); - } - - return true; -} - - -int -Device::getSamplingFrequency( ) { - return 0; -} - -std::vector -Device::getSupportedSamplingFrequencies() -{ - std::vector frequencies; - return frequencies; -} - -FFADODevice::ClockSourceVector -Device::getSupportedClockSources() { - FFADODevice::ClockSourceVector r; - return r; -} - -bool -Device::setActiveClockSource(ClockSource s) { - return false; -} - -FFADODevice::ClockSource -Device::getActiveClockSource() { - ClockSource s; - return s; -} - -bool -Device::setSamplingFrequency( int samplingFrequency ) -{ - - return false; -} - -bool -Device::lock() { - - return true; -} - - -bool -Device::unlock() { - - return true; -} - -void -Device::showDevice() -{ - unsigned int vendorId = getConfigRom().getNodeVendorId(); - unsigned int modelId = getConfigRom().getModelId(); - - Util::Configuration &c = getDeviceManager().getConfiguration(); - Util::Configuration::VendorModelEntry vme = c.findDeviceVME( vendorId, modelId ); - - debugOutput(DEBUG_LEVEL_VERBOSE, - "%s %s at node %d\n", vme.vendor_name.c_str(), vme.model_name.c_str(), getNodeId()); -} - -bool -Device::prepare() { - - return true; -} - -int -Device::getStreamCount() { - return 0; -} - -Streaming::StreamProcessor * -Device::getStreamProcessorByIndex(int i) { - - return NULL; -} - -bool -Device::startStreamByIndex(int i) { - return false; -} - -bool -Device::stopStreamByIndex(int i) { - return false; -} - -} diff --git a/libffado/src/maudio/maudio_avdevice.h b/libffado/src/maudio/maudio_avdevice.h deleted file mode 100644 index b4fa7c8f..00000000 --- a/libffado/src/maudio/maudio_avdevice.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2005-2008 by Daniel Wagner - * Copyright (C) 2005-2008 by Pieter Palmers - * - * This file is part of FFADO - * FFADO = Free Firewire (pro-)audio drivers for linux - * - * FFADO is based upon FreeBoB. - * - * 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) version 3 of the License. - * - * This program 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, see . - * - */ - -#ifndef MAUDIODEVICE_H -#define MAUDIODEVICE_H - -#include "debugmodule/debugmodule.h" -#include "libavc/avc_definitions.h" -#include "libavc/general/avc_extended_cmd_generic.h" - -#include "bebob/bebob_avdevice.h" - -#include "libstreaming/amdtp/AmdtpReceiveStreamProcessor.h" -#include "libstreaming/amdtp/AmdtpTransmitStreamProcessor.h" -#include "libstreaming/amdtp/AmdtpPort.h" -#include "libstreaming/amdtp/AmdtpPortInfo.h" - -#include "ffadodevice.h" - -class ConfigRom; -class Ieee1394Service; - -namespace MAudio { - -class Device : public FFADODevice { -public: - Device( DeviceManager& d, std::auto_ptr( configRom )); - virtual ~Device(); - - static bool probe( Util::Configuration& c, ConfigRom& configRom, bool generic = false ); - static FFADODevice * createDevice( DeviceManager& d, std::auto_ptr( configRom )); - virtual bool discover(); - - virtual void showDevice(); - - virtual bool setSamplingFrequency( int ); - virtual int getSamplingFrequency( ); - virtual std::vector getSupportedSamplingFrequencies(); - - virtual ClockSourceVector getSupportedClockSources(); - virtual bool setActiveClockSource(ClockSource); - virtual ClockSource getActiveClockSource(); - - virtual int getStreamCount(); - - virtual bool prepare(); - virtual bool lock(); - virtual bool unlock(); - - virtual Streaming::StreamProcessor *getStreamProcessorByIndex(int i); - virtual bool startStreamByIndex(int i); - virtual bool stopStreamByIndex(int i); - -}; - -} - -#endif -- 2.11.4.GIT