From: <tr...@ff...> - 2008-05-29 19:46:16
|
Author: ppalmers Date: 2008-05-29 12:46:13 -0700 (Thu, 29 May 2008) New Revision: 1235 Modified: branches/libffado-2.0/SConstruct branches/libffado-2.0/external/dbus/src/message.cpp branches/libffado-2.0/external/dbus/src/object.cpp branches/libffado-2.0/external/dbus/src/types.cpp branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp branches/libffado-2.0/src/bebob/bebob_avdevice.cpp branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp branches/libffado-2.0/src/debugmodule/debugmodule.cpp branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp branches/libffado-2.0/src/fireworks/efc/efc_cmd.h branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp branches/libffado-2.0/src/libavc/avc_definitions.h branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp branches/libffado-2.0/src/libavc/general/avc_generic.cpp branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp branches/libffado-2.0/src/libutil/cmd_serialize.cpp branches/libffado-2.0/src/libutil/serialize_libxml.cpp branches/libffado-2.0/src/motu/motu_avdevice.cpp branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp branches/libffado-2.0/support/firmware/downloader.cpp branches/libffado-2.0/support/firmware/fireworks-downloader.cpp branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp Log: svn merge -r 1231:1234 svn+ssh://ffa...@ff.../ffado/trunk/libffado Modified: branches/libffado-2.0/SConstruct =================================================================== --- branches/libffado-2.0/SConstruct 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/SConstruct 2008-05-29 19:46:13 UTC (rev 1235) @@ -99,6 +99,10 @@ env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts ) +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] Help( """ For building ffado you can set different options as listed below. You have to Modified: branches/libffado-2.0/external/dbus/src/message.cpp =================================================================== --- branches/libffado-2.0/external/dbus/src/message.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/external/dbus/src/message.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -29,6 +29,8 @@ #include "internalerror.h" #include "message_p.h" +#include <cstdlib> + using namespace DBus; /* Modified: branches/libffado-2.0/external/dbus/src/object.cpp =================================================================== --- branches/libffado-2.0/external/dbus/src/object.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/external/dbus/src/object.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -33,6 +33,8 @@ #include "server_p.h" #include "connection_p.h" +#include <cstring> + using namespace DBus; Object::Object( Connection& conn, const Path& path, const char* service ) Modified: branches/libffado-2.0/external/dbus/src/types.cpp =================================================================== --- branches/libffado-2.0/external/dbus/src/types.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/external/dbus/src/types.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -30,6 +30,8 @@ #include "message_p.h" #include "internalerror.h" +#include <cstdlib> + using namespace DBus; Variant::Variant() Modified: branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp =================================================================== --- branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -31,6 +31,8 @@ #include <iostream> #include <fstream> #include <sstream> +#include <cstdlib> +#include <cstring> using namespace std; using namespace DBus; Modified: branches/libffado-2.0/src/bebob/bebob_avdevice.cpp =================================================================== --- branches/libffado-2.0/src/bebob/bebob_avdevice.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/bebob/bebob_avdevice.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -52,6 +52,8 @@ #include <iostream> #include <sstream> #include <unistd.h> +#include <cstdlib> +#include <cstring> #include <sys/stat.h> using namespace AVC; Modified: branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp =================================================================== --- branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -34,6 +34,7 @@ #include "libutil/ByteSwap.h" #include <cstdio> +#include <cstring> namespace BeBoB { enum { Modified: branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp =================================================================== --- branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -28,6 +28,7 @@ #include "libutil/Time.h" #include "libutil/ByteSwap.h" +#include <cstring> namespace BeBoB { namespace Focusrite { Modified: branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp =================================================================== --- branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -125,7 +125,7 @@ { uint8_t fb_extsync_value = getSelectorFBValue(8); uint8_t fb_syncsource_value = getSelectorFBValue(9); - return fb_extsync_value & 0x01 | (fb_syncsource_value << 1) & 0x01; + return (fb_extsync_value & 0x01) | ((fb_syncsource_value << 1) & 0x01); } } // namespace Terratec Modified: branches/libffado-2.0/src/debugmodule/debugmodule.cpp =================================================================== --- branches/libffado-2.0/src/debugmodule/debugmodule.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/debugmodule/debugmodule.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -31,6 +31,7 @@ #include <iostream> #include <time.h> +#include <string.h> #if DEBUG_BACKTRACE_SUPPORT #include <execinfo.h> Modified: branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp =================================================================== --- branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -26,6 +26,7 @@ #include "libutil/ByteSwap.h" #include <iostream> +#include <cstring> using namespace std; Modified: branches/libffado-2.0/src/fireworks/efc/efc_cmd.h =================================================================== --- branches/libffado-2.0/src/fireworks/efc/efc_cmd.h 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/fireworks/efc/efc_cmd.h 2008-05-29 19:46:13 UTC (rev 1235) @@ -196,7 +196,7 @@ eERV_Unspecified = 0xFFFFFFFFL, }; - typedef struct efc_header + struct efc_header { uint32_t version; uint32_t seqnum; Modified: branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp =================================================================== --- branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -34,6 +34,7 @@ #include <sstream> #include <iostream> #include <fstream> +#include <cstring> #define ECHO_FLASH_ERASE_TIMEOUT_MILLISECS 2000 Modified: branches/libffado-2.0/src/libavc/avc_definitions.h =================================================================== --- branches/libffado-2.0/src/libavc/avc_definitions.h 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libavc/avc_definitions.h 2008-05-29 19:46:13 UTC (rev 1235) @@ -25,6 +25,8 @@ #define AVCDEFINITIONS_H #include <libavc1394/avc1394.h> +#include <cstring> +#include <cstdlib> #include <ostream> Modified: branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp =================================================================== --- branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -31,6 +31,8 @@ #include "libieee1394/ieee1394service.h" #include "libieee1394/configrom.h" +#include <cstring> + namespace AVC { AVCDescriptorSpecifier::AVCDescriptorSpecifier( enum EType type ) Modified: branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp =================================================================== --- branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -29,6 +29,7 @@ #include "libutil/ByteSwap.h" #include <iostream> +#include <cstring> using namespace std; Modified: branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp =================================================================== --- branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -27,6 +27,8 @@ #include "libutil/ByteSwap.h" #include <iostream> +#include <cstdlib> +#include <cstring> using namespace std; Modified: branches/libffado-2.0/src/libavc/general/avc_generic.cpp =================================================================== --- branches/libffado-2.0/src/libavc/general/avc_generic.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libavc/general/avc_generic.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -31,6 +31,9 @@ #include "libutil/ByteSwap.h" +#include <cstring> +#include <cstdlib> + #define DEBUG_EXTRA_VERBOSE 5 Modified: branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp =================================================================== --- branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -31,6 +31,7 @@ #include "libutil/SystemTimeSource.h" #include "libutil/Watchdog.h" +#include <cstring> #include <assert.h> IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); Modified: branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp =================================================================== --- branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -36,6 +36,7 @@ #include "libutil/ByteSwap.h" #include <assert.h> +#include <cstring> #define AMDTP_FLOAT_MULTIPLIER 2147483392.0 Modified: branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp =================================================================== --- branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -34,8 +34,10 @@ #include "libieee1394/IsoHandlerManager.h" #include "libieee1394/cycletimer.h" +#include "libutil/ByteSwap.h" + +#include <cstring> #include <math.h> -#include "libutil/ByteSwap.h" #include <assert.h> /* Provide more intuitive access to GCC's branch predition built-ins */ Modified: branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp =================================================================== --- branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -35,6 +35,8 @@ #include "libieee1394/cycletimer.h" #include "libutil/ByteSwap.h" + +#include <cstring> #include <assert.h> /* Provide more intuitive access to GCC's branch predition built-ins */ Modified: branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp =================================================================== --- branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -30,6 +30,8 @@ #include "assert.h" #include "errno.h" +#include <cstdlib> +#include <cstring> #define DLL_PI (3.141592653589793238) #define DLL_SQRT2 (1.414213562373095049) Modified: branches/libffado-2.0/src/libutil/cmd_serialize.cpp =================================================================== --- branches/libffado-2.0/src/libutil/cmd_serialize.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libutil/cmd_serialize.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -25,6 +25,8 @@ #include <iostream> #include <iomanip> +#include <cstdlib> +#include <cstring> #include "libutil/ByteSwap.h" Modified: branches/libffado-2.0/src/libutil/serialize_libxml.cpp =================================================================== --- branches/libffado-2.0/src/libutil/serialize_libxml.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/libutil/serialize_libxml.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -24,6 +24,9 @@ #include "serialize.h" +#include <cstring> +#include <cstdlib> + using namespace std; Modified: branches/libffado-2.0/src/motu/motu_avdevice.cpp =================================================================== --- branches/libffado-2.0/src/motu/motu_avdevice.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/src/motu/motu_avdevice.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -1246,9 +1246,9 @@ // optical port modes. At this stage it's not completely understood // what the "Optical control" register does, so the values it's set to // are more or less "magic" numbers. - if (reg & MOTU_OPTICAL_IN_MODE_MASK != (MOTU_OPTICAL_MODE_ADAT<<8)) + if ((reg & MOTU_OPTICAL_IN_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<8)) opt_ctrl |= 0x00000080; - if (reg & MOTU_OPTICAL_OUT_MODE_MASK != (MOTU_OPTICAL_MODE_ADAT<<10)) + if ((reg & MOTU_OPTICAL_OUT_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<10)) opt_ctrl |= 0x00000040; if (mode & MOTU_DIR_IN) { Modified: branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp =================================================================== --- branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -30,6 +30,8 @@ #include "libieee1394/ieee1394service.h" #include <iostream> +#include <cstdlib> +#include <cstring> using namespace std; Modified: branches/libffado-2.0/support/firmware/downloader.cpp =================================================================== --- branches/libffado-2.0/support/firmware/downloader.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/support/firmware/downloader.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -30,9 +30,9 @@ #include "debugmodule/debugmodule.h" #include <iostream> +#include <cstdlib> +#include <cstring> -#include <stdlib.h> - using namespace std; DECLARE_GLOBAL_DEBUG_MODULE; Modified: branches/libffado-2.0/support/firmware/fireworks-downloader.cpp =================================================================== --- branches/libffado-2.0/support/firmware/fireworks-downloader.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/support/firmware/fireworks-downloader.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -35,9 +35,9 @@ #include "devicemanager.h" #include <iostream> - -#include <string.h> #include <string> +#include <cstring> +#include <cstdlib> #define MAGIC_THAT_SAYS_I_KNOW_WHAT_IM_DOING 0x001807198000LL Modified: branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp =================================================================== --- branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp 2008-05-29 08:24:21 UTC (rev 1234) +++ branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp 2008-05-29 19:46:13 UTC (rev 1235) @@ -34,6 +34,7 @@ #include "debugmodule/debugmodule.h" #include "realtimetools.h" +#include <cstdlib> uint32_t count = 0; |