Navigation

← Previous Changeset
Next Changeset →

Changeset 1235

Timestamp:

05/29/08 12:46:13 (13 years ago)

Author:

ppalmers

Message:

svn merge -r 1231:1234 svn+ssh://ffadosvn@ffado.org/ffado/trunk/libffado

Files:

branches/libffado-2.0/external/dbus/src/message.cpp (modified) (1 diff)
branches/libffado-2.0/external/dbus/src/object.cpp (modified) (1 diff)
branches/libffado-2.0/external/dbus/src/types.cpp (modified) (1 diff)
branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp (modified) (1 diff)
branches/libffado-2.0/SConstruct (modified) (1 diff)
branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (1 diff)
branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp (modified) (1 diff)
branches/libffado-2.0/src/debugmodule/debugmodule.cpp (modified) (1 diff)
branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp (modified) (1 diff)
branches/libffado-2.0/src/fireworks/efc/efc_cmd.h (modified) (1 diff)
branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp (modified) (1 diff)
branches/libffado-2.0/src/libavc/avc_definitions.h (modified) (1 diff)
branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp (modified) (1 diff)
branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp (modified) (1 diff)
branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp (modified) (1 diff)
branches/libffado-2.0/src/libavc/general/avc_generic.cpp (modified) (1 diff)
branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp (modified) (1 diff)
branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (1 diff)
branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp (modified) (1 diff)
branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (1 diff)
branches/libffado-2.0/src/libutil/cmd_serialize.cpp (modified) (1 diff)
branches/libffado-2.0/src/libutil/serialize_libxml.cpp (modified) (1 diff)
branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
branches/libffado-2.0/src/motu/motu_avdevice.cpp (modified) (1 diff)
branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp (modified) (1 diff)
branches/libffado-2.0/support/firmware/downloader.cpp (modified) (1 diff)
branches/libffado-2.0/support/firmware/fireworks-downloader.cpp (modified) (1 diff)
branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/libffado-2.0/external/dbus/src/message.cpp

r562 r1235

30 30 #include "message_p.h"
31 31
32 #include <cstdlib>
33
32 34 using namespace DBus;
33 35
branches/libffado-2.0/external/dbus/src/object.cpp

r562 r1235

33 33 #include "server_p.h"
34 34 #include "connection_p.h"
35
36 #include <cstring>
35 37
36 38 using namespace DBus;
branches/libffado-2.0/external/dbus/src/types.cpp

r562 r1235

30 30 #include "message_p.h"
31 31 #include "internalerror.h"
32
33 #include <cstdlib>
32 34
33 35 using namespace DBus;
branches/libffado-2.0/external/dbus/tools/xml2cpp.cpp

r962 r1235

32 32 #include <fstream>
33 33 #include <sstream>
34 #include <cstdlib>
35 #include <cstring>
34 36
35 37 using namespace std;

branches/libffado-2.0/SConstruct

r1228	r1235
100	100	env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts )
101	101
	102	if os.environ.has_key('CC'):
	103	env['CC'] = os.environ['CC']
	104	if os.environ.has_key('CXX'):
	105	env['CXX'] = os.environ['CXX']
