Changeset 992

Timestamp:

04/06/08 16:19:31 (15 years ago)

Author:

jwoithe

Message:

Added support for getting firewire unit version via Dbus (needed by ffadomixer to differentiate MOTU models down the track).
Created a motu mixer in ffadomixer and commenced implementation of controls. The precise nature of the implementation is still being fine-tuned and is subject to change.
Minor whitespace cleanups and spelling corrections.

Files:

• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (8 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/motu/motu_controls.cpp (added)
• trunk/libffado/src/motu/motu_controls.h (added)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/support/dbus/control-interface.xml (modified) (1 diff)
• trunk/libffado/support/dbus/controlserver.cpp (modified) (1 diff)
• trunk/libffado/support/dbus/controlserver.h (modified) (1 diff)
• trunk/libffado/support/mixer/ffadomixer.in (modified) (5 diffs)
• trunk/libffado/support/mixer/mixer_motu.py (added)
• trunk/libffado/support/mixer/mixer_motu.ui (added)
• trunk/libffado/support/mixer/SConscript (modified) (1 diff)

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -38 +38 @@
-#include "libutil/DelayLockedLoop.h"
-#include "libutil/Time.h"
+
+#include "libcontrol/BasicElements.h"
-
-#include <string>
@@ -245 +247 @@
-};
-
+// Mixer registers
+const MixerCtrl MixerCtrls_Traveler[] = {
+    {"Mix1/Ana1_", "Mix 1 analog 1 ", "", MOTU_CTRL_STD_CHANNEL, 0x4000, },
+    {"Mix1/Ana2_", "Mix 1 analog 2 ", "", MOTU_CTRL_STD_CHANNEL, 0x4004, },
+    {"Mix1/Ana3_", "Mix 1 analog 3 ", "", MOTU_CTRL_STD_CHANNEL, 0x4008, },
+    {"Mix1/Ana4_", "Mix 1 analog 4 ", "", MOTU_CTRL_STD_CHANNEL, 0x400c, },
+    {"Mix1/Ana5_", "Mix 1 analog 5 ", "", MOTU_CTRL_STD_CHANNEL, 0x4010, },
+    {"Mix1/Ana6_", "Mix 1 analog 6 ", "", MOTU_CTRL_STD_CHANNEL, 0x4014, },
+    {"Mix1/Ana7_", "Mix 1 analog 7 ", "", MOTU_CTRL_STD_CHANNEL, 0x4018, },
+    {"Mix1/Ana8_", "Mix 1 analog 8 ", "", MOTU_CTRL_STD_CHANNEL, 0x401c, },
+};
+
+// For convenience during initial testing, just make the 828MkII and 896HD
+// use the Traveler's mixer definition.  Separate definitions for these 
+// models will come once the final mixer structure is in place.  For now
+// it's in a state of flux and subject to significant change.
+#define MixerCtrls_828MkII MixerCtrls_Traveler
+#define MixerCtrls_896HD   MixerCtrls_Traveler
+
-/* The order of DevicesProperty entries must match the numeric order of the
- * MOTU model enumeration (EMotuModel).
- */
-const DevicePropertyEntry DevicesProperty[] = {
-sizeof
-sizeof( Ports_828MKII ),    96000
-sizeof( Ports_TRAVELER ),  192000
-sizeof
-sizeof
-sizeof
-sizeof( Ports_896HD ),     192000
+N_ELEMENTS
+N_ELEMENTS( Ports_828MKII ),    96000, MixerCtrls_828MkII, N_ELEMENTS(MixerCtrls_828MkII),
+N_ELEMENTS( Ports_TRAVELER ),  192000, MixerCtrls_Traveler, N_ELEMENTS(MixerCtrls_Traveler),
+N_ELEMENTS
+N_ELEMENTS
+N_ELEMENTS
+N_ELEMENTS( Ports_896HD ),     192000, MixerCtrls_896HD, N_ELEMENTS(MixerCtrls_896HD), 
-};
-
@@ -267 +288 @@
-    , m_receiveProcessor ( 0 )
-    , m_transmitProcessor ( 0 )
-
+
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Motu::MotuDevice (NodeID %d)\n",
@@ -285 +307 @@
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free send iso channel %d\n", m_iso_send_channel);
-    }
+
+    destroyMixer();
+}
+
+bool
+MotuDevice::buildMixer() {
+    unsigned int i;
+    bool result = true;
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Building a MOTU mixer...\n");
+
+    destroyMixer();
+        
+    // create the mixer object container
+    m_MixerContainer = new Control::Container("Mixer");
+    if (!m_MixerContainer) {
+        debugError("Could not create mixer container...\n");
+        return false;
+    }
+
+    // Mixer controls get added here
+    for (i=0; i<DevicesProperty[m_motu_model-1].n_mixer_ctrls; i++) {
+        unsigned int type = DevicesProperty[m_motu_model-1].mixer_ctrl[i].type;
+        char name[100];
+        char label[100];
+        if (type & MOTU_CTRL_CHANNEL_FADER) {
+            snprintf(name, 100, "%s%s", DevicesProperty[m_motu_model-1].mixer_ctrl[i].name, "fader");
+            snprintf(label,100, "%s%s", DevicesProperty[m_motu_model-1].mixer_ctrl[i].label,"fader");
+            result &= m_MixerContainer->addElement(
+                new ChannelFader(*this, 
+                    DevicesProperty[m_motu_model-1].mixer_ctrl[i].dev_register,
+                    name, label, 
+                    DevicesProperty[m_motu_model-1].mixer_ctrl[i].desc));
+            type &= ~MOTU_CTRL_CHANNEL_FADER;
+        }
+        if (type & MOTU_CTRL_CHANNEL_PAN) {
+            snprintf(name, 100, "%s%s", DevicesProperty[m_motu_model-1].mixer_ctrl[i].name, "pan");
+            snprintf(label,100, "%s%s", DevicesProperty[m_motu_model-1].mixer_ctrl[i].label,"pan");
+            result &= m_MixerContainer->addElement(
+                new ChannelPan(*this, 
+                    DevicesProperty[m_motu_model-1].mixer_ctrl[i].dev_register,
+                    name, label,
+                    DevicesProperty[m_motu_model-1].mixer_ctrl[i].desc));
+            type &= ~MOTU_CTRL_CHANNEL_PAN;
+        }
+        if (type) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Unknown mixer control type flag bits 0x%08x\n", DevicesProperty[m_motu_model-1].mixer_ctrl[i].type);
+        }
+    }
+
+    if (!addElement(m_MixerContainer)) {
+        debugWarning("Could not register mixer to device\n");
+        // clean up
+        destroyMixer();
+        return false;
+    }
+
+    // Special controls
+    m_ControlContainer = new Control::Container("Control");
+    if (!m_ControlContainer) {
+        debugError("Could not create control container...\n");
+        return false;
+    }
+
+    // Special controls get added here
+
+    if (!result) {
+        debugWarning("One or more device control elements could not be created.");
+        // clean up those that couldn't be created
+        destroyMixer();
+        return false;
+    }
+    if (!addElement(m_ControlContainer)) {
+        debugWarning("Could not register controls to device\n");
+        // clean up
+        destroyMixer();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool
+MotuDevice::destroyMixer() {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "destroy mixer...\n");
+
+    if (m_MixerContainer == NULL) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "no mixer to destroy...\n");
+        return true;
+    }
+    
+    if (!deleteElement(m_MixerContainer)) {
+        debugError("Mixer present but not registered to the avdevice\n");
+        return false;
+    }
+
+    // remove and delete (as in free) child control elements
+    m_MixerContainer->clearElements(true);
+    delete m_MixerContainer;
+    m_MixerContainer = NULL;
+
+    // remove control container
+    if (m_ControlContainer == NULL) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "no controls to destroy...\n");
+        return true;
+    }
+    
+    if (!deleteElement(m_ControlContainer)) {
+        debugError("Controls present but not registered to the avdevice\n");
+        return false;
+    }
+    
+    // remove and delete (as in free) child control elements
+    m_ControlContainer->clearElements(true);
+    delete m_ControlContainer;
+    m_ControlContainer = NULL;
+
+    return true;
-}
-
@@ -337 +477 @@
-    }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -894 +1039 @@
-        flags |= MOTUFW_PA_RATE_1x;
-
-( DevicesProperty[m_motu_model-1].PortsListLength /sizeof( PortEntry ) )
-PortsList
-PortsList
-PortsList
+DevicesProperty[m_motu_model-1].n_port_entries
+port_entry
+port_entry
+port_entry
-            size += 3;
-        }
@@ -956 +1101 @@
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-
+t
-    }
-
@@ -965 +1110 @@
-    }
-
-( DevicesProperty[m_motu_model-1].PortsListLength /sizeof( PortEntry ) )
-PortsList
-PortsList
-PortsList
+DevicesProperty[m_motu_model-1].n_port_entries
+port_entry
+port_entry
+port_entry
-            asprintf(&buff,"%s_%s_%s" , id.c_str(), mode_str,
-PortsList
-PortsList
+port_entry
+port_entry
-                return false;
-        }

trunk/libffado/src/motu/motu_avdevice.h

@@ -34 +34 @@
-#include "libstreaming/motu/MotuTransmitStreamProcessor.h"
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-#define MOTUFW_OPTICAL_MODE_OFF        0x00
-
+   
-#define MOTUFW_OPTICAL_MODE_TOSLINK    0x02
-#define MOTUFW_OPTICAL_IN_MODE_MASK    (0x00000300)
- 
-
-
-
-
-
+
+   
+
+     
+ 
+ 
-#define MOTUFW_CLKSRC_SPDIF_TOSLINK    2
-
+    
-#define MOTUFW_CLKSRC_WORDCLOCK        4
-#define MOTUFW_CLKSRC_ADAT_9PIN        5
-
-
-  
-   
- 
+  
+
+
+
+
-
-/* Device registers */
-
-    
+ 
+
-#define MOTUFW_REG_CLK_CTRL        0x0b14
-     
-    
+
+
-
-/* Port Active Flags (ports declaration) */
@@ -117 +119 @@
-};
-
+struct MixerCtrl {
+    const char *name, *label, *desc;
+    unsigned int type;
+    unsigned int dev_register;
+};
+
-struct DevicePropertyEntry {
-
-
-
+
+
+
+
+
-    // Others features can be added here like MIDI port presence.
-};
-
+/* Macro to calculate the size of an array */
+#define N_ELEMENTS(_array) (sizeof(_array) / sizeof((_array)[0]))
+
-class MotuDevice : public FFADODevice {
+// Declare mixer controls as friends so they can access the register 
+// transaction functions.
+friend class ChannelFader;
+friend class ChannelPan;
-public:
-
-    MotuDevice( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ) );
-    virtual ~MotuDevice();
+
+    virtual bool buildMixer();
+    virtual bool destroyMixer();
-
-    static bool probe( ConfigRom& configRom );
@@ -182 +202 @@
-    signed int WriteRegister(unsigned int reg, quadlet_t data);
-
+    Control::Container *m_MixerContainer;
+    Control::Container *m_ControlContainer;
-};
-

trunk/libffado/src/SConscript

@@ -144 +144 @@
-motu_source = env.Split( '\
-        motu/motu_avdevice.cpp \
+        motu/motu_controls.cpp \
-        libstreaming/motu/MotuPort.cpp \
-        libstreaming/motu/MotuPortInfo.cpp \

trunk/libffado/support/dbus/control-interface.xml

@@ -42 +42 @@
-      <method name="getModelId">
-          <arg type="i" name="modelid" direction="out"/>
+      </method>
+      <method name="getUnitVersion">
+          <arg type="i" name="unitversion" direction="out"/>
-      </method>
-  </interface>

trunk/libffado/support/dbus/controlserver.cpp

@@ -495 +495 @@
-}
-
+DBus::Int32
+ConfigRomX::getUnitVersion( )
+{
+    return m_Slave.getUnitVersion();
+}
+
-// --- MatrixMixer
-

trunk/libffado/support/dbus/controlserver.h

@@ -211 +211 @@
-    DBus::Int32 getVendorId( );
-    DBus::Int32 getModelId( );
+    DBus::Int32 getUnitVersion( );
-
-private:

trunk/libffado/support/mixer/ffadomixer.in

@@ -42 +42 @@
-from mixer_mackie_generic import *
-from mixer_quatafire import *
+from mixer_motu import *
-
-SupportedDevices=[
@@ -55 +56 @@
-    [(0x00000f, 0x00010067),'MackieGenericControl'],
-    [(0x000f1b, 0x00010064),'QuataFireMixer'],
+    [(0x0001f2, 0x00000000),'MotuMixer'],
-    ]
-
@@ -175 +177 @@
-    def getModelId(self):
-        return self.iface.getModelId()
+    def getUnitVersion(self):
+        return self.iface.getUnitVersion()
-
-class ClockSelectInterface:
@@ -243 +247 @@
-        vendorId = cfgrom.getVendorId()
-        modelId = cfgrom.getModelId()
+        unitVersion = cfgrom.getUnitVersion()
-        GUID = cfgrom.getGUID()
-        print " Found (%s, %X, %X) %s %s" % (str(GUID), vendorId, modelId, cfgrom.getVendorName(), cfgrom.getModelName())
-        
-        thisdev=(vendorId, modelId);
+        # The MOTU devices use unitVersion to differentiate models.  For the
+        # moment thought we don't need to know precisely which model we're
+        # using.
+        if vendorId == 0x1f2:
+            thisdev=(vendorId, 0x00000000)
-        
-        for dev in SupportedDevices:
@@ -260 +270 @@
-                    else:
-                        mixerapp = "SaffireLEMixer"
-
-                print mixerapp
-                exec('forms.append('+mixerapp+'())')

trunk/libffado/support/mixer/SConscript

@@ -32 +32 @@
-        e['MIXERAPPS'] = [ 'phase24', 'phase88', 'saffirepro', 'saffire',
-                           'saffirele', 'af2', 'bcoaudio5', 'edirolfa66',
-
+, 'motu'
-        #
-        # For the ffadomixer.in