Changeset 1047

Timestamp:

04/26/08 10:30:41 (15 years ago)

Author:

ppalmers

Message:

remove compiler warnings. change non-critical warnings to debug messages.

Files:

• trunk/libffado/src/bebob/bebob_mixer.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (2 diffs)
• trunk/libffado/src/devicemanager.cpp (modified) (2 diffs)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (3 diffs)
• trunk/libffado/src/ffado.cpp (modified) (2 diffs)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (18 diffs)
• trunk/libffado/src/libavc/general/avc_subunit.cpp (modified) (2 diffs)
• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (5 diffs)
• trunk/libffado/src/libieee1394/test-cyclecalc.cpp (modified) (2 diffs)
• trunk/libffado/support/dbus/controlclient.h (modified) (1 diff)
• trunk/libffado/support/dbus/test-dbus.cpp (modified) (1 diff)
• trunk/libffado/tests/systemtests/test-sysload.cpp (modified) (1 diff)

trunk/libffado/src/bebob/bebob_mixer.cpp

@@ -324 +324 @@
-EnhancedMixerFBFeature::setValue(double v)
-{
-    int volume=(int)v;
-    debugOutput(DEBUG_LEVEL_NORMAL,"Set feature volume %d to %d...\n",
-volume
+(int)v
-
-    return true;

trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

@@ -652 +652 @@
-    unsigned int id;
-    switch(c) {
+        default:
-        case eDC_ADAT1: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT1_INPUT; break;
-        case eDC_ADAT2: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT2_INPUT; break;
@@ -671 +672 @@
-    unsigned int id;
-    switch(c) {
+        default:
-        case eDC_ADAT1: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT1_INPUT; break;
-        case eDC_ADAT2: id=FR_SAFFIREPRO_CMD_ID_ENABLE_ADAT2_INPUT; break;

trunk/libffado/src/devicemanager.cpp

@@ -927 +927 @@
-    bool slaveMode=false;
-    if(!getOption("slaveMode", slaveMode)) {
-
-
-
+
+
+
+
+
-    #warning TEST CODE FOR BOUNCE DEVICE !!
-    // this makes the bounce slave use the xmit SP as sync source
@@ -936 +938 @@
-    } else {
-        return device->getStreamProcessorByIndex(0);
-
+*/
-}
-

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -309 +309 @@
-    quadlet_t extended_status;
-    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status);
+    #ifdef DEBUG
-    uint16_t clock_status = (extended_status) & 0xFFFF;
-    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
-    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n",
-                                    extended_status, clock_status, clock_slipping);
+    #endif
-
-    diceNameVector names = getClockSourceNameString();
@@ -471 +473 @@
-    quadlet_t extended_status;
-    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &extended_status);
+    #ifdef DEBUG
-    uint16_t clock_status = (extended_status) & 0xFFFF;
-    uint16_t clock_slipping = (extended_status >> 16) & 0xFFFF;
-    debugOutput(DEBUG_LEVEL_VERBOSE," Clock status: 0x%08X, status=0x%04X, slip=0x%04X\n",
-                                    extended_status, clock_status, clock_slipping);
+    #endif
-
-    diceNameVector names = getClockSourceNameString();
@@ -516 +520 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE," Global param space:\n");
-
-(fb_quadlet_t *)&tmp_octlet,
+reinterpret_cast<fb_quadlet_t *>(&tmp_octlet), 
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Owner            : 0x%016X\n",tmp_octlet);
-

trunk/libffado/src/ffado.cpp

@@ -76 +76 @@
-}
-
-#warning
+// FIXME:
-#include "libavc/general/avc_generic.h"
-void ffado_sleep_after_avc_command( int time )
@@ -379 +379 @@
-            return ffado_audio_datatype_error;
-    }
-    #warning FIXME
-}
-

trunk/libffado/src/libavc/general/avc_plug.cpp