102	106
103	107	Help( """

branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

r1229 r1235

53 53 #include <sstream>
54 54 #include <unistd.h>
55 #include <cstdlib>
56 #include <cstring>
55 57 #include <sys/stat.h>
56 58
branches/libffado-2.0/src/bebob/bebob_dl_mgr.cpp

r1135 r1235

35 35
36 36 #include <cstdio>
37 #include <cstring>
37 38
38 39 namespace BeBoB {
branches/libffado-2.0/src/bebob/focusrite/focusrite_saffirepro.cpp

r1219 r1235

29 29
30 30 #include "libutil/ByteSwap.h"
31 #include <cstring>
31 32
32 33 namespace BeBoB {

branches/libffado-2.0/src/bebob/terratec/terratec_device.cpp

r1175	r1235
126	126	uint8_t fb_extsync_value = getSelectorFBValue(8);
127	127	uint8_t fb_syncsource_value = getSelectorFBValue(9);
128		return ~~fb_extsync_value & 0x01 \| (fb_syncsource_value << 1) & 0x01~~;
	128	return (fb_extsync_value & 0x01) \| ((fb_syncsource_value << 1) & 0x01);
129	129	}
130	130

branches/libffado-2.0/src/debugmodule/debugmodule.cpp

r1201 r1235

32 32
33 33 #include <time.h>
34 #include <string.h>
34 35
35 36 #if DEBUG_BACKTRACE_SUPPORT
branches/libffado-2.0/src/fireworks/efc/efc_cmd.cpp

r1136 r1235

27 27 #include "libutil/ByteSwap.h"
28 28 #include <iostream>
29 #include <cstring>
29 30
30 31 using namespace std;
branches/libffado-2.0/src/fireworks/efc/efc_cmd.h

r1136 r1235

197 197 };
198 198
199 ~~typedef~~ struct efc_header
199 struct efc_header
200 200 {
201 201 uint32_t version;
branches/libffado-2.0/src/fireworks/fireworks_firmware.cpp

r1200 r1235

35 35 #include <iostream>
36 36 #include <fstream>
37 #include <cstring>
37 38
38 39 #define ECHO_FLASH_ERASE_TIMEOUT_MILLISECS 2000
branches/libffado-2.0/src/libavc/avc_definitions.h

r864 r1235

26 26
27 27 #include <libavc1394/avc1394.h>
28 #include <cstring>
29 #include <cstdlib>
28 30 #include <ostream>
29 31
branches/libffado-2.0/src/libavc/descriptors/avc_descriptor.cpp

r1024 r1235

32 32 #include "libieee1394/configrom.h"
33 33
34 #include <cstring>
35
34 36 namespace AVC {
35 37
branches/libffado-2.0/src/libavc/descriptors/avc_descriptor_cmd.cpp

r1135 r1235

30 30 #include "libutil/ByteSwap.h"
31 31 #include <iostream>
32 #include <cstring>
32 33
33 34 using namespace std;
branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp

r1135 r1235

28 28 #include "libutil/ByteSwap.h"
29 29 #include <iostream>
30 #include <cstdlib>
31 #include <cstring>
30 32
31 33 using namespace std;
branches/libffado-2.0/src/libavc/general/avc_generic.cpp

r1219 r1235

31 31
32 32 #include "libutil/ByteSwap.h"
33
34 #include <cstring>
35 #include <cstdlib>
33 36
34 37 #define DEBUG_EXTRA_VERBOSE 5
branches/libffado-2.0/src/libieee1394/IsoHandlerManager.cpp

r1172 r1235

32 32 #include "libutil/Watchdog.h"
33 33
34 #include <cstring>
34 35 #include <assert.h>
35 36
branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

r1149 r1235

37 37 #include "libutil/ByteSwap.h"
38 38 #include <assert.h>
39 #include <cstring>
39 40
40 41 #define AMDTP_FLOAT_MULTIPLIER 2147483392.0

branches/libffado-2.0/src/libstreaming/motu/MotuReceiveStreamProcessor.cpp

r1194	r1235
35	35	#include "libieee1394/cycletimer.h"
36	36
	37	#include "libutil/ByteSwap.h"
	38
	39	#include <cstring>
37	40	#include <math.h>
38		~~#include "libutil/ByteSwap.h"~~
39	41	#include <assert.h>
40	42

branches/libffado-2.0/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

r1194 r1235

36 36
37 37 #include "libutil/ByteSwap.h"
38
39 #include <cstring>
38 40 #include <assert.h>
39 41
branches/libffado-2.0/src/libutil/cmd_serialize.cpp

r1135 r1235

26 26 #include <iostream>
27 27 #include <iomanip>
28 #include <cstdlib>
29 #include <cstring>
28 30
29 31 #include "libutil/ByteSwap.h"
branches/libffado-2.0/src/libutil/serialize_libxml.cpp

r1154 r1235

24 24
25 25 #include "serialize.h"
26
27 #include <cstring>
28 #include <cstdlib>
26 29
27 30 using namespace std;
branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp

r1012 r1235

31 31 #include "errno.h"
32 32
33 #include <cstdlib>
34 #include <cstring>
33 35
34 36 #define DLL_PI (3.141592653589793238)

branches/libffado-2.0/src/motu/motu_avdevice.cpp

r1229	r1235
1247	1247	// what the "Optical control" register does, so the values it's set to
1248	1248	// are more or less "magic" numbers.
1249		if (~~reg & MOTU_OPTICAL_IN_MODE_MASK~~ != (MOTU_OPTICAL_MODE_ADAT<<8))
	1249	if ((reg & MOTU_OPTICAL_IN_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<8))
1250	1250	opt_ctrl \|= 0x00000080;
1251		if (~~reg & MOTU_OPTICAL_OUT_MODE_MASK~~ != (MOTU_OPTICAL_MODE_ADAT<<10))
	1251	if ((reg & MOTU_OPTICAL_OUT_MODE_MASK) != (MOTU_OPTICAL_MODE_ADAT<<10))
1252	1252	opt_ctrl \|= 0x00000040;
1253	1253

branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp

r1009 r1235

31 31
32 32 #include <iostream>
33 #include <cstdlib>
34 #include <cstring>
33 35
34 36 using namespace std;
branches/libffado-2.0/support/firmware/downloader.cpp

r1011 r1235

31 31
32 32 #include <iostream>
33
34 #include <~~stdlib.h~~>
33 #include <cstdlib>
34 #include <cstring>
35 35
36 36 using namespace std;

branches/libffado-2.0/support/firmware/fireworks-downloader.cpp

r1053	r1235
36	36
37	37	#include <iostream>
38
39		~~#include <string.h>~~
40	38	#include <string>
	39	#include <cstring>
	40	#include <cstdlib>
41	41
42	42	#define MAGIC_THAT_SAYS_I_KNOW_WHAT_IM_DOING 0x001807198000LL

branches/libffado-2.0/tests/systemtests/test-isorecv-1.cpp

r1146 r1235

35 35 #include "debugmodule/debugmodule.h"
36 36 #include "realtimetools.h"
37 #include <cstdlib>
37 38
38 39 uint32_t count = 0;

r562	r1235
30	30	#include "message_p.h"
31	31
	32	#include <cstdlib>
	33
32	34	using namespace DBus;
33	35

r562	r1235
33	33	#include "server_p.h"
34	34	#include "connection_p.h"
	35
	36	#include <cstring>
35	37
36	38	using namespace DBus;

r562	r1235
30	30	#include "message_p.h"
31	31	#include "internalerror.h"
	32
	33	#include <cstdlib>
32	34
33	35	using namespace DBus;

r962	r1235
32	32	#include <fstream>
33	33	#include <sstream>
	34	#include <cstdlib>
	35	#include <cstring>
34	36
35	37	using namespace std;

r1229	r1235
53	53	#include <sstream>
54	54	#include <unistd.h>
	55	#include <cstdlib>
	56	#include <cstring>
55	57	#include <sys/stat.h>
56	58

r1135	r1235
35	35
36	36	#include <cstdio>
	37	#include <cstring>
37	38
38	39	namespace BeBoB {

r1201	r1235
32	32
33	33	#include <time.h>
	34	#include <string.h>
34	35
35	36	#if DEBUG_BACKTRACE_SUPPORT

r1136	r1235
197	197	};
198	198
199		~~typedef~~ struct efc_header
	199	struct efc_header
200	200	{
201	201	uint32_t version;

r864	r1235
26	26
27	27	#include <libavc1394/avc1394.h>
	28	#include <cstring>
	29	#include <cstdlib>
28	30	#include <ostream>
29	31

r1024	r1235
32	32	#include "libieee1394/configrom.h"
33	33
	34	#include <cstring>
	35
34	36	namespace AVC {
35	37

r1172	r1235
32	32	#include "libutil/Watchdog.h"
33	33
	34	#include <cstring>
34	35	#include <assert.h>
35	36

r1135	r1235
26	26	#include <iostream>
27	27	#include <iomanip>
	28	#include <cstdlib>
	29	#include <cstring>
28	30
29	31	#include "libutil/ByteSwap.h"

r1154	r1235
24	24
25	25	#include "serialize.h"
	26
	27	#include <cstring>
	28	#include <cstdlib>
26	29
27	30	using namespace std;

r1012	r1235
31	31	#include "errno.h"
32	32
	33	#include <cstdlib>
	34	#include <cstring>
33	35
34	36	#define DLL_PI (3.141592653589793238)

r1011	r1235
31	31
32	32	#include <iostream>
33
34		#include <~~stdlib.h~~>
	33	#include <cstdlib>
	34	#include <cstring>
35	35
36	36	using namespace std;

r1146	r1235
35	35	#include "debugmodule/debugmodule.h"
36	36	#include "realtimetools.h"
	37	#include <cstdlib>
37	38
38	39	uint32_t count = 0;

Navigation

Changeset 1235

Legend:

Download in other formats: