From: <tr...@ff...> - 2014-05-23 13:28:47
|
Author: jwoithe Date: 2014-05-23 06:28:39 -0700 (Fri, 23 May 2014) New Revision: 2531 Modified: trunk/libffado/src/motu/motu_controls.cpp Log: motu: remove some FIXME comments which are now no longer relevant. The current approach of reading device registers seems to work fine. For the purposes of the controls there is little justification at present in complicating things by trying to interface with the information delivered by the receive stream processor, especially since it's not always active or accessible in the mixer context. Modified: trunk/libffado/src/motu/motu_controls.cpp =================================================================== --- trunk/libffado/src/motu/motu_controls.cpp 2014-05-17 00:38:31 UTC (rev 2530) +++ trunk/libffado/src/motu/motu_controls.cpp 2014-05-23 13:28:39 UTC (rev 2531) @@ -112,8 +112,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return (val & m_value_mask) != 0; } @@ -162,8 +160,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return val & 0xff; } @@ -212,8 +208,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return ((val >> 8) & 0xff) - 0x40; } @@ -326,8 +320,6 @@ debugOutput(DEBUG_LEVEL_VERBOSE, "ignoring control marked as non-existent\n"); return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(reg) & 0xff; debugOutput(DEBUG_LEVEL_VERBOSE, "ChannelFader getValue for row %d col %d = %u\n", @@ -381,8 +373,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(reg); val = ((val >> 8) & 0xff) - 0x40; @@ -454,8 +444,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(reg); val = (val & m_value_mask) != 0; @@ -509,8 +497,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return val & 0xff; } @@ -563,8 +549,6 @@ return 0; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return (val & 0x00001000) != 0; } @@ -621,8 +605,6 @@ debugOutput(DEBUG_LEVEL_WARNING, "use of MOTU_CTRL_NONE in non-matrix control\n"); return true; } - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(m_register); return (val >> 8) & 0x0f; } @@ -664,8 +646,6 @@ unsigned int val; debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for phones destination\n"); - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. val = m_parent.ReadRegister(MOTU_REG_ROUTE_PORT_CONF); return val & 0x0f; } @@ -705,8 +685,6 @@ unsigned int dir, omode_a; debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for optical mode %d\n", m_register); - // FIXME: we could just read the appropriate mixer status field from the - // receive stream processor once we work out an efficient way to do this. dir = (m_register==MOTU_CTRL_DIR_IN)?MOTU_DIR_IN:MOTU_DIR_OUT; m_parent.getOpticalMode(dir, &omode_a, NULL); switch (omode_a) { |