[FFADO-svn] r2497 - trunk/libffado/src/motu

[<tr...@ff...>]

Author: jwoithe
Date: 2014-03-29 05:22:40 -0700 (Sat, 29 Mar 2014)
New Revision: 2497

Modified:
   trunk/libffado/src/motu/motu_avdevice.cpp
Log:
motu: The G1 configuration register only needs to be read when a G1 interface (aka 828mk1) is in use.  Although it's harmless for non-828mk1 interfaces, move the read into the 828mk1-specific code path to keep things neat.

Modified: trunk/libffado/src/motu/motu_avdevice.cpp
===================================================================
--- trunk/libffado/src/motu/motu_avdevice.cpp	2014-03-15 14:45:05 UTC (rev 2496)
+++ trunk/libffado/src/motu/motu_avdevice.cpp	2014-03-29 12:22:40 UTC (rev 2497)
@@ -1782,7 +1782,6 @@
 MotuDevice::startStreamByIndex(int i) {
 
 quadlet_t isoctrl = ReadRegister(MOTU_REG_ISOCTRL);
-quadlet_t config2_reg = ReadRegister(MOTU_G1_REG_CONFIG_2);
 
     if (m_motu_model == MOTU_MODEL_828MkI) {
         // The 828MkI device does this differently.  In particular it does
@@ -1791,6 +1790,9 @@
         // enable both when the 0th index is requested and ignore any
         // request for index 1.  Also note that on the G1 devices,
         // MOTU_REG_ISOCTRL and MOTU_G1_REG_CONFIG are one and the same.
+
+        quadlet_t config2_reg = ReadRegister(MOTU_G1_REG_CONFIG_2);
+
         if (i == 1)
             return true;
         m_receiveProcessor->setChannel(m_iso_recv_channel);