@@ -138 +138 @@
-
-    if ( !initFromDescriptor() ) {
-
+
+
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
-//         return false;
@@ -144 +145 @@
-
-    if ( !discoverPlugType() ) {
-
+
+
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
-        return false;
@@ -150 +152 @@
-
-    if ( !discoverName() ) {
-
+
+
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
-        return false;
@@ -163 +166 @@
-
-    if ( !discoverChannelPosition() ) {
-
+
+
-                    "(%d,%d,%d,%d,%d)\n",
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
@@ -170 +174 @@
-
-    if ( !discoverChannelName() ) {
-
+
+
-                    "(%d,%d,%d,%d,%d)\n",
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
@@ -177 +182 @@
-
-    if ( !discoverClusterInfo() ) {
-
+
+
-                    "(%d,%d,%d,%d,%d)\n",
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
@@ -184 +190 @@
-
-    if ( !discoverStreamFormat() ) {
-
+
+
-                    "(%d,%d,%d,%d,%d)\n",
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
@@ -191 +198 @@
-
-    if ( !discoverSupportedStreamFormats() ) {
-
+
+
-                    "(%d,%d,%d,%d,%d)\n",
-                    m_unit->getConfigRom().getNodeId(), getSubunitType(), getSubunitId(), m_direction, m_id );
@@ -288 +296 @@
-
-    if ( !extStreamFormatCmd.getFormatInformation() ) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-        return true;
-    }
@@ -295 +303 @@
-           != FormatInformation::eFHR_AudioMusic  )
-    {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-        return true;
-    }
@@ -323 +331 @@
-
-            if ( !clusterInfo ) {
-
+
+
-                            "info found for index %d\n",  i );
-                    return false;
@@ -345 +354 @@
-            if ( nrOfChannels != streamFormatInfo->m_numberOfChannels )
-            {
-
+
+
-                              "mismatch: '%s' plug discovering reported "
-                              "%d channels for cluster '%s', while stream "
@@ -564 +574 @@
-       (getPlugAddressType() == eAPA_ExternalPlug)) {
-        if (getPlugDirection() != eAPD_Output) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            return -1;
-        }
@@ -571 +581 @@
-    if(getPlugAddressType() == eAPA_SubunitPlug) {
-        if (getPlugDirection() != eAPD_Input) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            return -1;
-        }
@@ -662 +672 @@
-    if (getDirection() == eAPD_Output) {
-        if (getInputConnections().size()==0) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            return true;
-        }
-        if (getInputConnections().size()>1) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-        }
-
@@ -674 +684 @@
-    } else if (getDirection() == eAPD_Input) {
-        if (getOutputConnections().size()==0) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-            return true;
-        }
-        if (getOutputConnections().size()>1) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL, 
-        }
-
@@ -685 +695 @@
-
-    } else {
-Warning
+Error
-        return false;
-    }
@@ -1632 +1642 @@
-                   PlugManager& plugManager )
-{
-    #warning FIXME: The derived class should be creating these
-    // FIXME: The derived class should be creating these, such that discover() can become pure virtual
-
-    if ( !deser.isExisting( basePath + "m_subunitType" ) ) {
-        return 0;

trunk/libffado/src/libavc/general/avc_subunit.cpp

@@ -226 +226 @@
-Subunit::initPlugFromDescriptor( Plug& plug )
-{
-Error(
+Output(DEBUG_LEVEL_NORMAL, 
-    return false;
-}
@@ -260 +260 @@
-    Subunit* pSubunit = 0;
-
-    #warning FIXME: The derived class should be creating these
-    // FIXME: The derived class should be creating these, such that discover() can become pure virtual
-    switch( sbType ) {

trunk/libffado/src/libavc/general/avc_unit.cpp

@@ -632 +632 @@
-                                                   Plug::eAPT_Sync );
-    if ( !syncPCRInputPlugs.size() ) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-    }
-
@@ -639 +639 @@
-                                                    Plug::eAPT_Sync );
-    if ( !syncPCROutputPlugs.size() ) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-    }
-
@@ -646 +646 @@
-                                                  Plug::eAPT_IsoStream );
-    if ( !isoPCRInputPlugs.size() ) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-
-    }
@@ -654 +654 @@
-                                                   Plug::eAPT_IsoStream );
-    if ( !isoPCROutputPlugs.size() ) {
-Warning(
+Output(DEBUG_LEVEL_NORMAL,
-
-    }
@@ -825 +825 @@
-{
-    m_pPlugManager->showPlugs();
-
-
+//
+//
-}
-

trunk/libffado/src/libieee1394/test-cyclecalc.cpp

@@ -39 +39 @@
-     */
-
+    #ifdef DEBUG
-    uint32_t now_ctr = 0x140001DA;
-    uint64_t now = CYCLE_TIMER_TO_TICKS(0x140001DA);
-    unsigned int cycle = 7968;
-    uint16_t syt = 0x583B;
+    #endif
-    
-    debugOutput(DEBUG_LEVEL_VERBOSE,"NOW_CTR          : %08X (%03us %04uc %04ut)\n",
@@ -62 +64 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"CYCLE            : %uc\n",
-                          cycle);
-
+
-    uint64_t calc_ts = sytRecvToFullTicks(syt, cycle, now_ctr);
+    #endif
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011llu (%03us %04uc %04ut)\n",

trunk/libffado/support/dbus/controlclient.h

@@ -31 +31 @@
-#include "controlclient-glue.h"
-
-static const char* SERVER_NAME = "org.ffado.Control";
-static const char* SERVER_PATH = "/org/ffado/Control/Test/Fader";
-
-namespace DBusControl {
-

trunk/libffado/support/dbus/test-dbus.cpp

@@ -29 +29 @@
-#include "controlclient.h"
-#include <dbus-c++/dbus.h>
+
+static const char* SERVER_NAME = "org.ffado.Control";
+static const char* SERVER_PATH = "/org/ffado/Control/Test/Fader";
-
-using namespace std;

trunk/libffado/tests/systemtests/test-sysload.cpp

@@ -173 +173 @@
-        uint64_t run_until = sleep_time + arguments.period * arguments.cpu_pct / 100;
-        
-
+// 
-        while(rt_gettime_usecs() < run_until) load_function();
-        uint64_t toc = rt_gettime_usecs();