Changeset 445

Timestamp:

04/02/07 12:35:17 (5 years ago)

Author:

pieterpalmers

Message:

* name change from FreeBoB to FFADO
* replaced tabs by 4 spaces
* got rid of end-of-line spaces
* made all license and copyrights conform

library becomes LGPL, apps become GPL
explicitly state LGPL v2.1 and GPL v2 (don't like v3 draft)

copyrights are 2005-2007 Daniel & Pieter
except for the MotU stuff (C) Jonathan, Pieter

Files:

• trunk/libffado/autogen.sh (modified) (1 diff)
• trunk/libffado/ChangeLog (modified) (5 diffs)
• trunk/libffado/configure.ac (modified) (8 diffs)
• trunk/libffado/doc/adding_devices.dox (modified) (10 diffs)
• trunk/libffado/doc/amdtpstreamprocessor.dox (modified) (1 diff)
• trunk/libffado/doc/mainpage.dox (modified) (2 diffs)
• trunk/libffado/doc/reference.doxygen.in (modified) (2 diffs)
• trunk/libffado/doc/streaming.xmi (modified) (15 diffs)
• trunk/libffado/libffado.pc.in (modified) (1 diff)
• trunk/libffado/Makefile.am (modified) (2 diffs)
• trunk/libffado/src/bebob-sync.cpp (modified) (5 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (31 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (4 diffs)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.h (modified) (6 diffs)
• trunk/libffado/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_avplug.h (modified) (12 diffs)
• trunk/libffado/src/bebob/bebob_dl_bcd.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_dl_bcd.h (modified) (5 diffs)
• trunk/libffado/src/bebob/bebob_dl_codes.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_dl_codes.h (modified) (8 diffs)
• trunk/libffado/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_dl_mgr.h (modified) (3 diffs)
• trunk/libffado/src/bebob/bebob_functionblock.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_functionblock.h (modified) (3 diffs)
• trunk/libffado/src/bounce/bounce_avdevice.cpp (modified) (31 diffs)
• trunk/libffado/src/bounce/bounce_avdevice.h (modified) (6 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.cpp (modified) (27 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.h (modified) (7 diffs)
• trunk/libffado/src/bridgeco-downloader.cpp (modified) (5 diffs)
• trunk/libffado/src/debugmodule/debugmodule.cpp (modified) (15 diffs)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (9 diffs)
• trunk/libffado/src/debugmodule/test_debugmodule.cpp (modified) (1 diff)
• trunk/libffado/src/devicemanager.cpp (modified) (24 diffs)
• trunk/libffado/src/devicemanager.h (modified) (3 diffs)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (84 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (11 diffs)
• trunk/libffado/src/dice/dice_defines.h (modified) (4 diffs)
• trunk/libffado/src/fbtypes.h (modified) (2 diffs)
• trunk/libffado/src/ffado.cpp (modified) (8 diffs)
• trunk/libffado/src/ffado_streaming.cpp (modified) (30 diffs)
• trunk/libffado/src/iavdevice.cpp (modified) (3 diffs)
• trunk/libffado/src/iavdevice.h (modified) (6 diffs)
• trunk/libffado/src/libavc/avc_connect.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_connect.h (modified) (2 diffs)
• trunk/libffado/src/libavc/avc_definitions.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_definitions.h (modified) (4 diffs)
• trunk/libffado/src/libavc/avc_extended_cmd_generic.cpp (modified) (4 diffs)
• trunk/libffado/src/libavc/avc_extended_cmd_generic.h (modified) (5 diffs)
• trunk/libffado/src/libavc/avc_extended_plug_info.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_extended_plug_info.h (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_extended_stream_format.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_extended_stream_format.h (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_extended_subunit_info.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_extended_subunit_info.h (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_function_block.cpp (modified) (6 diffs)
• trunk/libffado/src/libavc/avc_function_block.h (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_generic.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_generic.h (modified) (6 diffs)
• trunk/libffado/src/libavc/avc_plug_info.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_plug_info.h (modified) (4 diffs)
• trunk/libffado/src/libavc/avc_serialize.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_serialize.h (modified) (4 diffs)
• trunk/libffado/src/libavc/avc_signal_source.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_signal_source.h (modified) (3 diffs)
• trunk/libffado/src/libavc/avc_subunit_info.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_subunit_info.h (modified) (4 diffs)
• trunk/libffado/src/libavc/avc_unit_info.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/avc_unit_info.h (modified) (3 diffs)
• trunk/libffado/src/libieee1394/ARMHandler.cpp (modified) (5 diffs)
• trunk/libffado/src/libieee1394/ARMHandler.h (modified) (6 diffs)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (10 diffs)
• trunk/libffado/src/libieee1394/configrom.h (modified) (4 diffs)
• trunk/libffado/src/libieee1394/IEC61883.cpp (modified) (1 diff)
• trunk/libffado/src/libieee1394/IEC61883.h (modified) (5 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (32 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (14 diffs)
• trunk/libffado/src/libosc/OscArgument.cpp (modified) (5 diffs)
• trunk/libffado/src/libosc/OscArgument.h (modified) (4 diffs)
• trunk/libffado/src/libosc/OscMessage.cpp (modified) (3 diffs)
• trunk/libffado/src/libosc/OscMessage.h (modified) (3 diffs)
• trunk/libffado/src/libosc/OscNode.cpp (modified) (13 diffs)
• trunk/libffado/src/libosc/OscNode.h (modified) (4 diffs)
• trunk/libffado/src/libosc/OscResponse.cpp (modified) (1 diff)
• trunk/libffado/src/libosc/OscResponse.h (modified) (4 diffs)
• trunk/libffado/src/libosc/OscServer.cpp (modified) (6 diffs)
• trunk/libffado/src/libosc/OscServer.h (modified) (3 diffs)
• trunk/libffado/src/libosc/unittests.cpp (modified) (13 diffs)
• trunk/libffado/src/libstreaming/AmdtpPort.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/AmdtpPort.h (modified) (3 diffs)
• trunk/libffado/src/libstreaming/AmdtpPortInfo.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/AmdtpPortInfo.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/AmdtpSlaveStreamProcessor.cpp (modified) (24 diffs)
• trunk/libffado/src/libstreaming/AmdtpSlaveStreamProcessor.h (modified) (7 diffs)
• trunk/libffado/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (61 diffs)
• trunk/libffado/src/libstreaming/AmdtpStreamProcessor.h (modified) (13 diffs)
• trunk/libffado/src/libstreaming/cip.h (modified) (6 diffs)
• trunk/libffado/src/libstreaming/cycletimer.h (modified) (25 diffs)
• trunk/libffado/src/libstreaming/IsoHandler.cpp (modified) (41 diffs)
• trunk/libffado/src/libstreaming/IsoHandler.h (modified) (12 diffs)
• trunk/libffado/src/libstreaming/IsoHandlerManager.cpp (modified) (22 diffs)
• trunk/libffado/src/libstreaming/IsoHandlerManager.h (modified) (7 diffs)
• trunk/libffado/src/libstreaming/IsoStream.cpp (modified) (3 diffs)
• trunk/libffado/src/libstreaming/IsoStream.h (modified) (6 diffs)
• trunk/libffado/src/libstreaming/MotuPort.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/MotuPort.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/MotuPortInfo.cpp (modified) (1 diff)
• trunk/libffado/src/libstreaming/MotuPortInfo.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (modified) (42 diffs)
• trunk/libffado/src/libstreaming/MotuStreamProcessor.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/Port.cpp (modified) (5 diffs)
• trunk/libffado/src/libstreaming/Port.h (modified) (7 diffs)
• trunk/libffado/src/libstreaming/PortManager.cpp (modified) (5 diffs)
• trunk/libffado/src/libstreaming/PortManager.h (modified) (4 diffs)
• trunk/libffado/src/libstreaming/StreamProcessor.cpp (modified) (19 diffs)
• trunk/libffado/src/libstreaming/StreamProcessor.h (modified) (15 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.cpp (modified) (47 diffs)
• trunk/libffado/src/libstreaming/StreamProcessorManager.h (modified) (9 diffs)
• trunk/libffado/src/libutil/Atomic.h (modified) (10 diffs)
• trunk/libffado/src/libutil/cycles.h (modified) (7 diffs)
• trunk/libffado/src/libutil/DelayLockedLoop.cpp (modified) (20 diffs)
• trunk/libffado/src/libutil/DelayLockedLoop.h (modified) (3 diffs)
• trunk/libffado/src/libutil/OptionContainer.cpp (modified) (11 diffs)
• trunk/libffado/src/libutil/OptionContainer.h (modified) (14 diffs)
• trunk/libffado/src/libutil/PacketBuffer.cpp (modified) (4 diffs)
• trunk/libffado/src/libutil/PacketBuffer.h (modified) (3 diffs)
• trunk/libffado/src/libutil/PosixThread.cpp (modified) (6 diffs)
• trunk/libffado/src/libutil/PosixThread.h (modified) (6 diffs)
• trunk/libffado/src/libutil/ringbuffer.c (modified) (17 diffs)
• trunk/libffado/src/libutil/ringbuffer.h (modified) (16 diffs)
• trunk/libffado/src/libutil/serialize.cpp (modified) (3 diffs)
• trunk/libffado/src/libutil/serialize.h (modified) (1 diff)
• trunk/libffado/src/libutil/StreamStatistics.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/StreamStatistics.h (modified) (3 diffs)
• trunk/libffado/src/libutil/SystemTimeSource.cpp (modified) (2 diffs)
• trunk/libffado/src/libutil/SystemTimeSource.h (modified) (4 diffs)
• trunk/libffado/src/libutil/test-dll.cpp (modified) (4 diffs)
• trunk/libffado/src/libutil/Thread.h (modified) (3 diffs)
• trunk/libffado/src/libutil/Time.c (modified) (2 diffs)
• trunk/libffado/src/libutil/Time.h (modified) (3 diffs)
• trunk/libffado/src/libutil/TimeSource.cpp (modified) (15 diffs)
• trunk/libffado/src/libutil/TimeSource.h (modified) (6 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (59 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.h (modified) (11 diffs)
• trunk/libffado/src/libutil/unittests.cpp (modified) (10 diffs)
• trunk/libffado/src/Makefile.am (modified) (11 diffs)
• trunk/libffado/src/maudio/fw410.xml (modified) (2 diffs)
• trunk/libffado/src/maudio/fwap.xml (modified) (2 diffs)
• trunk/libffado/src/maudio/maudio_avdevice.cpp (modified) (3 diffs)
• trunk/libffado/src/maudio/maudio_avdevice.h (modified) (4 diffs)
• trunk/libffado/src/maudio/refdesign.xml (modified) (2 diffs)
• trunk/libffado/src/metrichalo/mh_avdevice.cpp (modified) (6 diffs)
• trunk/libffado/src/metrichalo/mh_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (19 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (6 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)
• trunk/libffado/src/ser.cpp (modified) (3 diffs)
• trunk/libffado/src/threads.h (modified) (7 diffs)
• trunk/libffado/support/jack/ffado_driver.c (modified) (68 diffs)
• trunk/libffado/support/jack/ffado_driver.h (modified) (12 diffs)
• trunk/libffado/tests/Makefile.am (modified) (2 diffs)
• trunk/libffado/tests/streaming/debugtools.c (modified) (1 diff)
• trunk/libffado/tests/streaming/debugtools.h (modified) (1 diff)
• trunk/libffado/tests/streaming/Makefile.am (modified) (2 diffs)
• trunk/libffado/tests/streaming/test-isohandling.cpp (modified) (3 diffs)
• trunk/libffado/tests/streaming/testmidistreaming1.c (modified) (1 diff)
• trunk/libffado/tests/streaming/teststreaming.c (modified) (1 diff)
• trunk/libffado/tests/streaming/teststreaming2.c (modified) (1 diff)
• trunk/libffado/tests/streaming/teststreaming3.c (modified) (1 diff)
• trunk/libffado/tests/SytMonitor.cpp (modified) (5 diffs)
• trunk/libffado/tests/SytMonitor.h (modified) (3 diffs)
• trunk/libffado/tests/test-cycletimer.cpp (modified) (12 diffs)
• trunk/libffado/tests/test-extplugcmd.cpp (modified) (4 diffs)
• trunk/libffado/tests/test-ffado.cpp (modified) (24 diffs)
• trunk/libffado/tests/test-freebob.cpp (deleted)
• trunk/libffado/tests/test-fw410.cpp (modified) (5 diffs)
• trunk/libffado/tests/test-ieee1394service.cpp (modified) (5 diffs)
• trunk/libffado/tests/test-mixer.cpp (modified) (2 diffs)
• trunk/libffado/tests/test-sytmonitor.cpp (modified) (21 diffs)
• trunk/libffado/tests/test-timestampedbuffer.cpp (modified) (27 diffs)
• trunk/libffado/tests/test-volume.cpp (modified) (1 diff)

trunk/libffado/autogen.sh

@@ -2 +2 @@
-# Run this to generate all the initial makefiles, etc.
-
-
-autoreconf -f -i -s
-./configure --enable-maintainer-mode
-make

trunk/libffado/ChangeLog

@@ +1 @@
+REMARK: Please use the SVN commit messages as replacement for ChangeLog
+
+2007-03-20  Pieter Palmers
+    * name change from FreeBoB to FFADO
+    * replaced tabs by 4 spaces
+    * got rid of end-of-line spaces
+    * made all license and copyrights conform
+       library becomes LGPL, apps become GPL
+       explicitly state LGPL v2.1 and GPL v2 (don't like v3 draft)
+       copyrights are 2005-2007 Daniel & Pieter
+       except for the MotU stuff (C) Jonathan, Pieter
+
-2006-11-20  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-       
-
+    
+    
+
+    
+    
+
-2006-11-12  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
+    
+
+    
+    
-
-2006-11-11  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2006-08-27  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-2006-08-22  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
+    
+    
+    
-
-2006-07-17  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
+    
+    
+    
-
-2006-07-02  Daniel Wagner  <wagi@monom.org>
-
-       
+    
-
-2006-06-27  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
-
-2006-06-24  Daniel Wagner  <wagi@monom.org>
-
-       
+    
-
-2006-06-21  Daniel Wagner  <wagi@monom.org>
-
-       
+    
-
-2006-06-10  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2006-06-01  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
-       
+    
+
+    
+    
+    
+    
-
-2006-05-31  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2006-05-31  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
@@ -110 +122 @@
-
-2006-05-26  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
-       
+    
-    - added a 'verbose' option to disable/enable message output
-    - removed some residual messages
@@ -131 +143 @@
-
-2006-05-12  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
-       
-       
-       
-       
-       
-
-       
+    
+    
+    
+    
+    
+
+    
-
-2006-05-06  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-
-       
+    
+    
+    
+
+    
-
-2006-05-04  Pieter Palmers  <pieterpalmers@users.sourceforge.net>
-
-       
-
-       
+    
+
+    
-
-2006-05-04  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
+    
+
+    
+    
-
-2006-05-04  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
+    
+
+    
+    
-
-2006-05-03  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
+    
+
+    
+    
-
-2006-04-23  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
+    
+
+    
+    
+    
-
-2006-04-17  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
-       
-       
+    
+
+    
+    
+    
+    
+    
-
-2006-04-11  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
+    
+
+    
+    
+    
-
-2006-04-07  Pieter Palmers <pieterpalmers@users.sourceforge.net>
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-2006-04-05  Pieter Palmers <pieterpalmers@users.sourceforge.net>
-
-       
-
-       
-       
-
-       
-       
-       
-       
+    
+
+    
+    
+
+    
+    
+    
+    
-
-2006-04-04  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
+    
+
+    
+    
+    
-
-2006-03-30  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
-
-2006-03-20  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
+    
+
+    
+    
+    
-
-2006-03-15  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-
-       
-       
-       
-       
+    
+
+    
+    
+
+    
+    
+    
+    
-
-2006-03-12  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2006-03-10  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-       
-       
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+    
+    
-
-2006-03-05  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
-
-2006-03-04  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
-
-2006-03-02  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-       
-       
+    
+    
+
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+    
+    
-
-2006-03-01  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-
-       
-       
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+
+    
+    
-
-2006-02-28  Pieter Palmers <pieterpalmers@users.sourceforge.net>
-       
-       
-       
+    
+    
+    
-
-2006-02-26  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
-
-2006-02-22  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-        src/avdevice.cpp
-        src/avdevice.h
@@ -443 +455 @@
-        src/avdevicexml.cpp
-        src/avplug.cpp
-       
+    
-        src/avplugxml.cpp
-        src/libfreebobavc/avc_extended_plug_info.cpp
@@ -451 +463 @@
-        src/libfreebobavc/avc_plug_info.cpp
-        src/libfreebobavc/avc_plug_info.h:
-       
-       
-       
-       
-       
-
-       
-       
+    
+    
+    
+    
+    
+
+    
+    
-
-2006-01-19  Daniel Wagner  <wagi@monom.org>
-
-        * This patch cleans up the external dependency detection for 
-       
-       
-       
-       
-
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-
-       
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+
+    
-
-2006-01-12  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2006-01-08  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
-
-        * src/avdevice.h
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-
-       
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
-
-2006-01-06  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
-
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
-
-       
-       
-       
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
-
-2006-01-04  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-       
-       
-       
+    
+    
+
+    
+    
+    
+    
-
-2006-01-03  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
+    
+    
+    
-
-2006-01-02  Pieter Palmer <pieterpalmers@users.sourceforge.net>
-
-       
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-       
-
-       
-       
-       
-
+    
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+    
+
+    
+    
+    
+
-2006-01-02  Daniel Wagner  <wagi@monom.org>
-
-       
-       
+    
+    
-
-2005-12-31  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-
-       
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+    
-
-2005-12-30  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-
-       
-       
-
-       
-       
+    
+    
+
+    
+    
+
+    
+    
-
-2005-12-28  Daniel Wagner  <wagi@monom.org>
-
-       
-
-       
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+
+    
+    
+    
+
+    
+    
+
+    
+    
+
+    
-
-2005-12-27  Daniel Wagner  <wagi@monom.org>
-
-       
-       
-       
+    
+    
+    
-
-2005-12-26  Daniel Wagner  <wagi@monom.org>
-
-       
-
-
+    
+
+

trunk/libffado/configure.ac

@@ -1 @@
-reeBoB
+FADO
-# Copyright (C) 2005,06 by Daniel Wagner.
-# Copyright (C) 2006,07 by Pieter Palmers.
-#
-
+
+
-#
-reeBoB
+FADO
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-reeBoB
+FADO
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-reeBoB
+FADO
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
@@ -23 +24 @@
-
-
-reebob
-reebob
-reebob
-
-reebob_version, freebob_major_version.freebob_minor_version.freebob
-
-reebob, freebob_version, <freebob
+fado
+fado
+fado
+
+fado_version, ffado_major_version.ffado_minor_version.ffado
+
+fado, ffado_version, <ffado
-
-# Before making a release, the LT_VERSION string should be modified.
@@ -39 +40 @@
-# - If the interface is the same as the previous version, change to C:R+1:A
-
-2
+1
-AC_SUBST(LT_VERSION)
-
-REEBOB_MAJOR_VERSION, freebob_major_version,[Freebob
-REEBOB_MINOR_VERSION, freebob_minor_version,[Freebob
-REEBOB_MICRO_VERSION, freebob_micro_version,[Freebob
-REEBOB_MINOR_VERSION, freebob
-REEBOB_MAJOR_VERSION, freebob
-REEBOB_MICRO_VERSION, freebob
+FADO_MAJOR_VERSION, ffado_major_version,[FFADO
+FADO_MINOR_VERSION, ffado_minor_version,[FFADO
+FADO_MICRO_VERSION, ffado_micro_version,[FFADO
+FADO_MINOR_VERSION, ffado
+FADO_MAJOR_VERSION, ffado
+FADO_MICRO_VERSION, ffado
-
-AM_INIT_AUTOMAKE([subdir-objects])
-AM_MAINTAINER_MODE
-reebob
+fado
-AC_CONFIG_HEADER([config.h])
-AC_GNU_SOURCE
@@ -109 +110 @@
-AC_CHECK_LIB(pthread, pthread_create,,
-[
-reebob
+fado
-])
-
@@ -181 +182 @@
-
-  if test "$target_cpu" = "i586"; then
-REEBOB
+FADO
-  elif test "$target_cpu" = "i686"; then
-REEBOB
+FADO
-  else
-      :
-  fi
-
-REEBOB_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $FREEBOB
+FADO_OPT_CFLAGS="$COMMON_X86_OPT_FLAGS $FFADO
-
-
@@ -195 +196 @@
-                   [ask the compiler for its best optimizations]),
-    [ if test x$enable_optimize != xno ; then
-REEBOB
-REEBOB
+FADO
+FADO
-      fi 
-    ]
@@ -399 +400 @@
-                 doc/Makefile
-                 doc/reference.doxygen
-reebob
+fado
-                 src/Makefile
-                 tests/Makefile
-                 tests/streaming/Makefile
-reebob
+fado
-
-AC_OUTPUT
@@ -410 +411 @@
-AC_MSG_RESULT([
-
-reeBoB
+FADO
-
-  Building support for: $supported_devices

trunk/libffado/doc/adding_devices.dox

@@ -1 @@
-/*
- * This is the main page of the FreeBoB reference manual, built using
- * doxygen.
- */
-
-/**
-LibFreeBoB
+libffado
-
-@author Pieter Palmers <pieterpalmers@users.sourceforge.net>
@@ -21 +16 @@
- Layer 2 is implemented by subclassing the StreamProcessor class in src/libstreaming/
- 
-reebob
+fado
- - Create a DeviceManager that iterates over all nodes connected to the 1394 bus. 
-   For every node present, it tries the probeFunctions (probeBeBoB, probeMotu, ...).
@@ -54 +49 @@
-         the start/stop mechanism differ.
- 
-freebob
+libffado
-  - an IAvDevice descendant that takes care of the device discovery & configuration
-  - a StreamProcessor descendant that takes care of the device specific stream translation
@@ -65 +60 @@
-@section streamingbaseclasses Streaming base class hierarchy and operation
-
-LibFreeBoB
+libffado
-
-The following figure shows the base class diagram, and the derrived classed that implement
@@ -89 +84 @@
-- an IsoHandlerManager instance
-
-Freebob
+
-
-@subsection isoside The ISO side: 1394 isochronous traffic management
@@ -103 +98 @@
-\note This abstraction is completely device independent, it only provides a mechanism to transmit or receive a certain isochronous stream. It could as well be used for video streams...
-
-FreebobStreaming::IsoStream, FreebobStreaming::IsoHandlerManager, Freebob
+Streaming::IsoStream, Streaming::IsoHandlerManager, 
-
-@subsection audioapiside The Audio API side: port management
@@ -137 +132 @@
-The idea is that we present a collection of ports to the Audio API side which from which it can read or to which it can write.
-
-FreebobStreaming::Port, Freebob
+Streaming::Port, 
-
-@subsection connectingisoandaudio Connecting the ISO side with the Audio API side
@@ -161 +156 @@
-A StreamProcessor also has the init(), prepare() and reset() calls, which are still to be documented (see later).
-
-FreebobStreaming::StreamProcessor, FreebobStreaming::ReceiveStreamProcessor, FreebobStreaming::TransmitStreamProcessor, Freebob
+Streaming::StreamProcessor, Streaming::ReceiveStreamProcessor, Streaming::TransmitStreamProcessor, 
-
-@subsection mappingports Mapping Ports to IsoStreams
@@ -167 +162 @@
-
-@subsection puttingtogether Putting it all together
+
+@note this is outdated
+
-The framework is completed by introducing the StreamProcessorManager. As indicated before, this class implements a 'collection of StreamProcessors' and an IsoHandlerManager. 
-
-First of all, the StreamProcessorManager is a collection of StreamProcessors, hence it implements the  registerStreamProcessor and unregisterStreamProcessor methods. It maintains the list of StreamProcessors under it's control. When StreamProcessors are (un)registered, they are automatically (un)registered to the IsoHandlerManager too, creating IsoHandlers to handle them. Remember that StreamProcessor is a descendant of IsoStream, and can therefore be registered to an IsoHandlerManager. This results in the fact that the ISO stream the StreamProcessor is supposed to handle, will be attached to an IsoHandler.
-
-FreebobRunnable interface, and can therefore be used as the worker class for a Freebob
+Runnable interface, and can therefore be used as the worker class for a 
-
-The third function of the StreamProcessorManager is the synchronisation between the ISO side and the Audio API side. To implement this, the class provides a wait() method that waits on a synchronisation primitive. This primitive is signalled by the thread that iterates the IsoHandlerManager. This thread will signal the primitive when all StreamProcessors indicate that they have one period ready.
@@ -181 +179 @@
-\note A blocking-read/nonblocking write (and the other way around) version of access to PacketBuffered Ports is planned.
-
-FreebobStreaming::StreamProcessorManager, FreebobStreaming::IsoHandlerManager, Freebob
+Streaming::StreamProcessorManager, Streaming::IsoHandlerManager, 
-
-@subsection callingorder Some notes on when which method is called

trunk/libffado/doc/amdtpstreamprocessor.dox

@@ -1 @@
-/*
- * This is the main page of the FreeBoB reference manual, built using
- * doxygen.
- */
-
-/**
-@page amdtpdescription The AMDTP StreamProcessor

trunk/libffado/doc/mainpage.dox

@@ -1 +1 @@
-/*
-reeBoB
+FADO
- * doxygen.
- */
-
-/**
-reeBoB - Firewire (pro-)audio
+FADO - Free Firewire (pro-)Audio Drivers
-
-@author Pieter Palmers <pieterpalmers@users.sourceforge.net>
@@ -11 +11 @@
-@section intro Introduction
-
-reeBoB
+FADO
-
-\note this is a SVN version, therefore it is highly volatile. Certain parts of the documentation can be outdated. This documentation is also auto-generated, and it can occur that unused classes and interfaces appear in the documentation. This pollution will be cleaned up as we go along.
-
-reebob
+fado
-
-@section library Client side library
-
-reeBoB
+FADO
-API's. Currently the best support is for the JACK backend. It is also intended to implement configuration applications like mixer controls etc..
-
-
-
-
-
+
+
-
-@section devicesupport Adding support for unsupported devices
-
-is/was for BeBoB devices only, however the
-firew
+by FreeBoB was for BeBoB devices only, however the FFADO
+FireW
-
-Take a look at the @ref adding_devices page for a detailed description.

trunk/libffado/doc/reference.doxygen.in

@@ -18 +18 @@
-# by quotes) that should identify the project.
-
-REEBOB
+FADO
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
@@ -366 +366 @@
-                         @top_srcdir@/src/ \
-                         @top_srcdir@/src/debugmodule \
+                         @top_srcdir@/src/libavc \
+                         @top_srcdir@/src/libieee1394 \
+                         @top_srcdir@/src/libosc \
-                         @top_srcdir@/src/libstreaming \
-                         @top_srcdir@/src/libutil \
-
-
+
+
+
+
+
+
+
+
+
-
-# If the value of the INPUT tag contains directories, you can use the 

trunk/libffado/doc/streaming.xmi

@@ -85 +85 @@
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="13397" isRoot="false" isAbstract="false" name="PortVectorIterator" elementReference="13396" />
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="13401" isRoot="false" isAbstract="false" name="Port*" elementReference="12717" />
-reebob
+FADO
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="14530" isRoot="false" isAbstract="false" name="unsigned char*" elementReference="14529" />
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="14540" isRoot="false" isAbstract="false" name="unsigned int*" elementReference="12734" />
@@ -96 +96 @@
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="14665" isRoot="false" isAbstract="false" name="IsoHandlerManager*" elementReference="14659" />
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="15179" isRoot="false" isAbstract="false" name="quadlet_t*" elementReference="15178" />
-reebob
+fado
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="15236" isRoot="false" isAbstract="false" name="IsoHandler*" elementReference="15194" />
-        <UML:DataType stereotype="12706" isSpecification="false" isLeaf="false" visibility="public" namespace="88018" xmi.id="15278" isRoot="false" isAbstract="false" name="PacketBuffer*" elementReference="15167" />
@@ -109 +109 @@
-      </UML:Package>
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>
@@ -958 +958 @@
-      </UML:Class>
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>
@@ -1034 +1034 @@
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="13000" isRoot="false" isAbstract="false" name="enum E_Formats" />
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>
@@ -1531 +1531 @@
-      <UML:Class stereotype="13989" isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="13991" isRoot="false" isAbstract="false" name="SInt32" />
-      <UML:Class stereotype="13989" isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="13992" isRoot="false" isAbstract="false" name="UInt64" />
-reebob
+FADO
-Copied from the jackd/jackdmp sources
-function names changed in order to avoid naming problems when using this in
@@ -1549 +1549 @@
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*!
-reebob
+FADO
-       <UML:GeneralizableElement.generalization>
-        <UML:Generalization xmi.idref="13995" />
@@ -1660 +1660 @@
-         </UML:BehavioralFeature.parameter>
-        </UML:Operation>
-reebob
+FADO
-         <UML:BehavioralFeature.parameter>
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="14010" value="" type="14009" name="runnable" />
@@ -1668 +1668 @@
-         </UML:BehavioralFeature.parameter>
-        </UML:Operation>
-reebob
+FADO
-         <UML:BehavioralFeature.parameter>
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="14015" value="" type="14009" name="runnable" />
-         </UML:BehavioralFeature.parameter>
-        </UML:Operation>
-reebob
+FADO
-         <UML:BehavioralFeature.parameter>
-          <UML:Parameter isSpecification="false" visibility="private" xmi.id="14017" value="" type="14009" name="runnable" />
@@ -1679 +1679 @@
-         </UML:BehavioralFeature.parameter>
-        </UML:Operation>
-reebob
+FADO
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="14020" isRoot="false" isAbstract="false" isQuery="false" name="Start" >
-         <UML:BehavioralFeature.parameter>
@@ -1718 +1718 @@
-       </UML:Classifier.feature>
-      </UML:Class>
-reebob
+FADO
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="13998" isRoot="false" isAbstract="false" name="pthread_t" />
-      <UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="14002" isRoot="false" isAbstract="false" name="volatile bool" />
-reebob
+FADO
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>
@@ -2554 +2554 @@
-      </UML:Class>
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>
@@ -3556 +3556 @@
-         </UML:BehavioralFeature.parameter>
-        </UML:Operation>
-reebob
+FADO
-         <UML:BehavioralFeature.parameter>
-          <UML:Parameter kind="return" xmi.id="LlXy8i6aXj2o" type="12708" />
@@ -3686 +3686 @@
-        </UML:Operation>
-        <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="14668" isRoot="false" isAbstract="false" isQuery="false" name="~ StreamRunner" />
-reebob
+FADO
-         <UML:BehavioralFeature.parameter>
-          <UML:Parameter kind="return" xmi.id="9wZVdbzyKUvQ" type="12708" />
@@ -3698 +3698 @@
-       </UML:Classifier.feature>
-      </UML:Class>
-reebob
-reebob
+fado
+fado
-      <UML:Class comment="Id$ *//*
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-  Copyright (C) 2005,2006 Pieter Palmers &lt;pieterpalmers@users.sourceforge.net>

trunk/libffado/libffado.pc.in

@@ -4 +4 @@
-includedir=@includedir@
-
-reebob
-reeBoB
+fado
+FADO
-Version: @VERSION@
-reebob
+fado
-Cflags: -I${includedir}

trunk/libffado/Makefile.am

@@ -1 @@
-
-
+
-#
-
+
+
-#
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
-
-
+
+
+
+
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-reebob
+fado
-
-pkgconfigdir = $(libdir)/pkgconfig
-reebob
+fado
-
-$(srcdir)/configure: configure.ac aclocal.m4
@@ -39 +51 @@
-config.status: configure
-        ./config.status --recheck
-
-

trunk/libffado/src/bebob-sync.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +17 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
@@ -30 +33 @@
-// arg parsing
-////////////////////////////////////////////////
-freebob_
-reebob
-freebob_sync -- select sync mod
+bebob-
+fado
+bebob-sync -- select sync mode on a BeBoB devic
-                    "OPERATION:  set <nr>\n";
-static char args_doc[] = "NODE_ID OPERATION";
@@ -41 +44 @@
-};
-
-
+
+
-
-struct arguments
@@ -118 +122 @@
-    int node_id = strtol(arguments.args[0], &tail, 0);
-    if (errno) {
-       
-       
+    
+    
-    }
-

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -1 @@
- bebob_avdevice.cpp
-,06,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -42 +45 @@
-{
-    {0x00000f, 0x00010065, "Mackie", "Onyx Firewire"},
-
+
-    {0x0003db, 0x00010048, "Apogee Electronics", "Rosetta 200"},
-
@@ -105 +108 @@
-
-void
- 
+
-{
-//     m_pPlugManager->setVerboseLevel(l);
-
+
-    IAvDevice::setVerboseLevel(l);
-}
@@ -143 +146 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -155 +158 @@
-                m_model->vendor_name, m_model->model_name);
-    } else return false;
-
+
-    if ( !enumerateSubUnits() ) {
-        debugError( "Could not enumarate sub units\n" );
@@ -709 +712 @@
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
+
-    if(snoopMode) {
-        int current_sr=getSamplingFrequency();
@@ -724 +727 @@
-            return false;
-        }
-
+
-        if ( !setSamplingFrequencyPlug( *plug,
-                                        AvPlug::eAPD_Input,
@@ -732 +735 @@
-            return false;
-        }
-
+
-        plug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Output,  0 );
-        if ( !plug ) {
@@ -738 +741 @@
-            return false;
-        }
-
+
-        if ( !setSamplingFrequencyPlug( *plug,
-                                        AvPlug::eAPD_Output,
@@ -746 +749 @@
-            return false;
-        }
-
+
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-                     "setSampleRate: Set sample rate to %d\n",
@@ -886 +889 @@
-        "%s %s at node %d\n", m_model->vendor_name, m_model->model_name,
-        m_nodeId);
-
+
-    m_pPlugManager->showPlugs();
-}
@@ -946 +949 @@
-        // don't lock
-    } else {
-
+
-    }
-
@@ -962 +965 @@
-        // don't unlock
-    } else {
-
+
-    }
-    return true;
@@ -973 +976 @@
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
+
-    ///////////
-    // get plugs
@@ -989 +992 @@
-
-    int samplerate=outputPlug->getSampleRate();
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n");
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+
-    p=new Streaming::AmdtpReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
@@ -1011 +1014 @@
-        return false;
-    }
-
+
-    m_receiveProcessors.push_back(p);
-
@@ -1029 +1032 @@
-                                inputPlug->getNrOfChannels());
-    }
-
+
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor %s!\n",
@@ -1050 +1053 @@
-        }
-    }
-
+
-    // we put this SP into the transmit SP vector,
-    // no matter if we are in snoop mode or not
@@ -1065 +1068 @@
-    Streaming::StreamProcessor *processor,
-    Streaming::AmdtpAudioPort::E_Direction direction) {
-
+
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
-    }
-
+
-    AvPlug::ClusterInfoVector& clusterInfos = plug.getClusterInfos();
-    for ( AvPlug::ClusterInfoVector::const_iterator it = clusterInfos.begin();
@@ -1173 +1176 @@
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
+
-        if(snoopMode) { // a stream from the device to another host
-            // FIXME: put this into a decent framework!
@@ -1179 +1182 @@
-            struct iec61883_oPCR opcr;
-            if (iec61883_get_oPCRX(
- 
+
-                    m_pConfigRom->getNodeId() | 0xffc0,
-                    (quadlet_t *)&opcr,
-                    n)) {
-
+
-                debugWarning("Error getting the channel for SP %d\n",i);
-                return false;
-            }
-
+
-            iso_channel=opcr.channel;
-        } else {
-            iso_channel=m_p1394Service->allocateIsoChannelCMP(
- 
+
-                m_p1394Service->getLocalNodeId()| 0xffc0, -1);
-        }
@@ -1198 +1201 @@
-            return false;
-        }
-
+
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Started SP %d on channel %d\n",i,iso_channel);
-
+
-        p->setChannel(iso_channel);
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
- 
+
+
-            // FIXME: put this into a decent framework!
-            // we should check the iPCR[n] on the device
-            struct iec61883_iPCR ipcr;
-            if (iec61883_get_iPCRX(
- 
+
-                    m_pConfigRom->getNodeId() | 0xffc0,
-                    (quadlet_t *)&ipcr,
-                    n)) {
-
+
-                debugWarning("Error getting the channel for SP %d\n",i);
-                return false;
-            }
-
+
-            iso_channel=ipcr.channel;
-
+
-        } else {
-            iso_channel=m_p1394Service->allocateIsoChannelCMP(
@@ -1229 +1232 @@
-                m_pConfigRom->getNodeId() | 0xffc0, n);
-        }
-
+
-        if (iso_channel<0) {
-            debugError("Could not allocate ISO channel for SP %d\n",i);
-            return false;
-        }
-
+
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Started SP %d on channel %d\n",i,iso_channel);
-
+
-        p->setChannel(iso_channel);
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-    return false;
@@ -1266 +1269 @@
-        }
-        p->setChannel(-1);
-
+
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        if(snoopMode) {
-
@@ -1283 +1286 @@
-        }
-        p->setChannel(-1);
-
+
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-    return false;
@@ -1414 +1417 @@
-                     Util::IOSerialize& ser ) const
-{
-
+
-    bool result;
-    result  = m_pConfigRom->serialize( basePath + "m_pConfigRom/", ser );
@@ -1435 +1438 @@
-        i++;
-    }
-
+
-    result &= serializeOptions( basePath + "Options", ser );
-
@@ -1451 +1454 @@
-    ConfigRom *configRom =
-        ConfigRom::deserialize( basePath + "m_pConfigRom/", deser, ieee1394Service );
-
+
-    if ( !configRom ) {
-        return NULL;
@@ -1457 +1460 @@
-
-    AvDevice* pDev = new AvDevice(
- 
+
-        ieee1394Service, configRom->getNodeId());
-
@@ -1463 +1466 @@
-        bool result;
-        result  = deser.read( basePath + "m_verboseLevel", pDev->m_verboseLevel );
-
+
-        if (pDev->m_pPlugManager) delete pDev->m_pPlugManager;
-        pDev->m_pPlugManager = AvPlugManager::deserialize( basePath + "AvPlug", deser, *pDev );
@@ -1484 +1487 @@
-            }
-        }
-
+
-        result &= deserializeOptions( basePath + "Options", deser, *pDev );
-    }

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -1 @@
- bebob_avdevice.h
-,06,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BEBOB_AVDEVICE_H
-#define BEBOB_AVDEVICE_H
@@ -51 +55 @@
-    unsigned int model_id;
-    char *vendor_name;
- 
+
-};
-
@@ -60 +64 @@
-              int nodeId );
-    virtual ~AvDevice();
-
+
-    void setVerboseLevel(int l);
-
@@ -115 +119 @@
-    static AvDevice* deserialize( Glib::ustring basePath,
-                                  Util::IODeserialize& deser,
-                               
+                
-protected:
-

trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp

@@ -1 @@
- bebob_avdevice_subunit.cpp
-,06,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/bebob/bebob_avdevice_subunit.h

@@ -1 @@
- bebob_avdevice_subunit.h
-,06,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BEBOB_AVDEVICESUBUNIT_H
-#define BEBOB_AVDEVICESUBUNIT_H
@@ -38 +42 @@
- public:
-    AvDeviceSubunit( AvDevice& avDevice,
-               
-               
-               
+        
+        
+        
-    virtual ~AvDeviceSubunit();
-
@@ -50 +54 @@
-
-    subunit_t getSubunitId()
-       
+    
-    AVCCommand::ESubunitType getSubunitType()
-       
+    
-
-    AvPlugVector& getPlugs()
-       
+    
-    AvPlug* getPlug(AvPlug::EAvPlugDirection direction, plug_id_t plugId);
-
@@ -65 +69 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static AvDeviceSubunit* deserialize( Glib::ustring basePath,
-                                       
+                    
-                                         AvDevice& avDevice );
- protected:
@@ -98 +102 @@
- public:
-    AvDeviceSubunitAudio( AvDevice& avDevice,
-                       
-                       
+            
+            
-    AvDeviceSubunitAudio();
-    virtual ~AvDeviceSubunitAudio();
@@ -135 +139 @@
- public:
-    AvDeviceSubunitMusic( AvDevice& avDevice,
-                       
-                       
+            
+            
-    AvDeviceSubunitMusic();
-    virtual ~AvDeviceSubunitMusic();

trunk/libffado/src/bebob/bebob_avplug.cpp

@@ -1 @@
- bebob_avplug.cpp
-,06,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/bebob/bebob_avplug.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -50 +53 @@
-
-    enum EAvPlugAddressType {
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
-    };
-
@@ -69 +72 @@
-
-    enum EAvPlugDirection {
-       
-       
-       
+    
+    
+    
-    };
-
-    // \todo This constructors sucks. too many parameters. fix it.
-    AvPlug( Ieee1394Service& ieee1394Service,
-       
+    
-            AvPlugManager& plugManager,
-       
-       
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
-    AvPlug( const AvPlug& rhs );
-    virtual ~AvPlug();
@@ -96 +99 @@
-
-    int getGlobalId() const
-       
+        
-    plug_id_t getPlugId() const
-       
+        
-    AVCCommand::ESubunitType getSubunitType() const
-       
+        
-    subunit_id_t getSubunitId() const
-       
+        
-    const char* getName() const
-       
+        
-    EAvPlugDirection getPlugDirection() const
-       
+        
-    sampling_frequency_t getSamplingFrequency() const
-       
+        
-    int getSampleRate() const; // 22050, 24000, 32000, ...
-    int getNrOfChannels() const;
@@ -118 +121 @@
-        { return m_addressType; }
-    EAvPlugType getPlugType() const
-       
+        
-
-    function_block_type_t getFunctionBlockType() const
-       
+        
-    function_block_id_t getFunctionBlockId() const
-        { return m_functionBlockId; }
@@ -131 +134 @@
-
-    static PlugAddress::EPlugDirection convertPlugDirection(
-       
+    
-
-    void showPlug() const;
@@ -148 +151 @@
-        stream_position_t          m_streamPosition;
-        stream_position_location_t m_location;
-       
+    
-    };
-    typedef std::vector<ChannelInfo> ChannelInfoVector;
-
-    struct ClusterInfo {
-       
-       
-       
+    
+    
+    
-
-        nr_of_channels_t         m_nrOfChannels;
-        ChannelInfoVector        m_channelInfos;
-       
+    
-    };
-    typedef std::vector<ClusterInfo> ClusterInfoVector;
@@ -183 +186 @@
-
-    ExtendedStreamFormatCmd setPlugAddrToStreamFormatCmd(
-       
+    
-
-    SignalSourceCmd setSrcPlugAddrToSignalCmd();
-
-    void setDestPlugAddrToSignalCmd(
-       
+    
-
-    void debugOutputClusterInfos( int debugLevel );
@@ -245 +248 @@
-            , m_index( 0xff )
-            {}
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
-    };
-    typedef std::vector<FormatInfo> FormatInfoVector;
@@ -297 +300 @@
-    AvPlug* getPlug( AVCCommand::ESubunitType subunitType,
-                     subunit_id_t subunitId,
-               
-               
+        
+        
-                     AvPlug::EAvPlugAddressType plugAddressType,
-                     AvPlug::EAvPlugDirection plugDirection,
@@ -304 +307 @@
-    AvPlug* getPlug( int iGlobalId ) const;
-    AvPlugVector getPlugsByType( AVCCommand::ESubunitType subunitType,
-                               
-                               
-                               
-                               
-                               
-                               
+                
+                
+                
+                
+                
+                
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
@@ -351 +354 @@
-}
-
-
+ // BEBOB_AVPLUG_H

trunk/libffado/src/bebob/bebob_dl_bcd.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/bebob/bebob_dl_bcd.h

@@ -1 @@
- bebob_dl_bcd.h
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BEBOB_DL_BCD_H
-#define BEBOB_DL_BCD_H
@@ -45 +49 @@
-        fb_quadlet_t getSoftwareVersion() const
-            { return m_softwareVersion; }
-       
-       
-       
-       
-
+    
+    
+    
+    
+
-        fb_quadlet_t getImageBaseAddress() const
-            { return m_imageBaseAddress; }
@@ -59 +63 @@
-            { return m_imageCRC; }
-
-       
-       
+    
+    
-        fb_quadlet_t getCnELength() const
-            { return m_cneLength; }
-       
-       
+    
+    
-
-        bool read( int addr, fb_quadlet_t* q );
-        bool read( int addr, fb_octlet_t* o );
-       
+    
-
-       
+    
-
-    protected:
-        unsigned long crc32_table[256];
-       
-       
-       
+    
+    
+    
-        bool checkHeaderCRC( unsigned int crcOffset,
-                             unsigned int headerSize );
@@ -89 +93 @@
-        fb_quadlet_t m_softwareId;
-        fb_quadlet_t m_softwareVersion;
-       
-       
-
+    
+    
+
-
-        fb_quadlet_t m_imageBaseAddress;
@@ -99 +103 @@
-
-        fb_quadlet_t m_cneLength;
-       
-       
+    
+    
-
-
-
-       
+    
-    };
-

trunk/libffado/src/bebob/bebob_dl_codes.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "bebob/bebob_dl_codes.h"
-#include "bebob/bebob_dl_bcd.h"

trunk/libffado/src/bebob/bebob_dl_codes.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -64 +67 @@
-                      fb_byte_t operandSizeRequestField,
-                      fb_byte_t operandSizeResponseField );
-       
+    
-
-        virtual bool serialize( IOSSerialize& se );
@@ -74 +77 @@
-            { return static_cast<EBootloaderCommandCodes>( m_commandCode ); }
-
-       
-       
+    
+    
-        size_t getMsgSize() const
-            { return m_msgSize; }
@@ -163 +166 @@
-        enum EObject {
-            eO_Application    = 0,
-       
-       
+    
+    
-            eO_Bootloader     = 3,
-       
-       
+    
+    
-        };
-
-        CommandCodesDownloadStart( fb_quadlet_t protocolVersion,
-                               
+                
-        virtual ~CommandCodesDownloadStart();
-
@@ -218 +221 @@
-        virtual bool deserialize( IISDeserialize& de );
-
-       
-       
-       
+    
+    
+    
-            { m_address = address; return true; }
-        bool setNumberBytes( fb_quadlet_t numByte )
@@ -233 +236 @@
-        fb_quadlet_t m_numBytes;
-
-       
-       
+    
+    
-    };
-
@@ -287 +290 @@
-        enum EStartMode {
-            eSM_Application = 0,
-       
+    
-        };
-
@@ -306 +309 @@
-    private:
-        fb_quadlet_t m_startMode;
-       
+    
-    };
-

trunk/libffado/src/bebob/bebob_dl_mgr.cpp

@@ -1 @@
- bebob_dl_mgr.cpp
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "bebob_dl_mgr.h"
-#include "bebob_dl_codes.h"

trunk/libffado/src/bebob/bebob_dl_mgr.h

@@ -1 @@
- bebob_dl_mgr.h
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BEBOB_DL_MGR_H
-#define BEBOB_DL_MGR_H
@@ -51 +55 @@
-        bool programGUID( octlet_t guid );
-
-       
+    
-
-       
+    
-            { return m_ieee1394service; }
-
-       
+    
-            { m_forceEnabled = enabled; return true; }
-
-       
-       
+    
+    
-    protected:
-       
-       
-       
-       
+    
+    
+    
+    
-
-       
+    
-        bool writeRequest( CommandCodes& cmd );
-       
-       
+    
+    
-
-        bool programGUIDCmd( octlet_t guid );
-       
+    
-        bool startApplicationCmd();
-        bool initializePersParamCmd();
@@ -111 +115 @@
-        info_register_t    m_cachedInfoRegs;
-
-       
-       
+    
+    
-
-       
+    
-
-        bool            m_forceEnabled;
-       
+    
-
-       
+    
-    };
-}

trunk/libffado/src/bebob/bebob_functionblock.cpp

@@ -1 @@
- bebob_functionblock.cpp
-6,
+
+5-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "bebob/bebob_functionblock.h"
-#include "bebob/bebob_avdevice_subunit.h"

trunk/libffado/src/bebob/bebob_functionblock.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BEBOB_FUNCTION_BLOCK_H
-#define BEBOB_FUNCTION_BLOCK_H
@@ -47 +51 @@
-
-    FunctionBlock( AvDeviceSubunit& subunit,
-               
+        
-                   function_block_type_t subtype,
-                   function_block_id_t id,
@@ -65 +69 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static FunctionBlock* deserialize( Glib::ustring basePath,
-                               
-                               
+                
+                
-                                       AvDeviceSubunit& subunit);
-protected:

trunk/libffado/src/bounce/bounce_avdevice.cpp

@@ -1 @@
- bounce_avdevice.cpp
-6
-6
+
+5-2007
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "bounce/bounce_avdevice.h"
-
@@ -45 +49 @@
-static VendorModelEntry supportedDeviceList[] =
-{
-reeBoB
+FADO
-};
-
@@ -80 +84 @@
-          ++i )
-    {
- 
+
-//             ( supportedDeviceList[i].vendor_id == vendorId )
-             ( supportedDeviceList[i].model_id == modelId )
- 
+
-           )
-        {
@@ -98 +102 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "discovering BounceDevice (NodeID %d)\n",
-                 m_nodeId );
-
+
-//     unsigned int vendorId = m_pConfigRom->getNodeVendorId();
-    unsigned int modelId = m_pConfigRom->getModelId();
@@ -108 +112 @@
-    {
-        if ( //( supportedDeviceList[i].vendor_id == vendorId )
- 
- 
+
+
-           )
-        {
@@ -168 +172 @@
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Adding ports to processor\n");
-
+
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
-    }
-
+
-    int i=0;
-    for (i=0;i<BOUNCE_NB_AUDIO_CHANNELS;i++) {
@@ -205 +209 @@
-        free(buff);
-    }
-
+
-    for (i=0;i<BOUNCE_NB_MIDI_CHANNELS;i++) {
-        char *buff;
@@ -237 +241 @@
-     }
-
-       
+    
-}
-
@@ -243 +247 @@
-BounceDevice::prepare() {
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing BounceDevice...\n" );
-
+
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
@@ -251 +255 @@
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+
-    p=new Streaming::AmdtpReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
@@ -285 +289 @@
-                                BOUNCE_NB_AUDIO_CHANNELS+(BOUNCE_NB_MIDI_CHANNELS?1:0));
-    }
-
+
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor %s!\n",
@@ -335 +339 @@
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -343 +347 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -358 +362 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -367 +371 @@
-            return false;
-        }
-
+
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -381 +385 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -396 +400 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -405 +409 @@
-            return false;
-        }
-
+
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -420 +424 @@
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -431 +435 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -438 +442 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -444 +448 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -464 +468 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -471 +475 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -477 +481 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-    return false;
@@ -491 +495 @@
-int BounceDevice::allocateIsoChannel(unsigned int packet_size) {
-    unsigned int bandwidth=8+packet_size;
-
+
-    int ch=m_p1394Service->allocateIsoChannelGeneric(bandwidth);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "allocated channel %d, bandwidth %d\n",
-        ch, bandwidth);
-
+
-    return ch;
-}
@@ -510 +514 @@
-BounceDevice::readReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX\n", offset);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read_quadlet( nodeId, addr, result ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, addr);
@@ -524 +528 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
-
+
-    return true;
-}
@@ -530 +534 @@
-bool
-BounceDevice::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-  
+
-        offset, data);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->write_quadlet( nodeId, addr, data ) ) {
-        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr);
@@ -548 +552 @@
-}
-
- 
+
-BounceDevice::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read( nodeId, addr, length, data ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
@@ -568 +572 @@
-}
-
- 
+
-BounceDevice::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-  
+
-        offset, length);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;

trunk/libffado/src/bounce/bounce_avdevice.h

@@ -1 @@
- bounce_avdevice.h
-6
-6
+
+5-2007
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BOUNCEDEVICE_H
-#define BOUNCEDEVICE_H
@@ -66 +70 @@
-public:
-    BounceDevice( std::auto_ptr<ConfigRom>( configRom ),
-               
-               
+        
+        
-    virtual ~BounceDevice();
-
-    static bool probe( ConfigRom& configRom );
-    bool discover();
-
+
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    int getSamplingFrequency( );
-
+
-    bool prepare();
-    bool lock();
@@ -86 +90 @@
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
+
-    void showDevice();
-
@@ -99 +103 @@
-
-    bool addPortsToProcessor(
- 
+
-       Streaming::Port::E_Direction direction);
-
+
-private: // generic helpers
-    int allocateIsoChannel(unsigned int packet_size);
@@ -112 +116 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
+
-private:
-    BounceNotifier *m_Notifier;
-    /**
- 
+
-     * hosts address space
-     */
@@ -126 +130 @@
-        BounceNotifier(BounceDevice *, nodeaddr_t start);
-        virtual ~BounceNotifier();
-
+
-    private:
-        BounceDevice *m_bouncedevice;

trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-  FreeBob Streaming API
-  FreeBob = Firewire (pro-)audio for linux
+Copyright (C) 2005-2007 by Pieter Palmers
+Copyright (C) 2005-2007 by Daniel Wagner
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -42 +38 @@
-{
-  //{vendor_id, model_id, unit_specifier_id, vendor_name, model_name},
-reeBoB
+FADO
-};
-
@@ -80 +76 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Initializing memory space...\n");
-    fb_quadlet_t result=0xFFFFFFFFLU;
-
+
-    // initialize the ISO channel registers
-    // this will write to our own registers
@@ -91 +87 @@
-        return false;
-    }
-
+
-    // set everything such that we can be discovered
-    m_original_config_rom=save_config_rom( m_p1394Service->getHandle() );
-
+
-    if ( init_config_rom( m_p1394Service->getHandle() ) < 0 ) {
-        debugError("Could not initalize local config rom\n");
-        return false;
-    }
-
+
-    // refresh our config rom cache
-    if ( !m_pConfigRom->initialize() ) {
@@ -122 +118 @@
-bool
-BounceSlaveDevice::lock() {
- 
+
-        m_model->vendor_name, m_model->model_name, m_nodeId);
-
+
-    // get a notifier to handle device notifications
-    nodeaddr_t notify_address;
@@ -131 +127 @@
-                        BOUNCE_REGISTER_LENGTH,
-                        BOUNCE_REGISTER_LENGTH);
-
+
-    if (notify_address == 0xFFFFFFFFFFFFFFFFLLU) {
-        debugError("Could not find free ARM block for notification\n");
-        return false;
-    }
-
+
-    m_Notifier=new BounceSlaveDevice::BounceSlaveNotifier(this, notify_address);
-
+
-    if(!m_Notifier) {
-        debugError("Could not allocate notifier\n");
-        return false;
-    }
-
+
-    if (!m_p1394Service->registerARMHandler(m_Notifier)) {
-        debugError("Could not register notifier\n");
@@ -150 +146 @@
-        return false;
-    }
-
+
-    // (re)initialize the memory space
-    if (!initMemSpace()) {
@@ -156 +152 @@
-        return false;
-    }
-
+
-    return true;
-}
@@ -177 +173 @@
-BounceSlaveDevice::prepare() {
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing BounceSlaveDevice...\n" );
-
+
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+
-    p=new Streaming::AmdtpSlaveReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
@@ -206 +202 @@
-                                m_samplerate,
-                                BOUNCE_NB_AUDIO_CHANNELS);
-
+
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor!\n");
@@ -227 +223 @@
-bool
-BounceSlaveDevice::startStreamByIndex(int i) {
-
+
-    if (i<(int)m_receiveProcessors.size()) {
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
+
-        // the other side sends on this channel
-        nodeaddr_t iso_channel_offset = BOUNCE_REGISTER_RX_ISOCHANNEL;
-        iso_channel_offset += ((unsigned)n)*4;
-
+
-        if (!waitForRegisterNotEqualTo(iso_channel_offset, 0xFFFFFFFFLU)) {
-            debugError("Timeout waiting for stream %d to get an ISO channel\n",i);
-            return false;
-        }
-
+
-        fb_quadlet_t result;
-        // this will read from our own registers
@@ -247 +243 @@
-            return false;
-        }
-
+
-        // set ISO channel
-        p->setChannel(result);
-
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        // the other side sends on this channel
-        nodeaddr_t iso_channel_offset = BOUNCE_REGISTER_TX_ISOCHANNEL;
-        iso_channel_offset += ((unsigned)n)*4;
-
+
-        if (!waitForRegisterNotEqualTo(iso_channel_offset, 0xFFFFFFFF)) {
-            debugError("Timeout waiting for stream %d to get an ISO channel\n",i);
-            return false;
-        }
-
+
-        fb_quadlet_t result;
-        // this will read from our own registers
@@ -272 +268 @@
-            return false;
-        }
-
+
-        // set ISO channel
-        p->setChannel(result);
@@ -279 +275 @@
-
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -301 +297 @@
-        debugWarning("Could not retrieve isoTimeoutSecs parameter, defauling to 120secs\n");
-    }
-
+
-    int wait_cycles=timeoutSecs*10; // two seconds
-
+
-    fb_quadlet_t reg=v;
-
+
-    while ((v == reg) && wait_cycles) {
-        wait_cycles--;
@@ -318 +314 @@
-        return false;
-    }
-
+
-    return true;
-}
@@ -326 +322 @@
-
-
- 
+
-BounceSlaveDevice::save_config_rom(raw1394handle_t handle)
-{
@@ -333 +329 @@
-    /* get the current rom image */
-    retval=raw1394_get_config_rom(handle, tmp.rom, 0x100, &tmp.rom_size, &tmp.rom_version);
-    
+    
-//     printf("save_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,tmp.rom_size,tmp.rom_version);
-
@@ -339 +335 @@
-}
-
- 
+
-BounceSlaveDevice::restore_config_rom(raw1394handle_t handle, struct BounceSlaveDevice::configrom_backup old)
-{
-    int retval;
-//     int i;
-
+
-    quadlet_t current_rom[0x100];
-    size_t current_rom_size;
@@ -371 +367 @@
-}
-
- 
+
-BounceSlaveDevice::init_config_rom(raw1394handle_t handle)
-{
@@ -380 +376 @@
-    rom1394_directory dir;
-    char *leaf;
-
+
-    /* get the current rom image */
-    retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
@@ -391 +387 @@
-//     }
-//     printf("\n");
-
+
-    /* get the local directory */
-    rom1394_get_directory( handle, raw1394_get_local_id(handle) & 0x3f, &dir);
-
+
-    /* change the vendor description for kicks */
-    i = strlen(dir.textual_leafs[0]);
-REEBOB
-
-REEBOB
-REEBOB
-
+FADO
+
+FADO
+FADO
+
-    /* update the rom */
-    retval = rom1394_set_directory(rom, &dir);
@@ -411 +407 @@
-//     }
-//     printf("\n");
-
+
-    /* free the allocated mem for the textual leaves */
-    rom1394_free_directory( &dir);
-
+
-    /* add an AV/C unit directory */
-REEBOB
+FADO
-    dir.unit_sw_version = 0x00010001;
-REEBOB
+FADO
-    dir.nr_textual_leafs = 1;
-    dir.textual_leafs = &leaf;
-
+
-    /* manipulate the rom */
-    retval = rom1394_add_unit( rom, &dir);
-
+
-    /* get the computed size of the rom image */
-    rom_size = rom1394_get_size(rom);
-
+
-//     printf("rom1394_add_unit_directory returned %d, romsize %d:",retval,rom_size);
-//     for (i = 0; i < rom_size; i++)
@@ -435 +431 @@
-//     }
-//     printf("\n");
-     
+
-    /* convert computed rom size from quadlets to bytes before update */
-    rom_size *= sizeof(quadlet_t);
-    retval = raw1394_update_config_rom(handle, rom, rom_size, rom_version);
-//     printf("update_config_rom returned %d\n",retval);
-
+
-    retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
-//     printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,rom_size,rom_version);
@@ -449 +445 @@
-//     }
-//     printf("\n");
-
-    
-
+
+    
+
-    return 0;
-}
@@ -459 +455 @@
-
-BounceSlaveDevice::BounceSlaveNotifier::BounceSlaveNotifier(BounceSlaveDevice *d, nodeaddr_t start)
- 
+
-              RAW1394_ARM_READ | RAW1394_ARM_WRITE, // allowed operations
-              0, //RAW1394_ARM_READ | RAW1394_ARM_WRITE, // operations to be notified of
@@ -468 +464 @@
-}
-
- 
+
-{
-

trunk/libffado/src/bounce/bounce_slave_avdevice.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "debugmodule/debugmodule.h"
-#include "bounce_avdevice.h"
-
-REEBOB
+FADO
-
-REEBOB_BOUNCE_SERVER_VENDORNAME  "FreeBoB
-REEBOB_BOUNCE_SERVER_MODELNAME   "freebob
+FADO_BOUNCE_SERVER_VENDORNAME  "FFADO
+FADO_BOUNCE_SERVER_MODELNAME   "ffado
-
-// NOTE: this is currently free, but it is not really allowed to use
-REEBOB
-REEBOB
-REEBOB
+FADO
+FADO
+FADO
-
-namespace Bounce {
@@ -51 +48 @@
-          Ieee1394Service& ieee1394Service );
-    virtual ~BounceSlaveDevice();
-
+
-    static bool probe( ConfigRom& configRom );
-    bool discover();
@@ -57 +54 @@
-    bool lock();
-    bool unlock();
-
+
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
@@ -65 +62 @@
-    bool initMemSpace();
-    bool restoreMemSpace();
-
+
-private: // configrom shit
-
@@ -74 +71 @@
-    };
-    struct configrom_backup m_original_config_rom;
-
- 
+
+
-        save_config_rom(raw1394handle_t handle);
-    int restore_config_rom(raw1394handle_t handle, struct configrom_backup old);
-    int init_config_rom(raw1394handle_t handle);
-
+
-private:
-    BounceSlaveNotifier *m_Notifier;
-    /**
- 
+
-     * hosts address space
-     */
@@ -91 +88 @@
-        BounceSlaveNotifier(BounceSlaveDevice *, nodeaddr_t start);
-        virtual ~BounceSlaveNotifier();
-
+
-    private:
-        BounceSlaveDevice *m_bounceslavedevice;
@@ -99 +96 @@
-} // end of namespace Bounce
-
-REEBOB
+FADO
-
-

trunk/libffado/src/bridgeco-downloader.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +17 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
@@ -32 +35 @@
-// arg parsing
-////////////////////////////////////////////////
-freebob_
-reebob
-freebob_downloader -- firmware downloader application
+bridgeco-
+fado
+bridgeco-downloader -- firmware downloader application for BridgeCo devices
-                    "OPERATION: display\n"
-                    "           setguid GUID\n"
@@ -135 +138 @@
-    int node_id = strtol(arguments.args[0], &tail, 0);
-    if (errno) {
-       
-       
+    
+    
-    }
-
@@ -220 +223 @@
-    return 0;
-}
-
-

trunk/libffado/src/debugmodule/debugmodule.cpp

@@ -1 @@
-
-
+
+
+
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -54 +58 @@
-DebugModule::~DebugModule()
-{
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
-    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-        cerr << "Could not unregister DebugModule at DebugModuleManager"
@@ -99 +103 @@
-    va_list arg;
-    va_start( arg, format );
-
+
-    // remove the path info from the filename
-    const char *f = file;
@@ -107 +111 @@
-        fname=f;
-    }
-
+
-    DebugModuleManager::instance()->print( "%s (%s)[%4d] %s: ", getPreSequence( level ),
-                 fname,  line,  function );
@@ -149 +153 @@
-DebugModuleManager::~DebugModuleManager()
-{
-       
+    
-    for ( DebugModuleVectorIterator it = m_debugModules.begin();
-          it != m_debugModules.end();
@@ -159 +163 @@
-    }
-
-       
-               
-
-       
-       
-       
-       
-
-       
-       
-
-       
-               
-                       
-       
-               
-
-       
-       
+    
+        
+
+    
+    
+    
+    
+
+    
+    
+
+    
+        
+            
+    
+        
+
+    
+    
-
-}
@@ -184 +188 @@
-DebugModuleManager::init()
-{
-       
-               
+    
+        
-
-        // if ( m_level >= eDL_VeryVerbose )
-        //         cout << "DebugModuleManager init..." << endl;
-
-       
-       
-
-      
-      
-
-       
-              
+    
+    
+
+    
+    
+
+    
+        
-
-    return true;
@@ -223 +227 @@
-{
-    bool already_present=false;
-
+
-    for ( DebugModuleVectorIterator it = m_debugModules.begin();
-          it != m_debugModules.end();
@@ -233 +237 @@
-        }
-    }
-
+
-    if (already_present) {
-        cerr << "DebugModuleManager::registerModule: Module already registered: "
@@ -246 +250 @@
-DebugModuleManager::unregisterModule( DebugModule& debugModule )
-{
-
+
-    for ( DebugModuleVectorIterator it = m_debugModules.begin();
-          it != m_debugModules.end();
@@ -256 +260 @@
-        }
-    }
-
+
-    cerr << "DebugModuleManager::unregisterModule: Could not unregister "
-         << "DebugModule (" << debugModule.getName() << ")" << endl;
@@ -288 +292 @@
-DebugModuleManager::mb_flush()
-{
-       
-       
-               
-               
-       
+    
+    
+        
+        
+    
-}
-
@@ -301 +305 @@
-    DebugModuleManager *m=static_cast<DebugModuleManager *>(arg);
-
-       
-       
-      
-
-       
-              
-
-              
-              
-              
-              
-       
-
-      
-
-       
+    
+    
+    
+
+    
+        
+
+        
+        
+        
+        
+    
+
+    
+
+    
-}
-
@@ -322 +326 @@
-DebugModuleManager::print(const char *fmt, ...)
-{
-       
-       
-
-       
-       
-       
-       
-
-       
-               
-               
-               
-                       
-               
-       
-       
-               
-               
-               
-               
-       } else {                        
-            
-               
-               
-       
+    
+    
+
+    
+    
+    
+    
+
+    
+        
+        
+        
+            
+        
+    
+    
+        
+        
+        
+        
+    } else {            
+        
+        
+        
+    
-}
-
@@ -353 +357 @@
-DebugModuleManager::va_print (const char *fmt, va_list ap)
-{
-       
-
-       
-       
-
-       
-               
-               
-               
-                       
-               
-       
-
-       
-               
-               
-               
-               
-       } else {                        
-            
-               
-               
-       
+    
+
+    
+    
+
+    
+        
+        
+        
+            
+        
+    
+
+    
+        
+        
+        
+        
+    } else {            
+        
+        
+        
+    
-}
-

trunk/libffado/src/debugmodule/debugmodule.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -31 +35 @@
-
-/* MB_NEXT() relies on the fact that MB_BUFFERS is a power of two */
-     
+    
-#define MB_NEXT(index) ((index+1) & (MB_BUFFERS-1))
-  256             
+    256        
-
-#define debugFatal( format, args... )                               \
@@ -78 +82 @@
-#define IMPL_GLOBAL_DEBUG_MODULE( RegisterName, Level )            \
-                DebugModule m_debugModule =                        \
-               
+        
-
-#define setDebugLevel( Level ) {                                    \
-                m_debugModule.setLevel( Level ); \
-                               
+                
-
-/*                m_debugModule.print( eDL_Normal,                        \
@@ -90 +94 @@
-                                     "Setting debug level to %d\n",  \
-                                     Level ); \
-                               
+                
-
-#define getDebugLevel(  )                                     \
@@ -97 +101 @@
-
-#ifdef DEBUG
-
+
-    #define debugOutput( level, format, args... )                  \
-                m_debugModule.print( level,                        \
@@ -129 +133 @@
-
-#include <sys/time.h>
-
+
-#ifdef DO_PREEMPTION_CHECKING
-#define CHECK_PREEMPTION(onoff) \
-       
+    
-#else
-#define CHECK_PREEMPTION(onoff)
@@ -196 +200 @@
-    static DebugModuleManager* instance();
-    ~DebugModuleManager();
-
+
-    bool setMgrDebugLevel( std::string name, debug_level_t level );
-
@@ -206 +210 @@
-
-    bool init();
-
+
-    void print(const char *fmt, ...);
-    void va_print(const char *fmt, va_list);
-
+
-private:
-    DebugModuleManager();
@@ -227 +231 @@
-    static void *mb_thread_func(void *arg);
-    void mb_flush();
-
+
-    static DebugModuleManager* m_instance;
-    DebugModuleVector          m_debugModules;

trunk/libffado/src/debugmodule/test_debugmodule.cpp

@@ +1 @@
+/*
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ * Copyright (C) 2005-2007 by Pieter Palmers
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ * 
+ * FFADO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FFADO; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
-#include "debugmodule.h"
-

trunk/libffado/src/devicemanager.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -94 +98 @@
-
-void
- 
+
-{
-    m_verboseLevel=l;
-    setDebugLevel(l);
-
+
-    if (m_1394Service) m_1394Service->setVerboseLevel(l);
-    if (m_oscServer) m_oscServer->setVerboseLevel(l);
-    OscNode::setVerboseLevel(l);
-
+
-    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
-          it != m_avDevices.end();
@@ -126 +130 @@
-        return false;
-    }
-
+
-    m_oscServer = new OSC::OscServer("17820");
-
+
-    if (!m_oscServer) {
-        debugFatal("failed to create osc server\n");
@@ -135 +139 @@
-        return false;
-    }
-
+
-    if (!m_oscServer->init()) {
-        debugFatal("failed to init osc server\n");
@@ -144 +148 @@
-        return false;
-    }
-
+
-    if (!m_oscServer->registerAtRootNode(this)) {
-        debugFatal("failed to register devicemanager at server\n");
@@ -153 +157 @@
-        return false;
-    }
-
+
-    if (!m_oscServer->start()) {
-        debugFatal("failed to start osc server\n");
@@ -162 +166 @@
-        return false;
-    }
-
+
-    setVerboseLevel(m_verboseLevel);
-    return true;
@@ -198 +202 @@
-        {
-            debugOutput( DEBUG_LEVEL_VERBOSE, "Probing node %d...\n", nodeId );
-
+
-            if (nodeId == m_1394Service->getLocalNodeId()) {
-                debugOutput( DEBUG_LEVEL_VERBOSE, "Skipping local node (%d)...\n", nodeId );
-                continue;
-            }
-
+
-            std::auto_ptr<ConfigRom> configRom =
-                std::auto_ptr<ConfigRom>( new ConfigRom( *m_1394Service,
@@ -219 +223 @@
-                continue;
-            }
-
+
-            IAvDevice* avDevice = getDriverForDevice( configRom,
-                                                      nodeId );
@@ -228 +232 @@
-
-                avDevice->setVerboseLevel( m_verboseLevel );
-
+
-                if ( !avDevice->discover() ) {
-                    debugError( "discover: could not discover device\n" );
@@ -238 +242 @@
-                    debugError( "setting Id failed\n" );
-                }
-
+
-                if (snoopMode) {
-                    debugOutput( DEBUG_LEVEL_VERBOSE,
@@ -249 +253 @@
-                    }
-                }
-
+
-                if ( m_verboseLevel >= DEBUG_LEVEL_VERBOSE ) {
-                    avDevice->showDevice();
@@ -255 +259 @@
-
-                m_avDevices.push_back( avDevice );
-
+
-                if (!addChildOscNode(avDevice)) {
-                    debugWarning("failed to register AvDevice at OSC server\n");
@@ -263 +267 @@
-        }
-        return true;
-
+
-    } else { // slave mode
-        fb_nodeid_t nodeId = m_1394Service->getLocalNodeId();
@@ -289 +293 @@
-                         "discover: driver found for device %d\n",
-                         nodeId );
-
+
-            avDevice->setVerboseLevel( m_verboseLevel );
-
@@ -307 +311 @@
-            m_avDevices.push_back( avDevice );
-        }
-
+
-        return true;
-    }
@@ -392 +396 @@
-
-        if (avDevice->getConfigRom().getNodeId() == node) {
-       
-       
+    
+    
-    }
-    return false;
@@ -440 +444 @@
-DeviceManager::getAvDeviceByIndex( int idx )
-{
-       
+    
-}
-
@@ -446 +450 @@
-DeviceManager::getAvDeviceCount( )
-{
-       
+    
-}
-
@@ -465 +469 @@
-        debugWarning("Could not retrieve slaveMode parameter, defauling to false\n");
-    }
-
+
-    #warning TEST CODE FOR BOUNCE DEVICE !!
-    // this makes the bounce slave use the xmit SP as sync source
@@ -473 +477 @@
-        return device->getStreamProcessorByIndex(0);
-    }
-    
-}
-
@@ -487 +490 @@
-    int i;
-    i=0; // avoids unused warning
-
+
-    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
-          it != m_avDevices.end();
@@ -494 +497 @@
-        IAvDevice* pAvDevice;
-        pAvDevice = *it; // avoids unused warning
-
+
-        #ifdef ENABLE_BEBOB
-        BeBoB::AvDevice* pBeBoBDevice = reinterpret_cast< BeBoB::AvDevice* >( pAvDevice );
@@ -577 +580 @@
-    } while ( pBeBoBDevice );
-    #endif
-
+
-    return true;
-}

trunk/libffado/src/devicemanager.h

@@ -1 @@
-
-
+
+
+
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-REEBOB
-REEBOB
+FADO
+FADO
-
-#include "debugmodule/debugmodule.h"
@@ -44 +48 @@
-typedef std::vector< IAvDevice* >::iterator IAvDeviceVectorIterator;
-
- 
+
-    : public Util::OptionContainer,
-      public OSC::OscNode
@@ -78 +82 @@
-    Ieee1394Service* m_1394Service;
-    IAvDeviceVector  m_avDevices;
-
+
-    OSC::OscServer*  m_oscServer;
-
+
-// debug stuff
-public:

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -1 @@
- dice_avdevice.cpp
-
+
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -94 +97 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -115 +118 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -126 +129 @@
-        return false;
-    }
-
+
-    if ( !initIoFunctions() ) {
-        debugError("Could not initialize I/O functions\n");
@@ -138 +141 @@
-}
-
- 
+
-DiceAvDevice::getSamplingFrequency( ) {
-    ESamplingFrequency samplingFrequency;
-
+
-    fb_quadlet_t clockreg;
-    if (!readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clockreg)) {
@@ -147 +150 @@
-        return false;
-    }
-
+
-    clockreg = DICE_GET_RATE(clockreg);
-
@@ -164 +167 @@
-        default:                 samplingFrequency = eSF_DontCare; break;
-    }
-
+
-    return convertESamplingFrequency(samplingFrequency);
-}
@@ -171 +174 @@
-DiceAvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
-{
- 
+
-        convertESamplingFrequency(samplingFrequency));
-
+
-    bool supported=false;
-    fb_quadlet_t select=0x0;
-
+
-    switch ( samplingFrequency ) {
-    default:
@@ -236 +239 @@
-        return false;
-    }
-
+
-    fb_quadlet_t clockreg;
-    if (!readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &clockreg)) {
@@ -256 +259 @@
-        return false;
-    }
-
+
-    if(clockreg != clockreg_verify) {
-        debugError("Samplerate register write failed\n");
-        return false;
-    }
-
+
-    return true;
-}
@@ -270 +273 @@
-    fb_quadlet_t tmp_quadlet;
-    fb_octlet_t tmp_octlet;
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-        "%s %s at node %d\n", m_model->vendor_name, m_model->model_name,
@@ -285 +288 @@
-
-    debugOutput(DEBUG_LEVEL_VERBOSE," Global param space:\n");
-
+
-    readGlobalRegBlock(DICE_REGISTER_GLOBAL_OWNER, (fb_quadlet_t *)&tmp_octlet,sizeof(fb_octlet_t));
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Owner            : 0x%016X\n",tmp_octlet);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Notification     : 0x%08X\n",tmp_quadlet);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_NOTIFICATION, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nick name        : %s\n",getDeviceNickName().c_str());
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCK_SELECT, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock Select     : 0x%02X 0x%02X\n",
-        (tmp_quadlet>>8) & 0xFF, tmp_quadlet & 0xFF);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_ENABLE, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Enable           : %s\n",
-        (tmp_quadlet&0x1?"true":"false"));
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_STATUS, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock Status     : %s 0x%02X\n",
-        (tmp_quadlet&0x1?"locked":"not locked"), (tmp_quadlet>>8) & 0xFF);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_EXTENDED_STATUS, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Extended Status  : 0x%08X\n",tmp_quadlet);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_SAMPLE_RATE, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Samplerate       : 0x%08X (%lu)\n",tmp_quadlet,tmp_quadlet);
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Version          : 0x%08X (%u.%u.%u.%u)\n",
@@ -321 +324 @@
-        DICE_DRIVER_SPEC_VERSION_NUMBER_GET_D(tmp_quadlet)
-        );
-
+
-    readGlobalReg(DICE_REGISTER_GLOBAL_CLOCKCAPABILITIES, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock caps       : 0x%08X\n",tmp_quadlet & 0x1FFF007F);
@@ -327 +330 @@
-    diceNameVector names=getClockSourceNameString();
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Clock sources    :\n");
-
+
-    for ( diceNameVectorIterator it = names.begin();
-          it != names.end();
@@ -334 +337 @@
-        debugOutput(DEBUG_LEVEL_VERBOSE,"    %s\n", (*it).c_str());
-    }
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE," TX param space:\n");
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nb of xmit        : %1d\n", m_nb_tx);
-    for (unsigned int i=0;i<m_nb_tx;i++) {
-        debugOutput(DEBUG_LEVEL_VERBOSE,"  Transmitter %d:\n",i);
-
+
-        readTxReg(i, DICE_REGISTER_TX_ISOC_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO channel       : %3d\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_TX_SPEED_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO speed         : %3d\n", tmp_quadlet);
-
+
-        readTxReg(i, DICE_REGISTER_TX_NB_AUDIO_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb audio channels : %3d\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_TX_MIDI_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb midi channels  : %3d\n", tmp_quadlet);
-
+
-        readTxReg(i, DICE_REGISTER_TX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 caps          : 0x%08X\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_TX_AC3_ENABLE_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 enable        : 0x%08X\n", tmp_quadlet);
-
+
-        diceNameVector channel_names=getTxNameString(i);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Channel names     :\n");
@@ -364 +367 @@
-        }
-    }
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE," RX param space:\n");
-    debugOutput(DEBUG_LEVEL_VERBOSE,"  Nb of recv        : %1d\n", m_nb_tx);
-    for (unsigned int i=0;i<m_nb_rx;i++) {
-        debugOutput(DEBUG_LEVEL_VERBOSE,"  Receiver %d:\n",i);
-
+
-        readTxReg(i, DICE_REGISTER_RX_ISOC_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   ISO channel       : %3d\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_RX_SEQ_START_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Sequence start    : %3d\n", tmp_quadlet);
-
+
-        readTxReg(i, DICE_REGISTER_RX_NB_AUDIO_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb audio channels : %3d\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_RX_MIDI_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Nb midi channels  : %3d\n", tmp_quadlet);
-
+
-        readTxReg(i, DICE_REGISTER_RX_AC3_CAPABILITIES_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 caps          : 0x%08X\n", tmp_quadlet);
-        readTxReg(i, DICE_REGISTER_RX_AC3_ENABLE_BASE, &tmp_quadlet);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   AC3 enable        : 0x%08X\n", tmp_quadlet);
-
+
-        diceNameVector channel_names=getRxNameString(i);
-        debugOutput(DEBUG_LEVEL_VERBOSE,"   Channel names     :\n");
@@ -421 +424 @@
-        fb_quadlet_t nb_midi;
-        unsigned int nb_channels=0;
-
+
-        if(!readTxReg(i, DICE_REGISTER_TX_NB_AUDIO_BASE, &nb_audio)) {
-            debugError("Could not read DICE_REGISTER_TX_NB_AUDIO_BASE register for ATX%u",i);
@@ -430 +433 @@
-            continue;
-        }
-
+
-        // request the channel names
-        diceNameVector names_audio=getTxNameString(i);
-
+
-        if (names_audio.size() != nb_audio) {
-            debugWarning("The audio channel name vector is incorrect, using default names\n");
-            names_audio.clear();
-
+
-            for (unsigned int j=0;j<nb_audio;j++) {
-                std::ostringstream newname;
@@ -444 +447 @@
-            }
-        }
-
+
-        nb_channels=nb_audio;
-        if(nb_midi) nb_channels += 1; // midi-muxed counts as one
-
+
-        // construct the MIDI names
-        diceNameVector names_midi;
@@ -455 +458 @@
-            names_midi.push_back(newname.str());
-        }
-
+
-        // construct the streamprocessor
-        Streaming::AmdtpReceiveStreamProcessor *p;
@@ -478 +481 @@
-
-            if (!addChannelToProcessor(&channelInfo, p, Streaming::Port::E_Capture)) {
- 
+
-                    channelInfo.name.c_str());
-                continue;
-            }
-        }
-
+
-        // add midi ports to the processor
-        for (unsigned int j=0;j<nb_midi;j++) {
@@ -493 +496 @@
-
-            if (!addChannelToProcessor(&channelInfo, p, Streaming::Port::E_Capture)) {
- 
+
-                    channelInfo.name.c_str());
-                continue;
-            }
-        }
-
+
-        // add the SP to the vector
-        m_receiveProcessors.push_back(p);
-    }
-
+
-    // prepare transmit SP's
-    for (unsigned int i=0;i<m_nb_rx;i++) {
@@ -508 +511 @@
-        fb_quadlet_t nb_midi;
-        unsigned int nb_channels=0;
-
+
-        if(!readTxReg(i, DICE_REGISTER_RX_NB_AUDIO_BASE, &nb_audio)) {
-            debugError("Could not read DICE_REGISTER_RX_NB_AUDIO_BASE register for ARX%u",i);
@@ -517 +520 @@
-            continue;
-        }
-
+
-        // request the channel names
-        diceNameVector names_audio=getRxNameString(i);
-
+
-        if (names_audio.size() != nb_audio) {
-            debugWarning("The audio channel name vector is incorrect, using default names\n");
-            names_audio.clear();
-
+
-            for (unsigned int j=0;j<nb_audio;j++) {
-                std::ostringstream newname;
@@ -531 +534 @@
-            }
-        }
-
+
-        nb_channels=nb_audio;
-        if(nb_midi) nb_channels += 1; // midi-muxed counts as one
-
+
-        // construct the MIDI names
-        diceNameVector names_midi;
@@ -542 +545 @@
-            names_midi.push_back(newname.str());
-        }
-
+
-        // construct the streamprocessor
-        Streaming::AmdtpTransmitStreamProcessor *p;
@@ -565 +568 @@
-
-            if (!addChannelToProcessor(&channelInfo, p, Streaming::Port::E_Playback)) {
- 
+
-                    channelInfo.name.c_str());
-                continue;
-            }
-        }
-
+
-        // add midi ports to the processor
-        for (unsigned int j=0;j<nb_midi;j++) {
@@ -580 +583 @@
-
-            if (!addChannelToProcessor(&channelInfo, p, Streaming::Port::E_Playback)) {
- 
+
-                    channelInfo.name.c_str());
-                continue;
-            }
-        }
-
+
-        m_transmitProcessors.push_back(p);
-    }
@@ -596 +599 @@
-    Streaming::StreamProcessor *processor,
-    Streaming::Port::E_Direction direction) {
-
+
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
@@ -609 +612 @@
-        portname << "c";
-    }
-
+
-    portname << "_" << channelInfo->name;
-
@@ -655 +658 @@
-DiceAvDevice::lock() {
-    fb_octlet_t result;
-
- 
+
+
-        m_model->vendor_name, m_model->model_name, m_nodeId);
-
+
-    // get a notifier to handle device notifications
-    nodeaddr_t notify_address;
@@ -665 +668 @@
-                        DICE_NOTIFIER_BLOCK_LENGTH,
-                        DICE_NOTIFIER_BLOCK_LENGTH);
-
+
-    if (notify_address == 0xFFFFFFFFFFFFFFFFLLU) {
-        debugError("Could not find free ARM block for notification\n");
-        return false;
-    }
-
+
-    m_notifier=new DiceAvDevice::DiceNotifier(this, notify_address);
-
+
-    if(!m_notifier) {
-        debugError("Could not allocate notifier\n");
-        return false;
-    }
-
+
-    if (!m_p1394Service->registerARMHandler(m_notifier)) {
-        debugError("Could not register notifier\n");
@@ -686 +689 @@
-
-    // register this notifier
- 
+
-                       + m_global_reg_offset
-                       + DICE_REGISTER_GLOBAL_OWNER;
@@ -696 +699 @@
-        return false;
-    }
-
+
-    fb_nodeaddr_t swap_value = ((0xFFC0) | m_p1394Service->getLocalNodeId());
-    swap_value = swap_value << 48;
-    swap_value |= m_notifier->getStart();
-
- 
+
+
-                                       swap_value, &result )) {
-        debugWarning("Could not register ourselves as device owner\n");
-    }
-
+
-    if (result != DICE_OWNER_NO_OWNER) {
-        debugWarning("Could not register ourselves as device owner, unexpected register value: 0x%016llX\n", result);
@@ -717 +720 @@
-DiceAvDevice::unlock() {
-    fb_octlet_t result;
-
+
-    if(!m_notifier) {
-        debugWarning("Request to unlock, but no notifier present!\n");
-        return false;
-    }
-
- 
+
+
-                       + m_global_reg_offset
-                       + DICE_REGISTER_GLOBAL_OWNER;
@@ -733 +736 @@
-        return false;
-    }
-
+
-    fb_nodeaddr_t compare_value = ((0xFFC0) | m_p1394Service->getLocalNodeId());
- 
+
-    compare_value |= m_notifier->getStart();
-
- 
+
+
-                                       DICE_OWNER_NO_OWNER, &result )) {
-        debugWarning("Could not unregister ourselves as device owner\n");
-    }
-
+
-    m_p1394Service->unregisterARMHandler(m_notifier);
-    delete m_notifier;
@@ -788 +791 @@
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -796 +799 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -811 +814 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -820 +823 @@
-            return false;
-        }
-
+
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -834 +837 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -849 +852 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -858 +861 @@
-            return false;
-        }
-
+
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -879 +882 @@
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -890 +893 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -897 +900 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -903 +906 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        return true;
-
+
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
+
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -923 +926 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -930 +933 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -936 +939 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -951 +954 @@
-int DiceAvDevice::allocateIsoChannel(unsigned int packet_size) {
-    unsigned int bandwidth=8+packet_size;
-
+
-    int ch=m_p1394Service->allocateIsoChannelGeneric(bandwidth);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "allocated channel %d, bandwidth %d\n",
-        ch, bandwidth);
-
+
-    return ch;
-}
@@ -979 +982 @@
-    fb_quadlet_t result;
-    readGlobalReg(DICE_REGISTER_GLOBAL_ENABLE, &result);
- 
+
-    // but disable is definately == 0
-    return (result != DICE_ISOSTREAMING_DISABLE);
@@ -1007 +1010 @@
-    diceNameVector names;
-    char namestring[DICE_TX_NAMES_SIZE+1];
-
- 
+
+
-                        (fb_quadlet_t *)namestring, DICE_TX_NAMES_SIZE)) {
-        debugError("Could not read TX name string \n");
-        return names;
-    }
-
+
-    namestring[DICE_TX_NAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1022 +1025 @@
-    diceNameVector names;
-    char namestring[DICE_RX_NAMES_SIZE+1];
-
- 
+
+
-                        (fb_quadlet_t *)namestring, DICE_RX_NAMES_SIZE)) {
-        debugError("Could not read RX name string \n");
-        return names;
-    }
-
+
-    namestring[DICE_RX_NAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1037 +1040 @@
-    diceNameVector names;
-    char namestring[DICE_CLOCKSOURCENAMES_SIZE+1];
-
- 
+
+
-                        (fb_quadlet_t *)namestring, DICE_CLOCKSOURCENAMES_SIZE)) {
-        debugError("Could not read CLOCKSOURCE name string \n");
-        return names;
-    }
-
+
-    namestring[DICE_CLOCKSOURCENAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1051 +1054 @@
-DiceAvDevice::getDeviceNickName() {
-    char namestring[DICE_NICK_NAME_SIZE+1];
-
- 
+
+
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not read nickname string \n");
-        return std::string("(unknown)");
-    }
-
+
-    namestring[DICE_NICK_NAME_SIZE]='\0';
-    return std::string(namestring);
@@ -1096 +1099 @@
-    }
-    m_global_reg_offset*=4;
-
+
-    if(!readReg(DICE_REGISTER_GLOBAL_PAR_SPACE_SZ, &m_global_reg_size)) {
-        debugError("Could not initialize m_global_reg_size\n");
@@ -1102 +1105 @@
-    }
-    m_global_reg_size*=4;
-
+
-    if(!readReg(DICE_REGISTER_TX_PAR_SPACE_OFF, &m_tx_reg_offset)) {
-        debugError("Could not initialize m_tx_reg_offset\n");
@@ -1108 +1111 @@
-    }
-    m_tx_reg_offset*=4;
-
+
-    if(!readReg(DICE_REGISTER_TX_PAR_SPACE_SZ, &m_tx_reg_size)) {
-        debugError("Could not initialize m_tx_reg_size\n");
@@ -1114 +1117 @@
-    }
-    m_tx_reg_size*=4;
-
+
-    if(!readReg(DICE_REGISTER_RX_PAR_SPACE_OFF, &m_rx_reg_offset)) {
-        debugError("Could not initialize m_rx_reg_offset\n");
@@ -1120 +1123 @@
-    }
-    m_rx_reg_offset*=4;
-
+
-    if(!readReg(DICE_REGISTER_RX_PAR_SPACE_SZ, &m_rx_reg_size)) {
-        debugError("Could not initialize m_rx_reg_size\n");
@@ -1126 +1129 @@
-    }
-    m_rx_reg_size*=4;
-
+
-    if(!readReg(DICE_REGISTER_UNUSED1_SPACE_OFF, &m_unused1_reg_offset)) {
-        debugError("Could not initialize m_unused1_reg_offset\n");
@@ -1132 +1135 @@
-    }
-    m_unused1_reg_offset*=4;
-
+
-    if(!readReg(DICE_REGISTER_UNUSED1_SPACE_SZ, &m_unused1_reg_size)) {
-        debugError("Could not initialize m_unused1_reg_size\n");
@@ -1138 +1141 @@
-    }
-    m_unused1_reg_size*=4;
-
+
-    if(!readReg(DICE_REGISTER_UNUSED2_SPACE_OFF, &m_unused2_reg_offset)) {
-        debugError("Could not initialize m_unused2_reg_offset\n");
@@ -1144 +1147 @@
-    }
-    m_unused2_reg_offset*=4;
-
+
-    if(!readReg(DICE_REGISTER_UNUSED2_SPACE_SZ, &m_unused2_reg_size)) {
-        debugError("Could not initialize m_unused2_reg_size\n");
@@ -1160 +1163 @@
-    }
-    m_tx_size*=4;
-
+
-    if(!readReg(m_tx_reg_offset + DICE_REGISTER_RX_NB_RX, &m_nb_rx)) {
-        debugError("Could not initialize m_nb_rx\n");
@@ -1170 +1173 @@
-    }
-    m_rx_size*=4;
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE,"DICE Parameter Space info:\n");
-    debugOutput(DEBUG_LEVEL_VERBOSE," Global  : offset=%04X size=%04d\n", m_global_reg_offset, m_global_reg_size);
@@ -1179 +1182 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED1 : offset=%04X size=%04d\n", m_unused1_reg_offset, m_unused1_reg_size);
-    debugOutput(DEBUG_LEVEL_VERBOSE," UNUSED2 : offset=%04X size=%04d\n", m_unused2_reg_offset, m_unused2_reg_size);
-
+
-    return true;
-}
@@ -1186 +1189 @@
-DiceAvDevice::readReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX\n", offset);
-
+
-    if(offset >= DICE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read_quadlet( nodeId, addr, result ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, addr);
-        return false;
-    }
-
+
-    *result=ntohl(*result);
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
-
+
-    return true;
-}
@@ -1209 +1212 @@
-bool
-DiceAvDevice::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-  
+
-        offset, data);
-
+
-    if(offset >= DICE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->write_quadlet( nodeId, addr, htonl(data) ) ) {
-        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr);
@@ -1227 +1230 @@
-}
-
- 
+
-DiceAvDevice::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
+
-    if(offset >= DICE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read( nodeId, addr, length/4, data ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
-        return false;
-    }
-
+
-    for(unsigned int i=0;i<length/4;i++) {
-        *(data+i)=ntohl(*(data+i));
-    }
-
+
-    return true;
-}
-
- 
+
-DiceAvDevice::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-  
+
-        offset, length);
-
+
-    if(offset >= DICE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    fb_quadlet_t data_out[length/4];
-
+
-    for(unsigned int i=0;i<length/4;i++) {
-        data_out[i]=ntohl(*(data+i));
-    }
-
+
-    if(!m_p1394Service->write( nodeId, addr, length/4, data_out ) ) {
-        debugError("Could not write to node 0x%04X addr 0x%012llX\n", nodeId, addr);
-        return false;
-    }
-
+
-    return true;
-}
@@ -1289 +1292 @@
-bool
-DiceAvDevice::writeGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-  
+
-        offset, data);
-
@@ -1296 +1299 @@
-}
-
- 
+
-DiceAvDevice::readGlobalRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
@@ -1305 +1308 @@
-}
-
- 
+
-DiceAvDevice::writeGlobalRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
@@ -1314 +1317 @@
-}
-
- 
+
-DiceAvDevice::globalOffsetGen(fb_nodeaddr_t offset, size_t length) {
-
@@ -1328 +1331 @@
-        return DICE_INVALID_OFFSET;
-    }
-
+
-    return offset;
-}
@@ -1335 +1338 @@
-DiceAvDevice::readTxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading tx %d register offset 0x%04llX\n", i, offset);
-
+
-    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, sizeof(fb_quadlet_t));
-    return readReg(m_tx_reg_offset + offset_tx, result);
@@ -1349 +1352 @@
-}
-
- 
+
-DiceAvDevice::readTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
+
-    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, length);
-    return readRegBlock(m_tx_reg_offset + offset_tx, data, length);
-}
-
- 
+
-DiceAvDevice::writeTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
@@ -1367 +1370 @@
-}
-
- 
+
-DiceAvDevice::txOffsetGen(unsigned int i, fb_nodeaddr_t offset, size_t length) {
-    // registry offsets should always be smaller than 0x7FFFFFFF
@@ -1402 +1405 @@
-DiceAvDevice::readRxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading rx %d register offset 0x%04llX\n", i, offset);
-
+
-    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, sizeof(fb_quadlet_t));
-    return readReg(m_rx_reg_offset + offset_rx, result);
@@ -1409 +1412 @@
-bool
-DiceAvDevice::writeRxReg(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t data) {
-  
+
-        offset, data);
-
+
-    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, sizeof(fb_quadlet_t));
-    return writeReg(m_rx_reg_offset + offset_rx, data);
-}
-
- 
+
-DiceAvDevice::readRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
+
-    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, length);
-    return readRegBlock(m_rx_reg_offset + offset_rx, data, length);
-}
-
- 
+
-DiceAvDevice::writeRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
@@ -1434 +1437 @@
-}
-
- 
+
-DiceAvDevice::rxOffsetGen(unsigned int i, fb_nodeaddr_t offset, size_t length) {
-    // registry offsets should always be smaller than 0x7FFFFFFF
@@ -1469 +1472 @@
-
-DiceAvDevice::DiceNotifier::DiceNotifier(DiceAvDevice *d, nodeaddr_t start)
- 
+
-              RAW1394_ARM_READ | RAW1394_ARM_WRITE | RAW1394_ARM_LOCK,
-              RAW1394_ARM_WRITE, 0)
@@ -1477 +1480 @@
-}
-
- 
+
-{
-

trunk/libffado/src/dice/dice_avdevice.h

@@ -1 @@
- dice_avdevice.h
-
+
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef DICEDEVICE_H
-#define DICEDEVICE_H
@@ -69 +73 @@
-
-    bool prepare();
-
+
-    bool lock();
-    bool unlock();
-
+
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
+
-    bool enableStreaming();
-    bool disableStreaming();
-
+
-protected:
-    struct VendorModelEntry *m_model;
-
+
-    // streaming stuff
-    typedef std::vector< Streaming::StreamProcessor * > StreamProcessorVector;
-    StreamProcessorVector m_receiveProcessors;
-    StreamProcessorVector m_transmitProcessors;
-
+
-private: // streaming & port helpers
-    enum EPortTypes {
@@ -92 +96 @@
-        ePT_MIDI,
-    };
-
+
-    typedef struct {
-        std::string name;
@@ -98 +102 @@
-        unsigned int streamPosition;
-        unsigned int streamLocation;
- 
-
- 
- 
+
+
+
+
-                              Streaming::Port::E_Direction direction);
-
+
-    int allocateIsoChannel(unsigned int packet_size);
-    bool deallocateIsoChannel(int channel);
-
+
-private: // helper functions
-    bool enableIsoStreaming();
-    bool disableIsoStreaming();
-    bool isIsoStreamingEnabled();
-
+
-    bool maskedCheckZeroGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t mask);
-    bool maskedCheckNotZeroGlobalReg(fb_nodeaddr_t offset, fb_quadlet_t mask);
-
+
-    typedef std::vector< std::string > diceNameVector;
-    typedef std::vector< std::string >::iterator diceNameVectorIterator;
@@ -122 +126 @@
-    diceNameVector getClockSourceNameString();
-    std::string getDeviceNickName();
-
+
-private: // register I/O routines
-    bool initIoFunctions();
@@ -130 +134 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
+
-    bool readGlobalReg(fb_nodeaddr_t, fb_quadlet_t *);
-    bool writeGlobalReg(fb_nodeaddr_t, fb_quadlet_t);
@@ -136 +140 @@
-    bool writeGlobalRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    fb_nodeaddr_t globalOffsetGen(fb_nodeaddr_t, size_t);
-
+
-    bool readTxReg(unsigned int i, fb_nodeaddr_t, fb_quadlet_t *);
-    bool writeTxReg(unsigned int i, fb_nodeaddr_t, fb_quadlet_t);
@@ -142 +146 @@
-    bool writeTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    fb_nodeaddr_t txOffsetGen(unsigned int, fb_nodeaddr_t, size_t);
-
+
-    bool readRxReg(unsigned int i, fb_nodeaddr_t, fb_quadlet_t *);
-    bool writeRxReg(unsigned int i, fb_nodeaddr_t, fb_quadlet_t);
@@ -148 +152 @@
-    bool writeRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    fb_nodeaddr_t rxOffsetGen(unsigned int, fb_nodeaddr_t, size_t);
-
+
-    fb_quadlet_t m_global_reg_offset;
-    fb_quadlet_t m_global_reg_size;
@@ -159 +163 @@
-    fb_quadlet_t m_unused2_reg_offset;
-    fb_quadlet_t m_unused2_reg_size;
-
+
-    fb_quadlet_t m_nb_tx;
-    fb_quadlet_t m_tx_size;
-    fb_quadlet_t m_nb_rx;
-    fb_quadlet_t m_rx_size;
-
+
-private:
-    // notification
-    DiceNotifier *m_notifier;
-
+
-    /**
- 
+
-     * hosts notify address
-     */
@@ -180 +184 @@
-        DiceNotifier(DiceAvDevice *, nodeaddr_t start);
-        virtual ~DiceNotifier();
-
+
-    private:
-        DiceAvDevice *m_dicedevice;

trunk/libffado/src/dice/dice_defines.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef DICEDEFINES_H
-#define DICEDEFINES_H
@@ -23 +27 @@
-#define DICE_VER_1_0_4_0
-// #define DICE_VER_1_0_7_0
-
-
-#define DICE_INVALID_OFFSET                  0xFFFFF00000000000ULL
@@ -138 +141 @@
-// the format of the user messages
-// however diceDriverInterface.h indicates:
- 
- 
- 
+
+
+
-//  movements)."
-
@@ -161 +164 @@
-#define DICE_NOTIFY_USER_GET_MESSAGE(x) \
-                ( ((x) >> 24 ) & 0xFF )
-
+
-//   NICK_NAME register
-

trunk/libffado/src/fbtypes.h

@@ -1 +1 @@
-/* fbtypes.h
-
+-2007 by
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
+
-#ifndef FBTYPES_H
-#define FBTYPES_H
-
+
-#include <libraw1394/raw1394.h>
-
+
-typedef quadlet_t   fb_quadlet_t;
-typedef byte_t      fb_byte_t;
@@ -32 +35 @@
-class DeviceManager;
-
-reebob
+fado
-    DeviceManager*   m_deviceManager;
-};

trunk/libffado/src/ffado.cpp

@@ -1 @@
-
-
+
+
+
- *
-
+
+
+
+
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-
-
+
- *
- * This library is distributed in the hope that it will be useful,
@@ -22 +25 @@
-#include "config.h"
-
-reebob/freebob
+fado/ffado
-
-#include "debugmodule/debugmodule.h"
@@ -36 +39 @@
-
-DECLARE_GLOBAL_DEBUG_MODULE;
-reeBoB
+FADO
-
-#ifdef __cplusplus
@@ -42 +45 @@
-#endif
-
- 
- 
- 
+
+
+
-
-static void exitfunc(void) __attribute__((destructor));
@@ -58 +61 @@
-
-const char*
-reebob
+fado
-    return PACKAGE_STRING;
-}
@@ -64 +67 @@
-
-int
-reebob
-REEBOB
+fado
+FADO
-}
-
-reebob
-reebob
+fado
+fado
-{
-reebob_handle_t handle = new struct freebob
+fado_handle_t handle = new struct ffado
-    if (! handle ) {
-        debugFatal( "Could not allocate memory for new handle\n" );
@@ -93 +96 @@
-
-int
-reebob_destroy_handle( freebob_handle_t freebob
+fado_destroy_handle( ffado_handle_t ffado
-{
-reebob
-reebob
+fado
+fado
-    return 0;
-}
-
-int
-reebob_discover_devices( freebob_handle_t freebob
+fado_discover_devices( ffado_handle_t ffado
-{
-    if (verbose) {
-reebob
+fado
-   }
-reebob
+fado
-}
-
-int
-reebob_node_is_valid_freebob_device( freebob_handle_t freebob
+fado_node_is_valid_ffado_device( ffado_handle_t ffado
-{
-reebob
+fado
-}
-
-int
-reebob_get_nb_devices_on_bus( freebob_handle_t freebob
+fado_get_nb_devices_on_bus( ffado_handle_t ffado
-{
-reebob
+fado
-}
-
-int
-reebob_get_device_node_id( freebob_handle_t freebob
+fado_get_device_node_id( ffado_handle_t ffado
-{
-reebob
+fado
-}
-
-int
-reebob_set_samplerate( freebob_handle_t freebob
+fado_set_samplerate( ffado_handle_t ffado
-{
-reebob
+fado
-    if ( avDevice ) {
-        if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {
-reebob
+fado
-        }
-    }
@@ -139 +142 @@
-}
-
-reebob
+fado
-{
-    AVCCommand::setSleepAfterAVCCommand( time );

trunk/libffado/src/ffado_streaming.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#include "devicemanager.h"
-#include "iavdevice.h"
@@ -53 +45 @@
-using namespace Streaming;
-
-reebob
+fado
-{
-    DeviceManager * m_deviceManager;
-    StreamProcessorManager *processorManager;
-
-reebob
-reebob
- 
-
-reebob_device_t *freebob_streaming_init (freebob_device_info_t *device_info, freebob
+fado
+fado
+
+
+fado_device_t *ffado_streaming_init (ffado_device_info_t *device_info, ffado
-    unsigned int i=0;
-
-reebob_device *dev = new struct _freebob
-
-reebob
+fado_device *dev = new struct _ffado
+
+fado
-
-    if(!dev) {
@@ -83 +75 @@
-            return 0;
-    }
-
+
-    dev->m_deviceManager->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-    if ( !dev->m_deviceManager->initialize( dev->options.port ) ) {
@@ -93 +85 @@
-
-    // create a processor manager to manage the actual stream
-      
+
-    dev->processorManager = new StreamProcessorManager(dev->options.period_size,dev->options.nb_buffers);
-    if(!dev->processorManager) {
@@ -101 +93 @@
-            return 0;
-    }
-
+
-    dev->processorManager->setThreadParameters(dev->options.realtime, dev->options.packetizer_priority);
-
+
-    dev->processorManager->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-    if(!dev->processorManager->init()) {
@@ -112 +104 @@
-            return 0;
-    }
-
+
-    // set slave mode option
-    bool slaveMode=(dev->options.slave_mode != 0);
@@ -125 +117 @@
-            debugWarning("Failed to set snoop mode option\n");
-    }
-
+
-    // discover the devices on the bus
-    if(!dev->m_deviceManager->discover()) {
@@ -134 +126 @@
-            return 0;
-    }
-
+
-    // are there devices on the bus?
-    if(dev->m_deviceManager->getAvDeviceCount()==0) {
@@ -143 +135 @@
-            return 0;
-    }
-
+
-    // iterate over the found devices
-    // add the stream processors of the devices to the managers
@@ -151 +143 @@
-
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Locking device (%p)\n", device);
-
+
-        if (!device->lock()) {
-            debugWarning("Could not lock device, skipping device (%p)!\n", device);
-            continue;
-        }
-
- 
+
+
-                    dev->options.sample_rate, device);
-
+
-        // Set the device's sampling rate to that requested
-        // FIXME: does this really belong here?  If so we need to handle errors.
-        if (!device->setSamplingFrequency(parseSampleRate(dev->options.sample_rate))) {
- 
+
-                        dev->options.sample_rate, device);
-
+
-            // try again:
-            if (!device->setSamplingFrequency(parseSampleRate(dev->options.sample_rate))) {
@@ -188 +180 @@
-        }
-    }
-
+
-    // set the sync source
-    if (!dev->processorManager->setSyncSource(dev->m_deviceManager->getSyncSource())) {
@@ -201 +193 @@
-}
-
-reebob_streaming_prepare(freebob
+fado_streaming_prepare(ffado
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Preparing...\n");
-
+
-    if (!dev->processorManager->prepare()) {
-        debugFatal("Could not prepare streaming...\n");
@@ -212 +204 @@
-}
-
-reebob_streaming_finish(freebob
+fado_streaming_finish(ffado
-    unsigned int i=0;
-
+
-    assert(dev);
-
+
-    // iterate over the found devices
-    for(i=0;i<dev->m_deviceManager->getAvDeviceCount();i++) {
@@ -228 +220 @@
-        }
-    }
-
+
-    delete dev->processorManager;
-    delete dev->m_deviceManager;
@@ -236 +228 @@
-}
-
-reebob_streaming_start(freebob
+fado_streaming_start(ffado
-    unsigned int i=0;
-    debugOutput(DEBUG_LEVEL_VERBOSE,"------------- Start -------------\n");
-
+
-    // create the connections for all devices
-    // iterate over the found devices
@@ -246 +238 @@
-        IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i);
-        assert(device);
-
+
-        int j=0;
-        for(j=0; j<device->getStreamCount();j++) {
@@ -265 +257 @@
-        return 0;
-    } else {
-reebob
-
-
-
-
-reebob_streaming_stop(freebob
+fado
+
+
+
+
+fado_streaming_stop(ffado
-    unsigned int i;
-    debugOutput(DEBUG_LEVEL_VERBOSE,"------------- Stop -------------\n");
@@ -286 +278 @@
-            debugWarning("Could not disable streaming on device %d!\n",i);
-        }
-
+
-        int j=0;
-        for(j=0; j<device->getStreamCount();j++) {
@@ -302 +294 @@
-}
-
-reebob_streaming_reset(freebob
+fado_streaming_reset(ffado
-    debugOutput(DEBUG_LEVEL_VERBOSE,"------------- Reset -------------\n");
-
@@ -310 +302 @@
-}
-
-reebob_streaming_wait(freebob
+fado_streaming_wait(ffado
-    static int periods=0;
-    static int periods_print=0;
-    static int xruns=0;
-
+
-    periods++;
-    if(periods>periods_print) {
-reebob
+fado
-        debugOutputShort(DEBUG_LEVEL_VERBOSE, "============================================\n");
-        debugOutputShort(DEBUG_LEVEL_VERBOSE, "Xruns: %d\n",xruns);
@@ -325 +317 @@
-        periods_print+=100;
-    }
-
+
-    if(dev->processorManager->waitForPeriod()) {
-        return dev->options.period_size;
-    } else {
-        debugWarning("XRUN detected\n");
-
+
-        // do xrun recovery
-        dev->processorManager->handleXrun();
@@ -338 +330 @@
-}
-
-reebob_streaming_transfer_capture_buffers(freebob
+fado_streaming_transfer_capture_buffers(ffado
-    return dev->processorManager->transfer(StreamProcessor::E_Receive);
-}
-
-reebob_streaming_transfer_playback_buffers(freebob
+fado_streaming_transfer_playback_buffers(ffado
-    return dev->processorManager->transfer(StreamProcessor::E_Transmit);
-}
-
-reebob_streaming_transfer_buffers(freebob
+fado_streaming_transfer_buffers(ffado
-    return dev->processorManager->transfer();
-}
-
-
-reebob_streaming_write(freebob_device_t *dev, int i, freebob
+fado_streaming_write(ffado_device_t *dev, int i, ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Playback);
- 
+
-    // it should already have failed before, if not correct
- 
-
+
+
-    return p->writeEvents((void *)buffer, nsamples);
-}
-
-reebob_streaming_read(freebob_device_t *dev, int i, freebob
+fado_streaming_read(ffado_device_t *dev, int i, ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Capture);
- 
+
-    // it should already have failed before, if not correct
- 
-
+
+
-    return p->readEvents((void *)buffer, nsamples);
-}
-
-reebob_streaming_get_nb_capture_streams(freebob
+fado_streaming_get_nb_capture_streams(ffado
-    return dev->processorManager->getPortCount(Port::E_Capture);
-}
-
-reebob_streaming_get_nb_playback_streams(freebob
+fado_streaming_get_nb_playback_streams(ffado
-    return dev->processorManager->getPortCount(Port::E_Playback);
-}
-
-reebob_streaming_get_capture_stream_name(freebob
+fado_streaming_get_capture_stream_name(ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Capture);
-    if(!p) {
@@ -391 +383 @@
-}
-
-reebob_streaming_get_playback_stream_name(freebob
+fado_streaming_get_playback_stream_name(ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Playback);
-    if(!p) {
@@ -405 +397 @@
-}
-
-reebob_streaming_stream_type freebob_streaming_get_capture_stream_type(freebob
+fado_streaming_stream_type ffado_streaming_get_capture_stream_type(ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Capture);
-    if(!p) {
-        debugWarning("Could not get capture port at index %d\n",i);
-reebob
+fado
-    }
-    switch(p->getPortType()) {
-    case Port::E_Audio:
-reebob
+fado
-    case Port::E_Midi:
-reebob
+fado
-    case Port::E_Control:
-reebob
+fado
-    default:
-reebob
-
-
-
-reebob_streaming_stream_type freebob_streaming_get_playback_stream_type(freebob
+fado
+
+
+
+fado_streaming_stream_type ffado_streaming_get_playback_stream_type(ffado
-    Port *p=dev->processorManager->getPortByIndex(i, Port::E_Playback);
-    if(!p) {
-        debugWarning("Could not get playback port at index %d\n",i);
-reebob
+fado
-    }
-    switch(p->getPortType()) {
-    case Port::E_Audio:
-reebob
+fado
-    case Port::E_Midi:
-reebob
+fado
-    case Port::E_Control:
-reebob
+fado
-    default:
-reebob
-
-
-
-reebob_streaming_set_stream_buffer_type(freebob_device_t *dev, int i, 
-reebob
+fado
+
+
+
+fado_streaming_set_stream_buffer_type(ffado_device_t *dev, int i,
+fado
-
-    Port *p=dev->processorManager->getPortByIndex(i, direction);
@@ -450 +442 @@
-        return -1;
-    }
-
+
-    switch(t) {
-reebob
+fado
-        if (!p->setDataType(Port::E_Int24)) {
-            debugWarning("%s: Could not set data type to Int24\n",p->getName().c_str());
@@ -462 +454 @@
-        }
-        break;
-reebob
+fado
-        if (!p->setDataType(Port::E_Float)) {
-            debugWarning("%s: Could not set data type to Float\n",p->getName().c_str());
@@ -472 +464 @@
-        }
-        break;
-reebob
+fado
-        if (!p->setDataType(Port::E_MidiEvent)) {
-            debugWarning("%s: Could not set data type to MidiEvent\n",p->getName().c_str());
@@ -490 +482 @@
-}
-
-reebob_streaming_set_playback_buffer_type(freebob_device_t *dev, int i, freebob
-reebob
-
-
-reebob_streaming_set_capture_buffer_type(freebob_device_t *dev, int i, freebob
-reebob
-
-
-reebob_streaming_stream_onoff(freebob_device_t *dev, int i, 
+fado_streaming_set_playback_buffer_type(ffado_device_t *dev, int i, ffado
+fado
+
+
+fado_streaming_set_capture_buffer_type(ffado_device_t *dev, int i, ffado
+fado
+
+
+fado_streaming_stream_onoff(ffado_device_t *dev, int i,
-    int on, enum Port::E_Direction direction) {
-    Port *p=dev->processorManager->getPortByIndex(i, direction);
@@ -514 +506 @@
-}
-
-reebob_streaming_playback_stream_onoff(freebob
-reebob
-
-
-reebob_streaming_capture_stream_onoff(freebob
-reebob
+fado_streaming_playback_stream_onoff(ffado
+fado
+
+
+fado_streaming_capture_stream_onoff(ffado
+fado
-}
-
-// TODO: the way port buffers are set in the C api doesn't satisfy me
-reebob_streaming_set_capture_stream_buffer(freebob
+fado_streaming_set_capture_stream_buffer(ffado
-        Port *p=dev->processorManager->getPortByIndex(i, Port::E_Capture);
-
- 
+
+
-        // it should already have failed before, if not correct
- 
-
+
+
-        p->useExternalBuffer(true);
-        p->setExternalBufferAddress((void *)buff);
@@ -537 +529 @@
-}
-
-reebob_streaming_set_playback_stream_buffer(freebob
+fado_streaming_set_playback_stream_buffer(ffado
-        Port *p=dev->processorManager->getPortByIndex(i, Port::E_Playback);
- 
+
-        // it should already have failed before, if not correct
- 
-
+
+
-        p->useExternalBuffer(true);
-        p->setExternalBufferAddress((void *)buff);

trunk/libffado/src/iavdevice.cpp

@@ -1 @@
- iavdevice.h
-6
-
+
+5-2007
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -40 +43 @@
-{
-    addOption(Util::OptionContainer::Option("id",std::string("dev?")));
-
+
-    std::ostringstream nodestr;
-    nodestr << "node" << nodeId;
-    setOscBase(nodestr.str());
-    ConfigRom& c = getConfigRom();
-
+
-    addChildOscNode(&c);
-}
@@ -68 +71 @@
-
-void
- 
+
-{
-    m_verboseLevel=l;

trunk/libffado/src/iavdevice.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -35 +39 @@
-@brief Base class for device support
-
-reebob support 
+fado support
- for a specific device.
-
-*/
- 
+
-    : public Util::OptionContainer,
-      public OSC::OscNode
-{
-public:
-       
+    
-                    Ieee1394Service& ieee1394service,
-                    int nodeId );
-
-       
-
-       
-       
-
-       
-       
-
-       
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-
+
+    
+
+    
+    
+
+    
+    
+
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+
-    /**
-     * @brief This is called by the device manager to give the device a unique ID.
@@ -87 +91 @@
-     *
-     * @note Currently this is a simple integer that is equal to
- 
+
-     *       device list. Therefore it is dependant on the order
-     *       in which the devices are detected. The side-effect
@@ -93 +97 @@
-     *       and history (e.g. busresets etc). This makes that
-     *       these ID's are not fixed to a specific physical device.
- 
+
-     *       approach, which is tied to a physiscal device and is
- 
-
- 
+
+
+
-     * @return true if successful
-     */
-    bool setId(unsigned int id);
-
-       
-       
-       
-
-       
-       
-       
-
-
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-
-
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-
- 
+
+    
+    
+    
+
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+
+
-     * @brief Enable streaming on all 'started' streams
-     *
@@ -146 +150 @@
-     */
-    virtual bool enableStreaming();
-
- 
+
+
-     * @brief Disable streaming on all streams
-     *
@@ -158 +162 @@
-    virtual bool disableStreaming();
-
-
-       
-       
-
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-
-       
-       
-       
-       
-       
-       
-       
+
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+    
-
-    /**

trunk/libffado/src/libavc/avc_connect.cpp

@@ -1 @@
- avc_connect.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_connect.h

@@ -1 @@
- avc_connect.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-onnect_h
-onnect_h
+ONNECT_H
+ONNECT_H
-
-#include "avc_generic.h"
@@ -36 +39 @@
-
-    virtual const char* getCmdName() const
-       
+    
-};
-
-
-onnect_h
+ONNECT_H

trunk/libffado/src/libavc/avc_definitions.cpp

@@ -1 @@
- avc_defintions.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_definitions.h

@@ -1 @@
- avc_definitions.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-CDefinitions_h
-CDefinitions_h
+DDEFINITIONS_H
+DDEFINITIONS_H
-
-#include <libavc1394/avc1394.h>
@@ -70 +73 @@
-typedef byte_t control_selector_t;
-typedef byte_t control_data_length_t;
+typedef uint16_t control_data_ext_length_t;
+typedef uint16_t mixer_level_t;
+typedef byte_t mixer_programmable_state_t;
-typedef byte_t input_fb_plug_number_t;
-typedef byte_t input_audio_channel_number_t;
@@ -99 +105 @@
-/**
- * \brief Convert from ESamplingFrequency to an integer
- 
- 
+
+
- */
-int convertESamplingFrequency(ESamplingFrequency freq);
-/**
- * \brief Convert from integer to ESamplingFrequency
- 
- 
+
+
- */
-ESamplingFrequency parseSampleRate( int sampleRate );
@@ -123 +129 @@
-#define AVC1394_SUBUNIT_ID_RESERVED 0x06
-
-CDefinitions_h
+DDEFINITIONS_H

trunk/libffado/src/libavc/avc_extended_cmd_generic.cpp

@@ -1 @@
- avc_extended_cmd_generic.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -461 +464 @@
-
-PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
-                                               
-                                               
+                        
+                        
-    : m_plugDirection( plugDirection )
-    , m_addressMode( plugAddressMode )
@@ -470 +473 @@
-
-PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
-                                               
-                                               
+                        
+                        
-    : m_plugDirection( plugDirection )
-    , m_addressMode( plugAddressMode )
@@ -479 +482 @@
-
-PlugAddressSpecificData::PlugAddressSpecificData( EPlugDirection plugDirection,
-                                               
-                                               
+                        
+                        
-    : m_plugDirection( plugDirection )
-    , m_addressMode( plugAddressMode )

trunk/libffado/src/libavc/avc_extended_cmd_generic.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -38 +41 @@
-        ePT_ExternalPlug     = 0x01,
-        ePT_AsynchronousPlug = 0x02,
-       
+    
-    };
-
@@ -205 +208 @@
-        ePD_Input     = 0x00,
-        ePD_Output    = 0x01,
-       
+    
-    };
-
@@ -212 +215 @@
-        ePAM_Subunit       = 0x01,
-        ePAM_FunctionBlock = 0x02,
-       
+    
-    };
-
@@ -259 +262 @@
-
-    PlugAddressSpecificData( EPlugDirection plugDirection,
-                       
-                       
-
-                       
-                       
-
-                       
-                       
-
-                       
+            
+            
+
+            
+            
+
+            
+            
+
+            
-    PlugAddressSpecificData( const  PlugAddressSpecificData& pa );
-

trunk/libffado/src/libavc/avc_extended_plug_info.cpp

@@ -1 @@
- avc_extended_plug_info.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_extended_plug_info.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -285 +288 @@
-public:
-    enum ESubFunction {
-       
+    
-        eSF_NotUsed                              = AVC1394_PLUG_INFO_SUBFUNCTION_SERIAL_BUS_NOT_USED,
-    };
@@ -301 +304 @@
-    bool setInfoType( const ExtendedPlugInfoInfoType& infoType );
-    ExtendedPlugInfoInfoType* getInfoType()
-       
+    
-
-    virtual const char* getCmdName() const
-       
+    
-
-protected:

trunk/libffado/src/libavc/avc_extended_stream_format.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -38 +41 @@
-           << ", midi channels: " << info.m_midiChannels << ")";
-*/
-      
+    
-    return stream;
-}
@@ -120 +123 @@
-{
-    stream << (int)info.m_samplingFrequency << " Hz (rate control: ";
-       
-
-       
-               
-               
-       
-               
-               
-       
+    
+
+    
+        
+        
+    
+        
+        
+    
-
-    return stream;

trunk/libffado/src/libavc/avc_extended_stream_format.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-xtendedStreamFormat_h
-xtendedStreamFormat_h
+XTENDEDSTREAMFROMAT_H
+XTENDEDSTREAMFROMAT_H
-
-#include "avc_generic.h"
@@ -274 +277 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-protected:
@@ -284 +287 @@
-};
-
-xtendedStreamFormat_h
+XTENDEDSTREAMFROMAT_H

trunk/libffado/src/libavc/avc_extended_subunit_info.cpp

@@ -1 @@
- avc_extended_subunit_info.cpp
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_extended_subunit_info.h

@@ -1 @@
- avc_extended_subunit_info.h
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -66 +69 @@
-
-    enum EProcessingType {
-       
+    
-        ePT_Mixer                   = 0x01,
-        ePT_Generic                 = 0x02,
@@ -95 +98 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-    page_t                m_page;

trunk/libffado/src/libavc/avc_function_block.cpp

@@ -1 @@
- avc_function_block.cpp
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -144 +147 @@
-FunctionBlockProcessingEnhancedMixer::serialize( IOSSerialize& se )
-{
-
+
+
+
+
-    bStatus  = se.write( m_controlSelector, "FunctionBlockProcessingEnhancedMixer controlSelector" );
-    bStatus &= se.write( m_statusSelector,  "FunctionBlockProcessingEnhancedMixer statusSelector" );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return bStatus;
-}
@@ -154 +207 @@
-FunctionBlockProcessingEnhancedMixer::deserialize( IISDeserialize& de )
-{
-
+
+
-    bStatus  = de.read( &m_controlSelector );
+
+    // NOTE: the returned value is currently bogus, so overwrite it
+    m_controlSelector=FunctionBlockProcessing::eCSE_Processing_EnhancedMixer;
+
-    bStatus &= de.read( &m_statusSelector );
+
+    byte_t data_length_hi;
+    byte_t data_length_lo;
+    bStatus &= de.read( &data_length_hi );
+    bStatus &= de.read( &data_length_lo );
+
+    m_controlDataLength = (data_length_hi << 8) + data_length_lo;
+    switch (m_statusSelector) {
+        case eSS_ProgramableState:
+            m_ProgramableStateData.clear();
+            for (int i=0;i<m_controlDataLength/8;i++) {
+                byte_t value;
+                bStatus &= de.read( &value);
+
+                for (int j=7;j>=0;j--) {
+                    byte_t bit_value;
+                    bit_value=(((1<<j) & value) ? 1 : 0);
+                    m_ProgramableStateData.push_back(bit_value);
+                }
+            }
+
+            todo=m_controlDataLength%8;
+            if (todo) {
+                byte_t value;
+                bStatus &= de.read( &value);
+
+                for (int j=7;j>7-todo;j--) {
+                    byte_t bit_value;
+                    bit_value=(((1<<j) & value) ? 1 : 0);
+                    m_ProgramableStateData.push_back(bit_value);
+                }
+            }
+            break;
+        case eSS_Level:
+            m_LevelData.clear();
+            for (int i=0;i<m_controlDataLength/2;i++) {
+                byte_t mixer_value_hi=0, mixer_value_lo=0;
+                bStatus &= de.read( &mixer_value_hi);
+                bStatus &= de.read( &mixer_value_lo);
+                mixer_level_t value = (mixer_value_hi << 8) + mixer_value_lo;
+                m_LevelData.push_back(value);
+            }
+            break;
+    }
-
-    return bStatus;
@@ -358 +460 @@
-FunctionBlockProcessing::deserialize( IISDeserialize& de )
-{
+    // NOTE: apparently the fbCmd of the STATUS type,
+    // with EnhancedMixer controlSelector returns with this
+    // controlSelector type changed to Mixer, making it
+    // impossible to choose the correct response handler
+    // based upon the response only.
+    
+    // HACK: we assume that it is the same as the sent one
+    // we also look at our data structure to figure out what we sent
+    byte_t controlSelector=eCSE_Processing_Unknown;
+    if(m_pMixer) {
+        controlSelector=eCSE_Processing_Mixer;
+    } else if(m_pEnhancedMixer) {
+        controlSelector=eCSE_Processing_EnhancedMixer;
+    }
+    
-    bool bStatus;
-    bStatus  = de.read( &m_selectorLength );
@@ -364 +481 @@
-    bStatus &= de.read( &m_outputAudioChannelNumber );
-
-
-
+
+
+
+
+
-    switch( controlSelector ) {
-    case eCSE_Processing_Mixer:
@@ -385 +505 @@
-    }
-
+    byte_t tmp;
+    if (de.peek(&tmp)) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Unprocessed bytes:\n");
+        while (de.read(&tmp)) {
+            debugOutput(DEBUG_LEVEL_VERBOSE," %02X\n",tmp);
+        }
+    }
+
-    return bStatus;
-}

trunk/libffado/src/libavc/avc_function_block.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -26 +29 @@
-
-#include <libavc1394/avc1394.h>
+#include <vector>
+using namespace std;
-
-class FunctionBlockFeatureVolume: public IBusData
@@ -78 +83 @@
-    virtual FunctionBlockProcessingEnhancedMixer* clone() const;
-
-
-
+
+
+
+
+
-};
-

trunk/libffado/src/libavc/avc_generic.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -30 +33 @@
-
-IMPL_DEBUG_MODULE( AVCCommand, AVCCommand, DEBUG_LEVEL_NORMAL );
+IMPL_DEBUG_MODULE( IBusData, IBusData, DEBUG_LEVEL_VERBOSE );
-
-int AVCCommand::m_time = 0;
@@ -227 +231 @@
-        }
-    } else {
-       
+    
-    }
-

trunk/libffado/src/libavc/avc_generic.h

@@ -1 @@
- avc_generic.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-eneric_h
-eneric_h
+ENERIC_H
+ENERIC_H
-
-#include "avc_definitions.h"
@@ -45 +48 @@
-
-    virtual IBusData* clone() const = 0;
+    
+protected:
+    DECLARE_DEBUG_MODULE;
-};
-
@@ -106 +112 @@
-    bool setVerbose( int verboseLevel );
-    int getVerboseLevel();
-
+
-    virtual const char* getCmdName() const = 0;
-
@@ -113 +119 @@
-protected:
-    void showFcpFrame( const unsigned char* buf,
-               
+        
-
-protected:
@@ -133 +139 @@
-    ECommandType m_commandType;
-    static int   m_time;
-
+
-    DECLARE_DEBUG_MODULE;
-};
@@ -141 +147 @@
-const char* responseToString( AVCCommand::EResponse eResponse );
-
-eneric_h
+ENERIC_H

trunk/libffado/src/libavc/avc_plug_info.cpp

@@ -1 @@
- avc_plug_info.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_plug_info.h

@@ -1 @@
- avc_plug_info.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-lugInfo_h
-lugInfo_h
+LUGINFO_H
+LUGINFO_H
-
-#include "avc_generic.h"
@@ -43 +46 @@
-
-    PlugInfoCmd( Ieee1394Service& ieee1394service,
-               
+        
-    PlugInfoCmd( const PlugInfoCmd& rhs );
-    virtual ~PlugInfoCmd();
@@ -51 +54 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-    nr_of_plugs_t m_serialBusIsochronousInputPlugs;
@@ -70 +73 @@
-
-
-lugInfo_h
+LUGINFO_H

trunk/libffado/src/libavc/avc_serialize.cpp

@@ -1 @@
- avc_serialize.cpp
-,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -26 +29 @@
-#include <netinet/in.h>
-
+IMPL_DEBUG_MODULE( CoutSerializer, CoutSerializer, DEBUG_LEVEL_NORMAL );
+
-bool
-CoutSerializer::write( byte_t d, const char* name )
-{
-printf(
+debugOutput( DEBUG_LEVEL_NORMAL,
-    m_cnt += sizeof( byte_t );
-
@@ -38 +43 @@
-CoutSerializer::write( quadlet_t d, const char* name )
-{
-printf(
+debugOutput( DEBUG_LEVEL_NORMAL,
-    m_cnt += sizeof( quadlet_t );
-    return true;

trunk/libffado/src/libavc/avc_serialize.h

@@ -1 @@
- avc_serialize.h
-,
+
+-20
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-
-
+
+
+
+
-
-#include <libraw1394/raw1394.h> // byte_t and quadlet_t declaration
@@ -62 +67 @@
-private:
-    unsigned int m_cnt;
+    DECLARE_DEBUG_MODULE;
-
-};
@@ -97 +103 @@
-
-    int getNrOfProducesBytes() const
-       
+    
-
-protected:
@@ -135 +141 @@
-};
-
-erialize_h
+ERIALIZE_H
-

trunk/libffado/src/libavc/avc_signal_source.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_signal_source.h

@@ -1 @@
- avc_signal_source.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-ignalSource_h
-ignalSource_h
+IGNALSOURCE_H
+IGNALSOURCE_H
-
-#include "avc_generic.h"
@@ -73 +76 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-    bool setSignalSource( SignalUnitAddress& signalAddress );
@@ -96 +99 @@
-
-
-ignalSource_h
+IGNALSOURCE_H

trunk/libffado/src/libavc/avc_subunit_info.cpp

@@ -1 @@
- avc_subunit_info.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_subunit_info.h

@@ -1 @@
- avc_subunit_info.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-ubUnitInfo_h
-ubUnitInfo_h
+UBUNITINFO_H
+UBUNITINFO_H
-
-#include "avc_generic.h"
@@ -39 +42 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-    bool clear();
@@ -49 +52 @@
-
-    enum {
-       
-       
+    
+    
-    };
-
-    struct TableEntry {
-       
-       
+    
+    
-    };
-
@@ -61 +64 @@
-
-    short getMaxNoOfPages()
-       
+    
-
-
-    short            m_nrOfValidEntries;
-    short getNrOfValidEntries()
-       
+    
-
-};
-
-
-ubUnitInfo_h
+UBUNITINFO_H

trunk/libffado/src/libavc/avc_unit_info.cpp

@@ -1 @@
- avc_unit_info.cpp
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libavc/avc_unit_info.h

@@ -1 @@
- avc_unit_info.h
-
+
+-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-nitInfo_h
-nitInfo_h
+NITINFO_H
+NITINFO_H
-
-#include "avc_generic.h"
@@ -56 +59 @@
-
-    virtual const char* getCmdName() const
-       
+    
-
-    reserved_t  m_reserved;
@@ -66 +69 @@
-
-
-nitInfo_h
+NITINFO_H

trunk/libffado/src/libieee1394/ARMHandler.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -35 +30 @@
- * @param initial_value  pointer to buffer containing (if necessary) initial value
- *                    NULL means undefined
- 
- 
+
+
- *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
- * @param notification_options identifies for which type of request you want
- 
+
- *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
- * @param client_transactions identifies for which type of request you want
@@ -45 +40 @@
- *                    for those requests no response will be generated, but
- *                    has to be generated by the application.
- 
+
- *                    following flags - ARM_READ, ARM_WRITE, ARM_LOCK
- *                    For each bit set here, notification_options and
@@ -101 +96 @@
-//         byte_t          *buffer;
-// } *raw1394_arm_request_t;
- 
+
-// typedef struct raw1394_arm_response {
-//         int             response_code;
@@ -107 +102 @@
-//         byte_t          *buffer;
-// } *raw1394_arm_response_t;
- 
+
-// typedef struct raw1394_arm_request_response {
-//         struct raw1394_arm_request  *request;

trunk/libffado/src/libieee1394/ARMHandler.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -37 +34 @@
-/**
- * @brief Class to handle AddressRangeMappings
- 
- 
+
+
- * address range mapping, i.e. implementing handlers
- * that react to reads/writes of certain addresses
- * in 1394 memory space
- 
+
- * see the _arm_ functions in raw1394.h for more insight
- 
+
- */
-
+
-class ARMHandler {
-friend class Ieee1394Service;
@@ -57 +54 @@
-               unsigned int client_transactions
-              );
-
+
-    virtual ~ARMHandler();
-
@@ -65 +62 @@
-
-    struct raw1394_arm_response *getResponse() {return &m_response;};
-
+
-    nodeaddr_t getStart() {return m_start;};
-    nodeaddr_t getLength() {return m_length;};
@@ -71 +68 @@
-    unsigned int getNotificationOptions() {return m_notification_options;};
-    unsigned int getClientTransactions() {return m_client_transactions;};
-
+
-    byte_t *getBuffer() {return m_buffer;};
-
+
-private:
-    nodeaddr_t m_start;
@@ -82 +79 @@
-
-    byte_t *m_buffer;
-
+
-    struct raw1394_arm_response m_response;
-
+
-    void printBufferBytes( unsigned int level, size_t length, byte_t* buffer ) const;
-    void printRequest(struct raw1394_arm_request *arm_req);
-
+
-protected:
-
-
+
-    DECLARE_DEBUG_MODULE;
-
-};
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libieee1394/configrom.cpp

@@ -1 @@
-
-
+
+
+
+
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -159 +164 @@
-                len );
-
-       
+    
-            len--;
-        }
-        // \todo XXX seems a bit strage to do this but the nodemgr.c code does
-        // it. try to figure out why this is needed (or not)
-       
-       
+    
+    
-
-
@@ -178 +183 @@
-                ( void* )CSR1212_TEXTUAL_DESCRIPTOR_LEAF_DATA( m_modelNameKv ),
-                len );
-       
+    
-            len--;
-        }
-        // \todo XXX for edirol fa-66 it seems somehow broken. see above
-        // todo as well.
-       
-       
+    
+    
-
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Model name: '%s'\n", buf);
@@ -217 +222 @@
-{
-    struct config_csr_info* csr_info = (struct config_csr_info*) private_data;
-
+
-    if ( !csr_info->service->read( csr_info->nodeId,
-                                   addr,
@@ -249 +254 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "process unit directory:\n" );
-    csr1212_for_each_dir_entry(csr, kv, ud_kv, dentry) {
-       
-       
-               
+    
+    
+        
-                    debugOutput( DEBUG_LEVEL_VERBOSE,
-                                 "\tvendor_id = 0x%08x\n",
-                                 kv->value.immediate);
-                    m_vendorId = kv->value.immediate;
-               
-               
-
-       
+        
+        
+
+    
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "\tmodel_id = 0x%08x\n",
-                             kv->value.immediate);
-                m_modelId = kv->value.immediate;
-               
-
-       
+        
+
+    
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "\tspecifier_id = 0x%08x\n",
-                             kv->value.immediate);
-                m_unit_specifier_id = kv->value.immediate;
-               
-
-       
+        
+
+    
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "\tversion = 0x%08x\n",
@@ -284 +289 @@
-                    }
-                }
-               
-
-       
-               
-               
-               
-               
-               
-               
-               
-               
-                       
-                       
+        
+
+    
+        
+        
+        
+        
+        
+        
+        
+        
+            
+            
-                            m_vendorNameKv = kv;
-                       
-
-                       
+            
+
+            
-                            m_modelNameKv = kv;
-                       
-                       
-
-               
-               
-               
-
-       
-               
-               
-               
-               
-               
-
-               
-
-       
-               
-       
-       
+            
+            
+
+        
+        
+        
+
+    
+        
+        
+        
+        
+        
+
+        
+
+    
+        
+    
+    
-    }
-}
@@ -334 +339 @@
-
-    csr1212_for_each_dir_entry(csr, kv, csr->root_kv, dentry) {
-       
-       
+    
+    
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "vendor id = 0x%08x\n", kv->value.immediate);
-               
-
-       
+        
+
+    
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "capabilities = 0x%08x\n", kv->value.immediate);
-               
-
-       
-               
-               
-
-       
-               
-               
-                       
-                       
-                       
-                       
-                       
+        
+
+    
+        
+        
+
+    
+        
+        
+            
+            
+            
+            
+            
-                    {
-                        m_vendorNameKv = kv;
-                       
-               
-               
-               
-       
-       
+            
+        
+        
+        
+    
+    
-    }
-
@@ -578 +583 @@
-ConfigRom::processOscMessage(OSC::OscMessage *m) {
-    OSC::OscResponse r=OSC::OscResponse(OSC::OscResponse::eUnhandled);
-
+
-    unsigned int nbArgs=m->nbArguments();
-    if (nbArgs>=1) {
@@ -584 +589 @@
-        if(arg0.isString()) { // commands
-            string cmd=arg0.getString();
-
+
-            debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) CMD? %s\n", this, cmd.c_str());
-            if(cmd == "params") {
@@ -623 +628 @@
-        }
-    }
-
+
-    return r;
-

trunk/libffado/src/libieee1394/configrom.h

@@ -1 @@
-
-
+
+
+
+
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -56 +61 @@
-
-    bool isIsoResourseManager() const
-       
+    
-    bool isCycleMasterCapable() const
-        { return m_isCycleMasterCapable; }
@@ -70 +75 @@
-
-    fb_quadlet_t getNodeVendorId() const
-       
+    
-
-    bool updatedNodeId();
@@ -78 +83 @@
-
-    bool serialize( Glib::ustring path, Util::IOSerialize& ser );
- 
-                               
-                               
+
+                
+                
-
- protected:

trunk/libffado/src/libieee1394/IEC61883.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
+
+
+
+
- */
-

trunk/libffado/src/libieee1394/IEC61883.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include "../debugmodule/debugmodule.h"
-
-/*
- 
+
- * but I need these functions!
- * FIXME: this will only work until somebody decides to change
@@ -45 +41 @@
- **/
-
- 
+
- * MPR/PCR addresses defined in IEC-61883.
- * This refers to the number of output or input PCRs--
@@ -147 +143 @@
- * @a: The CSR offset address (relative to base) of the register to read.
- * @value: A pointer to a quadlet where the plug register's value will be stored.
- 
- 
+
+
- * suceess or -1 for error (errno available).
- **/
@@ -155 +151 @@
-
-
- 
+
- * iec61883_plug_set - Write a node's plug register.
- * @h: A raw1394 handle.
@@ -204 +200 @@
-};
-
-REEBOB
-
-
+FADO
+
+

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "ieee1394service.h"
-#include "ARMHandler.h"
@@ -42 +46 @@
-{
-    pthread_mutex_init( &m_mutex, 0 );
-
+
-    for (unsigned int i=0; i<64; i++) {
-        m_channels[i].channel=-1;
@@ -73 +77 @@
-        raw1394_destroy_handle( m_handle );
-    }
-
+
-    if ( m_resetHandle ) {
-        raw1394_destroy_handle( m_resetHandle );
@@ -117 +121 @@
-    m_default_arm_handler = raw1394_set_arm_tag_handler( m_resetHandle,
-                                   this->armHandlerLowLevel );
-
+
-    startRHThread();
-
@@ -230 +234 @@
-}
-
- 
+
-Ieee1394Service::lockCompareSwap64(  fb_nodeid_t nodeId,
-                        fb_nodeaddr_t addr,
@@ -244 +248 @@
-    fb_octlet_t buffer;
-    if(!read_octlet( nodeId, addr,&buffer )) {
-Output(DEBUG_LEVEL_VERBOSE,"Could not read owner
+Warning("Could not read
-    } else {
-
-
-
-
-
-
-
-
-
+
+
+
-    #endif
-
+
-    // do endiannes swapping
-    compare_value=byteSwap_octlet(compare_value);
-    swap_value=byteSwap_octlet(swap_value);
-
+
-    int retval=raw1394_lock64(m_handle, nodeId, addr, RAW1394_EXTCODE_COMPARE_SWAP,
-                          swap_value, compare_value, result);
-
+
-    #ifdef DEBUG
-    if(!read_octlet( nodeId, addr,&buffer )) {
-Output(DEBUG_LEVEL_VERBOSE,"Could not read owner
+Warning("Could not read
-    } else {
-Owner register 
+
-    }
-    #endif
-
+
-    *result=byteSwap_octlet(*result);
-
+
-    return (retval == 0);
-}
@@ -286 +284 @@
-        buf[i] = ntohl( buf[i] );
-    }
-
-    #ifdef DEBUG
-    debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, "  pre avc1394_transaction_block2\n" );
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, len, buf );
-    #endif
-
-    fb_quadlet_t* result =
@@ -300 +293 @@
-                                    10 );
-
-    #ifdef DEBUG
-    debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, "  post avc1394_transaction_block2\n" );
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, *resp_len, result );
-    #endif
-
-    for ( unsigned int i = 0; i < *resp_len; ++i ) {
-        result[i] = htonl( result[i] );
@@ -389 +377 @@
-        h, h->getStart(), h->getLength());
-
- 
+
-                         h->getLength(), h->getBuffer(), (octlet_t)h,
-                         h->getAccessRights(),
@@ -399 +387 @@
-        return false;
-    }
-
+
-    m_armHandlers.push_back( h );
-
@@ -406 +394 @@
-
-bool Ieee1394Service::unregisterARMHandler( ARMHandler *h ) {
- 
+
-        h, h->getStart());
-
+
-    for ( arm_handler_vec_t::iterator it = m_armHandlers.begin();
-          it != m_armHandlers.end();
@@ -439 +427 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Finding free ARM block of %d bytes, from 0x%016llX in steps of %d bytes\n",
-        length, start, step);
-
+
-    int cnt=0;
-    const int maxcnt=10;
@@ -446 +434 @@
-        // try to register
-        err=raw1394_arm_register(m_resetHandle, start, length, 0, 0, 0, 0, 0);
-
+
-        if (err) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, " -> cannot use 0x%016llX\n", start);
@@ -466 +454 @@
-}
-
- 
- 
+
+
-                     unsigned long arm_tag,
-                     byte_t request_type, unsigned int requested_length,
@@ -493 +481 @@
-            raw1394_arm_request_t arm_req=arm_req_resp->request;
-            raw1394_arm_response_t arm_resp=arm_req_resp->response;
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE,"ARM handler for address 0x%016llX called\n",
-                (*it)->getStart());
-            debugOutput(DEBUG_LEVEL_VERBOSE," request type   : 0x%02X\n",request_type);
-            debugOutput(DEBUG_LEVEL_VERBOSE," request length : %04d\n",requested_length);
-
+
-            switch(request_type) {
-                case RAW1394_ARM_READ:
@@ -583 +571 @@
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Removing busreset handler (%p)\n", functor);
-
+
-    for ( reset_handler_vec_t::iterator it = m_busResetHandlers.begin();
-          it != m_busResetHandlers.end();
@@ -603 +591 @@
- * or an allocated channel number.
- *
- 
+
- * bandwidth at the IRM
- *
- * Also allocates the necessary bandwidth (in ISO allocation units).
- 
+
- * FIXME: As in libiec61883, channel 63 is not requested; this is either a
- * bug or it's omitted since that's the channel preferred by video devices.
@@ -616 +604 @@
-signed int Ieee1394Service::allocateIsoChannelGeneric(unsigned int bandwidth) {
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Allocating ISO channel using generic method...\n" );
-
+
-    struct ChannelInfo cinfo;
-
@@ -627 +615 @@
-        if (raw1394_bandwidth_modify(m_handle, bandwidth, RAW1394_MODIFY_ALLOC) < 0) {
-            debugFatal("Could not allocate bandwidth of %d\n", bandwidth);
-
+
-            raw1394_channel_modify (m_handle, c, RAW1394_MODIFY_FREE);
-            return -1;
@@ -634 +622 @@
-            cinfo.bandwidth=bandwidth;
-            cinfo.alloctype=AllocGeneric;
-
+
+
+
+
+
+
-            if (registerIsoChannel(c, cinfo)) {
-                return c;
@@ -667 +660 @@
-
-signed int Ieee1394Service::allocateIsoChannelCMP(
- 
+
-    nodeid_t recv_node, int recv_plug
-    ) {
-
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Allocating ISO channel using IEC61883 CMP...\n" );
-
+
-    struct ChannelInfo cinfo;
-
+
-    int c = -1;
-    int bandwidth=1;
-
+
-    // do connection management: make connection
-    c = iec61883_cmp_connect(
@@ -697 +690 @@
-    cinfo.bandwidth=bandwidth;
-    cinfo.alloctype=AllocCMP;
-
+
-    cinfo.xmit_node=xmit_node;
-    cinfo.xmit_plug=xmit_plug;
-    cinfo.recv_node=recv_node;
-    cinfo.recv_plug=recv_plug;
-
+
-    if (registerIsoChannel(c, cinfo)) {
-        return c;
@@ -711 +704 @@
-
-/**
- 
+
- * a negative channel number.
- *
@@ -717 +710 @@
- * and uses the appropriate method to deallocate. Also frees the bandwidth
- * that was reserved along with this channel.
- 
+
- * @param c channel number
- * @return true if successful
@@ -723 +716 @@
-bool Ieee1394Service::freeIsoChannel(signed int c) {
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Freeing ISO channel %d...\n", c );
-
+
-    if (c < 0 || c > 63) {
-        debugWarning("Invalid channel number: %d\n", c);
-        return false;
-    }
-
+
-    switch (m_channels[c].alloctype) {
-        default:
-            debugError(" BUG: invalid allocation type!\n");
-            return false;
-
- 
+
+
-            debugWarning(" Channel %d not registered\n", c);
-            return false;
-
+
-        case AllocGeneric:
-            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using generic routine...\n" );
@@ -751 +744 @@
-                return false;
-            return true;
-
+
-        case AllocCMP:
-            debugOutput(DEBUG_LEVEL_VERBOSE, " allocated using IEC61883 CMP...\n" );
-            debugOutput(DEBUG_LEVEL_VERBOSE, " performing IEC61883 CMP disconnect...\n" );
-            if(iec61883_cmp_disconnect(
- 
+
-                    m_channels[c].xmit_node | 0xffc0,
-                    m_channels[c].xmit_plug,
@@ -769 +762 @@
-            return true;
-    }
-
+
-    // unreachable
-    debugError("BUG: unreachable code reached!\n");
-
+
-    return false;
-}
@@ -788 +781 @@
-                m_channels[c].channel, m_channels[c].bandwidth);
-        }
-
+
-        memcpy(&m_channels[c], &cinfo, sizeof(struct ChannelInfo));
-
+
-    } else return false;
-    return true;
@@ -806 +799 @@
-            return false;
-        }
-
+
-        m_channels[c].channel=-1;
-        m_channels[c].bandwidth=-1;
@@ -814 +807 @@
-        m_channels[c].recv_node=0xFFFF;
-        m_channels[c].recv_plug=-1;
-
+
-    } else return false;
-    return true;
@@ -822 +815 @@
- * Returns the current value of the `bandwidth available' register on
- * the IRM, or -1 on error.
- 
+
- */
-signed int Ieee1394Service::getAvailableBandwidth() {
@@ -836 +829 @@
-
-void
- 
+
-{
-    setDebugLevel(l);

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
-REEBOB
-REEBOB
+FADO_
+FADO_
-
-#include "fbtypes.h"
@@ -45 +48 @@
-
-    int getPort()
-       
+    
-   /**
-    * @brief get number of nodes on the bus
@@ -57 +60 @@
-    */
-    int getNodeCount();
-
+
-   /**
-    * @brief get the node id of the local node
@@ -67 +70 @@
-    */
-    nodeid_t getLocalNodeId();
-
+
-   /**
-    * @brief send async read request to a node and wait for response.
@@ -77 +80 @@
-    * @param length amount of data to read in quadlets
-    * @param buffer pointer to buffer where data will be saved
-
+
-    * @return true on success or false on failure (sets errno)
-    */
-    bool read( fb_nodeid_t nodeId,
-       
-       
-       
+    
+    
+    
-
-    bool read_quadlet( fb_nodeid_t nodeId,
@@ -106 +109 @@
-    */
-    bool write( fb_nodeid_t nodeId,
-               
-               
-               
+        
+        
+        
-
-    bool write_quadlet( fb_nodeid_t nodeId,
@@ -143 +146 @@
-                                    fb_quadlet_t* buf,
-                                    int len,
-                               
+                
-
-    bool transactionBlockClose();
@@ -153 +156 @@
-    bool addBusResetHandler( Functor* functor );
-    bool remBusResetHandler( Functor* functor );
-
+
-    /**
-     * @brief register an AddressRangeMapping Handler
@@ -169 +172 @@
-     */
-    bool unregisterARMHandler( ARMHandler *h );
-
+
-    nodeaddr_t findFreeARMBlock( nodeaddr_t start, size_t length, size_t step );
-
@@ -176 +179 @@
-    signed int getAvailableBandwidth();
-    signed int allocateIsoChannelGeneric(unsigned int bandwidth);
- 
+
-                                     nodeid_t recv_node, int recv_plug);
-    bool freeIsoChannel(signed int channel);
-
+
-private:
-    enum EAllocType {
@@ -196 +199 @@
-        int recv_plug;
-    };
-
+
-    // the info for the channels we manage
-    struct ChannelInfo m_channels[64];
-
+
-    bool unregisterIsoChannel(unsigned int c);
-    bool registerIsoChannel(unsigned int c, struct ChannelInfo cinfo);
@@ -211 +214 @@
-    void printBuffer( unsigned int level, size_t length, fb_quadlet_t* buffer ) const;
-    void printBufferBytes( unsigned int level, size_t length, byte_t* buffer ) const;
-
+
-    static int resetHandlerLowLevel( raw1394handle_t handle,
-                    unsigned int generation );
-    bool resetHandler( unsigned int generation );
-
+
-    static int armHandlerLowLevel(raw1394handle_t handle, unsigned long arm_tag,
-                     byte_t request_type, unsigned int requested_length,
- 
+
-    bool armHandler(  unsigned long arm_tag,
-                     byte_t request_type, unsigned int requested_length,
@@ -234 +237 @@
-    typedef std::vector< Functor* > reset_handler_vec_t;
-    reset_handler_vec_t m_busResetHandlers;
-
+
-    // ARM stuff
-    arm_tag_handler_t m_default_arm_handler;
-
+
-    typedef std::vector< ARMHandler * > arm_handler_vec_t;
-    arm_handler_vec_t m_armHandlers;
-
+
-    fb_octlet_t byteSwap_octlet(fb_octlet_t value);
-
+
-public:
-    void setVerboseLevel(int l);
@@ -249 +252 @@
-};
-
-
+ // FFADO_IEEE1394SERVICE_H

trunk/libffado/src/libosc/OscArgument.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-  You should have received a copy of the GNU General Public License
-  along with this program {}
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+You should have received a copy of the GNU Lesser General Public
+License along with this library;
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA
- */
-
@@ -31 +28 @@
-IMPL_DEBUG_MODULE( OscArgument, OscArgument, DEBUG_LEVEL_VERBOSE );
-
- 
+
-    : m_isInt(true)
-    , m_intVal(i)
@@ -42 +39 @@
-{}
-
- 
+
-    : m_isInt(false)
-    , m_intVal(0)
@@ -53 +50 @@
-{}
-
- 
+
-    : m_isInt(false)
-    , m_intVal(0)
@@ -64 +61 @@
-{}
-
- 
+
-    : m_isInt(false)
-    , m_intVal(0)

trunk/libffado/src/libosc/OscArgument.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -44 +42 @@
-    OscArgument(string);
-    virtual ~OscArgument();
-
+
-    bool operator == ( const OscArgument& rhs );
-
+
-    int32_t getInt() { return m_intVal;};
-    bool isInt() { return m_isInt;};
@@ -55 +53 @@
-    string& getString() { return m_stringVal;};
-    bool isString() { return m_isString;};
-
+
-    void print();
-
+
-protected:
-    bool m_isInt;
-    int32_t m_intVal;
-
+
-    bool m_isInt64;
-    int64_t m_int64Val;
-
+
-    bool m_isFloat;
-    float m_floatVal;
-
+
-    bool m_isString;
-    string m_stringVal;
@@ -78 +76 @@
-} // end of namespace OSC
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libosc/OscMessage.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -62 +57 @@
-                addArgument((int64_t)(argv[i]->h));
-                break;
-
+
-            /* unsupported types */
-            /** OSC binary blob type. Accessed using the lo_blob_*() functions. */
@@ -86 +81 @@
-            case LO_INFINITUM:
-            default:
- 
+
-                            "unsupported osc type: %c\n", lo_type(types[i]));
-        }

trunk/libffado/src/libosc/OscMessage.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include <string>
@@ -47 +43 @@
-    OscMessage(string path, const char* types, lo_arg** argv, int argc);
-    virtual ~OscMessage();
-
+
-    lo_message makeLoMessage();
-
+
-    void addArgument(int32_t v);
-    void addArgument(int64_t v);
-    void addArgument(float v);
-    void addArgument(string v);
-
+
-    OscArgument& getArgument(unsigned int idx);
-    unsigned int nbArguments();
-
+
-    void setPath(string v);
-    string getPath() {return m_Path;};
-    void print();
-
+
-protected:
-    typedef std::vector< OscArgument > OscArgumentVector;
@@ -75 +71 @@
-} // end of namespace OSC
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libosc/OscNode.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -80 +77 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) MSG: %s\n",this, path.c_str());
-
+
-    // delete leading slash
-    if(path.find_first_of('/')==0) path=path.substr(1,path.size());
-
+
-    // delete trailing slash
-    if(path.find_last_of('/')==path.size()-1) path=path.substr(0,path.size()-1);
-
+
-    // continue processing
-    int firstsep=path.find_first_of('/');
@@ -92 +89 @@
-    if (firstsep == -1) {
-        OscResponse retVal;
-
+
-        // process the message
-        retVal=processOscMessage(m);
-
+
-        if(retVal.isHandled()) {
-            return retVal; // completely handled
@@ -121 +118 @@
-        }
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Child node %s not found \n",newbase.c_str());
-
+
-        return OscResponse(OscResponse::eError);
-    }
@@ -160 +157 @@
-}
-
- 
+
-OscNode::oscListChildren(OscMessage m) {
-
+
-    for ( OscNodeVectorIterator it = m_ChildNodes.begin();
-      it != m_ChildNodes.end();
@@ -179 +176 @@
-{
-    assert(n);
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Adding child node %s\n",n->getOscBase().c_str());
-    for ( OscNodeVectorIterator it = m_ChildNodes.begin();
@@ -186 +183 @@
-    {
-        if(*it == n) {
- 
+
-                "Child node %s already registered\n",
-                n->getOscBase().c_str());
@@ -202 +199 @@
- * you would add it using this function, by
- *  addChildOscNode(n, "/base/level1/level2")
- 
- 
-  
- 
+
+
+
+
- */
-bool
@@ -211 +208 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "add node to: %s\n",path.c_str());
-
+
-    // delete leading slashes
-    if(path.find_first_of('/')==0) path=path.substr(1,path.size());
-
+
-    // delete trailing slashes
-    if(path.find_last_of('/')==path.size()-1) path=path.substr(0,path.size()-1);
-
+
-    // continue processing
-    int firstsep=path.find_first_of('/');
@@ -243 +240 @@
-        }
-        debugOutput( DEBUG_LEVEL_VERBOSE, "node %s not found, creating auto-node\n",newbase.c_str());
-
+
-        OscNode *autoNode=new OscNode(newbase,true);
-
+
-        // add the auto-node to this node
-        m_ChildNodes.push_back(autoNode);
-
+
-        // add the child to the node
-        return autoNode->addChildOscNode(n,newpath);
@@ -255 +252 @@
-}
-
- 
+
-OscNode::removeChildOscNode(OscNode *n)
-{
@@ -276 +273 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Child node %s not found \n",n->getOscBase().c_str());
-
+
-    return false; //not found
-}
-
- 
+
-OscNode::printOscNode()
-{
@@ -286 +283 @@
-}
-
- 
+
-OscNode::printOscNode(string path)
-{

trunk/libffado/src/libosc/OscNode.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -55 +53 @@
-
-    string getOscBase() {return m_oscBase;};
-
+
-    void setOscNodeAutoDelete(bool b) {m_oscAutoDelete=b;};
-    bool doOscNodeAutoDelete() {return m_oscAutoDelete;};
-
+
-    void printOscNode(string path);
-    void printOscNode();
-
+
-    virtual OscResponse processOscMessage(OscMessage *m);
-    virtual OscResponse processOscMessage(string path, OscMessage *m);
-
+
-protected:
-    void setOscBase(string s) {m_oscBase=s;};
@@ -71 +69 @@
-    OscResponse processOscMessageDefault(OscMessage *m, OscResponse);
-    OscMessage oscListChildren(OscMessage);
-
+
-    string m_oscBase;
-    bool m_oscAutoDelete;
-
+
-    typedef vector< OscNode * > OscNodeVector;
-    typedef vector< OscNode * >::iterator OscNodeVectorIterator;
@@ -88 +86 @@
-} // end of namespace OSC
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libosc/OscResponse.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-  You should have received a copy of the GNU General Public License
-  along with this program {}
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+You should have received a copy of the GNU Lesser General Public
+License along with this library;
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA
- */
-

trunk/libffado/src/libosc/OscResponse.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "OscMessage.h"
@@ -47 +45 @@
-    OscResponse(OscMessage);
-    virtual ~OscResponse();
-
+
-    OscMessage& getMessage() {return m_message;};
-
+
-    bool isError() {return m_type==eError;};
-    bool isHandled() {return (m_type != eError) && (m_type != eUnhandled);};
@@ -58 +56 @@
-    enum EType m_type;
-    OscMessage m_message;
-
+
-protected:
-    DECLARE_DEBUG_MODULE;
@@ -66 +64 @@
-} // end of namespace OSC
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libosc/OscServer.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-  You should have received a copy of the GNU General Public License
-  along with this program {}
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+You should have received a copy of the GNU Lesser General Public
+License along with this library;
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301 USA
- */
-
@@ -86 +83 @@
-        return false;
-    }
-
+
-    m_server = lo_server_thread_new(m_port.c_str(), error_cb);
-
+
-    if (m_server == NULL) {
-        debugWarning("Could not start OSC server on port %s, trying other port...\n", m_port.c_str());
@@ -96 +93 @@
-            return false;
-        }
- 
+
-                    lo_server_get_url(lo_server_thread_get_server(m_server)));
-    } else {
-        debugOutput(DEBUG_LEVEL_VERBOSE,
- 
+
-                    lo_server_get_url(lo_server_thread_get_server(m_server)));
-    }
-
+
-    // For debugging, print all incoming OSC messages
-    lo_server_thread_add_method(m_server, NULL, NULL, generic_cb, this);
@@ -134 +131 @@
-    OscServer *server=reinterpret_cast<OscServer *>(user_data);
-    assert(server);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Message on: %s\n", path);
-
@@ -144 +141 @@
-    // construct the message
-    OscMessage m = OscMessage(path, types, argv, argc);
-
+
-#ifdef DEBUG
-    if (getDebugLevel()>=DEBUG_LEVEL_VERY_VERBOSE) {
@@ -162 +159 @@
-            // send response
-            lo_address addr = lo_message_get_source(msg);
-
+
-            lo_message lo_msg;
-            lo_msg=r.getMessage().makeLoMessage();
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE, " Sending response to %s\n",lo_address_get_url(addr));
-
+
-            #ifdef DEBUG
-                if(getDebugLevel()>=DEBUG_LEVEL_VERY_VERBOSE) r.getMessage().print();
-            #endif
-
+
-            if (lo_send_message(addr, "/response", lo_msg) < 0) {
-                debugError("Failed to send response\n");

trunk/libffado/src/libosc/OscServer.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include <lo/lo.h>
@@ -46 +42 @@
-    OscServer(string port);
-    virtual ~OscServer();
-
+
-    bool init();
-    bool start();
-    bool stop();
-
+
-    bool registerAtRootNode(OscNode *);
-    bool unregisterAtRootNode(OscNode *);
-
-private:
-  
+
-    static int  generic_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg, void* user_data);
-
+
-protected:
-    string             m_port;
-    lo_server_thread   m_server;
-
+
-    OscNode * m_rootNode;
-
@@ -73 +69 @@
-} // end of namespace OSC
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libosc/unittests.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +18 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
- */
-
-
-#include "OscServer.h"
@@ -36 +39 @@
-#define TEST_SHOULD_RETURN_FALSE(test) \
-    (test ? printf( "'" #test "' should return true\n") && false : true )
-
+
-static int run=0;
-
@@ -50 +53 @@
-    bool result=true;
-    OscMessage m=OscMessage();
-
+
-    m.addArgument((float)1.1);
-    m.addArgument("teststring");
-    m.addArgument(1);
-    m.print();
-
+
-    result &= TEST_SHOULD_RETURN_TRUE(m.nbArguments()==3);
-    result &= TEST_SHOULD_RETURN_TRUE(m.getArgument(0).getFloat()==(float)1.1);
-    result &= TEST_SHOULD_RETURN_TRUE(m.getArgument(1).getString()==string("teststring"));
-    result &= TEST_SHOULD_RETURN_TRUE(m.getArgument(2).getInt()==1);
-
+
-    return result;
-}
@@ -69 +72 @@
-    bool result=true;
-    OscMessage m=OscMessage();
-
+
-    OscNode n1=OscNode("base1");
-    OscNode n2=OscNode("child1");
@@ -75 +78 @@
-    OscNode n4=OscNode("subchild1");
-    OscNode n5=OscNode("subchild2");
-
+
-    OscNode n6=OscNode("subsubchild1");
-    OscNode n7=OscNode("subsubchild2");
-
+
-    OscNode n8=OscNode("auto1");
-    OscNode n9=OscNode("auto2");
-
+
-    n1.addChildOscNode(&n2);
-    n1.addChildOscNode(&n3);
-    n2.addChildOscNode(&n4);
-    n2.addChildOscNode(&n5);
-
+
-    n1.addChildOscNode(&n6,"base1/child1/");
-    n1.addChildOscNode(&n7,"base1/child1/");
-
+
-    n1.addChildOscNode(&n8,"auto1/test/");
-    n1.addChildOscNode(&n9,"auto1/test2/");
-
+
-    n1.printOscNode();
-
+
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1",&m).isError());
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1/child1",&m).isError());
@@ -102 +105 @@
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1/child2",&m).isError());
-    result &= TEST_SHOULD_RETURN_TRUE(n1.processOscMessage("base1/child2/subchild1",&m).isError());
-
+
-    return result;
-}
@@ -108 +111 @@
-////////////////////////////////
-
- 
+
-    : public OscNode
-{
@@ -124 +127 @@
-test_OscServer_T1() {
-    bool result=true;
-
+
-    OscServer s=OscServer("17820");
-
+
-    if (!s.init()) {
-        printf("failed to init server");
-        return false;
-    }
-
+
-    OscNode n1=OscNode("base1");
-    OscNode n2=OscNode("child1");
@@ -137 +140 @@
-    OscNode n4=OscNode("subchild1");
-    OscNode n5=OscNode("subchild2");
-
+
-    OscNode n6=OscNode("subsubchild1");
-    OscNode n7=OscNode("subsubchild2");
-
+
-    OscNode n8=OscNode("auto1");
-    OscNode n9=OscNode("auto2");
-
+
-    n1.addChildOscNode(&n2);
-    n1.addChildOscNode(&n3);
-    n2.addChildOscNode(&n4);
-    n2.addChildOscNode(&n5);
-
+
-    n1.addChildOscNode(&n6,"base1/child1/");
-    n1.addChildOscNode(&n7,"base1/child1/");
-
+
-    n1.addChildOscNode(&n8,"auto1/test/");
-    n1.addChildOscNode(&n9,"auto1/test2/");
-
+
-    OscTestNode n10=OscTestNode("base2");
-
+
-    if (!s.registerAtRootNode(&n1)) {
-        printf("failed to register base1 at server");
@@ -165 +168 @@
-        return false;
-    }
-
+
-    if (!s.start()) {
-        printf("failed to start server");
-        return false;
-    }
-
+
-    printf("server started\n");
-    printf("press ctrl-c to stop it & continue\n");
-
+
-    signal (SIGINT, sighandler);
-
+
-    run=1;
-    while(run) {
@@ -183 +186 @@
-    }
-    signal (SIGINT, SIG_DFL);
-
+
-    if (!s.stop()) {
-        printf("failed to stop server");
-        return false;
-    }
-
+
-    if (!s.unregisterAtRootNode(&n1)) {
-        printf("failed to unregister base1 at server");
@@ -197 +200 @@
-        return false;
-    }
-
+
-    return result;
-}

trunk/libffado/src/libstreaming/AmdtpPort.cpp

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
- *   FreeBob Streaming API
- *   FreeBob = Firewire (pro-)audio for linux
- *
- *   http://freebob.sf.net
- *
- *   Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
- *
- *   This program is free software {} you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation {} either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY {} without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program {} if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * 
- *
- */
-#include "AmdtpPort.h"
-#include <assert.h>

trunk/libffado/src/libstreaming/AmdtpPort.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/**
@@ -43 +39 @@
-
- The AMDTP/AM824/IEC61883-6 port that represents audio.
-
+
-*/
- 
-       
+
+    
-{
-
-public:
-
-
-       
-
-
-               
-       
-       
-       
+
+    
+
+
+        
+    
+    
+    
-
-       
-
+    
+
-protected:
-
@@ -70 +66 @@
-
- The AMDTP/AM824/IEC61883-6 port that represents midi.
-
+
-*/
- 
-       
+
+    
-{
-
-public:
-
-
-       
-
-
-               
-               
-
-       
+
+    
+
+
+        
+        
+
+    
-
-
-       
+    
-
-protected:
-
+
-};
-
-} // end of namespace Streaming
-
-REEBOB
+FADO

trunk/libffado/src/libstreaming/AmdtpPortInfo.cpp

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
- *   FreeBob Streaming API
- *   FreeBob = Firewire (pro-)audio for linux
- *
- *   http://freebob.sf.net
- *
- *   Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
- *
- *   This program is free software {} you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation {} either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY {} without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program {} if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * 
- *
- */
-#include "AmdtpPortInfo.h"
-#include <assert.h>

trunk/libffado/src/libstreaming/AmdtpPortInfo.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -37 +33 @@
-
- Contains the information that maps the port to an AMDTP stream position (i.e. channel)
- 
+
- to this port.
-
+
-*/
-class AmdtpPortInfo {
@@ -45 +41 @@
-public:
-    /**
- 
+
-     * device configuration (e.g. an SPDIF port could be plain audio in 24bit integer
- 
+
-     *
-     * This kind of enum allows to discriminate these formats when decoding
-     * If all channels always have the same format, you won't be needing this
-     */
-       
-               
-               
-               
-       
+    
+        
+        
+        
+    
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-protected:
@@ -80 +76 @@
-} // end of namespace Streaming
-
-REEBOB
+FADO

trunk/libffado/src/libstreaming/AmdtpSlaveStreamProcessor.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
+
-#include "AmdtpSlaveStreamProcessor.h"
-
@@ -53 +49 @@
-enum raw1394_iso_disposition
-AmdtpSlaveTransmitStreamProcessor::getPacket(unsigned char *data, unsigned int *length,
-       
-       
-
+    
+    
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-    if (cycle<0) return RAW1394_ISO_OK;
-
+
-    m_last_cycle=cycle;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,%d)\n",
-        cycle, m_running, m_disabled, m_is_disabled);
-
+
-#ifdef DEBUG
-    if(dropped>0) {
@@ -69 +65 @@
-    }
-#endif
-
+
-    // calculate & preset common values
-
+
-    /* Our node ID can change after a bus reset, so it is best to fetch
-     * our node ID for each packet. */
@@ -84 +80 @@
-    packet->eoh1 = 2;
-    packet->fmt = IEC61883_FMT_AMDTP;
-
+
-    *tag = IEC61883_TAG_WITH_CIP;
-    *sy = 0;
-
+
-    // determine if we want to send a packet or not
-    // note that we can't use getCycleTimer directly here,
-    // because packets are queued in advance. This means that
- 
+
-    // on 'cycle', not 'now'.
-    unsigned int ctr=m_handler->getCycleTimer();
-    int now_cycles = (int)CYCLE_TIMER_GET_CYCLES(ctr);
-
+
-    // the difference between the cycle this
-    // packet is intended for and 'now'
-    int cycle_diff = diffCycles(cycle, now_cycles);
-
+
-#ifdef DEBUG
-    if(m_running && (cycle_diff < 0)) {
@@ -114 +110 @@
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Xmit StreamProcessor %p started running at cycle %d\n",this, cycle);
-        m_running=true;
-
+
-        uint32_t ticks_to_advance = TICKS_PER_CYCLE * TRANSMIT_ADVANCE_CYCLES;
-
+
-        // if cycle lies cycle_diff cycles in the future, the
-        // timestamp for it corresponds to
-        // now+cycle_diff * TICKS_PER_CYCLE
-        ticks_to_advance += cycle_diff * TICKS_PER_CYCLE;
-
+
-        // determine the 'now' time in ticks
-        uint32_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
-
+
-        cycle_timer = addTicks(cycle_timer, ticks_to_advance);
-        m_data_buffer->setBufferHeadTimestamp(cycle_timer);
-    }
-
+
-    uint64_t ts_head, fc;
-    if (!m_disabled && m_is_disabled) { // this means that we are trying to enable
-        // check if we are on or past the enable point
-        int cycles_past_enable=diffCycles(cycle, m_cycle_to_enable_at);
-
+
-        if (cycles_past_enable >= 0) {
-            m_is_disabled=false;
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Enabling StreamProcessor %p at %u\n", this, cycle);
-
+
-            // initialize the buffer head & tail
-            m_SyncSource->m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
-
+
-            // the number of cycles the sync source lags (> 0)
-            // or leads (< 0)
-            int sync_lag_cycles=diffCycles(cycle, m_SyncSource->getLastCycle());
-
+
-            // account for the cycle lag between sync SP and this SP
-            // the last update of the sync source's timestamps was sync_lag_cycles
-            // cycles before the cycle we are calculating the timestamp for.
- 
+
-            // frame that is sent on cycle CT to have a timestamp T1.
-            // ts_head however is for cycle CT-sync_lag_cycles, and lies
@@ -155 +151 @@
-            // T1.
-            ts_head = addTicks(ts_head, (sync_lag_cycles) * TICKS_PER_CYCLE);
-
+
-            ts_head = substractTicks(ts_head, TICKS_PER_CYCLE);
-
+
-            // account for the number of cycles we are too late to enable
-            ts_head = addTicks(ts_head, cycles_past_enable * TICKS_PER_CYCLE);
-
+
-            // account for one extra packet of frames
- 
+
-                        (uint32_t)((float)m_syt_interval * m_SyncSource->m_data_buffer->getRate()));
-
@@ -181 +177 @@
-    } else if (m_disabled && !m_is_disabled) {
-        // trying to disable
- 
+
-                    this, cycle);
-        m_is_disabled=true;
-    }
-
+
-    // the base timestamp is the one of the next sample in the buffer
-    m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
@@ -191 +187 @@
-    // we send a packet some cycles in advance, to avoid the
-    // following situation:
- 
+
-    // the moment to send this packet. therefore we decide
-    // not to send the packet, but send it in the next cycle.
-    // This means that the next time point will be 3072 ticks
- 
+
-    // packet is sent, unless TRANSFER_DELAY > 3072.
-    // this means that we need at least one cycle of extra buffering.
-    uint32_t ticks_to_advance = TICKS_PER_CYCLE * TRANSMIT_ADVANCE_CYCLES;
-
+
-    // if cycle lies cycle_diff cycles in the future, we should
-    // queue this packet cycle_diff * TICKS_PER_CYCLE earlier than
@@ -207 +203 @@
-    // determine the 'now' time in ticks
-    uint32_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
-
+
-    cycle_timer = addTicks(cycle_timer, ticks_to_advance);
-
+
-    // time until the packet is to be sent (if > 0: send packet)
-    int32_t until_next=diffTicks(ts_head, cycle_timer);
@@ -218 +214 @@
-        // add the transmit transfer delay to construct the playout time (=SYT timestamp)
-        uint32_t ts_packet=addTicks(ts_head, TRANSMIT_TRANSFER_DELAY);
-
+
-        // if we are disabled, send a silent packet
-        // and advance the buffer head timestamp
-        if(m_is_disabled) {
-
+
-            transmitSilenceBlock((char *)(data+8), m_syt_interval, 0);
-            m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-
+
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT SYNC: CY=%04u TSH=%011llu TSP=%011lu\n",
-                cycle, ts_head, ts_packet);
@@ -232 +228 @@
-            uint32_t ts_step=(uint32_t)((float)(m_syt_interval)
-                             *m_SyncSource->m_data_buffer->getRate());
-
+
-            // the next buffer head timestamp
-            ts_head=addTicks(ts_head,ts_step);
-            m_data_buffer->setBufferHeadTimestamp(ts_head);
-
+
-            // defer to make sure we get to be enabled asap
-            return RAW1394_ISO_DEFER;
-
+
-        } else { // enabled & packet due, read from the buffer
-            if (m_data_buffer->readFrames(m_syt_interval, (char *)(data + 8))) {
-                m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-
+
-                // process all ports that should be handled on a per-packet base
-                // this is MIDI for AMDTP (due to the need of DBC)
@@ -249 +245 @@
-                    debugWarning("Problem encoding Packet Ports\n");
-                }
-
+
-                debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT DATA: CY=%04u TSH=%011llu TSP=%011lu\n",
-                    cycle, ts_head, ts_packet);
-
+
-                return RAW1394_ISO_OK;
-
+
-            } else if (now_cycles<cycle) {
-                // we can still postpone the queueing of the packets
-                // because the ISO transmit packet buffer is not empty yet
-                return RAW1394_ISO_AGAIN;
-
+
-            } else { // there is no more data in the ringbuffer
-                // compose a silent packet, we should always
@@ -265 +261 @@
-                transmitSilenceBlock((char *)(data+8), m_syt_interval, 0);
-                m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-
- 
+
+
-                        now_cycles, cycle, TICKS_TO_CYCLES(ts_packet));
-                // signal underrun
@@ -274 +270 @@
-                m_disabled=true;
-                m_is_disabled=true;
-
+
-                return RAW1394_ISO_DEFER;
-            }
-        }
-
+
-    } else { // no packet due, send no-data packet
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT NONE: CY=%04u TSH=%011llu\n",
-                cycle, ts_head);
-
+
-        m_dbc += fillNoDataPacketHeader(packet, length);
-        return RAW1394_ISO_DEFER;
-    }
-
+
-    // we shouldn't get here
-    return RAW1394_ISO_ERROR;
@@ -298 +294 @@
-{}
-
- 
+
-{}
-
- 
- 
- 
+
+
+
-                  unsigned int cycle, unsigned int dropped) {
-
+
-    enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
-    m_last_cycle=cycle;
-
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-    assert(packet);
@@ -318 +314 @@
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"ch%2u: CY=%4u, SYT=%08X (%4ucy + %04uticks) (running=%d, disabled=%d,%d)\n",
-  
+
-        CYCLE_TIMER_GET_CYCLES(ntohs(packet->syt)), CYCLE_TIMER_GET_OFFSET(ntohs(packet->syt)),
-        m_running,m_disabled,m_is_disabled);
-
- 
- 
+
+
-        channel, packet->fdf,
-        packet->syt,
-        packet->dbs,
-        packet->dbc,
- 
+
-        length);
-
@@ -336 +332 @@
-        // check if we are on or past the enable point
-        int cycles_past_enable=diffCycles(cycle, m_cycle_to_enable_at);
-
+
-        if (cycles_past_enable >= 0) {
-            m_is_disabled=false;
- 
+
-                this, cycle, ntohs(packet->syt));
-            // the previous timestamp is the one we need to start with
@@ -358 +354 @@
-
-    // check if this is a valid packet
- 
- 
+
+
-       && (packet->fmt == 0x10)
- 
+
-       && (length>=2*sizeof(quadlet_t))) {
-
+
-        unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
-
@@ -370 +366 @@
-
-        //=> convert the SYT to a full timestamp in ticks
- 
+
-                                        cycle, m_handler->getCycleTimer());
-
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "RECV: CY=%04u TS=%011llu\n",
-                cycle, m_last_timestamp);
-
+
-        // we have to keep in mind that there are also
-        // some packets buffered by the ISO layer,
@@ -385 +381 @@
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"STMP: %lluticks | buff=%d, syt_interval=%d, tpf=%f\n",
-            m_last_timestamp, m_handler->getWakeupInterval(),m_syt_interval,m_ticks_per_frame);
-
+
-        //=> signal that we're running (if we are)
-        if(!m_running && nevents && m_last_timestamp2 && m_last_timestamp) {
@@ -399 +395 @@
-            // estimate as to when a period might be ready. i.e. it will not
-            // be ready earlier than this timestamp + period time
-
- 
+
+
-            // SYT_INTERVAL * rate later
-            uint64_t ts=addTicks(m_last_timestamp,
@@ -408 +404 @@
-            // the buffer by the next packet.
-            m_data_buffer->setBufferTailTimestamp(ts);
-
+
-            return RAW1394_ISO_DEFER;
-        }
-
+
-        #ifdef DEBUG_OFF
- 
+
-        {
-            uint32_t syt = (uint32_t)ntohs(packet->syt);
-            uint32_t now=m_handler->getCycleTimer();
-            uint32_t now_ticks=CYCLE_TIMER_TO_TICKS(now);
-
+
-            uint32_t test_ts=sytRecvToFullTicks(syt, cycle, now);
-
@@ -432 +428 @@
-        }
-        #endif
-
+
-        //=> process the packet
-        // add the data payload to the ringbuffer
- 
+
-            retval=RAW1394_ISO_OK;
-
+
-            // process all ports that should be handled on a per-packet base
-            // this is MIDI for AMDTP (due to the need of DBC)
@@ -444 +440 @@
-                retval=RAW1394_ISO_DEFER;
-            }
-
+
-        } else {
-
- 
+
+
-                 cycle, m_data_buffer->getFrameCounter(), m_handler->getPacketCount());
-
+
-            m_xruns++;
-
+
-            // disable the processing, will be re-enabled when
-            // the xrun is handled

trunk/libffado/src/libstreaming/AmdtpSlaveStreamProcessor.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/**
@@ -46 +42 @@
-#define IEC61883_STREAM_TYPE_MBLA   0x06
-
-                     
-           
-         
+            
+        
+        
-
-     0x80 
-     0x81 
-     
-     
+    0x80
+    0x81
+    
+    
-
-namespace Streaming {
@@ -59 +55 @@
-class AmdtpSlaveReceiveStreamProcessor;
-
- 
+
-    : public AmdtpTransmitStreamProcessor
-{
@@ -68 +64 @@
-    virtual ~AmdtpSlaveTransmitStreamProcessor();
-
- 
+
-            getPacket(unsigned char *data, unsigned int *length,
-                    unsigned char *tag, unsigned char *sy,
@@ -75 +71 @@
-};
-
- 
+
-    : public AmdtpReceiveStreamProcessor
-{
@@ -84 +80 @@
-    virtual ~AmdtpSlaveReceiveStreamProcessor();
-
- 
- 
+
+
-                    unsigned int cycle, unsigned int dropped);
-
@@ -93 +89 @@
-} // end of namespace Streaming
-
-REEBOB
+FADO
-

trunk/libffado/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
+
-#include "AmdtpStreamProcessor.h"
-#include "Port.h"
@@ -59 +55 @@
-
-/**
- 
+
- */
-bool AmdtpTransmitStreamProcessor::init() {
-
-       
-       
-
-       
-       
-               
-               
-       
-
-       
+    
+    
+
+    
+    
+        
+        
+    
+
+    
-}
-
-void AmdtpTransmitStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-}
-
-enum raw1394_iso_disposition
-AmdtpTransmitStreamProcessor::getPacket(unsigned char *data, unsigned int *length,
-       
-       
-
+    
+    
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-    if (cycle<0) return RAW1394_ISO_OK;
-
+
-    m_last_cycle=cycle;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,%d)\n",
-        cycle, m_running, m_disabled, m_is_disabled);
-
+
-#ifdef DEBUG
-    if(dropped>0) {
@@ -98 +94 @@
-    }
-#endif
-
+
-    // calculate & preset common values
-
+
-    /* Our node ID can change after a bus reset, so it is best to fetch
-     * our node ID for each packet. */
@@ -113 +109 @@
-    packet->eoh1 = 2;
-    packet->fmt = IEC61883_FMT_AMDTP;
-
+
-    *tag = IEC61883_TAG_WITH_CIP;
-    *sy = 0;
-
+
-    // determine if we want to send a packet or not
-    // note that we can't use getCycleTimer directly here,
-    // because packets are queued in advance. This means that
- 
+
-    // on 'cycle', not 'now'.
-    unsigned int ctr=m_handler->getCycleTimer();
-    int now_cycles = (int)CYCLE_TIMER_GET_CYCLES(ctr);
-
+
-    // the difference between the cycle this
-    // packet is intended for and 'now'
-    int cycle_diff = diffCycles(cycle, now_cycles);
-
+
-#ifdef DEBUG
-    if(m_running && (cycle_diff < 0)) {
@@ -144 +140 @@
-            m_running=true;
-    }
-
+
-    uint64_t ts_head, fc;
-    if (!m_disabled && m_is_disabled) { // this means that we are trying to enable
-        // check if we are on or past the enable point
-        int cycles_past_enable=diffCycles(cycle, m_cycle_to_enable_at);
-
+
-        if (cycles_past_enable >= 0) {
-            m_is_disabled=false;
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Enabling StreamProcessor %p at %u\n", this, cycle);
-
+
-            // initialize the buffer head & tail
-            m_SyncSource->m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
-
+
-            // the number of cycles the sync source lags (> 0)
-            // or leads (< 0)
-            int sync_lag_cycles=diffCycles(cycle, m_SyncSource->getLastCycle());
-
+
-            // account for the cycle lag between sync SP and this SP
-            // the last update of the sync source's timestamps was sync_lag_cycles
-            // cycles before the cycle we are calculating the timestamp for.
- 
+
-            // frame that is sent on cycle CT to have a timestamp T1.
-            // ts_head however is for cycle CT-sync_lag_cycles, and lies
@@ -171 +167 @@
-            // T1.
-            ts_head = addTicks(ts_head, (sync_lag_cycles) * TICKS_PER_CYCLE);
-
+
-            ts_head = substractTicks(ts_head, TICKS_PER_CYCLE);
-
+
-            // account for the number of cycles we are too late to enable
-            ts_head = addTicks(ts_head, cycles_past_enable * TICKS_PER_CYCLE);
-
+
-            // account for one extra packet of frames
- 
+
-                        (uint32_t)((float)m_syt_interval * m_SyncSource->m_data_buffer->getRate()));
-
@@ -197 +193 @@
-    } else if (m_disabled && !m_is_disabled) {
-        // trying to disable
- 
+
-                    this, cycle);
-        m_is_disabled=true;
-    }
-
+
-    // the base timestamp is the one of the next sample in the buffer
-    m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
@@ -207 +203 @@
-    // we send a packet some cycles in advance, to avoid the
-    // following situation:
- 
+
-    // the moment to send this packet. therefore we decide
-    // not to send the packet, but send it in the next cycle.
-    // This means that the next time point will be 3072 ticks
- 
+
-    // packet is sent, unless TRANSFER_DELAY > 3072.
-    // this means that we need at least one cycle of extra buffering.
-    uint32_t ticks_to_advance = TICKS_PER_CYCLE * TRANSMIT_ADVANCE_CYCLES;
-
+
-    // if cycle lies cycle_diff cycles in the future, we should
-    // queue this packet cycle_diff * TICKS_PER_CYCLE earlier than
@@ -223 +219 @@
-    // determine the 'now' time in ticks
-    uint32_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
-
+
-    cycle_timer = addTicks(cycle_timer, ticks_to_advance);
-
+
-    // time until the packet is to be sent (if > 0: send packet)
-    int32_t until_next=diffTicks(ts_head, cycle_timer);
@@ -234 +230 @@
-        // add the transmit transfer delay to construct the playout time (=SYT timestamp)
-        uint32_t ts_packet=addTicks(ts_head, TRANSMIT_TRANSFER_DELAY);
-
+
-        // if we are disabled, send a silent packet
-        // and advance the buffer head timestamp
-        if(m_is_disabled) {
-
+
-//             transmitSilenceBlock((char *)(data+8), m_syt_interval, 0);
-//             m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-             
+
-//             debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT SYNC: CY=%04u TSH=%011llu TSP=%011lu\n",
-//                 cycle, ts_head, ts_packet);
- 
+
-//             // update the base timestamp
-//             uint32_t ts_step=(uint32_t)((float)(m_syt_interval)
-//                              *m_SyncSource->m_data_buffer->getRate());
-             
+
-//             // the next buffer head timestamp
-//             ts_head=addTicks(ts_head,ts_step);
-//             m_data_buffer->setBufferHeadTimestamp(ts_head);
-             
+
-            // no-data
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT SYNC: CY=%04u NONE\n", cycle);
@@ -258 +254 @@
-            // defer to make sure we get to be enabled asap
-            return RAW1394_ISO_DEFER;
-
+
-        } else { // enabled & packet due, read from the buffer
-            if (m_data_buffer->readFrames(m_syt_interval, (char *)(data + 8))) {
-                m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-
+
-                // process all ports that should be handled on a per-packet base
-                // this is MIDI for AMDTP (due to the need of DBC)
@@ -268 +264 @@
-                    debugWarning("Problem encoding Packet Ports\n");
-                }
-
+
-                debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT DATA: CY=%04u TSH=%011llu TSP=%011lu\n",
-                    cycle, ts_head, ts_packet);
-
+
-                return RAW1394_ISO_OK;
-
+
-            } else if (now_cycles<cycle) {
-                // we can still postpone the queueing of the packets
-                // because the ISO transmit packet buffer is not empty yet
-                return RAW1394_ISO_AGAIN;
-
+
-            } else { // there is no more data in the ringbuffer
-                // compose a silent packet, we should always
@@ -284 +280 @@
-                transmitSilenceBlock((char *)(data+8), m_syt_interval, 0);
-                m_dbc += fillDataPacketHeader(packet, length, ts_packet);
-
- 
+
+
-                        now_cycles, cycle, TICKS_TO_CYCLES(ts_packet));
-                // signal underrun
@@ -293 +289 @@
-                m_disabled=true;
-                m_is_disabled=true;
-
+
-                return RAW1394_ISO_DEFER;
-            }
-        }
-
+
-    } else { // no packet due, send no-data packet
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "XMIT NONE: CY=%04u TSH=%011llu\n",
-                cycle, ts_head);
-
+
-        m_dbc += fillNoDataPacketHeader(packet, length);
-        return RAW1394_ISO_DEFER;
-    }
-
+
-    // we shouldn't get here
-    return RAW1394_ISO_ERROR;
@@ -314 +310 @@
-        struct iec61883_packet *packet, unsigned int* length,
-        uint32_t ts) {
-
+
-    packet->fdf = m_fdf;
-
@@ -320 +316 @@
-    uint16_t timestamp_SYT = TICKS_TO_SYT(ts);
-    packet->syt = ntohs(timestamp_SYT);
-
+
-    *length = m_syt_interval*sizeof(quadlet_t)*m_dimension + 8;
-
@@ -328 +324 @@
-unsigned int AmdtpTransmitStreamProcessor::fillNoDataPacketHeader(
-        struct iec61883_packet *packet, unsigned int* length) {
-
+
-    // no-data packets have syt=0xFFFF
-    // and have the usual amount of events as dummy data (?)
-    packet->fdf = IEC61883_FDF_NODATA;
-    packet->syt = 0xffff;
-
- 
+
+
-    bool send_payload=true;
-    if(send_payload) {
@@ -355 +351 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Prefill transmit buffers...\n");
-
+
-    if(!transferSilence(m_ringbuffer_size_frames)) {
-        debugFatal("Could not prefill transmit stream\n");
@@ -372 +368 @@
-    m_PacketStat.reset();
-    m_WakeupStat.reset();
-
+
-    // we have to make sure that the buffer HEAD timestamp
-    // lies in the future for every possible buffer fill case.
-    int offset=(int)(m_ringbuffer_size_frames*m_ticks_per_frame);
-
+
-    m_data_buffer->setTickOffset(offset);
-
+
-    // reset all non-device specific stuff
-    // i.e. the iso stream and the associated ports
@@ -385 +381 @@
-        return false;
-    }
-
+
-    // we should prefill the event buffer
-    if (!prefill()) {
-        debugFatal("Could not prefill buffers\n");
-    
-
-
+
+
+
-    return true;
-}
@@ -401 +397 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing (%p)...\n", this);
-
+
-    // prepare all non-device specific stuff
-    // i.e. the iso stream and the associated ports
@@ -408 +404 @@
-        return false;
-    }
-
+
-    switch (m_framerate) {
-    case 32000:
@@ -440 +436 @@
-        break;
-    }
-
+
-    iec61883_cip_init (
- 
- 
+
+
-        m_fdf,
- 
- 
+
+
-        m_syt_interval);
-
-    // prepare the framerate estimate
-    m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);
-
-       
+
+    
-    m_ringbuffer_size_frames=m_nb_buffers * m_period;
-
-    
+
-    m_data_buffer->setBufferSize(m_ringbuffer_size_frames);
-    m_data_buffer->setEventSize(sizeof(quadlet_t));
-    m_data_buffer->setEventsPerFrame(m_dimension);
-
+
-    m_data_buffer->setUpdatePeriod(m_period);
-    m_data_buffer->setNominalRate(m_ticks_per_frame);
-
+
-    m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
-
+
-    m_data_buffer->prepare();
-
@@ -479 +475 @@
-            return false;
-        }
-
-
+
+
-        switch ((*it)->getPortType()) {
-            case Port::E_Audio:
@@ -497 +493 @@
-                    return false;
-                }
-
+
-                if(!(*it)->setDataType(Port::E_Float)) {
-                    debugFatal("Could not set data type");
-                    return false;
-                }
-
-
+
+
-                break;
-            case Port::E_Midi:
@@ -510 +506 @@
-                    return false;
-                }
-
+
-                // we use a timing unit of 10ns
-                // this makes sure that for the max syt interval
@@ -527 +523 @@
-                    return false;
-                }
-
+
-                // buffertype and datatype are dependant on the API
-                debugWarning("---------------- ! Doing hardcoded test setup ! --------------\n");
@@ -546 +542 @@
-    }
-
- 
+
-    // as this is called from the processorManager->prepare()
-    // so we can init the ports
@@ -585 +581 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Preparing to enable...\n");
-
- 
+
-    // buffer timestamp to something sane, because this timestamp
-    // is used when it is SyncSource
-
+
-    // the time we initialize to will determine the time at which
-    // the first sample in the buffer will be sent, so we should
-    // make it at least 'time_to_enable_at'
-
+
-    uint64_t now=m_handler->getCycleTimer();
-    unsigned int now_secs=CYCLE_TIMER_GET_SECS(now);
-
+
-    // check if a wraparound on the secs will happen between
-    // now and the time we start
-    int until_enable=(int)time_to_enable_at - (int)CYCLE_TIMER_GET_CYCLES(now);
-
+
-    if(until_enable>4000) {
-        // wraparound on CYCLE_TIMER_GET_CYCLES(now)
@@ -616 +612 @@
-    uint64_t ts_head= now_secs*TICKS_PER_SECOND;
-    ts_head+=time_to_enable_at*TICKS_PER_CYCLE;
-
+
-    // we also add the nb of cycles we transmit in advance
-    ts_head=addTicks(ts_head, TRANSMIT_ADVANCE_CYCLES*TICKS_PER_CYCLE);
-
+
-    m_data_buffer->setBufferTailTimestamp(ts_head);
-
@@ -633 +629 @@
-bool AmdtpTransmitStreamProcessor::transferSilence(unsigned int nframes) {
-    bool retval;
-
+
-    char *dummybuffer=(char *)calloc(sizeof(quadlet_t),nframes*m_dimension);
-
+
-    transmitSilenceBlock(dummybuffer, nframes, 0);
-
-    // add the silence data to the ringbuffer
- 
+
-        retval=true;
-    } else {
@@ -647 +643 @@
-
-    free(dummybuffer);
-
+
-    return retval;
-}
@@ -653 +649 @@
-bool AmdtpTransmitStreamProcessor::putFrames(unsigned int nbframes, int64_t ts) {
-    m_PeriodStat.mark(m_data_buffer->getBufferFill());
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "AmdtpTransmitStreamProcessor::putFrames(%d, %llu)\n", nbframes, ts);
-
+
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
@@ -663 +659 @@
-    return true;
-}
- 
+
- * write received events to the stream ringbuffers.
- */
-
- 
+
-                       unsigned int nevents, unsigned int offset)
-{
@@ -678 +674 @@
-
-        if((*it)->isDisabled()) {continue;};
-
+
-        //FIXME: make this into a static_cast when not DEBUG?
-
@@ -701 +697 @@
-}
-
- 
+
-                       unsigned int nevents, unsigned int offset)
-{
@@ -745 +741 @@
-    bool ok=true;
-    char byte;
-
+
-    quadlet_t *target_event=NULL;
-    unsigned int j;
-
+
-    for ( PortVectorIterator it = m_PacketPorts.begin();
-          it != m_PacketPorts.end();
@@ -761 +757 @@
-        assert(pinfo->getFormat()==AmdtpPortInfo::E_Midi);
-#endif
-
+
-        AmdtpMidiPort *mp=static_cast<AmdtpMidiPort *>(*it);
-
+
-        // we encode this directly (no function call) due to the high frequency
-        /* idea:
-        spec says: current_midi_port=(dbc+j)%8;
- 
+
-        we'll start at the right event for the midi port.
-        => if we increment j with 8, we stay at the right event.
-        */
- 
+
-        //        predict how much loops will be present here
-        // first prefill the buffer with NO_DATA's on all time muxed channels
-
+
-        for(j = (dbc & 0x07)+mp->getLocation(); j < nevents; j += 8) {
-
+
-            target_event=(quadlet_t *)(data + ((j * m_dimension) + mp->getPosition()));
-
+
-            if(mp->canRead()) { // we can send a byte
-                mp->readEvent(&byte);
@@ -784 +780 @@
-                    IEC61883_AM824_SET_LABEL((byte)<<16,
-                                             IEC61883_AM824_LABEL_MIDI_1X));
- 
+
-                // can't send a byte, either because there is no byte,
-                // or because this would exceed the maximum rate
@@ -793 +789 @@
-
-    }
-
+
-    return ok;
-}
-
-
- 
+
-                       unsigned int offset, unsigned int nevents)
-{
@@ -833 +829 @@
-                buffer+=offset;
-
-               
-
+
+
-                    // don't care for overflow
-                    float v = *buffer * multiplier;  // v: -231 .. 231
-                    unsigned int tmp = ((int)v);
-                    *target_event = htonl((tmp >> 8) | 0x40000000);
-
+
-                    buffer++;
-                    target_event += m_dimension;
@@ -849 +845 @@
-    return 0;
-}
- 
+
-                       unsigned int offset, unsigned int nevents)
-{
@@ -888 +884 @@
-
-    // call the parent init
- 
+
-    // because this sets the buffersizes from the processormanager
-    if(!ReceiveStreamProcessor::init()) {
@@ -898 +894 @@
-}
-
- 
- 
- 
+
+
+
-                  unsigned int cycle, unsigned int dropped) {
-
+
-    enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
-    m_last_cycle=cycle;
-
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-    assert(packet);
@@ -915 +911 @@
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"ch%2u: CY=%4u, SYT=%08X (%4ucy + %04uticks) (running=%d, disabled=%d,%d)\n",
-  
+
-        CYCLE_TIMER_GET_CYCLES(ntohs(packet->syt)), CYCLE_TIMER_GET_OFFSET(ntohs(packet->syt)),
-        m_running,m_disabled,m_is_disabled);
-
- 
- 
+
+
-        channel, packet->fdf,
-        packet->syt,
-        packet->dbs,
-        packet->dbc,
- 
+
-        length);
-
@@ -932 +928 @@
-        // check if we are on or past the enable point
-        int cycles_past_enable=diffCycles(cycle, m_cycle_to_enable_at);
-
+
-        if (cycles_past_enable >= 0) {
-            m_is_disabled=false;
- 
+
-                this, cycle, ntohs(packet->syt));
-            // the previous timestamp is the one we need to start with
@@ -954 +950 @@
-
-    // check if this is a valid packet
- 
- 
+
+
-       && (packet->fmt == 0x10)
- 
+
-       && (length>=2*sizeof(quadlet_t))) {
-
+
-        unsigned int nevents=((length / sizeof (quadlet_t)) - 2)/packet->dbs;
-
@@ -966 +962 @@
-
-        //=> convert the SYT to a full timestamp in ticks
- 
+
-                                        cycle, m_handler->getCycleTimer());
-
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "RECV: CY=%04u TS=%011llu\n",
-                cycle, m_last_timestamp);
-
+
-        // we have to keep in mind that there are also
-        // some packets buffered by the ISO layer,
@@ -981 +977 @@
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"STMP: %lluticks | buff=%d, syt_interval=%d, tpf=%f\n",
-            m_last_timestamp, m_handler->getWakeupInterval(),m_syt_interval,m_ticks_per_frame);
-
+
-        //=> signal that we're running (if we are)
-        if(!m_running && nevents && m_last_timestamp2 && m_last_timestamp) {
@@ -995 +991 @@
-            // estimate as to when a period might be ready. i.e. it will not
-            // be ready earlier than this timestamp + period time
-
- 
+
+
-            // SYT_INTERVAL * rate later
-            uint64_t ts=addTicks(m_last_timestamp,
@@ -1004 +1000 @@
-            // the buffer by the next packet.
-            m_data_buffer->setBufferTailTimestamp(ts);
-
+
-            return RAW1394_ISO_DEFER;
-        }
-
+
-        #ifdef DEBUG_OFF
-        if((cycle % 1000) == 0) {
@@ -1013 +1009 @@
-            uint32_t now=m_handler->getCycleTimer();
-            uint32_t now_ticks=CYCLE_TIMER_TO_TICKS(now);
-
+
-            uint32_t test_ts=sytRecvToFullTicks(syt, cycle, now);
-
@@ -1027 +1023 @@
-        }
-        #endif
-
+
-        //=> process the packet
-        // add the data payload to the ringbuffer
- 
+
-            retval=RAW1394_ISO_OK;
-
+
-            // process all ports that should be handled on a per-packet base
-            // this is MIDI for AMDTP (due to the need of DBC)
@@ -1039 +1035 @@
-                retval=RAW1394_ISO_DEFER;
-            }
-
+
-        } else {
-
- 
+
+
-                 cycle, m_data_buffer->getFrameCounter(), m_handler->getPacketCount());
-
+
-            m_xruns++;
-
+
-            // disable the processing, will be re-enabled when
-            // the xrun is handled
@@ -1071 +1067 @@
-
-void AmdtpReceiveStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-}
-
@@ -1101 +1097 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing (%p)...\n", this);
-
-       
-       
-       
-               
-               
-       
-
-       
-       
-               
-               
-       
-               
-               
-       
-       
-               
-               
-       
-               
-               
-       
-               
-               
-       
-               
-               
-       
-               
-               
-       
+
+    
+    
+    
+        
+        
+    
+
+    
+    
+        
+        
+    
+        
+        
+    
+    
+        
+        
+    
+        
+        
+    
+        
+        
+    
+        
+        
+    
+        
+        
+    
-
-    // prepare the framerate estimate
@@ -1139 +1135 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Initializing remote ticks/frame to %f\n",m_ticks_per_frame);
-
-       
+    
-    unsigned int ringbuffer_size_frames=m_nb_buffers * m_period;
-
-    
+
+
-    m_data_buffer->setBufferSize(ringbuffer_size_frames);
-    m_data_buffer->setEventSize(sizeof(quadlet_t));
-    m_data_buffer->setEventsPerFrame(m_dimension);
-
+
-    // the buffer is written every syt_interval
-    m_data_buffer->setUpdatePeriod(m_syt_interval);
-    m_data_buffer->setNominalRate(m_ticks_per_frame);
-
+
-    m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
-
+
-    m_data_buffer->prepare();
-
-       
-       
-       
-       
-               
-               
-       
-               
-               
-                       
-                       
-               
-
-               
-                       
-                               
-                                       
-                                       
-                               
-                               
-                               
-                               
-                               
-                                       
-                                       
-                               
-                               
-                                       
-                                       
-                               
-                               
-                                       
-                                       
-                               
-                               
-                       
-                               
-                                       
-                                       
-                               
-                               
-                               
-                               
-                               
-                               
-                                       
-                                       
-                               
-                               
-                                       
-                                       
-                               
-                               
-                       
-                               
-                               
-               
-       
-
-
-       
-       
-       
-               
-               
-       
-
-       
-               
-               
-       
+    
+    
+    
+    
+        
+        
+    
+        
+        
+            
+            
+        
+
+        
+            
+                
+                    
+                    
+                
+                
+                
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+            
+                
+                    
+                    
+                
+                
+                
+                
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+            
+                
+                
+        
+    
+
+
+    
+    
+    
+        
+        
+    
+
+    
+        
+        
+    
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Prepared for:\n");
@@ -1234 +1230 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Port: %d, Channel: %d\n",
-             m_port,m_channel);
-
+
-    return true;
-
@@ -1264 +1260 @@
- * \brief write received events to the stream ringbuffers.
- */
- 
-                                       
+
+                    
-{
-       
-
-       
-
-       
+    
+
+    
+
+    
-          it != m_PeriodPorts.end();
-          ++it )
@@ -1278 +1274 @@
-        if((*it)->isDisabled()) {continue;};
-
-               
-
-               
-               
-
-               
-               
-                       
-                               
-                               
-                       
-                       
-               
-                       
-
-               
-                       
-               
-                       
-               
+        
+
+        
+        
+
+        
+        
+            
+                
+                
+            
+            
+        
+            
+
+        
+            
+        
+            
+        
-    }
-    return no_problem;
@@ -1313 +1309 @@
-bool AmdtpReceiveStreamProcessor::decodePacketPorts(quadlet_t *data, unsigned int nevents, unsigned int dbc)
-{
-       
-
-       
-       
-
-       
+    
+
+    
+    
+
+    
-          it != m_PacketPorts.end();
-          ++it )
-       
+    
-
-#ifdef DEBUG
-               
-               
-
-               
-               
+        
+        
+
+        
+        
-#endif
-               
-
-               
-               
-               
-
-               
-               
-               
-
-               
-               
-                       
-                       
-
-                       
-                       
-                               
-                               
-                                       
-                                       
-                               
-                       
-               
-
-       
-
-       
-
-
- 
-                                       
+        
+
+        
+        
+        
+
+        
+        
+        
+
+        
+        
+            
+            
+
+            
+            
+                
+                
+                    
+                    
+                
+            
+        
+
+    
+
+    
+
+
+
+                    
-{
-       
-
-    
-    
-    
-
-       
-
-       
-
-       
-               
-               
-                       
-                               
-
-                               
-
-                               
-
-                               
-                                       
-                                       
-                                       
-                               
-                       
-                       
-               
-                       
-                               
-                               
-
-                               
-
-                               
-
-
-
-                                       
-                                       
-                                       
-
-                                       
-
-                                       
-                                       
-                               
-                       
-                       
-       
-
-       
+    
+
+    
+    
+    
+
+    
+
+    
+
+    
+        
+        
+            
+                
+
+                
+
+                
+
+                
+                    
+                    
+                    
+                
+            
+            
+        
+            
+                
+                
+
+                
+
+                
+
+
+
+                    
+                    
+                    
+
+                    
+
+                    
+                    
+                
+            
+            
+    
+
+    
-}
-

trunk/libffado/src/libstreaming/AmdtpStreamProcessor.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
-
+
+
+
-
-/**
@@ -46 +42 @@
-#define IEC61883_STREAM_TYPE_MBLA   0x06
-
-                     
-           
-         
-
-     0x80 
-     0x81 
-     
-     
+            
+        
+        
+
+    0x80
+    0x81
+    
+    
-
-namespace Streaming {
@@ -65 +61 @@
-\brief The Base Class for an AMDTP transmit stream processor
-
- 
+
- into AMDTP streams.
-
+
-*/
- 
-       
+
+    
-{
-
@@ -78 +74 @@
-     * @param port 1394 port
-     * @param framerate frame rate
- 
+
-     *                  (midi-muxed is only one stream)
-     */
@@ -85 +81 @@
-    virtual ~AmdtpTransmitStreamProcessor();
-
- 
+
-            getPacket(unsigned char *data, unsigned int *length,
-                    unsigned char *tag, unsigned char *sy,
@@ -93 +89 @@
-    bool reset();
-    bool prepare();
-
+
-    bool prepareForStop();
-    bool prepareForStart();
-
+
-    bool prepareForEnable(uint64_t time_to_enable_at);
-
+
-    bool putFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents from the client
-
@@ -104 +100 @@
-    // this period takes m_period/m_framerate seconds of time
-    // during this time, 8000 packets are sent
-    
-
+    
+
-    // however, if we only count the number of used packets
-    // it is m_period / m_syt_interval
-    unsigned int getPacketsPerPeriod() {return (m_period)/m_syt_interval;};
-
- 
-
+
+
+
-    int getMinimalSyncDelay();
-
+
-    void setVerboseLevel(int l);
-
+
-protected:
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset);
-
-    struct iec61883_cip m_cip_status;
-
+
-    int m_dimension;
-    unsigned int m_syt_interval;
-
-    int m_fdf;
-
+
-    bool prefill();
-
+
-    unsigned int fillNoDataPacketHeader(struct iec61883_packet *packet, unsigned int* length);
-    unsigned int fillDataPacketHeader(struct iec61883_packet *packet, unsigned int* length, uint32_t ts);
-
-
+
+
-    bool transferSilence(unsigned int size);
-
- 
+
-                        unsigned int offset);
-
+
-    bool encodePacketPorts(quadlet_t *data, unsigned int nevents, unsigned int dbc);
-    int encodePortToMBLAEvents(AmdtpAudioPort *, quadlet_t *data,
-                                unsigned int offset, unsigned int nevents);
-
- 
+
+
-                        unsigned int offset);
-    int encodeSilencePortToMBLAEvents(AmdtpAudioPort *, quadlet_t *data,
-                                unsigned int offset, unsigned int nevents);
-    void updatePreparedState();
-
+
-    unsigned long m_last_timestamp;
-
-    unsigned int m_dbc;
-
+
-    unsigned int m_ringbuffer_size_frames;
-
@@ -159 +155 @@
-\brief The Base Class for an AMDTP receive stream processor
-
- 
+
- AMDTP streams into Ports.
-
+
-*/
- 
-       
+
+    
-{
-
@@ -172 +168 @@
-     * @param port 1394 port
-     * @param framerate frame rate
- 
+
-     *                  (midi-muxed is only one stream)
-     */
-       
-
-       
-
-
-
-               
-
-
-       
-       
-       
-
+    
+
+    
+
+
+
+        
+
+
+    
+    
+    
+
-    bool prepareForStop();
-    bool prepareForStart();
-
+
-    bool getFrames(unsigned int nbframes); ///< transfer the buffer contents to the client
-
@@ -196 +192 @@
-    // this period takes m_period/m_framerate seconds of time
-    // during this time, 8000 packets are sent
-    
-
+    
+
-    // however, if we only count the number of used packets
-    // it is m_period / m_syt_interval
-       
-
-
+    
+
+
-
-    void dumpInfo();
-
+
-    int getMinimalSyncDelay();
-
+
-    void setVerboseLevel(int l);
-
+
-protected:
-
@@ -215 +211 @@
-
-    bool decodePacketPorts(quadlet_t *data, unsigned int nevents, unsigned int dbc);
-
+
-    int decodeMBLAEventsToPort(AmdtpAudioPort *, quadlet_t *data, unsigned int offset, unsigned int nevents);
-    void updatePreparedState();
@@ -221 +217 @@
-    int m_dimension;
-    unsigned int m_syt_interval;
-
+
-    uint64_t m_last_timestamp; /// last timestamp (in ticks)
-    uint64_t m_last_timestamp2; /// last timestamp (in ticks)
-    uint64_t m_last_timestamp_at_period_ticks;
-
+
-    DECLARE_DEBUG_MODULE;
-
@@ -233 +229 @@
-} // end of namespace Streaming
-
-REEBOB
-
+FADO
+

trunk/libffado/src/libstreaming/cip.h

@@ +1 @@
+/*
+ * libiec61883 - Linux IEEE 1394 streaming media library.
+ * Copyright (C) 2004 Kristian Hogsberg, Dan Dennedy, and Dan Maas.
+ * This file written by Kristian Hogsberg.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
-#ifndef _IEC61883_CIP_PRIVATE_H
-#define _IEC61883_CIP_PRIVATE_H
@@ -21 +41 @@
-
-struct iec61883_packet {
-       
-       
-       
-       
+    
+    
+    
+    
-
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-       
+    
-
-       
+    
-};
-
@@ -45 +65 @@
-
-struct iec61883_packet {
-       
-       
-       
-       
+    
+    
+    
+    
-
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-       
+    
-
-       
+    
-};
-
@@ -84 +104 @@
-
-#define IEC61883_FDF_NODATA   0xFF
-
+
-/* AM824 format definitions. */
-#define IEC61883_FDF_AM824 0x00
@@ -104 +124 @@
-#define IEC60958_LABEL   0x0
-#define IEC60958_PAC_B   0x3 /* Preamble Code 'B': Start of channel 1, at
-                       
+            
-#define IEC60958_PAC_RSV 0x2 /* Preamble Code 'RESERVED' */
-#define IEC60958_PAC_M   0x1 /* Preamble Code 'M': Start of channel 1 that
-                             * 
+                  *    
-#define IEC60958_PAC_W   0x0 /* Preamble Code 'W': start of channel 2. */
-#define IEC60958_DATA_VALID   0 /* When cleared means data is valid. */
@@ -113 +133 @@
-
-struct iec61883_fraction {
-       
-       
-       
+    
+    
+    
-};
-
-struct iec61883_cip {
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
-};
-
-void
-iec61883_cip_init(struct iec61883_cip *cip, int format, int fdf,
-               
- 
+        
+
-iec61883_cip_set_transmission_mode(struct iec61883_cip *ptz, int mode);
-
- 
+
-iec61883_cip_get_max_packet_size(struct iec61883_cip *ptz);
-
-int
-iec61883_cip_fill_header(int node_id, struct iec61883_cip *cip,
-               
+        
-
-int
-iec61883_cip_fill_header_nodata(int node_id, struct iec61883_cip *cip,
-               
+        
-
-#ifdef __cplusplus

trunk/libffado/src/libstreaming/cycletimer.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/* Definitions and utility macro's to handle the ISO cycle timer */
-
@@ -52 +47 @@
-                                   (CYCLE_TIMER_GET_CYCLES(x) * TICKS_PER_CYCLE ) +\
-                                   (CYCLE_TIMER_GET_OFFSET(x)            ))
-
+
-// non-efficient versions, to be avoided in critical code
-#define TICKS_TO_SECS(x) ((x)/TICKS_PER_SECOND)
@@ -61 +56 @@
-                                 | ((TICKS_TO_CYCLES(x) & 0x1FFF) << 12) \
-                                 | ((TICKS_TO_OFFSET(x) & 0xFFF)))
-
+
-#define TICKS_TO_SYT(x)         (((TICKS_TO_CYCLES(x) & 0xF) << 12) \
-                                 | ((TICKS_TO_OFFSET(x) & 0xFFF)))
@@ -114 +109 @@
-        if (x < 0) {
-            debugWarning("insufficient wrapping: %lld\n",x);
-
+
-            debugWarning("correcting...\n");
-            while (x < 0) {
-                x += TICKS_PER_SECOND * 128L;
-
+
-                if (x < 0) {
-                    debugWarning(" insufficient wrapping: %lld\n",x);
@@ -134 +129 @@
- *
- * The input value is wrapped to the maximum value of the cycle
- 
+
- * to the minimum value of the cycle timer, in ticks (= 0).
- *
@@ -141 +136 @@
- */
-static inline uint32_t wrapAtMinMaxTicks(int64_t x) {
-
+
-    if (x < 0) {
-        x += TICKS_PER_SECOND * 128L;
@@ -166 +161 @@
- * such that it respects wrapping.
- *
- 
+
- * negative and very large. However the real difference is
- * not large. It can be calculated by unwrapping x and then
- * calculating x-y.
- *
- 
+
- * @param y Second timestamp
- * @return the difference x-y, unwrapped
@@ -177 +172 @@
-static inline int32_t diffTicks(uint32_t x, uint32_t y) {
-    int64_t diff=(int64_t)x - (int64_t)y;
-
+
-    // the maximal difference we allow (64secs)
-    const int64_t max=TICKS_PER_SECOND*64L;
-
+
-    if(diff > max) {
-        // this means that y has wrapped, but
@@ -194 +189 @@
-        diff += TICKS_PER_SECOND*128L;
-    }
-
+
-    return (int32_t)diff;
-
+
-}
-
@@ -205 +200 @@
- * wrapping the result if necessary.
- *
- 
+
- * @param y Second timestamp
- * @return the sum x+y, wrapped
@@ -221 +216 @@
- * wrapping the result if necessary.
- *
- 
+
- * @param y Second timestamp
- * @return the difference x-y, wrapped
@@ -238 +233 @@
- * @param rcv_cycle The cycle this timestamp was received on
- * @param ctr_now The current value of the cycle timer ('now')
- 
+
- */
-static inline uint32_t sytRecvToFullTicks(uint32_t syt_timestamp, unsigned int rcv_cycle, uint32_t ctr_now) {
-    uint32_t timestamp;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT=%08X CY=%04X CTR=%08X\n",
-        syt_timestamp,rcv_cycle,ctr_now);
-
+
-    // reconstruct the full cycle
-    uint32_t cc_cycles=CYCLE_TIMER_GET_CYCLES(ctr_now);
-    uint32_t cc_seconds=CYCLE_TIMER_GET_SECS(ctr_now);
-
+
-    // the cycletimer has wrapped since this packet was received
- 
+
-    // was received
-    if (rcv_cycle>cc_cycles) {
@@ -262 +257 @@
-        }
-    }
-
+
-    // reconstruct the top part of the timestamp using the current cycle number
-    uint32_t rcv_cycle_masked=rcv_cycle & 0xF;
-    uint32_t syt_cycle=CYCLE_TIMER_GET_CYCLES(syt_timestamp);
-
+
-    // if this is true, wraparound has occurred, undo this wraparound
-    if(syt_cycle<rcv_cycle_masked) syt_cycle += 0x10;
-
+
-    // this is the difference in cycles wrt the cycle the
-    // timestamp was received
-    uint32_t delta_cycles=syt_cycle-rcv_cycle_masked;
-
+
-    // reconstruct the cycle part of the timestamp
-    uint32_t new_cycles=rcv_cycle + delta_cycles;
-
+
-    // if the cycles cause a wraparound of the cycle timer,
-    // perform this wraparound
@@ -286 +281 @@
-            "Detected wraparound: %d + %d = %d\n",
-            rcv_cycle,delta_cycles,new_cycles);
-
+
-        new_cycles-=8000; // wrap around
-#ifdef DEBUG
@@ -297 +292 @@
-        timestamp += TICKS_PER_SECOND;
-    }
-
+
-    timestamp += CYCLE_TIMER_GET_OFFSET(syt_timestamp);
-
+
-    timestamp = addTicks(timestamp, cc_seconds * TICKS_PER_SECOND);
-
+
-    #ifdef DEBUG
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
@@ -309 +304 @@
-        }
-    #endif
-
+
-    return timestamp;
-}
@@ -317 +312 @@
- *
- * The difference between sytRecvToFullTicks and sytXmitToFullTicks is
- 
+
- * wraparound is present if rcv_cycle > current_cycle. In the xmit
- * version this is when current_cycle > xmt_cycle.
@@ -324 +319 @@
- * @param xmt_cycle The cycle this timestamp was received on
- * @param ctr_now The current value of the cycle timer ('now')
- 
+
- */
-static inline uint32_t sytXmitToFullTicks(uint32_t syt_timestamp, unsigned int xmt_cycle, uint32_t ctr_now) {
-    uint32_t timestamp;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT=%08X CY=%04X CTR=%08X\n",
-        syt_timestamp,xmt_cycle,ctr_now);
-
+
-    // reconstruct the full cycle
-    uint32_t cc_cycles=CYCLE_TIMER_GET_CYCLES(ctr_now);
-    uint32_t cc_seconds=CYCLE_TIMER_GET_SECS(ctr_now);
-
+
-    // the cycletimer has wrapped since this packet was received
- 
+
-    // is to be transmitted
-    if (xmt_cycle<cc_cycles) {
@@ -348 +343 @@
-        }
-    }
-
+
-    // reconstruct the top part of the timestamp using the current cycle number
-    uint32_t xmt_cycle_masked=xmt_cycle & 0xF;
-    uint32_t syt_cycle=CYCLE_TIMER_GET_CYCLES(syt_timestamp);
-
+
-    // if this is true, wraparound has occurred, undo this wraparound
-    if(syt_cycle<xmt_cycle_masked) syt_cycle += 0x10;
-
+
-    // this is the difference in cycles wrt the cycle the
-    // timestamp was received
-    uint32_t delta_cycles=syt_cycle-xmt_cycle_masked;
-
+
-    // reconstruct the cycle part of the timestamp
-    uint32_t new_cycles=xmt_cycle + delta_cycles;
-
+
-    // if the cycles cause a wraparound of the cycle timer,
-    // perform this wraparound
@@ -372 +367 @@
-            "Detected wraparound: %d + %d = %d\n",
-            xmt_cycle,delta_cycles,new_cycles);
-
+
-        new_cycles-=8000; // wrap around
-#ifdef DEBUG
@@ -383 +378 @@
-        timestamp += TICKS_PER_SECOND;
-    }
-
+
-    timestamp += CYCLE_TIMER_GET_OFFSET(syt_timestamp);
-
+
-    timestamp = addTicks(timestamp, cc_seconds * TICKS_PER_SECOND);
-
+
-    #ifdef DEBUG
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
@@ -395 +390 @@
-        }
-    #endif
-
+
-    return timestamp;
-}
@@ -407 +402 @@
- * See diffTicks
- *
- 
+
- * @param y Second cycle value
- * @return the difference x-y, unwrapped
@@ -413 +408 @@
-static inline int diffCycles(unsigned int x, unsigned int y) {
-    int diff = x - y;
-
+
-    // the maximal difference we allow (64secs)
-    const int max=CYCLES_PER_SECOND/2;
-
+
-    if(diff > max) {
-        diff -= CYCLES_PER_SECOND;
@@ -422 +417 @@
-        diff += CYCLES_PER_SECOND;
-    }
-
+
-    return diff;
-}

trunk/libffado/src/libstreaming/IsoHandler.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -57 +52 @@
-
-/* the C callbacks */
- 
+
-IsoXmitHandler::iso_transmit_handler(raw1394handle_t handle,
-               
-               
-               
-
-       
-       
-
-       
-
-
- 
- 
-                                               
-
-                                               
-
-       
-       
-
-       
+        
+        
+        
+
+    
+    
+
+    
+
+
+
+
+                        
+
+                        
+
+    
+    
+
+    
-}
-
-int IsoHandler::busreset_handler(raw1394handle_t handle, unsigned int generation)
-      
-       
-
-       
-       
-       
+
+    
+
+    
+    
+    
-}
-
@@ -93 +88 @@
-/* Base class implementation */
-IsoHandler::IsoHandler(int port)
- 
+
-   m_buf_packets(400), m_max_packet_size(1024), m_irq_interval(-1),
-   m_packetcount(0), m_dropped(0), m_Client(0),
@@ -101 +96 @@
-
-IsoHandler::IsoHandler(int port, unsigned int buf_packets, unsigned int max_packet_size, int irq)
- 
- 
- 
+
+
+
-   m_packetcount(0), m_dropped(0), m_Client(0),
-   m_State(E_Created)
@@ -121 +116 @@
-            stop();
-        }
-
+
-        raw1394_destroy_handle(m_handle);
-    }
-
+
-    if(m_handle_util) raw1394_destroy_handle(m_handle_util);
-
@@ -134 +129 @@
-    if(m_handle) {
-        if(raw1394_loop_iterate(m_handle)) {
- 
+
-                 "IsoHandler (%p): Failed to iterate handler: %s\n",
-                 this,strerror(errno));
@@ -142 +137 @@
-        }
-    } else {
- 
+
-    }
-}
@@ -156 +151 @@
-        return false;
-    }
-
+
-    // the main handle for the ISO traffic
-    m_handle = raw1394_new_handle_on_port( m_port );
@@ -169 +164 @@
-    }
-    raw1394_set_userdata(m_handle, static_cast<void *>(this));
-
+
-    // a second handle for utility stuff
-    m_handle_util = raw1394_new_handle_on_port( m_port );
@@ -179 +174 @@
-            debugError("Are ieee1394 and raw1394 drivers loaded?\n");
-        }
-
+
-        raw1394_destroy_handle(m_handle);
-        return false;
-    }
-    raw1394_set_userdata(m_handle_util, static_cast<void *>(this));
-
+
-    // bus reset handling
-    if(raw1394_busreset_notify (m_handle, RAW1394_NOTIFY_ON)) {
@@ -209 +204 @@
-    // update the internal state
-    m_State=E_Initialized;
-
+
-    return true;
-}
@@ -222 +217 @@
-        return false;
-    }
-
+
-    // Don't call until libraw1394's raw1394_new_handle() function has been
-    // fixed to correctly initialise the iso_packet_infos field.  Bug is
@@ -228 +223 @@
-
-//     raw1394_iso_shutdown(m_handle);
-
+
-    m_State = E_Prepared;
-
+
-    return true;
-}
@@ -237 +232 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
+
-    // check the state
-    if(m_State != E_Prepared) {
@@ -252 +247 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
+
-    // check state
-    if(m_State != E_Running) {
@@ -258 +253 @@
-        return false;
-    }
-
+
-    // this is put here to try and avoid the
-    // Runaway context problem
-    // don't know if it will help though.
-    raw1394_iso_xmit_sync(m_handle);
-
+
-    raw1394_iso_stop(m_handle);
-
+
-    m_State=E_Prepared;
-
+
-    return true;
-}
@@ -276 +271 @@
- * @return ?
- */
-
+
-int IsoHandler::handleBusReset(unsigned int generation) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n");
-
-
+
+
-    return 0;
-}
@@ -293 +288 @@
-    // the new api should be realtime safe.
-    // it might cause a reschedule when turning preemption,
- 
- 
+
+
-    int err;
-    uint32_t cycle_timer;
@@ -314 +309 @@
-    // the new api should be realtime safe.
-    // it might cause a reschedule when turning preemption,
- 
- 
+
+
-    int err;
-    uint32_t cycle_timer;
@@ -351 +346 @@
-
-    if (m_Client) {
-     
+
-            return false;
-    }
@@ -369 +364 @@
-
-    if(stream != m_Client) {
-     
+
-            return false;
-    }
-
-    m_Client->clearHandler();
-
+
-    m_Client=0;
-    return true;
@@ -387 +382 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-}
- 
+
-                               unsigned int max_packet_size, int irq)
-                : IsoHandler(port, buf_packets,max_packet_size,irq)
@@ -411 +406 @@
-
-enum raw1394_iso_disposition IsoRecvHandler::putPacket(
- 
- 
+
+
-                    unsigned int cycle, unsigned int dropped) {
-
@@ -424 +419 @@
-        return m_Client->putPacket(data, length, channel, tag, sy, cycle, dropped);
-    }
-
+
-    return RAW1394_ISO_OK;
-}
@@ -430 +425 @@
-bool IsoRecvHandler::prepare()
-{
-
+
-    // prepare the generic IsoHandler
-    if(!IsoHandler::prepare()) {
@@ -443 +438 @@
-
-    if(m_irq_interval > 1) {
-   
+
-                                iso_receive_handler,
-                                m_buf_packets,
@@ -452 +447 @@
-            debugFatal("Could not do receive initialisation!\n" );
-            debugFatal("  %s\n",strerror(errno));
-
+
-            return false;
-        }
-    } else {
-   
+
-                                iso_receive_handler,
-                                m_buf_packets,
@@ -465 +460 @@
-            debugFatal("Could not do receive initialisation!\n" );
-            debugFatal("  %s\n",strerror(errno));
-
+
-            return false;
-    
+
-    }
-    return true;
@@ -475 +470 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "start on cycle %d\n", cycle);
-
+
-    // start the generic IsoHandler
-    if(!IsoHandler::start(cycle)) {
-        return false;
-    }
-
+
-    if(raw1394_iso_recv_start(m_handle, cycle, -1, 0)) {
-        debugFatal("Could not start receive handler (%s)\n",strerror(errno));
@@ -490 +485 @@
-int IsoRecvHandler::handleBusReset(unsigned int generation) {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "handle bus reset...\n");
-
+
-    //TODO: implement busreset
-
+
-    // pass on the busreset signal
-    if(IsoHandler::handleBusReset(generation)) {
@@ -508 +503 @@
-
-}
- 
+
-                               unsigned int max_packet_size, int irq)
-                : IsoHandler(port, buf_packets, max_packet_size,irq),
@@ -516 +511 @@
-
-}
- 
+
-                               unsigned int max_packet_size, int irq,
-                               enum raw1394_iso_speed speed)
@@ -575 +570 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "start on cycle %d\n", cycle);
-
+
-    if(!(IsoHandler::start(cycle))) {
-        return false;
-    }
-
+
-    if(raw1394_iso_xmit_start(m_handle, cycle, m_prebuffers)) {
-        debugFatal("Could not start xmit handler (%s)\n",strerror(errno));
@@ -608 +603 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "bus reset...\n");
-    //TODO: implement busreset
-
+
-    // pass on the busreset signal
-    if(IsoHandler::handleBusReset(generation)) {
-            return -1;
-    }
-
+
-    return 0;
-}
@@ -622 +617 @@
-#if 0
-IsoRecvHandler::IsoRecvHandler(int port)
-               
-
-       
-
- 
+        
+
+    
+
+
-                               unsigned int max_packet_size, int irq)
-               
-
-       
+        
+
+    
-
-}
@@ -640 +635 @@
-// raw1394_destroy_handle() (in the base class destructor) will do any iso
-// system shutdown required.
-       
+    
-
-}
@@ -646 +641 @@
-bool
-IsoRecvHandler::initialize() {
-       
-
-       
-
-       
-               
-       
-
-       
-
-       
+    
+
+    
+
+    
+        
+    
+
+    
+
+    
-                                         iso_receive_handler,
-                                         m_buf_packets,
-                                         m_max_packet_size,
-                                         m_irq_interval)) {
-               
-
-               
-       
-
-       
-
-
-
- 
-
-                       
-
-       
-       
-       
-
-       
+        
+
+        
+    
+
+    
+
+
+
+
+
+            
+
+    
+    
+    
+
+    
-}
-
@@ -686 +681 @@
-int IsoRecvHandler::registerStream(IsoRecvStream *stream)
-{
-       
-       
-
-       
-
-       
-       
+    
+    
+
+    
+
+    
+    
-
-}
@@ -698 +693 @@
-int IsoRecvHandler::unregisterStream(IsoRecvStream *stream)
-{
-       
-       
+    
+    
-
-    for ( IsoRecvStreamVectorIterator it = m_Clients.begin();
@@ -706 +701 @@
-    {
-        IsoRecvStream* s = *it;
- 
-                       
+
+            
-            m_Clients.erase(it);
-                       
+            
-        }
-    }
-
-       
+    
-
-}
-
-void IsoRecvHandler::listen(int channel) {
-       
-       
-
-       
+    
+    
+
+    
-
-}
-
-void IsoRecvHandler::unListen(int channel) {
-       
-       
-
-       
+    
+    
+
+    
-
-}
@@ -735 +730 @@
-int IsoRecvHandler::start(int cycle)
-{
-       
-       
+    
+    
-}
-#endif

trunk/libffado/src/libstreaming/IsoHandler.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
-
+
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -51 +47 @@
-{
-    protected:
-
+
-    public:
-
+
-        enum EHandlerType {
-                EHT_Receive,
@@ -69 +65 @@
-        virtual bool start(int cycle);
-        virtual bool stop();
-
+
-        bool iterate();
-
+
-        void setVerboseLevel(int l);
-
@@ -112 +108 @@
-        unsigned int    m_max_packet_size;
-        int             m_irq_interval;
-
+
-        int m_packetcount;
-        int m_dropped;
@@ -135 +131 @@
-            E_Error
-        };
-
+
-        enum EHandlerStates m_State;
-
@@ -141 +137 @@
-
-/*!
- 
+
-*/
-
- 
+
-{
-
@@ -153 +149 @@
-
-        bool init();
-
+
-        enum EHandlerType getType() { return EHT_Receive;};
-
@@ -164 +160 @@
-
-    private:
- 
- 
+
+
-                            unsigned int length, unsigned char channel,
- 
+
-                            unsigned int dropped);
-
-  
- 
- 
+
+
+
-                          unsigned int cycle, unsigned int dropped);
-
@@ -181 +177 @@
-*/
-
- 
+
-{
-    public:
-        IsoXmitHandler(int port);
- 
+
-                        unsigned int max_packet_size, int irq);
- 
- 
+
+
-                        enum raw1394_iso_speed speed);
-        virtual ~IsoXmitHandler();
-
-        bool init();
-
+
-        enum EHandlerType getType() { return EHT_Transmit;};
-
@@ -211 +207 @@
-                        unsigned char *tag, unsigned char *sy,
-                        int cycle, unsigned int dropped);
-  
+
-                getPacket(unsigned char *data, unsigned int *length,
-                        unsigned char *tag, unsigned char *sy,
@@ -217 +213 @@
-
-        enum raw1394_iso_speed m_speed;
-
+
-        unsigned int m_prebuffers;
-
@@ -224 +220 @@
-}
-
-REEBOB
-
-
-
+FADO
+
+
+

trunk/libffado/src/libstreaming/IsoHandlerManager.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -73 +68 @@
-
-    m_isoManagerThread=new Util::PosixThread(
- 
+
-        m_realtime, prio,
-        PTHREAD_CANCEL_DEFERRED);
@@ -111 +106 @@
-{
-//     updateCycleTimers();
-
+
-    if(!iterate()) {
-        debugFatal("Could not iterate the isoManager\n");
-        return false;
-    
-
+
+
-    return true;
-}
@@ -128 +123 @@
-bool IsoHandlerManager::iterate()
-{
-       
-       
-       
-
-       
-
-       
-               
-                       
-               
-               
-               
-       
-
-       
-               
-                       
-               
-
-               
-                       
-               
-
-               
-                       
-                       
-
-                       
-               
-       
-
-       
+    
+    
+    
+
+    
+
+    
+        
+            
+        
+        
+        
+    
+
+    
+        
+            
+        
+
+        
+            
+        
+
+        
+            
+            
+
+            
+        
+    
+
+    
-
-}
@@ -167 +162 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-    assert(handler);
-
+
-    m_IsoHandlers.push_back(handler);
-
+
-    handler->setVerboseLevel(getDebugLevel());
-
-    // rebuild the fd map for poll()'ing.
-     
+
-
-}
@@ -179 +174 @@
-bool IsoHandlerManager::unregisterHandler(IsoHandler *handler)
-{
-       
-       
-
-       
-       
-       
-       
-               
-                       
-                       
-                       
-                       
-               
-       
-       
-
-       
+    
+    
+
+    
+    
+    
+    
+        
+            
+            
+            
+            
+        
+    
+    
+
+    
-
-}
-
-bool IsoHandlerManager::rebuildFdMap() {
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-       
-               
-               
-       
-
-       
-       
-       
-       
-       
-               
-               
-               
-       
-
-       
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+    
+        
+        
+    
+
+    
+    
+    
+    
+    
+        
+        
+        
+    
+
+    
-}
-
-void IsoHandlerManager::disablePolling(IsoStream *stream) {
-    int i=0;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Disable polling on stream %p\n",stream);
-
@@ -243 +238 @@
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "polling disabled\n");
-        }
-
+
-        i++;
-    }
@@ -250 +245 @@
-void IsoHandlerManager::enablePolling(IsoStream *stream) {
-    int i=0;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Enable polling on stream %p\n",stream);
-
+
-    for ( IsoHandlerVectorIterator it = m_IsoHandlers.begin();
-        it != m_IsoHandlers.end();
@@ -262 +257 @@
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "polling enabled\n");
-        }
-
+
-        i++;
-    }
@@ -279 +274 @@
- *
- * \todo : currently there is a one-to-one mapping
- 
+
- *        multichannel receive
- */
-bool IsoHandlerManager::registerStream(IsoStream *stream)
-{
-       
-       
-
-       
-       
-       
-       
-       
-               
-                       
-                       
-
-               
-       
-
-       
-       
-
-       
-       
-               
-               
-
+    
+    
+
+    
+    
+    
+    
+    
+        
+            
+            
+
+        
+    
+
+    
+    
+
+    
+    
+        
+        
+
-#if 1
-               
-
-               
-
-               
-               
-               
-               
-                       
-               
-
-               
-               
-               
-       
-
-               
-               
+        
+
+        
+
+        
+        
+        
+        
+            
+        
+
+        
+        
+        
+    
+
+        
+        
-#else
-               
-               
-               
-               
-
-               
-               
-
-               
-               
-                       
-               
-
-               
-               
-
-               
-
-               
-                       
-               
-
-               
-               
-               
-       
+        
+        
+        
+        
+
+        
+        
+
+        
+        
+            
+        
+
+        
+        
+
+        
+
+        
+            
+        
+
+        
+        
+        
+    
-
-#endif
-               
-               
-               
-
-               
-               
-               
-
-               
-
-               
-                       
-                       
-               
-
-               
-
-               
-               
-                       
-                       
-               
-
-               
-               
-                       
-                       
-               
-
-               
-               
-                       
-                       
-               
-               
-       
-
-       
-               
-               
+        
+        
+        
+
+        
+        
+        
+
+        
+
+        
+            
+            
+        
+
+        
+
+        
+        
+            
+            
+        
+
+        
+        
+            
+            
+        
+
+        
+        
+            
+            
+        
+        
+    
+
+    
+        
+        
-
-#if 1
-               
-
-               
-               
-               
-               
-               
-                       
-               
-
-               
-               
-               
-       
-
-              
-              
+        
+
+        
+        
+        
+        
+        
+            
+        
+
+        
+        
+        
+    
+
+        
+        
-#else
-               
-               
-               
-               
-
-               
-               
-
-               
-               
-                       
-               
-
-               
-               
-
-               
-
-               
-                       
-               
-
-               
-               
-               
-       
+        
+        
+        
+        
+
+        
+        
+
+        
+        
+            
+        
+
+        
+        
+
+        
+
+        
+            
+        
+
+        
+        
+        
+    
-#endif
-
-               
-               
-               
-
-               
-               
-               
-               
-
-               
-            
-
-               
-            if (buffers<10) buffers=10;     
-
-               
-               
-               
-
-               
-
-               
-                       
-                       
-               
-
-               
-
-               
-               
-                       
-                       
-               
-
-               
-               
-                       
-                       
-               
-
-               
-               
-                       
-                       
-               
-               
-       
-
-       
-       
-       
-
-       
+
+        
+        
+        
+
+        
+        
+        
+        
+
+        
+        
+
+        
+        if (buffers<10) buffers=10;
+
+        
+        
+        
+
+        
+
+        
+            
+            
+        
+
+        
+
+        
+        
+            
+            
+        
+
+        
+        
+            
+            
+        
+
+        
+        
+            
+            
+        
+        
+    
+
+    
+    
+    
+
+    
-}
-
-bool IsoHandlerManager::unregisterStream(IsoStream *stream)
-{
-       
-       
-
-       
-       
-       
-       
-       
-               
-                       
-                               
-                               
-                       
-
-                       
-               
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-
-                       
-
-                       
-                       
-               
-       
-
-       
+    
+    
+
+    
+    
+    
+    
+    
+        
+            
+                
+                
+            
+
+            
+        
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+
+            
+
+            
+            
+        
+    
+
+    
-
-}
@@ -577 +572 @@
-{
-    bool retval=true;
-
-
-
+
+
+
-    // check state
-    if(m_State != E_Created) {
@@ -585 +580 @@
-        return false;
-    }
-
+
-    for ( IsoHandlerVectorIterator it = m_IsoHandlers.begin();
-          it != m_IsoHandlers.end();
@@ -611 +606 @@
-bool IsoHandlerManager::startHandlers(int cycle) {
-    bool retval=true;
-
-
-
+
+
+
-    // check state
-    if(m_State != E_Prepared) {
@@ -619 +614 @@
-        return false;
-    }
-
+
-    for ( IsoHandlerVectorIterator it = m_IsoHandlers.begin();
-        it != m_IsoHandlers.end();
@@ -630 +625 @@
-        }
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Starting ISO iterator thread...\n");
-
- 
+
-    //       starting the streams.
-    // start the iso runner thread
-    m_isoManagerThread->Start();
-
+
-    if (retval) {
-        m_State=E_Running;
@@ -649 +644 @@
-bool IsoHandlerManager::stopHandlers() {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
+
-    // check state
-    if(m_State != E_Running) {
@@ -655 +650 @@
-        return false;
-    }
-
+
-    bool retval=true;
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Stopping ISO iterator thread...\n");
-    m_isoManagerThread->Stop();
-
+
-    for ( IsoHandlerVectorIterator it = m_IsoHandlers.begin();
-        it != m_IsoHandlers.end();
@@ -671 +666 @@
-        }
-    }
-
+
-    if (retval) {
-        m_State=E_Prepared;
@@ -677 +672 @@
-        m_State=E_Error;
-    }
-
+
-    return retval;
-}
@@ -683 +678 @@
-bool IsoHandlerManager::reset() {
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
+
-    // check state
-    if(m_State == E_Error) {
@@ -689 +684 @@
-        return false;
-    }
-
+
-    // if not in an error condition, reset means stop the handlers
-    return stopHandlers();
@@ -708 +703 @@
-void IsoHandlerManager::dumpInfo() {
-    int i=0;
-
+
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "Dumping IsoHandlerManager Stream handler information...\n");
-    debugOutputShort( DEBUG_LEVEL_NORMAL, " State: %d\n",(int)m_State);

trunk/libffado/src/libstreaming/IsoHandlerManager.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -89 +85 @@
-        bool unregisterStream(IsoStream *); ///< unregister an iso stream from the manager
-
- 
- 
- 
+
+
+
-
-        bool reset(); ///< reset the ISO manager and all streams
-
-        bool prepare(); ///< prepare the ISO manager and all streams
-
+
-        bool init();
-
+
-        void disablePolling(IsoStream *); ///< disables polling on a stream
-        void enablePolling(IsoStream *); ///< enables polling on a stream
@@ -106 +102 @@
-        bool Execute(); // note that this is called in we while(running) loop
-        bool Init();
-
+
-    // the state machine
-    private:
@@ -115 +111 @@
-            E_Error
-        };
-
+
-        enum EHandlerStates m_State;
-
+
-    private:
-        /// iterate all child handlers
@@ -124 +120 @@
-    private:
-        // note: there is a disctinction between streams and handlers
- 
+
-        // multichannel receive)
-
@@ -152 +148 @@
-        unsigned int m_priority;
-        Util::PosixThread *m_isoManagerThread;
-
-
+
+
-        // debug stuff
-        DECLARE_DEBUG_MODULE;
@@ -161 +157 @@
-}
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libstreaming/IsoStream.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -35 +30 @@
-IMPL_DEBUG_MODULE( IsoStream, IsoStream, DEBUG_LEVEL_NORMAL );
-
- 
- 
- 
+
+
+
-                     unsigned int cycle, unsigned int dropped) {
-
@@ -47 +42 @@
-}
-
- 
+
-IsoStream::getPacket(unsigned char *data, unsigned int *length,
-                     unsigned char *tag, unsigned char *sy,

trunk/libffado/src/libstreaming/IsoStream.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include <libraw1394/raw1394.h>
@@ -55 +51 @@
-        };
-
- 
+
-                    : m_type(type), m_channel(-1), m_port(0), m_handler(0)
-        {};
- 
+
-                    : m_type(type), m_channel(-1), m_port(port), m_handler(0)
-        {};
-        virtual ~IsoStream()
-        {};
-
+
-        virtual void setVerboseLevel(int l) { setDebugLevel( l ); };
-
@@ -75 +71 @@
-        virtual unsigned int getPacketsPerPeriod() {return 1;};
-        virtual unsigned int getMaxPacketSize() {return 1024;}; //FIXME: arbitrary
-
+
-        virtual bool init();
-
- 
- 
- 
+
+
+
-                            unsigned int cycle, unsigned int dropped);
- 
+
-                getPacket(unsigned char *data, unsigned int *length,
-                        unsigned char *tag, unsigned char *sy,
@@ -90 +86 @@
-
-        int getNodeId();
-
+
-        virtual bool reset();
-        
-
+
+
-    protected:
-
@@ -104 +100 @@
-
-        IsoHandler *m_handler;
-
+
-        DECLARE_DEBUG_MODULE;
-
@@ -111 +107 @@
-}
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libstreaming/MotuPort.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-  FreeBob Streaming API
-  FreeBob = Firewire (pro-)audio for linux
+Copyright (C) 2005-2007 by Jonathan Woithe
+Copyright (C) 2005-2007 by Pieter Palmers
- *
-
+
+
- *
-  Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-

trunk/libffado/src/libstreaming/MotuPort.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/**
@@ -44 +41 @@
-
-*/
- 
-       
+
+    
-{
-
-public:
-
-
-       
-               
-               
-       
-       
-       
+
+    
+        
+        
+    
+    
+    
-
-       
-
+    
+
-protected:
-
@@ -69 +66 @@
-
-*/
- 
-       
+
+    
-{
-
-public:
-
-
-       
-               
-               
-               
-       
+
+    
+        
+        
+        
+    
-
-
-       
+    
-
-protected:
-
+
-};
-
@@ -94 +91 @@
-
-*/
- 
-       
+
+    
-{
-
-public:
-
-
-       
-               
-               
-
-       
+
+    
+        
+        
+
+    
-
-
-       
+    
-
-protected:
-
+
-};
-
-} // end of namespace Streaming
-
-REEBOB
+FADO
-

trunk/libffado/src/libstreaming/MotuPortInfo.cpp

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/*
- *   FreeBob Streaming API
- *   FreeBob = Firewire (pro-)audio for linux
- *
- *   http://freebob.sf.net
- *
- *   Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
- *
- *   This program is free software {} you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation {} either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY {} without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program {} if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * 
- *
- */
-#include "MotuPortInfo.h"
-#include <assert.h>

trunk/libffado/src/libstreaming/MotuPortInfo.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -36 +33 @@
-\brief Class containing the stream information for a Motu channel
-
- 
- 
+
+
-
-*/
@@ -44 +41 @@
-public:
-    /**
- 
+
-     * device configuration (e.g. an SPDIF port could be plain audio in 24bit integer
- 
+
-     *
-     * This kind of enum allows to discriminate these formats when decoding
-     * If all channels always have the same format, you won't be needing this
-     */
-     
-             
-             
-     
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
+    
+        
+        
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
-
-
-       
-       
-       
+    
+    
+    
-
-protected:
@@ -89 +86 @@
-} // end of namespace Streaming
-
-REEBOB
+FADO

trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-  FreeBob Streaming API
-  FreeBob = Firewire (pro-)audio for linux
+Copyright (C) 2005-2007 by Jonathan Woithe
+Copyright (C) 2005-2007 by Pieter Palmers
- *
-
+
+
- *
-
-
+
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
+
-#include "MotuStreamProcessor.h"
-#include "Port.h"
@@ -61 +57 @@
-uint32_t ts_sec = CYCLE_TIMER_GET_SECS(ct_now);
-  // If the cycles have wrapped, correct ts_sec so it represents when timestamp
- 
+
-  // in advance of the cycle timer (reasons unknown at this stage).  In addition,
-  // iso buffering can delay the arrival of packets for quite a number of cycles
@@ -82 +78 @@
-/* transmit */
-MotuTransmitStreamProcessor::MotuTransmitStreamProcessor(int port, int framerate,
-               
-       
-       
-       
+        
+    
+    
+    
-}
-
@@ -94 +90 @@
-bool MotuTransmitStreamProcessor::init() {
-
-       
-       
-
-       
-       
-               
-               
-       
-
-       
+    
+    
+
+    
+    
+        
+        
+    
+
+    
-}
-
-void MotuTransmitStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-}
-
@@ -114 +110 @@
-enum raw1394_iso_disposition
-MotuTransmitStreamProcessor::getPacket(unsigned char *data, unsigned int *length,
-       
-       
+    
+    
-
-// FIXME: the actual delays in the system need to be worked out so
@@ -121 +117 @@
-    uint64_t ts_head, fc;
-
-       
-       
-
+    
+    
+
-    m_last_cycle=cycle;
-
+
-    // determine if we want to send a packet or not
-    // note that we can't use getCycleTimer directly here,
-    // because packets are queued in advance. This means that
- 
+
-    // on 'cycle', not 'now'.
-    unsigned int ctr=m_handler->getCycleTimer();
-    int now_cycles = (int)CYCLE_TIMER_GET_CYCLES(ctr);
-
+
-    // the difference between the cycle this
-    // packet is intended for and 'now'
-    int cycle_diff = diffCycles(cycle, now_cycles);
-
-       
-       
+
+    
+    
-
-    // as long as the cycle parameter is not in sync with
@@ -154 +150 @@
-        if ((unsigned int)cycle == m_cycle_to_enable_at) {
-            m_is_disabled=false;
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Enabling StreamProcessor %p at %u\n", this, cycle);
-
+
-            // initialize the buffer head & tail
-            m_SyncSource->m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
-
+
-            // the number of cycles the sync source lags (> 0)
-            // or leads (< 0)
-            int sync_lag_cycles=diffCycles(cycle, m_SyncSource->getLastCycle());
-
+
-            // account for the cycle lag between sync SP and this SP
-            // the last update of the sync source's timestamps was sync_lag_cycles
-            // cycles before the cycle we are calculating the timestamp for.
- 
+
-            // frame that is sent on cycle CT to have a timestamp T1.
-            // ts_head however is for cycle CT-sync_lag_cycles, and lies
@@ -173 +169 @@
-            // T1.
-            ts_head = addTicks(ts_head, sync_lag_cycles * TICKS_PER_CYCLE);
-
+
-            m_data_buffer->setBufferTailTimestamp(ts_head);
-
+
-            #ifdef DEBUG
-            if ((unsigned int)m_data_buffer->getFrameCounter() != m_data_buffer->getBufferSize()) {
@@ -190 +186 @@
-    } else if (m_disabled && !m_is_disabled) {
-        // trying to disable
- 
+
-                    this, cycle);
-        m_is_disabled=true;
-    }
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-
-    // the base timestamp is the one of the next sample in the buffer
-    m_data_buffer->getBufferHeadTimestamp(&ts_head, &fc); // thread safe
-
+
-    int64_t timestamp = ts_head;
-
-    // we send a packet some cycles in advance, to avoid the
-    // following situation:
- 
+
-    // the moment to send this packet. therefore we decide
-    // not to send the packet, but send it in the next cycle.
-    // This means that the next time point will be 3072 ticks
- 
+
-    // packet is sent, unless TRANSFER_DELAY > 3072.
-    // this means that we need at least one cycle of extra buffering.
-    uint64_t ticks_to_advance = TICKS_PER_CYCLE * TRANSMIT_ADVANCE_CYCLES;
-
+
-    // if cycle lies cycle_diff cycles in the future, we should
-    // queue this packet cycle_diff * TICKS_PER_CYCLE earlier than
@@ -224 +220 @@
-    // determine the 'now' time in ticks
-    uint64_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
-
+
-    // time until the packet is to be sent (if > 0: send packet)
-    int32_t until_next=diffTicks(timestamp, cycle_timer + ticks_to_advance);
-
-       
-       
-
+
+    
+    
+
-    // don't process the stream when it is not enabled, not running
-    // or when the next sample is not due yet.
-    if((until_next>0) || m_is_disabled || !m_running) {
-        // send dummy packet
-
- 
- 
+
+
+
-        // present.  For data-less packets the dbc is the same as the previously
-        // transmitted block.
@@ -245 +241 @@
-        quadlet++;
-        *length = 8;
-
+
-        #warning high-pitched sound protection removed!
-        // In the disabled state simply zero all data sent to the MOTU.  If
@@ -252 +248 @@
-        // some reason.  This is not completely sufficient, however (zeroed
-        // packets must also be sent on iso closedown).
-
+
-        // FIXME: Currently we simply send empty packets to the MOTU when
-        // the stream is disabled so the "m_disabled == 0" code is never
- 
+
-        // for the moment for reference.
-        // FIXME: Currently we don't read the buffer at all during closedown.
@@ -263 +259 @@
-//if (!m_is_disabled && m_running)
-//  return RAW1394_ISO_OK;
- 
+
-        return RAW1394_ISO_DEFER;
-    }
-
-       
-       
-       
-       
+    
+    
+    
+    
-
-    // add the transmit transfer delay to construct the playout time
-    uint64_t ts=addTicks(timestamp, TRANSMIT_TRANSFER_DELAY);
-
+
-    if (m_data_buffer->readFrames(n_events, (char *)(data + 8))) {
-
+
-        // Increment the dbc (data block count).  This is only done if the
-        // packet will contain events - that is, we are due to send some
@@ -286 +282 @@
-        if (m_tx_dbc > 0xff)
-            m_tx_dbc -= 0x100;
-
- 
- 
+
+
+
-        // present.  For data-less packets the dbc is the same as the previously
-        // transmitted block.
@@ -301 +297 @@
-        // I assume that it is in ticks, and wraps as the cycle timer
-        #warning syt conversion to be done
-
-               
-               
-               
-               
-               
-                       
-
-               
-               
+
+        
+        
+        
+        
+        
+            
+
+        
+        
-
-float ticks_per_frame = m_SyncSource->m_data_buffer->getRate();
-               
-                     
-                       
-                       
-                       
+        
+            
+            
+            
+            
-if (cycle==0) {
-  debugOutput(DEBUG_LEVEL_VERBOSE,"%d %d %d\n",
@@ -325 +321 @@
-}
-#if TESTTONE
-                       
-                       
-                       
-                       
-                               
-                               
-                               
-                              
-                                       
-                               
-                               
-                               
-                               
-                       
+            
+            
+            
+            
+                
+                
+                
+                
+                    
+                
+                
+                
+                
+            
-#endif
-
-               
-
-               
-
-               
-               
-               
-               
-
-               
-               
-               
-               
-                       
-               
+        
+
+        
+
+        
+        
+        
+        
+
+        
+        
+        
+        
+            
+        
-
-        return RAW1394_ISO_OK;
-
+
-    } else if (now_cycles<cycle) {
-        // we can still postpone the queueing of the packets
@@ -364 +360 @@
-    } else { // there is no more data in the ringbuffer
-
- 
+
-                 now_cycles, cycle, TICKS_TO_CYCLES(ts));
-
@@ -377 +373 @@
-        // compose a no-data packet, we should always
-        // send a valid packet
-
+
-        // send dummy packet
-
- 
- 
+
+
+
-        // present.  For data-less packets the dbc is the same as the previously
-        // transmitted block.
@@ -403 +399 @@
-
-bool MotuTransmitStreamProcessor::prefill() {
-
-       
-
-       
-       
-               
-                       
-                       
-               
-       
-       
+
+    
+
+    
+    
+        
+            
+            
+        
+    
+    
-}
-
-bool MotuTransmitStreamProcessor::reset() {
-
-       
+    
-
-    // we have to make sure that the buffer HEAD timestamp
-    // lies in the future for every possible buffer fill case.
-    int offset=(int)(m_data_buffer->getBufferSize()*m_ticks_per_frame);
-
+
-    m_data_buffer->setTickOffset(offset);
-
-       
-       
-       
-               
-               
-       
-
-       
-       
-               
-
-       
-
-       
+
+    
+    
+    
+        
+        
+    
+
+    
+    
+        
+
+    
+
+    
-}
-
-bool MotuTransmitStreamProcessor::prepare() {
-
-       
-
-       
-       
-       
-               
-               
-       
-
-       
-       
-       
-
-       
-
-       
-       
+
+    
+
+    
+    
+    
+        
+        
+    
+
+    
+    
+    
+
+    
+
+    
+    
-
-    // allocate the internal buffer
-    m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);
-       
-
-    
+    
+
+
-    m_data_buffer->setBufferSize(ringbuffer_size_frames);
-    m_data_buffer->setEventSize(m_event_size);
-    m_data_buffer->setEventsPerFrame(1);
-
+
-    m_data_buffer->setUpdatePeriod(m_period);
-    m_data_buffer->setNominalRate(m_ticks_per_frame);
-
+
-    // FIXME: check if the timestamp wraps at one second
-    m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
-
+
-    m_data_buffer->prepare();
-
-       
-       
-       
-       
-       
-               
-               
-                       
-                       
-       
-
-               
-               
-                       
-                               
-                               
-                       
-                       
-
-               
-                       
-                               
-                               
-                       
-                       
-                               
-                               
-                       
-                       
-                               
-                               
-                       
-                       
-                       
-                       
-
-               
-                       
-                               
-                               
-                       
-                       
-
-               
-                       
-                       
-               
-       
-
-       
-       
-       
-               
-               
-       
-
-       
-               
-               
-       
-
-       
+    
+    
+    
+    
+    
+        
+        
+            
+            
+    
+
+        
+        
+            
+                
+                
+            
+            
+
+        
+            
+                
+                
+            
+            
+                
+                
+            
+            
+                
+                
+            
+            
+            
+            
+
+        
+            
+                
+                
+            
+            
+
+        
+            
+            
+        
+    
+
+    
+    
+    
+        
+        
+    
+
+    
+        
+        
+    
+
+    
-}
-
-bool MotuTransmitStreamProcessor::prepareForStop() {
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-               
-
-       
-               
-               
-               
-               
-               
-               
-               
-
-               
-               
-               
-               
-
-               
-               
-               
-
-               
-               
-               
-       
-
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+        
+
+    
+        
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+
+        
+        
+        
+
+        
+        
+        
+    
+
+    
+    
+    
+    
-}
-
-bool MotuTransmitStreamProcessor::prepareForStart() {
-// Reset some critical variables required so the stream starts cleanly. This
- 
+
-// be done once should be placed in the init() method instead.
-       
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+    
+    
+
+    
+    
+
+    
+    
+
+    
-}
-
@@ -615 +611 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Preparing to enable...\n");
-
- 
+
-    // buffer timestamp to something sane, because this timestamp
-    // is used when it is SyncSource
-
+
-    // the time we initialize to will determine the time at which
-    // the first sample in the buffer will be sent, so we should
-    // make it at least 'time_to_enable_at'
-
+
-    uint64_t now=m_handler->getCycleTimer();
-    unsigned int now_secs=CYCLE_TIMER_GET_SECS(now);
-
+
-    // check if a wraparound on the secs will happen between
-    // now and the time we start
@@ -633 +629 @@
-        if (now_secs>=128) now_secs=0;
-    }
-
+
-//    uint64_t ts_head= now_secs*TICKS_PER_SECOND;
-    uint64_t ts_head = time_to_enable_at*TICKS_PER_CYCLE;
-
+
-    // we also add the nb of cycles we transmit in advance
-    ts_head=addTicks(ts_head, TRANSMIT_ADVANCE_CYCLES*TICKS_PER_CYCLE);
-
+
-    m_data_buffer->setBufferTailTimestamp(ts_head);
-
@@ -652 +648 @@
-bool MotuTransmitStreamProcessor::transferSilence(unsigned int size) {
-    bool retval;
-
-       
-       
-
-       
+
+    
+    
+
+    
-
-    // add the silence data to the ringbuffer
- 
+
-        retval=true;
-    } else {
@@ -666 +662 @@
-    }
-
-       
-
-       
+    
+
+    
-}
-
-bool MotuTransmitStreamProcessor::putFrames(unsigned int nbframes, int64_t ts) {
-    m_PeriodStat.mark(m_data_buffer->getBufferFill());
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "MotuTransmitStreamProcessor::putFrames(%d, %llu)\n", nbframes, ts);
-
+
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
@@ -684 +680 @@
-}
-
- 
+
- * write received events to the stream ringbuffers.
- */
-
- 
+
-                       unsigned int nevents, unsigned int offset) {
-       
-       
-
-       
-       
-       
-               
-       
-
-       
-       
-       
-               
-               
-
-               
-               
-
-               
-
-               
-                       
-                               
-                               
-                       
-                       
-               
-               //      
-               //              
-
-               
-                       
-               
-       
-       
-
-
- 
+    
+    
+
+    
+    
+    
+        
+    
+
+    
+    
+    
+        
+        
+
+        
+        
+
+        
+
+        
+            
+                
+                
+            
+            
+        
+        //    
+        //        
+
+        
+            
+        
+    
+    
+
+
+
-                       unsigned int nevents, unsigned int offset) {
-       
-       
-
-       
-
-       
-       
-       
-               
-               
-
-               
-
-               
-                       
-                               
-                               
-                       
-                       
-               
-               //      
-               //              
-
-               
-                       
-               
-       
-       
+    
+    
+
+    
+
+    
+    
+    
+        
+        
+
+        
+
+        
+            
+                
+                
+            
+            
+        
+        //    
+        //        
+
+        
+            
+        
+    
+    
-}
-
@@ -767 +763 @@
- * @return true if all successfull
- */
- 
-               
-       
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-               
-               
-
-               
-              
-
-
-               
-               
-               
-
-               
-               
-                       
-                               
-
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                                       
-                                       
-                                       
-                                       
-                                       
-                               
-                               
-                       
-                       
-                               
-
-         
-       
-
-       
-
-
- 
+
+        
+    
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+        
+        
+
+        
+        
+
+
+        
+        
+        
+
+        
+        
+            
+                
+
+                
+                
+                
+                
+                
+                
+                
+                    
+                    
+                    
+                    
+                    
+                
+                
+            
+            
+                
+
+        
+    
+
+    
+
+
+
-                       unsigned int offset, unsigned int nevents) {
-// Encodes nevents worth of data from the given port into the given buffer.  The
@@ -836 +832 @@
-// utilised.
-
-       
-
-
-       
-       
-       
-       
-       
-       
-
-       
-               
-               
-                       
-                               
-
-                               
-
-                               
-                               
-                               
-                               
-                               
-
-                               
-                                       
-                                       
-                                       
-
-                                       
-                                       
-                               
-                       
-                       
-               
-                       
-                               
-                               
-
-                               
-
-                               
-
-
-                                       
-                                       
-                                       
-                                       
-
-                                       
-                                       
-                               
-                       
-                       
-       
-
-       
-
-
- 
+    
+
+
+    
+    
+    
+    
+    
+    
+
+    
+        
+        
+            
+                
+
+                
+
+                
+                
+                
+                
+                
+
+                
+                    
+                    
+                    
+
+                    
+                    
+                
+            
+            
+        
+            
+                
+                
+
+                
+
+                
+
+
+                    
+                    
+                    
+                    
+
+                    
+                    
+                
+            
+            
+    
+
+    
+
+
+
-                       unsigned int offset, unsigned int nevents) {
-       
-       
-
-       
-       
+    
+    
+
+    
+    
-        case Port::E_Int24:
-        case Port::E_Float:
-               
-                       
-                       
-               
-               
-       
-
-       
+        
+            
+            
+        
+        
+    
+
+    
-}
-
-/* --------------------- RECEIVE ----------------------- */
-
- 
-       
+
+    
-    : ReceiveStreamProcessor(port, framerate), m_event_size(event_size),
-       
+    
-
-}
@@ -929 +925 @@
-bool MotuReceiveStreamProcessor::init() {
-
-       
-
-       
-       
-               
-               
-       
-
-       
-
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
- 
- 
- 
+    
+
+    
+    
+        
+        
+    
+
+    
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+
+
-                  unsigned int cycle, unsigned int dropped) {
-
-       
-       
-       
+
+    
+    
+    
-    m_last_cycle=cycle;
-
@@ -965 +961 @@
-        if (cycle == m_cycle_to_enable_at) {
-            m_is_disabled=false;
- 
+
-                this, cycle);
-
+
-            // the previous timestamp is the one we need to start with
-            // because we're going to update the buffer again this loop
@@ -988 +984 @@
-        m_is_disabled=true;
-    }
-
-       
-       
-       
-               
-               
-               
-               
-               
-               
-
-               
-               
-               
-               
-               
-               
-                       
-               
-
-               
-               
-               
-
+
+    
+    
+    
+        
+        
+        
+        
+        
+        
+
+        
+        
+        
+        
+        
+        
+            
+        
+
+        
+        
+        
+
-        //=> store the previous timestamp
-        m_last_timestamp2=m_last_timestamp;
-
-        //=> convert the SYT to a full timestamp in ticks
- 
+
-//                                        cycle, m_handler->getCycleTimer());
-//***
@@ -1028 +1024 @@
-m_last_timestamp = sphRecvToFullTicks(first_sph, m_handler->getCycleTimer());
-
-               
+        
-        if(!m_running && n_events && m_last_timestamp2 && m_last_timestamp) {
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Receive StreamProcessor %p started running at %d\n", this, cycle);
@@ -1041 +1037 @@
-            // estimate as to when a period might be ready. i.e. it will not
-            // be ready earlier than this timestamp + period time
-
- 
+
+
-            // SYT_INTERVAL * rate later
-            float frame_size=m_framerate<=48000?8:(m_framerate<=96000?16:32);
@@ -1056 +1052 @@
-            m_data_buffer->setBufferTailTimestamp(ts);
-//debugOutput(DEBUG_LEVEL_VERBOSE,"%p, last ts=%lld, ts=%lld, lts2=%lld\n", m_data_buffer, m_last_timestamp, ts, m_last_timestamp2);
-
+
-            return RAW1394_ISO_DEFER;
-        }
-
-               
+        
-//debugOutput(DEBUG_LEVEL_VERBOSE,"enabled: %p, last ts=%lld, ts2=%lld\n",m_data_buffer, m_last_timestamp, m_last_timestamp2);
-
-        //=> process the packet
-        // add the data payload to the ringbuffer
- 
+
-            retval=RAW1394_ISO_OK;
-
+
-            int dbc = get_bits(ntohl(quadlet[0]), 8, 8);
-
+
-            // process all ports that should be handled on a per-packet base
-            // this is MIDI for AMDTP (due to the need of DBC)
@@ -1076 +1072 @@
-                retval=RAW1394_ISO_DEFER;
-            }
-
+
-        } else {
-
- 
+
+
-                 cycle, m_data_buffer->getFrameCounter(), m_handler->getPacketCount());
-
+
-            m_xruns++;
-
+
-            // disable the processing, will be re-enabled when
-            // the xrun is handled
@@ -1093 +1089 @@
-    }
-
-       
+    
-}
-
@@ -1100 +1096 @@
-// ISO buffering
-int MotuReceiveStreamProcessor::getMinimalSyncDelay() {
-       
-
+    
+
-    return (int)(m_handler->getWakeupInterval() * n_events * m_ticks_per_frame);
-}
@@ -1107 +1103 @@
-bool MotuReceiveStreamProcessor::reset() {
-
-       
+    
-
-    m_data_buffer->setTickOffset(0);
-
-       
-       
-       
-               
-               
-       
-
-       
+    
+    
+    
+        
+        
+    
+
+    
-}
-
-bool MotuReceiveStreamProcessor::prepare() {
-
-       
-       
-       
-               
-               
-       
-
-       
-
-       
-       
-       
+    
+    
+    
+        
+        
+    
+
+    
+
+    
+    
+    
-
-    // setup any specific stuff here
-    // FIXME: m_frame_size would be a better name
-       
-
+    
+
-    // prepare the framerate estimate
-    m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);
-
-       
-       
-
-       
-
-    
+
+    
+    
+
+    
+
+
-    m_data_buffer->setBufferSize(ringbuffer_size_frames);
-    m_data_buffer->setEventSize(m_event_size);
-       
-
+
+
-// JMW: The rx buffer receives a new timestamp once per received frame so I think the
-// buffer update period is events_per_frame, not events per period.
@@ -1158 +1154 @@
-    m_data_buffer->setUpdatePeriod(events_per_frame);
-    m_data_buffer->setNominalRate(m_ticks_per_frame);
-
+
-    m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
-
+
-    m_data_buffer->prepare();
-
-       
-       
-       
-       
-               
-               
-       
-               
-
-               
-                       
-                       
-               
-
-               
-                       
-                               
-                                       
-                                       
-                               
-                               
-                       
-                               
-                                       
-                                       
-                               
-                               
-                                       
-                                       
-                               
-                               
-                                       
-                                       
-                               
-                               
-                               
-                               
-                       
-                               
-                                       
-                                       
-                               
-                               
-                       
-                               
-                               
-               
-
-       
-
-       
-       
-       
-               
-               
-       
-
-       
-               
-               
-       
-
-       
+    
+    
+    
+    
+        
+        
+    
+        
+
+        
+            
+            
+        
+
+        
+            
+                
+                    
+                    
+                
+                
+            
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+                    
+                    
+                
+                
+                
+                
+            
+                
+                    
+                    
+                
+                
+            
+                
+                
+        
+
+    
+
+    
+    
+    
+        
+        
+    
+
+    
+        
+        
+    
+
+    
-
-}
@@ -1232 +1228 @@
-bool MotuReceiveStreamProcessor::prepareForStop() {
-
-       
-       
-       
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
+    
+    
+    
-}
-
@@ -1247 +1243 @@
-// xrun recovery.  Initialisations which should be done once should be
-// placed in the init() method instead.
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+    
+
+    
+    
+
+    
+    
+
+    
-}
-
@@ -1274 +1270 @@
- * \brief write received events to the port ringbuffers.
- */
- 
-                                       
+
+                    
-{
-       
-       
+    
+    
-          it != m_PeriodPorts.end();
-          ++it ) {
-               
-
-               
-               
-
-               
-
-               
-                       
-                               
-                               
-                       
-                       
-               
-               //      
-               //              
-
-               
-                       
-               
-       
-       
+        
+
+        
+        
+
+        
+
+        
+            
+                
+                
+            
+            
+        
+        //    
+        //        
+
+        
+            
+        
+    
+    
-}
-
@@ -1313 +1309 @@
- * @return true if all successfull
- */
- 
-               
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-               
-               
-
-               
-               
-
-
-               
-
-               
-
-               
-               
-                       
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                               
-                                       
-                                               
-                                               
-                                                       
-                                                       
-                                               
-                                       
-                                       
-                                       
-                               
-                               
-                       
-                       
-                               
-
-         
-       
-
-       
-
-
- 
-               
+
+        
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+        
+        
+
+        
+        
+
+
+        
+
+        
+
+        
+        
+            
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                
+                    
+                        
+                        
+                            
+                            
+                        
+                    
+                    
+                    
+                
+                
+            
+            
+                
+
+        
+    
+
+    
+
+
+
+        
-{
-       
-
-       
-       
-       
-       
-       
-
-       
-       
-
-       
-               
-               
-                       
-                               
-
-                               
-
-                               
-                               
-                               
-                               
-                               
-
-                               
-                                       
-                                       
-                                       
-                                       
-                                       
-                                       
-                                               
-
-                                       
-                                       
-                               
-                       
-                       
-               
-                       
-                               
-                               
-
-                               
-
-                               
-
-
-
-                                       
-
-                                       
-                                       
-
-                                       
-
-                                       
-                                       
-                               
-                       
-                       
-       
-
-       
+    
+
+    
+    
+    
+    
+    
+
+    
+    
+
+    
+        
+        
+            
+                
+
+                
+
+                
+                
+                
+                
+                
+
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                        
+
+                    
+                    
+                
+            
+            
+        
+            
+                
+                
+
+                
+
+                
+
+
+
+                    
+
+                    
+                    
+
+                    
+
+                    
+                    
+                
+            
+            
+    
+
+    
-}
-
-signed int MotuReceiveStreamProcessor::setEventSize(unsigned int size) {
-       
-       
+    
+    
-}
-
@@ -1452 +1448 @@
-// data packet in bytes.
-//
-       
+    
-}
-
-void MotuReceiveStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-}
-

trunk/libffado/src/libstreaming/MotuStreamProcessor.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-#include <assert.h>
-
@@ -48 +44 @@
-{
-public:
-        
-        MotuTransmitStreamProcessor(int port, int framerate, 
-                unsigned int event_size);
-
-
+
+
-
-
-
-
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-    bool prepareForEnable(uint64_t time_to_enable_at);
-
+
-    bool putFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents from the client
-
-       
-       
-       
-
+
+    
+    
+    
+
-
-    int getMinimalSyncDelay();
-
-       
+    
-
-protected:
-       
-       
-       
-       
-       
+    
+    
+    
+    
+    
-
-       
-       
+    
+    
-
-       
-       
-       
+    
+    
+    
-
-    bool prefill();
-
-       
+
+    
-
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset);
-
-       
-
-
-       
-
-
-               
-
-               
+    
+
+
+    
+
+
+        
+
+        
-
-    DECLARE_DEBUG_MODULE;
@@ -118 +114 @@
- */
-class MotuReceiveStreamProcessor
- 
+
-{
-
-public:
-
-       
-       
-
-
-
-               
-
+    
+    
+
+
+
+        
+
-    bool getFrames(unsigned int nbframes); ///< transfer the buffer contents to the client
-
-       
-       
-       
+
+    
+    
+    
-
-    // these two are important to calculate the optimal
-    // ISO DMA buffers size
-    // an estimate will do
-       
-
-
+    
+
+
-    int getMinimalSyncDelay();
-
-
-
-
-
+
-
-
-
+
+
+
+
+
-
-protected:
-
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
-        // is junked.
-        signed int m_closedown_active;
-
+
-    uint64_t m_last_timestamp; /// last timestamp (in ticks)
-    uint64_t m_last_timestamp2; /// last timestamp (in ticks)
-    uint64_t m_last_timestamp_at_period_ticks;
-
+
-    DECLARE_DEBUG_MODULE;
-
@@ -179 +175 @@
-} // end of namespace Streaming
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libstreaming/Port.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
-#include "Port.h"
- 
+
-#include <assert.h>
-
-
-namespace Streaming {
-
-IMPL_DEBUG_MODULE( Port, Port, DEBUG_LEVEL_NORMAL );
-
- 
-     
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
-{
-
@@ -69 +63 @@
- */
-bool Port::init() {
-       
-               
-               
-
-
-       
-               
-
-       
-
-       
-               
-                       
-                               
-                       
-                               
-                               
-                       
-                       
-
-               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                       
-               
-                       
-                       
-                       
-       
-
-       
-
-       
-
-       
+    
+        
+        
+
+
+    
+        
+
+    
+
+    
+        
+            
+                
+            
+                
+                
+            
+            
+
+        
+            
+                
+                
+            
+                
+                
+            
+            
+        
+            
+            
+            
+    
+
+    
+
+    
+
+    
-}
-
-bool Port::reset() {
-       
-               freebob
-       
-       
+    
+        ffado
+    
+    
-};
-
-
-void Port::setVerboseLevel(int l) {
-       
+    
-}
-
-bool Port::setName(std::string name) {
-       
-
-       
-               
-               
-       
-
-       
-
-       
+    
+
+    
+        
+        
+    
+
+    
+
+    
-}
-
-bool Port::setBufferSize(unsigned int newsize) {
-       
-       
-               
-               
-       
-
-       
-       
+    
+    
+        
+        
+    
+
+    
+    
-
-}
-
-unsigned int Port::getEventSize() {
-       
-               
-                       
-               
-                       
-               
-                       
-               
-                       
-       
+    
+        
+            
+        
+            
+        
+            
+        
+            
+    
-}
-
-bool Port::setDataType(enum E_DataType d) {
-       
-       
-               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-       
-
-       
-               
-               
-       
-
-       
-       
+    
+    
+        
+        
+    
+
+    
+    
+    
+        
+            
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+    
+
+    
+        
+        
+    
+
+    
+    
-}
-
-bool Port::setSignalType(enum E_SignalType s) {
-       
-       
-               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-       
-
-       
-               
-               
-       
-
-       
-       
+    
+    
+        
+        
+    
+
+    
+    
+    
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+    
+
+    
+        
+        
+    
+
+    
+    
-
-}
-
-bool Port::setBufferType(enum E_BufferType b) {
-       
-       
-               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-               
-                       
-       
-
-       
-               
-               
-       
-
-       
-       
+    
+    
+        
+        
+    
+
+    
+    
+    
+        
+            
+            
+        
+            
+            
+        
+            
+        
+            
+    
+
+    
+        
+        
+    
+
+    
+    
-
-}
@@ -261 +255 @@
-bool Port::useExternalBuffer(bool b) {
-
-       
-       
-       
-               
-
-       
-
-       
-               
-               
-       
-
-       
-       
+    
+    
+    
+        
+
+    
+
+    
+        
+        
+    
+
+    
+    
-}
-
@@ -281 +275 @@
- * Get the buffer address (being the external or the internal one).
- *
- 
+
- */
-void *Port::getBufferAddress() {
-       
-       
+    
+    
-};
-
@@ -292 +286 @@
- * only call this when specifying an external buffer before init()
- *
- 
+
- */
-void Port::setExternalBufferAddress(void *buff) {
-       
-       
-       
+    
+    
+    
-};
-
-// buffer handling api's for ringbuffers
-bool Port::writeEvent(void *event) {
-       
-       
-
-       
-
-       return (freebob
+    
+    
+
+    
+
+    return (ffado
-}
-
-bool Port::readEvent(void *event) {
-       
-
-       unsigned int read=freebob
-
-       
-       
+    
+
+    unsigned int read=ffado
+
+    
+    
-}
-
-int Port::writeEvents(void *event, unsigned int nevents) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-}
-
-int Port::readEvents(void *event, unsigned int nevents) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-/* rate control */
-bool Port::canRead() {
-       
-
-       
-
-       
-
-       byte_present_in_buffer=(freebob
-
-       
-
-               
-                       
-               
-
-               
-                       
-                       
-                               
-                               
-                       
-                               
-                       
-
-                       
-               
-                       
-
-               
-       
-
-
-       
-
-       
-       
-       
-               
-       
-
-       
-
-
- 
-       
-
-       
-               
-               
-                       
-                       
-                       
-               
-               
-                       
-                       
-                       
-               
-               
-                       
-                       
-                       
-               
-               
-               
-               
-               
-
-               
-               
-
-               
-
-       
-               
-               
-       
-       
+    
+
+    
+
+    
+
+    byte_present_in_buffer=(ffado
+
+    
+
+        
+            
+        
+
+        
+            
+            
+                
+                
+            
+                
+            
+
+            
+        
+            
+
+        
+    
+
+
+    
+
+    
+    
+    
+        
+    
+
+    
+
+
+
+    
+
+    
+        
+        
+            
+            
+            
+        
+        
+            
+            
+            
+        
+        
+            
+            
+            
+        
+        
+        
+        
+        
+
+        
+        
+
+        
+
+    
+        
+        
+    
+    
-}
-
-/// Enable the port. (this can be called anytime)
- 
+
-Port::enable()  {
-
-
-
-
-
-
-
-
+
-    m_disabled=false;
-};
-
+/// Disable the port. (this can be called anytime)
+void
+Port::disable() {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Disabling port %s...\n",m_Name.c_str());
+    m_disabled=false;
+};
+
-
-/* Private functions */
-
-bool Port::allocateInternalBuffer() {
-       
-
-       
-       
-       
-
-       
-               
-               
-       
-
-       
-       
-               
-               
-               
-       
-
-       
+    
+
+    
+    
+    
+
+    
+        
+        
+    
+
+    
+    
+        
+        
+        
+    
+
+    
-}
-
-void Port::freeInternalBuffer() {
-       
-       
-
-       
-               
-               
-       
+    
+    
+
+    
+        
+        
+    
-}
-
-bool Port::allocateInternalRingBuffer() {
-       
-
-       
-       
-       
-
-       
-               
-               
-       
-
-       m_ringbuffer=freebob
-       
-               
-               
-               
-       
-
-       
+    
+
+    
+    
+    
+
+    
+        
+        
+    
+
+    m_ringbuffer=ffado
+    
+        
+        
+        
+    
+
+    
-}
-
-void Port::freeInternalRingBuffer() {
-       
-       
-
-       
-               freebob
-               
-       
-
-
-
+    
+    
+
+    
+        ffado
+        
+    
+
+
+

trunk/libffado/src/libstreaming/Port.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
-
+
+
+
-
-#include <stdint.h>
@@ -43 +39 @@
- layer and the datatype-specific layer. You can define port types by subclassing
- the base port class.
-
+
- After creating a port, you have to set its parameters and then call the init() function.
- 
+
- 1) the stream composition information from the AvDevice
- 2) the streaming API setup (buffer type, data type, ...)
-
+
- \note There are not much virtual functions here because of the high frequency of
-       calling. We try to do everything with a base class getter, and a child class
-       setter. If this isn't possible, we do a static_cast. This however can only be
- 
+
-       the ports. i.e. by design you should make sure that the static_cast will be
-       OK.
-
+
- \todo rework the implementation into something more beautifull
-*/
@@ -61 +57 @@
-
-public:
-       
-
-       
-       
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-
-               
-       
-
-       
-       
-       
-       
-               
-               
-            
-       
-
-       
-       
-       
-       
-               
-               
-               
-               
-       
-
-       
-       
-       
-       
-               
-               
-               
-       
-
-       
-       
-       
-       
-               
-               
-       
-
-       
-
-
-       
-
-
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-
-
-       
-       
-       
-
-       
-
-
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-       
-
-       
-        *      
-        *      
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-
-       
-
-       
-
-       
-       
-       
-       
-
-       
-       
-
-       
-       
-       
-       
-       
-
-      
+    
+
+    
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+
+        
+    
+
+    
+    
+    
+    
+        
+        
+        
+    
+
+    
+    
+    
+    
+        
+        
+        
+        
+    
+
+    
+    
+    
+    
+        
+        
+        
+    
+
+    
+    
+    
+    
+        
+        
+    
+
+    
+
+
+    
+
+
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+
+
+    
+    
+    
+
+    
+
+
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+    
+
+    
+     *    
+     *    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+
+    
+
+    
+    
+    
+    
+
+    
+    
+
+    
+    
+    
+    
+    
+
+    
-
-protected:
-       
-
-       
-       
-
-       
-       
-
-
-
-
-       
-       
-       
-
-       
-       freebob
-       
-
-       
-       
-       
-       
-       
-       
-
-       
-       
-
-       
-       
+    
+
+    
+    
+
+    
+    
+
+
+
+
+    
+    
+    
+
+    
+    ffado
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+    
+
+    
+    
-
-    DECLARE_DEBUG_MODULE;
@@ -322 +318 @@
-public:
-
-
-       
-       
-
-       
+
+    
+    
+
+    
-
-protected:
-
-
+
-};
-
@@ -342 +338 @@
-public:
-
-
-       
-       
-       
+
+    
+    
+    
-
-
@@ -362 +358 @@
-public:
-
-
-       
-       
-       
+
+    
+    
+    
-
-
@@ -375 +371 @@
-}
-
-REEBOB
-
-
+FADO
+
+

trunk/libffado/src/libstreaming/PortManager.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -41 +36 @@
-
-PortManager::~PortManager() {
-    
+    
-}
-
-// bool PortManager::setPortBuffersize(unsigned int newsize) {
-    
- 
- 
-    
-    
-    
-    
-            
-                    
-                    
-            
-    
- 
-    
- 
+    
+
+
+    
+    
+    
+    
+        
+            
+            
+        
+    
+
+    
+
-// }
-
-/**
- 
- 
- 
+
+
+
- */
-bool PortManager::addPort(Port *port)
-{
-       
-
-       
-       
-
-       
+    
+
+    
+    
+
+    
-}
-
-bool PortManager::deletePort(Port *port)
-{
-       
-       
-
-       
-       
-       
-       
-               
-                       
-                    
-                       
-               
-       
-
-       
-
-       
+    
+    
+
+    
+    
+    
+    
+        
+            
+            
+            
+        
+    
+
+    
+
+    
-
-}
@@ -101 +96 @@
-void PortManager::deleteAllPorts()
-{
-       
-
-       
-       
-       
-       
-               
-            
-       
-
-       
+    
+
+    
+    
+    
+    
+        
+        
+    
+
+    
-
-}
-
-int PortManager::getPortCount(enum Port::E_PortType type) {
-       
-
-       
-       
-       
-       
-
-                       
-               
-       
-       
+    
+
+    
+    
+    
+    
+
+            
+        
+    
+    
-}
-
-int PortManager::getPortCount() {
-       
-
-       
-
-       
+    
+
+    
+
+    
-}
-
-Port * PortManager::getPortAtIdx(unsigned int index) {
-
-       
+    
-
-}
@@ -145 +140 @@
-void PortManager::setVerboseLevel(int i) {
-
-       
-
-       
-       
-       
-       
-               
-       
+    
+
+    
+    
+    
+    
+        
+    
-
-}
@@ -158 +153 @@
-
-bool PortManager::resetPorts() {
-       
-
-       
-       
-       
-       
-               
-                       
-                       
-               
-       
-       
+    
+
+    
+    
+    
+    
+        
+            
+            
+        
+    
+    
-}
-
-bool PortManager::initPorts() {
-       
-
-       
-       
-       
-       
-               
-                       
-                       
-               
-       
-       
+    
+
+    
+    
+    
+    
+        
+            
+            
+        
+    
+    
-}
-
-bool PortManager::preparePorts() {
-       
-
-       
-       
-       
-
-       
-       
-       
-       
-               
-                       
-                       
-               
-
-               
-               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                               
-
-                       
-               
-       
-
-
-
-       
-
-
-
+    
+
+    
+    
+    
+
+    
+    
+    
+    
+        
+            
+            
+        
+
+        
+        
+            
+                
+                
+            
+                
+                
+            
+                
+
+            
+        
+    
+
+
+
+    
+
+
+

trunk/libffado/src/libstreaming/PortManager.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -43 +39 @@
-
- Contains helper classes that allow the easy maintaining of Port collections.
-
+
-*/
-class PortManager {
@@ -49 +45 @@
-public:
-
-       
-       
+    
+    
-
-       
-       
-       
+    
+    
+    
-
-       
-       
+    
+    
-
-    
+    
-
-       
+    
-
-       
-
-
+    
+
+
-
-      
+    
-
-protected:
-       
-       
-       
-    
+    
+    
+    
+    
-
-    DECLARE_DEBUG_MODULE;
@@ -81 +77 @@
-}
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libstreaming/StreamProcessor.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -41 +36 @@
-IMPL_DEBUG_MODULE( TransmitStreamProcessor, TransmitStreamProcessor, DEBUG_LEVEL_VERBOSE );
-
- 
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
-{
-    // create the timestamped buffer and register ourselves as its client
@@ -70 +65 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, " StreamProcessor information\n");
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Iso stream info:\n");
-
+
-    IsoStream::dumpInfo();
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  StreamProcessor info:\n");
@@ -79 +74 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Enabled               : %s\n", m_disabled ? "No" : "Yes");
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "   enable status        : %s\n", m_is_disabled ? "No" : "Yes");
-
- 
+
+
-        24576000.0/m_SyncSource->m_data_buffer->getRate(),
-        24576000.0/m_data_buffer->getRate()
-        );
-
+
-    m_data_buffer->dumpInfo();
-
+
-//     m_PeriodStat.dumpInfo();
-//     m_PacketStat.dumpInfo();
@@ -96 +91 @@
-{
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "enter...\n");
-
+
-    m_data_buffer->init();
-
+
-    return IsoStream::init();
-}
@@ -115 +110 @@
-        return false;
-    }
-
+
-    resetXrunCounter();
-
@@ -130 +125 @@
-    }
-    return true;
-
+
-}
-
@@ -150 +145 @@
-bool StreamProcessor::prepare() {
-
-       
-
-       
-
-       
-               
-               
-       
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+
+    
+
+    
+        
+        
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
-
-}
@@ -192 +187 @@
-    // FIXME: time_to_enable_at will be in 'time' not cycles
-    m_cycle_to_enable_at=time_to_enable_at;
-
+
-    if(!m_running) {
-            debugWarning("The StreamProcessor is not running yet, enable() might not be a good idea.\n");
@@ -200 +195 @@
-    uint64_t now_cycles=CYCLE_TIMER_GET_CYCLES(m_handler->getCycleTimer());
-    const int64_t max=(int64_t)(CYCLES_PER_SECOND/2);
-
+
-    int64_t diff=(int64_t)m_cycle_to_enable_at-(int64_t)now_cycles;
-
+
-    if (diff > max) {
-        diff-=TICKS_PER_SECOND;
@@ -208 +203 @@
-        diff+=TICKS_PER_SECOND;
-    }
-
+
-    if (diff<0) {
-        debugWarning("Request to enable streamprocessor %lld cycles ago (now=%llu, cy=%llu).\n",
@@ -231 +226 @@
-int64_t StreamProcessor::getTimeUntilNextPeriodSignalUsecs() {
-    uint64_t time_at_period=getTimeAtPeriod();
-
+
-    // we delay the period signal with the sync delay
-    // this makes that the period signals lag a little compared to reality
@@ -243 +238 @@
-
-    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
-
+
-    // calculate the time until the next period
-    int32_t until_next=diffTicks(time_at_period,cycle_timer);
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11lld\n",
-        time_at_period, cycle_timer, until_next
-        );
-
+
-    // now convert to usecs
-    // don't use the mapping function because it only works
@@ -267 +262 @@
- */
-void StreamProcessor::resetXrunCounter() {
-       
+    
-}
-
-void StreamProcessor::setVerboseLevel(int l) {
-       
-       
-       
-
-
-
- 
-       
+    
+    
+    
+
+
+
+
+    
-
-}
@@ -287 +282 @@
-
-void ReceiveStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-
-}
@@ -294 +289 @@
-uint64_t ReceiveStreamProcessor::getTimeAtPeriod() {
-    uint64_t next_period_boundary=m_data_buffer->getTimestampFromHead(m_period);
-
+
-    #ifdef DEBUG
-    uint64_t ts,fc;
-    m_data_buffer->getBufferTailTimestamp(&ts,&fc);
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> NPD=%11lld, LTS=%11llu, FC=%5u, TPF=%f\n",
-        next_period_boundary, ts, fc, m_ticks_per_frame
-        );
-    #endif
-
+
-    return next_period_boundary;
-}
@@ -311 +306 @@
-}
-
- 
-       
+
+    
-
-}
@@ -321 +316 @@
-
-void TransmitStreamProcessor::setVerboseLevel(int l) {
-       
-       
+    
+    
-
-}
@@ -332 +327 @@
-    uint64_t ts,fc;
-    m_data_buffer->getBufferTailTimestamp(&ts,&fc);
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> NPD=%11lld, LTS=%11llu, FC=%5u, TPF=%f\n",
-        next_period_boundary, ts, fc, m_ticks_per_frame
-        );
-    #endif
-
+
-    return next_period_boundary;
-}

trunk/libffado/src/libstreaming/StreamProcessor.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
-
+
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -47 +43 @@
-\brief Class providing a generic interface for Stream Processors
-
- 
+
- collection of ports. This class should be subclassed, and the relevant
- functions should be overloaded.
-
+
-*/
- 
- 
+
+
-                        public Util::TimestampedBufferClient,
-                        public Util::OptionContainer {
@@ -68 +64 @@
-    virtual ~StreamProcessor();
-
- 
- 
- 
+
+
+
-                        unsigned int cycle, unsigned int dropped) = 0;
- 
+
-            getPacket(unsigned char *data, unsigned int *length,
-                    unsigned char *tag, unsigned char *sy,
@@ -80 +76 @@
-
-    bool xrunOccurred() { return (m_xruns>0);};
-
+
-    // move to private?
-    void resetXrunCounter();
-
-    bool isRunning(); ///< returns true if there is some stream data processed
-
+
-    virtual bool prepareForEnable(uint64_t time_to_enable_at);
-    virtual bool prepareForDisable();
-
- 
- 
+
+
+
-    bool isEnabled() {return !m_is_disabled;};
-
@@ -116 +112 @@
-    void setManager(StreamProcessorManager *manager) {m_manager=manager;};
-    void clearManager() {m_manager=0;};
-
+
-protected:
-    unsigned int m_nb_buffers; ///< cached from manager->getNbBuffers(), the number of periods to buffer
@@ -126 +122 @@
-
-    StreamProcessorManager *m_manager;
-
+
-    bool m_running;
-    bool m_disabled;
-    bool m_is_disabled;
-    unsigned int m_cycle_to_enable_at;
-
+
-    StreamStatistics m_PacketStat;
-    StreamStatistics m_PeriodStat;
-
+
-    StreamStatistics m_WakeupStat;
-
+
-
-    DECLARE_DEBUG_MODULE;
-
+
-    // frame counter & sync stuff
-    public:
@@ -145 +141 @@
-         * @brief Can this StreamProcessor handle a transfer of nframes frames?
-         *
- 
+
-         * nframes frames. It is used to detect underruns-to-be.
-         *
@@ -153 +149 @@
-         */
-        virtual bool canClientTransferFrames(unsigned int nframes) = 0;
-
+
-        /**
-         * \brief return the time until the next period boundary should be signaled (in microseconds)
-         *
- 
- 
+
+
-         * determine when a buffer transfer can be made. When this value is
-         * smaller than 0, a period boundary is assumed to be crossed, hence a
@@ -180 +176 @@
-
-        /**
- 
+
-         *
-         * The same as getTimeUntilNextPeriodSignalUsecs() but in internal units.
@@ -189 +185 @@
-
-        uint64_t getTimeNow();
-
-
+
+
-        /**
-         * Returns the sync delay. This is the time a syncsource
@@ -202 +198 @@
-         */
-        void setSyncDelay(int d) {m_sync_delay=d;};
-
+
-        /**
-         * Returns the minimal sync delay a SP needs
@@ -215 +211 @@
-
-        int getBufferFill();
-
+
-    protected:
-        StreamProcessor *m_SyncSource;
@@ -233 +229 @@
-
-public:
-       
-
-       
-
-
-       
-
-
-               
-       
-
-       
+    
+
+    
+
+
+    
+
+
+        
+    
+
+    
-        virtual bool putFrames(unsigned int nbframes, int64_t ts) {return false;};
-
- 
-
-               
-      
+
+
+
+        
+    
-
-    uint64_t getTimeAtPeriod();
@@ -269 +265 @@
-
-public:
-       
-
-       
-
-       
-
-
-
-
-               
+    
+
+    
+
+    
+
+
+
+
+        
-        virtual bool getFrames(unsigned int nbframes) {return false;};
-
-
-               
-       
-       
-      
+
+        
+    
+    
+    
-
-    uint64_t getTimeAtPeriod();
@@ -300 +296 @@
-}
-
-REEBOB
-
-
+FADO
+
+

trunk/libffado/src/libstreaming/StreamProcessorManager.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -60 +55 @@
-
-StreamProcessorManager::~StreamProcessorManager() {
-       
-
+    
+
-}
-
@@ -72 +67 @@
- * and be sure that the processors are also ->init()'ed
- *
- 
+
- * @return true if successfull
- */
-bool StreamProcessorManager::registerProcessor(StreamProcessor *processor)
-{
-       
-       
-       
-
-       
-               
-
-               
-
-               
-
-               
-       
-
-       
-               
-
-               
-
-               
-
-               
-       
-
-       
-
-       
+    
+    
+    
+
+    
+        
+
+        
+
+        
+
+        
+    
+
+    
+        
+
+        
+
+        
+
+        
+    
+
+    
+
+    
-}
-
-bool StreamProcessorManager::unregisterProcessor(StreamProcessor *processor)
-{
-       
-       
-
-       
-
-               
-                       
-                       
-
-
-                                       
-
-                                       
-
-                                       
-                                               
-
-                                               
-
-                                       
-
-                                       
-                               
-               
-       
-
-       
-               
-                       
-                       
-
-
-                                       
-
-                                       
-
-                                       
-                                               
-
-                                               
-
-                                       
-
-                                       
-                               
-               
-       
-
-       
-
-       
+    
+    
+
+    
+
+        
+            
+            
+
+
+                    
+
+                    
+
+                    
+                        
+
+                        
+
+                    
+
+                    
+                
+        
+    
+
+    
+        
+            
+            
+
+
+                    
+
+                    
+
+                    
+                        
+
+                        
+
+                    
+
+                    
+                
+        
+    
+
+    
+
+    
-
-}
@@ -175 +170 @@
-bool StreamProcessorManager::init()
-{
-       
-
-       
-
-       
-               
-               
-       
-
-       
-       
-
-       
-               
-               
-       
-
-       
-
-       
+    
+
+    
+
+    
+        
+        
+    
+
+    
+    
+
+    
+        
+        
+    
+
+    
+
+    
-}
-
-bool StreamProcessorManager::prepare() {
-
-       
-
+    
+
-    m_is_slave=false;
-    if(!getOption("snoopMode", m_is_slave)) {
@@ -219 +214 @@
-            }
-    }
-
+
-    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-        it != m_TransmitProcessors.end();
@@ -234 +229 @@
-        it != m_ReceiveProcessors.end();
-        ++it ) {
-
+
-        if(!(*it)->setSyncSource(m_SyncSource)) {
-            debugFatal(  " could not set sync source (%p)...\n",(*it));
@@ -267 +262 @@
-    }
-
- 
+
-    // fail
-    if (m_ReceiveProcessors.size() + m_TransmitProcessors.size() == 0) {
@@ -274 +269 @@
-    }
-
-       
+    
-}
-
@@ -287 +282 @@
-        wait_cycles--;
-        notRunning=false;
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -299 +294 @@
-            if(!(*it)->isRunning()) notRunning=true;
-        }
-
+
-        // EXPERIMENT:
-        // the only stream that should be running is the sync
@@ -305 +300 @@
-        // when to signal buffers. Maybe we get an xrun at startup,
-        // but that should be handled.
-
- 
- 
+
+
+
-        // will not start up (e.g. the bounce device), because
-        // all streams are required to be running.
-
- 
+
+
-        // to start up
-//         if(!m_SyncSource->isRunning()) notRunning=true;
-
+
-        usleep(1000);
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Running check: %d\n",notRunning);
@@ -327 +322 @@
-            if(!(*it)->isRunning()) {
-                debugFatal(" receive stream %p not running\n",*it);
-   
+
-                debugFatal(" receive stream %p running\n",*it);
-            }
@@ -337 +332 @@
-            if(!(*it)->isRunning()) {
-                debugFatal(" transmit stream %p not running\n",*it);
-   
+
-                debugFatal(" transmit stream %p running\n",*it);
-            }
@@ -344 +339 @@
-    }
-
- 
+
-    // so wait for a while
-    usleep(USECS_PER_CYCLE * CYCLES_TO_SLEEP_AFTER_RUN_SIGNAL);
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " StreamProcessor streams running...\n");
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Finding minimal sync delay...\n");
-
@@ -360 +355 @@
-        if(min_delay>max_of_min_delay) max_of_min_delay=min_delay;
-    }
-
+
-    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-            it != m_TransmitProcessors.end();
@@ -367 +362 @@
-        if(min_delay>max_of_min_delay) max_of_min_delay=min_delay;
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  %d ticks\n", max_of_min_delay);
-    m_SyncSource->setSyncDelay(max_of_min_delay);
-
-
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Resetting StreamProcessors...\n");
-    // now we reset the frame counters
@@ -379 +374 @@
-        (*it)->reset();
-    }
-
+
-    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-            it != m_TransmitProcessors.end();
@@ -385 +380 @@
-        (*it)->reset();
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Enabling StreamProcessors...\n");
-
+
-    uint64_t now=m_SyncSource->getTimeNow(); // fixme: should be in usecs, not ticks
-
+
-    // FIXME: this should not be in cycles, but in 'time'
-    unsigned int enable_at=TICKS_TO_CYCLES(now)+ENABLE_DELAY_CYCLES;
@@ -403 +398 @@
-
-bool StreamProcessorManager::start() {
-       
-       
-
-       
-       
-       
-               
-               
-                       
-                               
-                               
-                       
-                       
-                               
-                               
-                       
-               
-
-       
-       
-               
-               
-                       
-                               
-                               
-                       
-                       
-                               
-                               
-                       
-               
-
-       
-       
-               
-               
-       
-
-       
+    
+    
+
+    
+    
+    
+        
+        
+            
+                
+                
+            
+            
+                
+                
+            
+        
+
+    
+    
+        
+        
+            
+                
+                
+            
+            
+                
+                
+            
+        
+
+    
+    
+        
+        
+    
+
+    
-        if (!disableStreamProcessors()) {
-               
-               
-       
-
-       
-       
-               
-               
-       
-
-       
-       
-               
-               
-       
-
-       
-       
-               
-       
-
-       
-
+        
+        
+    
+
+    
+    
+        
+        
+    
+
+    
+    
+        
+        
+    
+
+    
+    
+        
+    
+
+    
+
-}
-
-bool StreamProcessorManager::stop() {
-       
-       
-
-       
-       
-       
-       
-       
-       
-       
-               
-               
-
-               
-                       
-                       
-                       
-               
-
-               
-                       
-                       
-                       
-               
-               
-       
-
-
-       
-       
-       
-       
-       
-
-       
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+        
+        
+
+        
+            
+            
+            
+        
+
+        
+            
+            
+            
+        
+        
+    
+
+
+    
+    
+    
+    
+    
+
+    
-    // now unregister all streams from iso manager
-       
-       
-               
-               
-                       
-                               
-                               
-                       
-
-               
-
-       
-       
-               
-               
-                       
-                               
-                               
-                       
-
-               
-
-       
-
+    
+    
+        
+        
+            
+                
+                
+            
+
+        
+
+    
+    
+        
+        
+            
+                
+                
+            
+
+        
+
+    
+
-}
-
@@ -547 +542 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  Enable...\n");
-    m_SyncSource->enable(time_to_enable_at);
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Other StreamProcessors...\n");
-
+
-    // we prepare the streamprocessors for enable
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
@@ -572 +567 @@
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-            it != m_ReceiveProcessors.end();
-           
+
-        if(*it != m_SyncSource) {
-            debugOutput( DEBUG_LEVEL_VERBOSE, " Enable Receive SP (%p)...\n",*it);
@@ -597 +592 @@
-        wait_cycles--;
-        notEnabled=false;
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -611 +606 @@
-        usleep(1000); // one cycle
-    }
-
+
-    if(!wait_cycles) { // timout has occurred
-        debugFatal("One or more streams couldn't be enabled (timeout):\n");
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -620 +615 @@
-            if(!(*it)->isEnabled()) {
-                    debugFatal(" receive stream %p not enabled\n",*it);
-   
+
-                    debugFatal(" receive stream %p enabled\n",*it);
-            }
-        }
-
+
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-                it != m_TransmitProcessors.end();
@@ -630 +625 @@
-            if(!(*it)->isEnabled()) {
-                    debugFatal(" transmit stream %p not enabled\n",*it);
-   
+
-                    debugFatal(" transmit stream %p enabled\n",*it);
-            }
@@ -636 +631 @@
-        return false;
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, " => all StreamProcessors enabled...\n");
-
@@ -682 +677 @@
-        wait_cycles--;
-        enabled=false;
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -696 +691 @@
-        usleep(1000); // one cycle
-    }
-
+
-    if(!wait_cycles) { // timout has occurred
-        debugFatal("One or more streams couldn't be disabled (timeout):\n");
-
+
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-                it != m_ReceiveProcessors.end();
@@ -705 +700 @@
-            if(!(*it)->isEnabled()) {
-                    debugFatal(" receive stream %p not enabled\n",*it);
-   
+
-                    debugFatal(" receive stream %p enabled\n",*it);
-            }
-        }
-
+
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-                it != m_TransmitProcessors.end();
@@ -715 +710 @@
-            if(!(*it)->isEnabled()) {
-                    debugFatal(" transmit stream %p not enabled\n",*it);
-   
+
-                    debugFatal(" transmit stream %p enabled\n",*it);
-            }
@@ -721 +716 @@
-        return false;
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, " => all StreamProcessors disabled...\n");
-
+
-    return true;
-}
@@ -736 +731 @@
-bool StreamProcessorManager::handleXrun() {
-
-       
-
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
+    
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
-        if (!disableStreamProcessors()) {
-               
-               
-       
-
-       
-       
-       
-               
-               
-       
-
-       
-
-       
+        
+        
+    
+
+    
+    
+    
+        
+        
+    
+
+    
+
+    
-}
-
@@ -769 +764 @@
- *
- * This function does not return until a full period of samples is (or should be)
- 
+
- *
- * @return true if the period is ready, false if an xrun occurred
@@ -776 +771 @@
-    int time_till_next_period;
-    bool xrun_occurred=false;
-
+
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "enter...\n");
-
-    assert(m_SyncSource);
-
+
-    time_till_next_period=m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
-
+
-    while(time_till_next_period > 0) {
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "waiting for %d usecs...\n", time_till_next_period);
-
+
-        // wait for the period
-        usleep(time_till_next_period);
-
+
-        // check for underruns on the ISO side,
-        // those should make us bail out of the wait loop
@@ -807 +802 @@
-        time_till_next_period=m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "delayed for %d usecs...\n", time_till_next_period);
-
- 
- 
+
+
+
-    m_delayed_usecs=time_till_next_period;
-
+
-    // we save the 'ideal' time of the transfer at this point,
- 
+
-    // cycles making that we modify a receiving stream's buffer
-    // before we get to writing.
@@ -821 +816 @@
-    //       and the receive processors should have done their transfer.
-    m_time_of_transfer=m_SyncSource->getTimeAtPeriod();
- 
+
-        m_time_of_transfer);
-
+
-#ifdef DEBUG
-    int rcv_bf=0, xmt_bf=0;
@@ -836 +831 @@
-        xmt_bf = (*it)->getBufferFill();
-    }
- 
+
-        m_time_of_transfer,rcv_bf,xmt_bf,rcv_bf+xmt_bf);
-
+
-#endif
-
-    xrun_occurred=false;
-
+
-    // check if xruns occurred on the Iso side.
-    // also check if xruns will occur should we transfer() now
-
+
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-          it != m_ReceiveProcessors.end();
@@ -851 +846 @@
-        // a xrun has occurred on the Iso side
-        xrun_occurred |= (*it)->xrunOccurred();
-
+
-        // if this is true, a xrun will occur
-        xrun_occurred |= !((*it)->canClientTransferFrames(m_period));
-
+
-#ifdef DEBUG
-        if ((*it)->xrunOccurred()) {
@@ -865 +860 @@
-        }
-#endif
-
+
-    }
-    for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
@@ -872 +867 @@
-        // a xrun has occurred on the Iso side
-        xrun_occurred |= (*it)->xrunOccurred();
-
+
-        // if this is true, a xrun will occur
-        xrun_occurred |= !((*it)->canClientTransferFrames(m_period));
-
+
-#ifdef DEBUG
-        if ((*it)->xrunOccurred()) {
@@ -883 +878 @@
-            debugWarning("Xrun on XMIT SP %p due to buffer xrun\n",*it);
-        }
-        
-
-
+
+
+
-    m_nbperiods++;
-
+
-    // now we can signal the client that we are (should be) ready
-    return !xrun_occurred;
@@ -900 +895 @@
- */
-bool StreamProcessorManager::transfer() {
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Transferring period...\n");
-
@@ -920 +915 @@
-bool StreamProcessorManager::transfer(enum StreamProcessor::EProcessorType t) {
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Transferring period...\n");
-
+
-    // a static cast could make sure that there is no performance
-    // penalty for the virtual functions (to be checked)
@@ -927 +922 @@
-                it != m_ReceiveProcessors.end();
-                ++it ) {
-
+
-            if(!(*it)->getFrames(m_period)) {
-                    debugOutput(DEBUG_LEVEL_VERBOSE,"could not getFrames(%u, %11llu) from stream processor (%p)",
@@ -939 +934 @@
-                it != m_TransmitProcessors.end();
-                ++it ) {
-
+
-            if(!(*it)->putFrames(m_period, (int64_t)m_time_of_transfer)) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "could not putFrames(%u,%llu) to stream processor (%p)",
@@ -953 +948 @@
-
-void StreamProcessorManager::dumpInfo() {
-       
-       
-       
-
-       
-       
-               
-               
-               
-       
-
-       
-       
-               
-               
-               
-       
-
-       
-       
-       
+    
+    
+    
+
+    
+    
+        
+        
+        
+    
+
+    
+    
+        
+        
+        
+    
+
+    
+    
+    
-
-}
-
-void StreamProcessorManager::setVerboseLevel(int l) {
-       
-
-       
-
-       
-       
-               
-               
-               
-       
-
-       
-       
-               
-               
-               
-       
+    
+
+    
+
+    
+    
+        
+        
+        
+    
+
+    
+    
+        
+        
+        
+    
-}
-
-
-int StreamProcessorManager::getPortCount(enum Port::E_PortType type, enum Port::E_Direction direction) {
-       
-
-       
-               
-                       
-                       
-                       
-               
-       
-               
-                       
-                       
-                       
-               
-       
-       
+    
+
+    
+        
+            
+            
+            
+        
+    
+        
+            
+            
+            
+        
+    
+    
-}
-
-int StreamProcessorManager::getPortCount(enum Port::E_Direction direction) {
-       
-
-       
-               
-                       
-                       
-                       
-               
-       
-               
-                       
-                       
-                       
-               
-       
-       
+    
+
+    
+        
+            
+            
+            
+        
+    
+        
+            
+            
+            
+        
+    
+    
-}
-
@@ -1039 +1034 @@
-
-Port* StreamProcessorManager::getPortByIndex(int idx, enum Port::E_Direction direction) {
-       
-       
-
-       
-               
-                       
-                       
-                       
-                       
-                               
-                       
-                       
-               
-       
-               
-                       
-                       
-                       
-                       
-                               
-                       
-                       
-               
-       
-       
+    
+    
+
+    
+        
+            
+            
+            
+            
+                
+            
+            
+        
+    
+        
+            
+            
+            
+            
+                
+            
+            
+        
+    
+    
-}
-

trunk/libffado/src/libstreaming/StreamProcessorManager.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "debugmodule/debugmodule.h"
@@ -49 +45 @@
-/*!
-\brief Manages a collection of StreamProcessors and provides a synchronisation interface
-
+
-*/
-class StreamProcessorManager : public Util::OptionContainer {
-    friend class StreamProcessor;
-
+
-public:
-
@@ -64 +60 @@
-    bool start();
-    bool stop();
-
+
-    bool syncStartAll();
-
@@ -91 +87 @@
-    bool transfer(); ///< transfer the buffer contents from/to client
-    bool transfer(enum StreamProcessor::EProcessorType); ///< transfer the buffer contents from/to client (single processor type)
-
+
-    int getDelayedUsecs() {return m_delayed_usecs;};
-    bool xrunOccurred();
-    int getXrunCount() {return m_xruns;};
-
+
-private:
-    int m_delayed_usecs;
@@ -102 +98 @@
-    // for the transmit SP's
-    uint64_t m_time_of_transfer;
-
+
-public:
-    bool handleXrun(); ///< reset the streams & buffers after xrun
@@ -113 +109 @@
-private: // slaving support
-    bool m_is_slave;
-
+
-    // the sync source stuff
-private:
-    StreamProcessor *m_SyncSource;
-
+
-public:
-    bool setSyncSource(StreamProcessor *s);
@@ -125 +121 @@
-
-    // thread sync primitives
- 
+
-
-    bool m_thread_realtime;
@@ -137 +133 @@
-    unsigned int m_period;
-    unsigned int m_xruns;
-
+
-    IsoHandlerManager *m_isoManager;
-
@@ -148 +144 @@
-}
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/Atomic.h

@@ -1 +1 @@
-/*
-reebob (C) 2006
+FADO by
-
-Copied from the jackd/jackdmp sources
@@ -6 +6 @@
-a jackd backend.
-
-  
+
-
-This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
-*/
-
-reebobAtomic
-reebobAtomic
+FADOATOMIC
+FADOATOMIC
-
-typedef unsigned short UInt16;
@@ -40 +40 @@
-    register int result;
-    asm volatile (
-                                 
-      lwarx   r0, 0, %1       
-      cmpw    r0, %2          \n"                     
-      bne-    
-      sync                    
-      stwcx.  %3, 0, %1       
+                    
+    lwarx    r0, 0, %1    
+    cmpw    r0, %2        \n"            
+    bne-    
+    sync                
+    stwcx.    %3, 0, %1    
-        //  stores the new value at addr
-      bne-    
+    bne-    
-        "   li      %0, 1       \n"
-      b               
+    b        
-        "1:                     \n"
-        "   li      %0, 0       \n"
-        "2:                     \n"
-               
-               
-               
-               
+        
+        
+        
+        
-    return result;
-}
@@ -62 +62 @@
-#endif
-
- 
+
-
-#ifdef __SMP__
-      
+    
-#else
-      
+    
-#endif
-
@@ -77 +77 @@
-        LOCK "cmpxchg %2, (%1) \n\t"
-        "sete %0               \n\t"
-               
-               
-               
+        
+        
+        
-    return ret;
-}
@@ -96 +96 @@
-    register UInt32 tmp;
-    asm volatile (
-                                 
-      lwarx   %4, 0, %1       
-      cmpw    %4, %2          
-      bne-    
-      sync                    
-      stwcx.  %3, 0, %1       
+                    
+    lwarx    %4, 0, %1    
+    cmpw    %4, %2        
+    bne-    
+    sync                
+    stwcx.    %3, 0, %1    
-        //  stores the new value at addr
-      bne-    
+    bne-    
-        "   li      %0, 1       \n"
-      b               
+    b        
-        "1:                     \n"
-        "   li      %0, 0       \n"
-        "2:                     \n"
-               
-               
-               
+        
+        
+        
-    return result;
-}
@@ -117 +117 @@
-#endif
-
- 
+
-
-#ifdef __SMP__
-      
+    
-#else
-      
+    
-#endif
-
@@ -132 +132 @@
-        LOCK "cmpxchg %2, (%1) \n\t"
-        "sete %0               \n\t"
-               
-               
-               
+        
+        
+        
-    return ret;
-}
@@ -187 +187 @@
-}
-
+#endif // __FFADO_ATOMIC__
-
-#endif
-

trunk/libffado/src/libutil/cycles.h

@@ -1 +1 @@
-/* cycles.h
-
-reeBob
-reeBob
+FADO
+FADO
-
-reebob
+fado
-
-Based upon cycles.h from the jackdmp package.
@@ -11 +11 @@
-  Copyright (C) 2001 Paul Davis
-  Code derived from various headers from the Linux kernel
-
+
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
@@ -28 +28 @@
-*/
-
-freebob_cycles_h
-freebob_cycles_h
+FFADO_CYCLES_H
+FFADO_CYCLES_H
-
-/*
@@ -43 +43 @@
- * that we reschedule before that wraps. Scheduling at least every
- * four billion cycles just basically sounds like a good idea,
- 
+
- */
-
@@ -52 +52 @@
-/* PowerPC */
-
-                    
+            
-
-typedef unsigned long cycles_t;
@@ -65 +65 @@
-
-    __asm__ __volatile__(
-   
+    
-        "99:\n"
-        ".section __ftr_fixup,\"a\"\n"
-      
-      
-      
-      
+    
+    
+    
+    
-        ".previous"
-    : "=r" (ret) : "i" (CPU_FTR_601));
@@ -100 +100 @@
-#endif
-
-* __freebob_cycles_h__ */
+/ __FFADO_CYCLES_H__

trunk/libffado/src/libutil/DelayLockedLoop.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-
@@ -41 +36 @@
- * @param coeffs coefficients to use
- */
- 
+
-{
-    unsigned int i;
-
+
-    m_order=order;
-    if (m_order==0) m_order=1;
-
+
-    m_coeffs=new float[order];
-    m_nodes=new float[order];
-
+
-    for (i=0;i<order;i++) {
-        m_coeffs[i]=coeffs[i];
@@ -68 +63 @@
-{
-    unsigned int i;
-
+
-    m_order=order;
-    if (m_order==0) m_order=1;
-
+
-    m_coeffs=new float[order];
-    m_nodes=new float[order];
-
+
-    for (i=0;i<order;i++) {
-        m_coeffs[i]=0.0;
@@ -88 +83 @@
-DelayLockedLoop::DelayLockedLoop() {
-    m_order=1;
-
+
-    m_coeffs=new float[1];
-    m_coeffs[0]=0.0;
-
+
-    m_nodes=new float[1];
-    m_nodes[0]=0.0;
@@ -99 +94 @@
-    if(m_coeffs) delete[] m_coeffs;
-    if(m_nodes) delete[] m_nodes;
-
-
-
+
+
+
-/**
- * Returns the coefficient with index i
@@ -110 +105 @@
- * @return value of the coefficient
- */
- 
+
-DelayLockedLoop::getCoefficient(unsigned int i) {
-
-
-
-
+
+
+
-    } else {
-        return 0.0;
@@ -124 +118 @@
- *
- * i should be smaller than the DLL order
- 
+
- * @param i index of the coefficient
- * @param c value of the coefficient
@@ -130 +124 @@
-void
-DelayLockedLoop::setCoefficient(unsigned int i, float c) {
-
-
-
-
+
+
+
-    }
-}
@@ -142 +135 @@
- *
- * i should be smaller than the DLL order
- 
+
- *
- * @param i index of the integrator
@@ -149 +142 @@
-void
-DelayLockedLoop::setIntegrator(unsigned int i, float c) {
-
+
-    if (i<m_order) {
-        m_nodes[i]=c;
@@ -156 +149 @@
-
-/**
- 
+
- * meaning that it will set all internal nodes to 0.0
- */
- 
+
-DelayLockedLoop::reset() {
-
+
-    unsigned int i;
-    for (i=0;i<m_order;i++) {
-        m_nodes[i]=0.0;
-    }
-
+
-}
-
@@ -173 +166 @@
- * @return DLL order
- */
- 
+
-DelayLockedLoop::getOrder() {
-    return m_order;
@@ -190 +183 @@
- * @param coeffs coefficients to use
- */
- 
+
-DelayLockedLoop::setOrder(unsigned int order, float* coeffs) {
-    unsigned int i;
-
+
-    reset();
-
+
-    m_order=order;
-    if (m_order==0) m_order=1;
-
+
-    if(m_coeffs) delete[] m_coeffs;
-    m_coeffs=new float[order];
-
+
-    if(m_nodes) delete[] m_nodes;
-    m_nodes=new float[order];
-
+
-    for (i=0;i<order;i++) {
-        m_coeffs[i]=coeffs[i];
@@ -221 +214 @@
- * @param order new order for the DLL
- */
- 
+
-DelayLockedLoop::setOrder(unsigned int order) {
-    unsigned int i;
-
+
-    reset();
-
+
-    m_order=order;
-
+
-    if (m_order==0) m_order=1;
-
+
-    if(m_coeffs) delete[] m_coeffs;
-    m_coeffs=new float[order];
-
+
-    if(m_nodes) delete[] m_nodes;
-    m_nodes=new float[order];
-
+
-    for (i=0;i<order;i++) {
-        m_coeffs[i]=0.0;
@@ -243 +236 @@
-
-}
-
+
-/**
- * Put a new value in the loop, updating all internal nodes and
@@ -250 +243 @@
- * @param v new value
- */
- 
+
-DelayLockedLoop::put(float v) {
-
@@ -256 +249 @@
-    // to make use of pipeline-ing and out of order execution
-    // except for very high order loops, then we do it looped
-
+
-    // error = newval - output
-    m_error=v-m_nodes[0];
@@ -262 +255 @@
-    // update the output value
-    m_nodes[0]+=m_error*m_coeffs[0];
-
+
-    if(m_order==1) return; // we are done
-
+
-    // add the output of the second integrator
-    m_nodes[0]+=m_nodes[1];
-
+
-    // update the second integrator
-    m_nodes[1]+=m_error*m_coeffs[1];
-
+
-    if(m_order==2) return; // we are done
-
+
-    // if the order is even higher, we are using a loop
-    unsigned int i;
@@ -278 +271 @@
-        // add the i-th integrator value
-        m_nodes[i-1] += m_nodes[i];
-
+
-        // update the i-th integrator
-        m_nodes[i] = m_coeffs[i] * m_error;
-    }
-
+
-    return;
-}
-
-/**
- 
+
- *
- * @return current output value
- */
- 
+
-DelayLockedLoop::get() {
-    return m_nodes[0];
@@ -301 +294 @@
- * @return current error signal value
- */
- 
+
-DelayLockedLoop::getError() {
-    return m_error;
-}
-
-reeBob
+FADO

trunk/libffado/src/libutil/DelayLockedLoop.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-namespace Util {
@@ -35 +31 @@
-public:
-
-       
-       
-       
-
-       
-
+    
+    
+    
+
+    
+
-    float getCoefficient(unsigned int i);
-    void setCoefficient(unsigned int i, float c);
-
+
-    void setIntegrator(unsigned int i, float c);
-
+
-    void reset();
-
+
-    unsigned int getOrder();
-    void setOrder(unsigned int i);
-    void setOrder(unsigned int order, float* coeffs);
-
+
-    void put(float v);
-    float get();
-    float getError();
-
+
-protected:
-
@@ -65 +61 @@
-};
-
-reeBob
+FADO
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/OptionContainer.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -36 +31 @@
-IMPL_DEBUG_MODULE( OptionContainer, OptionContainer, DEBUG_LEVEL_NORMAL );
-
- 
+
-    : m_Name(""),
-    m_stringValue(""),
@@ -46 +41 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(""),
@@ -56 +51 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(v),
@@ -66 +61 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(""),
@@ -76 +71 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(""),
@@ -86 +81 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(""),
@@ -96 +91 @@
-{}
-
- 
+
-    : m_Name(n),
-    m_stringValue(""),
@@ -135 +130 @@
-    Option op=Option();
-    Glib::ustring tmpstr;
-
+
-    result  = deser.read( basePath + "m_Name", tmpstr );
-    op.m_Name = tmpstr;
@@ -341 +336 @@
-        return false;
-    }
-
+
-    m_Options.push_back(o);
-
+
-    return true;
-}
@@ -449 +444 @@
-        std::ostringstream strstrm;
-        strstrm << basePath << "/" << "Option" << i;
-
+
-        Option pOption = Option::deserialize( strstrm.str() + "/",
-                                              deser );

trunk/libffado/src/libutil/OptionContainer.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -48 +46 @@
-            EUInt = 5,
-        };
-
+
-    public:
-        Option();
@@ -57 +55 @@
-        Option(std::string, int64_t);
-        Option(std::string, uint64_t);
-
+
-        ~Option() {};
-
+
-        std::string getName() {return m_Name;};
-        enum EType getType() {return m_Type;};
-
+
-        void set(std::string v);
-        void set(bool v);
@@ -68 +66 @@
-        void set(int64_t v);
-        void set(uint64_t v);
-
+
-        std::string getString() {return m_stringValue;};
-        bool getBool() {return m_boolValue;};
@@ -74 +72 @@
-        int64_t getInt() {return m_intValue;};
-        uint64_t getUInt() {return m_uintValue;};
-
+
-    public: // serialization support
-        bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
@@ -81 +79 @@
-    private:
-        std::string m_Name;
-
+
-        std::string m_stringValue;
-
+
-        bool        m_boolValue;
-        double      m_doubleValue;
-        int64_t     m_intValue;
-        uint64_t    m_uintValue;
-
+
-        enum EType  m_Type;
-    };
@@ -96 +94 @@
-    OptionContainer();
-    virtual ~OptionContainer();
-
+
-    bool setOption(std::string name, std::string v);
-    bool setOption(std::string name, bool v);
@@ -108 +106 @@
-    bool setOption(std::string name, int8_t v);
-    bool setOption(std::string name, uint8_t v);
-
+
-    bool getOption(std::string name, std::string &v);
-    bool getOption(std::string name, bool &v);
@@ -121 +119 @@
-    bool getOption(std::string name, int8_t &v);
-    bool getOption(std::string name, uint8_t &v);
-
+
-    Option::EType getOptionType(std::string name);
-
+
-    bool hasOption(std::string name);
-
+
-    int countOptions() {return m_Options.size();};
-
@@ -131 +129 @@
-    bool setOption(Option o);
-    Option getOption(std::string name);
-
+
-    bool hasOption(Option o);
-
+
-    bool addOption(Option o);
-
+
-    bool removeOption(Option o);
-    bool removeOption(std::string name);
-
+
-    void clearOptions() {m_Options.clear();};
-
+
-public: // provide an iterator interface
-
@@ -148 +146 @@
-        return(m_Options.begin());
-    }
-
+
-    iterator end()
-    {
@@ -155 +153 @@
-
-protected: // serialization support
- 
+
-                           Util::IOSerialize& ser) const;
-    static bool deserializeOptions( Glib::ustring basePath,
@@ -164 +162 @@
-    int findOption(Option o);
-    int findOption(std::string name);
-
+
-    typedef std::vector< Option > OptionVector;
-    typedef std::vector< Option >::iterator OptionVectorIterator;
-    OptionVector m_Options;
-
+
-protected:
-    DECLARE_DEBUG_MODULE;
@@ -176 +174 @@
-} // end of namespace Util
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/PacketBuffer.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -37 +32 @@
-
-PacketBuffer::~PacketBuffer() {
-       if(payload_buffer) freebob
-       if(header_buffer) freebob
-       if(len_buffer) freebob
+    if(payload_buffer) ffado
+    if(header_buffer) ffado
+    if(len_buffer) ffado
-}
-
-int PacketBuffer::initialize() {
-       
+    
-
-       if(payload_buffer) freebob
-       if(header_buffer) freebob
-       if(len_buffer) freebob
+    if(payload_buffer) ffado
+    if(header_buffer) ffado
+    if(len_buffer) ffado
-
-       payload_buffer=freebob
-       
-               
-               
-       
+    payload_buffer=ffado
+    
+        
+        
+    
-
-       header_buffer=freebob
-       
-               
-               
-       
+    header_buffer=ffado
+    
+        
+        
+    
-
-       len_buffer=freebob
-       
-               
-               
-       
-       
+    len_buffer=ffado
+    
+        
+        
+    
+    
-
-       
+    
-}
-
-void PacketBuffer::flush() {
-       
-               freebob
-       
-       
-               freebob
-       
-       
-               freebob
-       
+    
+        ffado
+    
+    
+        ffado
+    
+    
+        ffado
+    
-}
-
-int PacketBuffer::addPacket(quadlet_t *packet, int packet_len) {
-
-       
-       
+    
+    
-
-       
-       
-       
+    
+    
+    
-
-
-           && (freebob
+
+        && (ffado
-
-               freebob
-               freebob
-               freebob
+        ffado
+        ffado
+        ffado
-
-       
-       
+    
+    
-
-}
@@ -106 +101 @@
-int PacketBuffer::getNextPacket(quadlet_t *packet, int max_packet_len) {
-
-       
-       
+    
+    
-
-       
-       
+    
+    
-
-       
+    
-
-       if (freebob
-               
-       
+    if (ffado
+        
+    
-
-       if (freebob
-               
-       
+    if (ffado
+        
+    
-
-       
+    
-
-       if(freebob
-               
-       
+    if(ffado
+        
+    
-
-       
+    
-}
-
-int PacketBuffer::getBufferFillPackets() {
-
-       return freebob
+    return ffado
-}
-
@@ -139 +134 @@
-int PacketBuffer::getBufferFillPayload() {
-
-       return freebob
+    return ffado
-}
-

trunk/libffado/src/libutil/PacketBuffer.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -39 +35 @@
-public:
-
-
-       
-       
-       
+
+    
+    
+    
-
-       
-       
+    
+    
-
-       
+    
-
-       
+    
-
-       
+    
-
-       
-       
-       
+    
+    
+    
-
-protected:
-       
-       
-       
+    
+    
+    
-
-       freebob
-       freebob
-       freebob
-
+    ffado
+    ffado
+    ffado
+
-    DECLARE_DEBUG_MODULE;
-
@@ -72 +68 @@
-}
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/PosixThread.cpp

@@ -1 +1 @@
-/*
-reebob (C) 2006,
+FADO by
-
-Copied from the jackd/jackdmp sources
@@ -6 +6 @@
-a jackd backend.
-
- 
+
-Copyright (C) 2004-2006 Grame
-
@@ -54 +54 @@
-
-    // If Init succeed start the thread loop
-       
+    
-    while (obj->fRunning && res) {
-        res = runnable->Execute();
-               
+        
-    }
-
@@ -67 +67 @@
-{
-    int res;
-       
+    
-
-    if (fRealTime) {
@@ -121 +121 @@
-            return -1;
-        }
-
+
-        return 0;
-    }
@@ -142 +142 @@
-{
-    if (fThread) { // If thread has been started
-               
-               
+        
+        
-        fRunning = false; // Request for the thread to stop
-               
+        
-        return 0;
-    } else {

trunk/libffado/src/libutil/PosixThread.h

@@ -1 +1 @@
-/*
-reebob (C) 2006,
+FADO by
-
-Copied from the jackd/jackdmp sources
@@ -25 +25 @@
-*/
-
-
-
+FFADO_
+FFADO_
-
-#include "Thread.h"
@@ -46 +46 @@
-        int fPriority;
-        bool fRealTime;
-               
+        
-        int fCancellation;
-
@@ -68 +68 @@
-        virtual int Start();
-        virtual int Kill();
-               
+        
-
-        virtual int AcquireRealTime();
@@ -76 +76 @@
-        pthread_t GetThreadID();
-
-       
+    
-
-};
@@ -83 +83 @@
-
-
-
+ // __FFADO_POSIXTHREAD__

trunk/libffado/src/libutil/ringbuffer.c

@@ -1 +1 @@
-/*
-reeBoB
+FADO
-    
-  Copied from the jackd sources
@@ -39 +39 @@
-   actual buffer size is rounded up to the next power of two.  */
-
-reebob
-reebob
+fado
+fado
-{
-  int power_of_two;
-reebob
-
-reebob
+fado
+
+fado
-
-  for (power_of_two = 1; 1 << power_of_two < sz; power_of_two++);
@@ -63 +63 @@
-
-void
-reebob_ringbuffer_free (freebob
+fado_ringbuffer_free (ffado
-{
-#ifdef USE_MLOCK
@@ -76 +76 @@
-
-int
-reebob_ringbuffer_mlock (freebob
+fado_ringbuffer_mlock (ffado
-{
-#ifdef USE_MLOCK
@@ -91 +91 @@
-
-void
-reebob_ringbuffer_reset (freebob
+fado_ringbuffer_reset (ffado
-{
-  rb->read_ptr = 0;
@@ -102 +102 @@
-
-size_t
-reebob_ringbuffer_read_space (const freebob
+fado_ringbuffer_read_space (const ffado
-{
-  size_t w, r;
@@ -121 +121 @@
-
-size_t
-reebob_ringbuffer_write_space (const freebob
+fado_ringbuffer_write_space (const ffado
-{
-  size_t w, r;
@@ -141 +141 @@
-
-size_t
-reebob_ringbuffer_read (freebob
+fado_ringbuffer_read (ffado
-{
-  size_t free_cnt;
@@ -148 +148 @@
-  size_t n1, n2;
-
-reebob
+fado
-    return 0;
-  }
@@ -182 +182 @@
-
-size_t
-reebob_ringbuffer_peek (freebob
+fado_ringbuffer_peek (ffado
-{
-  size_t free_cnt;
@@ -192 +192 @@
-  tmp_read_ptr = rb->read_ptr;
-
-reebob
+fado
-    return 0;
-  }
@@ -226 +226 @@
-
-size_t
-reebob_ringbuffer_write (freebob
+fado_ringbuffer_write (ffado
-{
-  size_t free_cnt;
@@ -233 +233 @@
-  size_t n1, n2;
-
-reebob
+fado
-    return 0;
-  }
@@ -265 +265 @@
-
-void
-reebob_ringbuffer_read_advance (freebob
+fado_ringbuffer_read_advance (ffado
-{
-  rb->read_ptr += cnt;
@@ -274 +274 @@
-
-void
-reebob_ringbuffer_write_advance (freebob
+fado_ringbuffer_write_advance (ffado
-{
-  rb->write_ptr += cnt;
@@ -286 +286 @@
-
-void
-reebob_ringbuffer_get_read_vector (const freebob
-reebob
+fado_ringbuffer_get_read_vector (const ffado
+fado
-{
-  size_t free_cnt;
@@ -330 +330 @@
-
-void
-reebob_ringbuffer_get_write_vector (const freebob
-reebob
+fado_ringbuffer_get_write_vector (const ffado
+fado
-{
-  size_t free_cnt;

trunk/libffado/src/libutil/ringbuffer.h

@@ -3 +3 @@
-  function names changed in order to avoid naming problems when using this in
-  a jackd backend.
-
-reeBoB
-
+
+FADO
+
-    Copyright (C) 2000 Paul Davis
-    Copyright (C) 2003 Rohan Drape
-
+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or
-    (at your option) any later version.
-
+
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
+
-    You should have received a copy of the GNU Lesser General Public License
- 
+
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-*/
-
-
-
+FFADO_
+FFADO_
-
-#ifdef __cplusplus
@@ -45 +45 @@
- */
-
-  
+
-{
-  char  *buf;
-  size_t len;
- 
-reebob
+
+fado
-
-typedef struct
-{
-         
+        
-  volatile size_t write_ptr;
-  volatile size_t read_ptr;
-       
-       
-          
- 
-reebob
+    
+    
+        
+
+fado
-
-/**
- * Allocates a ringbuffer data structure of a specified size. The
-reebob
+fado
- * the memory associated with the ringbuffer.
- *
- * @param sz the ringbuffer size in bytes.
- *
-reebob
+fado
- * otherwise.
- */
-reebob_ringbuffer_t *freebob
+fado_ringbuffer_t *ffado
-
-/**
- * Frees the ringbuffer data structure allocated by an earlier call to
-reebob
-
-
-
-reebob_ringbuffer_free(freebob
+fado
+
+
+
+fado_ringbuffer_free(ffado
-
-/**
- * Fill a data structure with a description of the current readable
- * data held in the ringbuffer.  This description is returned in a two
-reebob
+fado
- * because the data to be read may be split across the end of the
- * ringbuffer.
@@ -100 +100 @@
- *
- * @param rb a pointer to the ringbuffer structure.
-reebob
-
-
-reebob_ringbuffer_get_read_vector(const freebob
-                                    freebob
+fado
+
+
+fado_ringbuffer_get_read_vector(const ffado
+                     ffado
-
-/**
- * Fill a data structure with a description of the current writable
- * space in the ringbuffer.  The description is returned in a two
-reebob
+fado
- * because the space available for writing may be split across the end
- * of the ringbuffer.
@@ -123 +123 @@
- *
- * @param rb a pointer to the ringbuffer structure.
-reebob
-
-reebob_ringbuffer_get_write_vector(const freebob
-                                     freebob
+fado
+
+fado_ringbuffer_get_write_vector(const ffado
+                      ffado
-
-/**
@@ -138 +138 @@
- * @return the number of bytes read, which may range from 0 to cnt.
- */
-reebob_ringbuffer_read(freebob
-
-
-reebob
+fado_ringbuffer_read(ffado
+
+
+fado
- * this function does not move the read pointer. Thus it's
- * a convenient way to inspect data in the ringbuffer in a
- * continous fashion. The price is that the data is copied
- * into a user provided buffer. For "raw" non-copy inspection
-reebob
+fado
- *
- * @param rb a pointer to the ringbuffer structure.
@@ -155 +155 @@
- * @return the number of bytes read, which may range from 0 to cnt.
- */
-reebob_ringbuffer_peek(freebob
+fado_ringbuffer_peek(ffado
-
-/**
@@ -161 +161 @@
- *
- * After data have been read from the ringbuffer using the pointers
-reebob
+fado
- * advance the buffer pointers, making that space available for future
- * write operations.
@@ -168 +168 @@
- * @param cnt the number of bytes read.
- */
-reebob_ringbuffer_read_advance(freebob
+fado_ringbuffer_read_advance(ffado
-
-/**
@@ -177 +177 @@
- * @return the number of bytes available to read.
- */
-reebob_ringbuffer_read_space(const freebob
+fado_ringbuffer_read_space(const ffado
-
-/**
@@ -186 +186 @@
- * @param rb a pointer to the ringbuffer structure.
- */
-reebob_ringbuffer_mlock(freebob
+fado_ringbuffer_mlock(ffado
-
-/**
@@ -195 +195 @@
- * @param rb a pointer to the ringbuffer structure.
- */
-reebob_ringbuffer_reset(freebob
+fado_ringbuffer_reset(ffado
-
-/**
@@ -206 +206 @@
- * @return the number of bytes write, which may range from 0 to cnt
- */
-reebob_ringbuffer_write(freebob
-                       
+fado_ringbuffer_write(ffado
+            
-
-/**
@@ -213 +213 @@
- *
- * After data have been written the ringbuffer using the pointers
-reebob
+fado
- * to advance the buffer pointer, making the data available for future
- * read operations.
@@ -220 +220 @@
- * @param cnt the number of bytes written.
- */
-reebob_ringbuffer_write_advance(freebob
+fado_ringbuffer_write_advance(ffado
-
-/**
@@ -229 +229 @@
- * @return the amount of free space (in bytes) available for writing.
- */
-reebob_ringbuffer_write_space(const freebob
+fado_ringbuffer_write_space(const ffado
-
-
@@ -236 +236 @@
-#endif
-
-
+ // FFADO_RINGBUFFER

trunk/libffado/src/libutil/serialize.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
-
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+ GNU
+Lesser
+
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -49 +52 @@
-{
-    try {
-reebob
+fado
-    } catch ( const exception& ex ) {
-        cout << "Exception caught: " << ex.what();
@@ -212 +215 @@
-    }
-    xmlpp::Node* pNode = pDoc->get_root_node();
-
+
-    xmlpp::NodeSet nodeSet = pNode->find( strMemberName );
-    for ( xmlpp::NodeSet::iterator it = nodeSet.begin();

trunk/libffado/src/libutil/serialize.h

@@ -1 @@
- serialize.h
-
+
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-

trunk/libffado/src/libutil/StreamStatistics.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-

trunk/libffado/src/libutil/StreamStatistics.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
-REEBOB
-REEBOB
+FADO
+FADO
-
-#include <string>
@@ -41 +36 @@
-
-    void setName(std::string n) {m_name=n;};
-
+
-    void mark(int value);
-
+
-    void dumpInfo();
-    void reset();
-
-    std::string m_name;
-
+
-    long m_count;
-    float m_average;
@@ -54 +49 @@
-    long m_max;
-    long m_sum;
-
+
-private:
-
+
-};
-

trunk/libffado/src/libutil/SystemTimeSource.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -41 +36 @@
-
-}
-
-reebob
+
+fado
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * 1000000ULL + tv.tv_usec;
-
+
-//     return GetMicroSeconds();
-}
-
-reebob
+fado
-    return getCurrentTime();
-}

trunk/libffado/src/libutil/SystemTimeSource.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -34 +30 @@
-namespace Util {
-
- 
+
-    : public Util::TimeSource
-{
@@ -40 +36 @@
-public:
-
-       
-       
-
+    
+    
+
-    // implement the TimeSource interface
-reebob
-reebob
-reebob_microsecs_t unWrapTime(freebob
-reebob_microsecs_t wrapTime(freebob
+fado
+fado
+fado_microsecs_t unWrapTime(ffado
+fado_microsecs_t wrapTime(ffado
-
-protected:
@@ -56 +52 @@
-} // end of namespace Util
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/test-dll.cpp

@@ -1 +1 @@
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB.
- *
-
-
-
-
+
+
+
+
+
+
+
+
- *
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -34 +30 @@
-    int i=0;
-    int i2=0;
-
+
-    #define MAX_TEST_ORDER 2
-
+
-    #define NB_VALUES 12
-    #define NB_LOOPS 50000
-
-    // this test is for a second order loop,
-
+
-
-    float omega=6.28*0.001;
@@ -47 +43 @@
-    coeffs[0]=1.41*omega;
-    coeffs[1]=omega*omega;
-
+
-    DelayLockedLoop d1(1, coeffs);
-
+
-    DelayLockedLoop d2(2, coeffs);
-
+
-    // this sequence represents the average deviation of the sample period
-    float deviation[NB_VALUES]={-0.001, 0.0, 0.001, 0.001, -0.001, 0.001, -0.001, 0.001, -0.001, 0.00, 0.001, -0.001};
-    float average=0.0;
-
+
-    // these are the actual period times
-    float ideal_values[NB_LOOPS];
-    float actual_values[NB_LOOPS];
-    float actual_values2[NB_LOOPS];
-
+
-    // we define a nominal sample time:
-    float ts_nominal=1.0/48000.0;
-    float period=100.0;
-
+
-    // we calculate the deviated sample times
-    for (i=0;i<NB_LOOPS;i++) {
-        unsigned int idx=i % NB_VALUES;
-
+
-        // this constructs time-between-samples type of data
-        // for testing the first order loop
-        actual_values[i]=period*ts_nominal*(1+deviation[idx]);
-
+
-        // this is constructing an incrementing time line
-        ideal_values[i]=0;
-        if (i==0) ideal_values[i] = ts_nominal * period;
-        else ideal_values[i] = ideal_values[i-1] + (ts_nominal * period);
-
+
-        actual_values2[i] = ideal_values[i] + (ts_nominal*deviation[idx]);
-
- 
+
+
-        // direction the deviation sequence takes.
- 
+
-    }
-    average /= NB_LOOPS;
-
+
-    d1.setIntegrator(0,period*ts_nominal);
-
+
-    d2.setIntegrator(0,ideal_values[0]);
-    d2.setIntegrator(1,ideal_values[0]);
-
+
-    for(i=0;i<50;i++) {
-        d1.put(actual_values[i]);
-        printf("%06d: IN = %8.4fms - OUT = %8.4fms, error output=%e\n", i, actual_values[i]*1000, d1.get()*1000, d1.getError());
-    }
-
+
-    printf("--------\n");
-    for(i2=0;i2<50;i2++) {
@@ -101 +97 @@
-        printf("%06d: IN = %8.4fms - OUT = %8.4fms, error output=%e\n", i, actual_values2[i2]*1000, d2.get()*1000,  d2.getError());
-    }
-
+
-    printf("========= CONVERGENCE =========\n");
-    for(;i<NB_LOOPS;i++) {
-        d1.put(actual_values[i]);
-    }
-  
- 
+
+
-        d1.getError(),
-        ts_nominal * period*1000,
-        (d1.get()-ts_nominal * period)/(ts_nominal * period)*100);
-
+
-    printf("--------\n");
-    for(;i2<NB_LOOPS;i2++) {
-        d2.put(actual_values2[i2]);
-    }
-  
- 
+
+
-        d2.getError(),
-        ideal_values[NB_LOOPS-1]*1000,
-        (d2.get()-ideal_values[NB_LOOPS-1])/(ideal_values[NB_LOOPS-1])*100);
-
-
+
+
-    printf("Average deviation: %f, period time = %fms\n",average, ts_nominal * period*1000);
-

trunk/libffado/src/libutil/Thread.h

@@ -1 +1 @@
-/*
-reebob (C) 2006,
+FADO by
-
-Copied from the jackd/jackdmp sources
@@ -77 +77 @@
-        virtual int Start() = 0;
-        virtual int Kill() = 0;
-               
+        
-
-        virtual int AcquireRealTime() = 0;
@@ -87 +87 @@
-
-        virtual pthread_t GetThreadID() = 0;
-
+
-    protected:
-           
+        
-
-};

trunk/libffado/src/libutil/Time.c

@@ -1 @@
-
-
-
+
+
-
-
+
+
-
-
+
-
-        
-        Based upon JackTime.c from the jackdmp package.
-        Original Copyright:
@@ -13 +12 @@
-        Copyright (C) 2001-2003 Paul Davis
-        Copyright (C) 2004-2006 Grame
-
-
-        This program is free software; you can redistribute it and/or modify

trunk/libffado/src/libutil/Time.h

@@ -1 +1 @@
-/*
-
-
-
+
-
-
+
+
-
-
-
-
-
+
-
-
-
+
+
-
-
-
-
-
+
+
-
-
-
-
-GNU Lesser General Public License for more details
+
+
+
+    (at your option) any later version
-
-
-
-
+
+
+
+
+
+
+
+
-
-*/
@@ -43 +42 @@
- */
-
-reebob
+fado
-
-
@@ -54 +53 @@
-#include <unistd.h>
-
-reebob
+FADO
-        usleep(usec);
-    }
-
-#ifdef GETCYCLE_TIME
-       
-reebob_microsecs_t __freebob
-reebob
+    
+fado_microsecs_t __ffado
+fado
-    extern void InitTime();
-reebob
-reebob
+fado
+fado
-    }
-#else
-       
+    
-    extern void InitTime();
-reebob
+fado
-        struct timespec ts;
-        clock_gettime(CLOCK_MONOTONIC, &ts);
-reebob
+fado
-    }
-#endif

trunk/libffado/src/libutil/TimeSource.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include "TimeSource.h"
@@ -56 +50 @@
- */
-void TimeSource::initSlaveTimeSource() {
-reebob
-reebob
-reebob
-reebob
-
+fado
+fado
+fado
+fado
+
-    if (m_Master) {
-        my_time=getCurrentTime();
-        master_time=m_Master->getCurrentTime();
-
+
-        struct timespec ts;
-
+
-        // sleep for ten milliseconds
-        ts.tv_sec=0;
-        ts.tv_nsec=10000000L;
-
+
-        nanosleep(&ts,NULL);
-
+
-        my_time2=getCurrentTime();
-        master_time2=m_Master->getCurrentTime();
-
+
-        float diff_slave=my_time2-my_time;
-        float diff_master=master_time2-master_time;
-
+
-        m_slave_rate=diff_slave/diff_master;
-
+
-        // average of the two offset estimates
-reebob
-reebob
+fado
+fado
-        m_slave_offset /= 2;
-
+
-        m_last_master_time=master_time2;
-        m_last_time=my_time2;
@@ -95 +89 @@
-        debugOutput(DEBUG_LEVEL_NORMAL,"init slave: slave rate=%f, slave_offset=%lu\n",
-            m_slave_rate, m_slave_offset
-                
-
-
-
-
-
-
- 
+
+
+
+
+
+
+
+
- * on it's own timeline
- *
- * @return the mapped time point
- */
-reebob_microsecs_t TimeSource::mapMasterTime(freebob
+fado_microsecs_t TimeSource::mapMasterTime(ffado
-    if(m_Master) {
-        // calculate the slave based upon the master
-        // and the estimated rate
-
+
-        // linear interpolation
-        int delta_master=master_time-m_last_master_time;
-
+
-        float offset=m_slave_rate * ((float)delta_master);
-
-reebob
-
+
+fado
+
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"map time: master=%d, offset=%f, slave_base=%lu, pred_ticks=%lu\n",
-            master_time, offset, m_last_time,mapped
-            );
-
+
-        return wrapTime(mapped);
-
+
-    } else {
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Requested map for non-slave TimeSource\n");
-
+
-        return master_time;
-    }
@@ -140 +134 @@
-    for ( TimeSourceVectorIterator it = m_Slaves.begin();
-          it != m_Slaves.end(); ++it ) {
-
- 
+
+
-        // master time
-        if (!(*it)->updateTimeSource()) return false;
-    }
-
+
-    // this TimeSource has a master
-    if(m_Master) {
-reebob
-reebob
-
- 
+fado
+fado
+
+
-        // measured at the same time, but that of course is
-        // not really true. The DLL will have to filter this
-        // out.
-
+
-        // the difference in master time
-        int64_t delta_master;
@@ -163 +157 @@
-            delta_master=m_Master->unWrapTime(master_time)-m_last_master_time;
-        }
-
+
-        // the difference in slave time
-        int64_t delta_slave;
@@ -171 +165 @@
-            delta_slave=unWrapTime(my_time)-m_last_time;
-        }
-
+
-        // the estimated slave difference
-        int delta_slave_est=(int)(m_slave_rate * ((double)delta_master));
-
+
-        // the measured & estimated rate
-        double rate_meas=((double)delta_slave/(double)delta_master);
-        double rate_est=((double)m_slave_rate);
-
+
-        m_last_err=(rate_meas-rate_est);
-
+
-        m_slave_rate += 0.01*m_last_err;
-
+
-        debugOutput(DEBUG_LEVEL_VERBOSE,"update slave: master=%llu, master2=%llu, diff=%lld\n",
-            master_time, m_last_master_time, delta_master);
@@ -191 +185 @@
-            );
-
-
+
-        m_last_master_time=master_time;
-
+
-        int64_t tmp = delta_slave_est;
-        tmp += m_last_time;
-
+
-        m_last_time = tmp;
-
-
-
+
+
+
-    }
-
@@ -209 +203 @@
- * Sets the master TimeSource for this timesource.
- * This TimeSource will sync to the master TimeSource,
- 
+
- * the master to a time point on it's own timeline
- *
-  
+
- * @return true if successful
- */
@@ -218 +212 @@
-    if (m_Master==NULL) {
-        m_Master=ts;
-
+
-        // initialize ourselves.
-        initSlaveTimeSource();
-
+
-        return true;
-    } else return false;
@@ -238 +232 @@
- * Registers a slave timesource to this master.
- * A slave TimeSource will sync to this TimeSource,
- 
- 
+
+
- * it's own timeline
- *
@@ -247 +241 @@
-bool TimeSource::registerSlave(TimeSource *ts) {
-    // TODO: we should check for circular master-slave relationships.
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Registering slave (%p)\n", ts);
-    assert(ts);
-
+
-    // inherit debug level
- 
-
+
+
-    if(ts->setMaster(this)) {
-        m_Slaves.push_back(ts);
@@ -275 +269 @@
-          it != m_Slaves.end(); ++it ) {
-
- 
+
-            m_Slaves.erase(it);
-            ts->clearMaster();
@@ -281 +275 @@
-        }
-    }
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, " TimeSource (%p) not found\n", ts);
-
+
-    return false;
-}
@@ -298 +292 @@
-    for ( TimeSourceVectorIterator it = m_Slaves.begin();
-          it != m_Slaves.end(); ++it ) {
-
+
-        (*it)->setVerboseLevel(l);
-    }
@@ -313 +307 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Last slave time  : %llu\n",m_last_time );
-
-
+
-    for ( TimeSourceVectorIterator it = m_Slaves.begin();
-          it != m_Slaves.end(); ++it ) {
-
+
-        (*it)->printTimeSourceInfo();
-    }

trunk/libffado/src/libutil/TimeSource.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "../debugmodule/debugmodule.h"
@@ -33 +29 @@
-#include <vector>
-
-reebob
+fado
-
-namespace Util {
@@ -44 +40 @@
-\brief The base class for all TimeSource's.
-
- 
+
-    information should subclass this class and implement
-    its virtual functions.
-
+
-    A TimeSource can be slaved to another TimeSource, allowing
-    the mapping of the master's time to the slave's time.
@@ -58 +54 @@
-    virtual ~TimeSource();
-
-reebob
-reebob
-reebob_microsecs_t unWrapTime(freebob
-reebob_microsecs_t wrapTime(freebob
-
-reebob_microsecs_t mapMasterTime(freebob
-
+fado
+fado
+fado_microsecs_t unWrapTime(ffado
+fado_microsecs_t wrapTime(ffado
+
+fado_microsecs_t mapMasterTime(ffado
+
-    bool updateTimeSource();
-
+
-    bool registerSlave(TimeSource *ts);
-    bool unregisterSlave(TimeSource *ts);
-
-    virtual void setVerboseLevel(int l);
-
+
-    virtual void printTimeSourceInfo();
-
+
-protected:
-
@@ -79 +75 @@
-    bool setMaster(TimeSource *ts);
-    void clearMaster();
-
+
-    void initSlaveTimeSource();
-
+
-    TimeSource * m_Master;
-    TimeSourceVector m_Slaves;
-
-reebob
-reebob
-
+
+fado
+fado
+
-    double m_slave_rate;
-    int64_t m_slave_offset;
-    double m_last_err;
-
+
-    DECLARE_DEBUG_MODULE;
-
@@ -98 +94 @@
-} // end of namespace Util
-
-REEBOB
+FADO
-
-

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -2 +2 @@
-
-/*
-reeBob
-reeBob
-
-reebob
+FADO
+FADO
+
+fado
- *
- *   Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
@@ -23 +23 @@
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- 
-
-
-
+
+
+
+
-#include "libutil/Atomic.h"
-#include "libstreaming/cycletimer.h"
@@ -54 +54 @@
-
-TimestampedBuffer::~TimestampedBuffer() {
-reebob
+fado
-    free(m_cluster_buffer);
-}
@@ -71 +71 @@
-    m_nominal_rate=r;
-    debugOutput(DEBUG_LEVEL_VERBOSE," nominal rate=%e set to %e\n",
-    
+
-    return true;
-}
@@ -100 +100 @@
-
-/**
- 
+
- *
- * Returns the effective rate calculated by the DLL.
@@ -109 +109 @@
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"getRate: %f/%f=%f\n",
-        m_dll_e2,(float)m_update_period, m_dll_e2/((float) m_update_period));
-
+
-    return m_dll_e2/((float) m_update_period);
-}
@@ -120 +120 @@
-bool TimestampedBuffer::setEventSize(unsigned int s) {
-    m_event_size=s;
-
+
-    m_bytes_per_frame=m_event_size*m_events_per_frame;
-    m_bytes_per_buffer=m_bytes_per_frame*m_buffer_size;
-
+
-    return true;
-}
@@ -134 +134 @@
-bool TimestampedBuffer::setEventsPerFrame(unsigned int n) {
-    m_events_per_frame=n;
-
+
-    m_bytes_per_frame=m_event_size*m_events_per_frame;
-    m_bytes_per_buffer=m_bytes_per_frame*m_buffer_size;
-
+
-    return true;
-}
@@ -155 +155 @@
-
-/**
- 
+
- *
- * A positive value means that the buffer is 'delayed' for nticks ticks.
- *
- * @note These offsets are only used when reading timestamps. Any function
- 
+
- * @param nframes the number of ticks (positive = delay buffer)
- * @return true if successful
@@ -174 +174 @@
- *
- * This returns the buffer fill of the internal ringbuffer. This
- 
+
- * guaranteed to be consistent at all times due to threading issues.
- *
- 
+
- * getFrameCounter, getBufferHeadTimestamp, getBufferTailTimestamp
- * functions
@@ -184 +184 @@
- */
-unsigned int TimestampedBuffer::getBufferFill() {
-reebob
+fado
-}
-
@@ -204 +204 @@
- * Resets the TimestampedBuffer, clearing the buffers and counters.
- * (not true yet: Also resets the DLL to the nominal values.)
- 
+
- * \note when this is called, you should make sure that the buffer
- *       tail timestamp gets set before continuing
@@ -211 +211 @@
- */
-bool TimestampedBuffer::reset() {
-reebob
-
+fado
+
-    resetFrameCounter();
-
+
-    return true;
-}
@@ -220 +220 @@
-/**
- * \brief Perpares the TimestampedBuffer
- 
- 
+
+
- * initializes all data structures.
- 
+
- * This should be called after parameters such as buffer size, event size etc.. are set,
- * and before any read/write operations are performed.
- 
+
- * @return true if successful
- */
@@ -233 +233 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE," Size=%u events, events/frame=%u, event size=%ubytes\n",
-                                        m_buffer_size,m_events_per_frame,m_event_size);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE," update period %u\n",
-                                    m_update_period);
-    debugOutput(DEBUG_LEVEL_VERBOSE," nominal rate=%f\n",
-                                    m_nominal_rate);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE," wrapping at %llu\n",m_wrap_at);
-
@@ -247 +247 @@
-    assert(m_nominal_rate != 0.0L);
-    assert(m_update_period != 0);
-
-reebob
+
+fado
-            (m_events_per_frame * m_buffer_size) * m_event_size))) {
-        debugFatal("Could not allocate memory event ringbuffer\n");
-        return false;
-    }
-
+
-    // allocate the temporary cluster buffer
-    if( !(m_cluster_buffer=(char *)calloc(m_events_per_frame,m_event_size))) {
-            debugFatal("Could not allocate temporary cluster buffer\n");
-reebob
+fado
-        return false;
-    }
-
+
-    // init the DLL
-    m_dll_e2=m_nominal_rate * (float)m_update_period;
-
+
-    m_dll_b=((float)(0.877));
-    m_dll_c=((float)(0.384));
@@ -272 +272 @@
-/**
- * @brief Write frames to the buffer
- 
+
- * Copies \ref nframes of frames from the buffer pointed to by \ref data to the
- * internal ringbuffer. The time of the last frame in the buffer is set to \ref ts.
- 
+
- * @param nframes number of frames to copy
- * @param data pointer to the frame buffer
@@ -286 +286 @@
-
-    // add the data payload to the ringbuffer
-reebob_ringbuffer_write(m_event_buffer,data,write_size) < write_size) 
+fado_ringbuffer_write(m_event_buffer,data,write_size) < write_size)
-    {
-//         debugWarning("writeFrames buffer overrun\n");
-        return false;
-    }
-
+
-    incrementFrameCounter(nframes,ts);
-
+
-    return true;
-
@@ -299 +299 @@
-/**
- * @brief Read frames from the buffer
- 
- 
+
+
- * to by \ref data.
- 
+
- * @param nframes number of frames to copy
- * @param data pointer to the frame buffer
@@ -312 +312 @@
-
-    // get the data payload to the ringbuffer
-reebob_ringbuffer_read(m_event_buffer,data,read_size)) < read_size) 
+fado_ringbuffer_read(m_event_buffer,data,read_size)) < read_size)
-    {
-//         debugWarning("readFrames buffer underrun\n");
-        return false;
-    }
-
+
-    decrementFrameCounter(nframes);
-
+
-    return true;
-
@@ -326 +326 @@
-/**
- * @brief Performs block processing write of frames
- 
+
- * This function allows for zero-copy writing into the ringbuffer.
- * It calls the client's processWriteBlock function to write frames
- * into the internal buffer's data area, in a thread safe fashion.
- 
+
- * It also updates the timestamp.
- 
+
- * @param nbframes number of frames to process
- * @param ts timestamp of the last frame written to the buffer
@@ -342 +342 @@
-    int xrun;
-    unsigned int offset=0;
-
-reebob
+
+fado
-    // we received one period of frames
-    // this is period_size*dimension of events
@@ -349 +349 @@
-    unsigned int bytes2write=events2write*m_event_size;
-
- 
+
-    *  first see if it can be done in one read.
- 
+
-    *  otherwise write up to a multiple of clusters directly to the buffer
-    *  then do the buffer wrap around using ringbuffer_write
- 
+
-    *  Make sure that we cannot end up on a non-cluster aligned position!
-    */
@@ -361 +361 @@
-    while(bytes2write>0) {
-        int byteswritten=0;
-
+
-        unsigned int frameswritten=(nbframes*cluster_size-bytes2write)/cluster_size;
-        offset=frameswritten;
-
-reebob
-
+
+fado
+
-        if(vec[0].len==0) { // this indicates a full event buffer
-            debugError("Event buffer overrun in buffer %p\n",this);
-            break;
-        }
-
+
-        /* if we don't take care we will get stuck in an infinite loop
-        * because we align to a cluster boundary later
- 
+
-        * smaller than one cluster
-        * this can happen because the ringbuffer size is always a power of 2
-        */
-        if(vec[0].len<cluster_size) {
-
+
-            // encode to the temporary buffer
-            xrun = m_Client->processWriteBlock(m_cluster_buffer, 1, offset);
-
+
-            if(xrun<0) {
-                // xrun detected
@@ -388 +388 @@
-                return false;
-            }
-
- 
+
+
-            // the write function handles the wrap around.
-reebob
+fado
-                         m_cluster_buffer,
-                         cluster_size);
-
+
-            // we advanced one cluster_size
-            bytes2write-=cluster_size;
-
- 
-
+
+
+
-            if(bytes2write>vec[0].len) {
-                // align to a cluster boundary
@@ -406 +406 @@
-                byteswritten=bytes2write;
-            }
-
+
-            xrun = m_Client->processWriteBlock(vec[0].buf,
-                         byteswritten/cluster_size,
-                         offset);
-
+
-            if(xrun<0) {
-                    // xrun detected
@@ -417 +417 @@
-            }
-
-reebob
+fado
-            bytes2write -= byteswritten;
-        }
@@ -425 +425 @@
-
-    }
-
+
-    incrementFrameCounter(nbframes,ts);
-
-
-
+
+
+
-}
-
-/**
- * @brief Performs block processing read of frames
- 
+
- * This function allows for zero-copy reading from the ringbuffer.
- * It calls the client's processReadBlock function to read frames
- 
+
- * fashion.
- 
+
- * @param nbframes number of frames to process
- * @return true if successful
@@ -446 +446 @@
-
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Reading %u from buffer (%p)...\n", nbframes, this);
-
+
-    int xrun;
-    unsigned int offset=0;
-
-reebob
+
+fado
-    // we received one period of frames on each connection
-    // this is period_size*dimension of events
@@ -456 +456 @@
-    unsigned int events2read=nbframes*m_events_per_frame;
-    unsigned int bytes2read=events2read*m_event_size;
- 
- 
- 
+
+
+
-    *  otherwise read up to a multiple of clusters directly from the buffer
-    *  then do the buffer wrap around using ringbuffer_read
- 
+
-    *  Make sure that we cannot end up on a non-cluster aligned position!
-    */
-    unsigned int cluster_size=m_events_per_frame*m_event_size;
-
+
-    while(bytes2read>0) {
-        unsigned int framesread=(nbframes*cluster_size-bytes2read)/cluster_size;
@@ -472 +472 @@
-        int bytesread=0;
-
-reebob
+fado
-
-        if(vec[0].len==0) { // this indicates an empty event buffer
@@ -485 +485 @@
-                */
-        if(vec[0].len<cluster_size) {
- 
+
-            // the read function handles wrap around
-reebob
+fado
-
-            assert(m_Client);
@@ -501 +501 @@
-            bytes2read-=cluster_size;
-
- 
+
-
-            if(bytes2read>vec[0].len) {
@@ -509 +509 @@
-                bytesread=bytes2read;
-            }
-
+
-            assert(m_Client);
-            xrun = m_Client->processReadBlock(vec[0].buf, bytesread/cluster_size, offset);
@@ -519 +519 @@
-            }
-
-reebob
+fado
-            bytes2read -= bytesread;
-        }
@@ -528 +528 @@
-
-    decrementFrameCounter(nbframes);
-
+
-    return true;
-}
@@ -534 +534 @@
-/**
- * @brief Sets the buffer tail timestamp.
- 
+
- * Set the buffer tail timestamp to \ref new_timestamp. This will recalculate
- 
+
- * \ref new_timestamp.
- 
+
- * This is thread safe.
- *
- * @note considers offsets
- 
- 
+
+
- */
-void TimestampedBuffer::setBufferTailTimestamp(uint64_t new_timestamp) {
@@ -550 +550 @@
-    int64_t ts=new_timestamp;
-    ts += m_tick_offset;
-
+
-    if (ts >= (int64_t)m_wrap_at) {
-        ts -= m_wrap_at;
@@ -556 +556 @@
-        ts += m_wrap_at;
-    }
-
+
-#ifdef DEBUG
-    if (new_timestamp >= m_wrap_at) {
-        debugWarning("timestamp not wrapped: %llu\n",new_timestamp);
-    
+
-    if ((ts >= (int64_t)m_wrap_at) || (ts < 0 )) {
-        debugWarning("ts not wrapped correctly: %lld\n",ts);
@@ -567 +567 @@
-
-    pthread_mutex_lock(&m_framecounter_lock);
-
+
-    m_buffer_tail_timestamp = ts;
-
+
-    m_dll_e2=m_update_period * m_nominal_rate;
-    m_buffer_next_tail_timestamp = (uint64_t)((float)m_buffer_tail_timestamp + m_dll_e2);
-
-    
-
+
+
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Set buffer tail timestamp for (%p) to %11llu => %11lld, NTS=%llu, DLL2=%f, RATE=%f\n",
-                this, new_timestamp, ts, m_buffer_next_tail_timestamp, m_dll_e2, m_nominal_rate);
@@ -582 +582 @@
-/**
- * @brief Sets the buffer head timestamp.
- 
- 
+
+
- * \ref new_timestamp. This does not consider offsets, because it's use is to
- * make sure the following is true after setBufferHeadTimestamp(x):
- *   x == getBufferHeadTimestamp()
- 
+
- * This is thread safe.
- 
- 
+
+
- */
-void TimestampedBuffer::setBufferHeadTimestamp(uint64_t new_timestamp) {
-
+
-#ifdef DEBUG
-    if (new_timestamp >= m_wrap_at) {
-        debugWarning("timestamp not wrapped: %llu\n",new_timestamp);
-    
+
-#endif
-
@@ -603 +603 @@
-
-    pthread_mutex_lock(&m_framecounter_lock);
-
+
-    // add the time
-    ts += (int64_t)(m_nominal_rate * (float)m_framecounter);
-
+
-    if (ts >= (int64_t)m_wrap_at) {
-        ts -= m_wrap_at;
@@ -612 +612 @@
-        ts += m_wrap_at;
-    }
-
+
-    m_buffer_tail_timestamp = ts;
-
+
-    m_dll_e2=m_update_period * m_nominal_rate;
-    m_buffer_next_tail_timestamp = (uint64_t)((float)m_buffer_tail_timestamp + m_dll_e2);
-
-    
-
+
+
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Set buffer head timestamp for (%p) to %11llu => %11lld, NTS=%llu, DLL2=%f, RATE=%f\n",
-                this, new_timestamp, ts, m_buffer_next_tail_timestamp, m_dll_e2, m_nominal_rate);
@@ -627 +627 @@
-/**
- * \brief return the timestamp of the first frame in the buffer
- 
+
- * This function returns the timestamp of the very first sample in
- 
+
- * for which this timestamp is valid.
- *
@@ -644 +644 @@
-/**
- * \brief return the timestamp of the last frame in the buffer
- 
+
- * This function returns the timestamp of the last frame in
- 
+
- * value for which this timestamp is valid.
- *
@@ -662 +662 @@
- * @brief Get timestamp for a specific position from the buffer tail
- *
- 
+
- * buffer tail
- *
@@ -672 +672 @@
-    // ts(x) = m_buffer_tail_timestamp -
-    //         (m_buffer_next_tail_timestamp - m_buffer_tail_timestamp)/(samples_between_updates)*(x)
-
+
-    int64_t diff=m_buffer_next_tail_timestamp - m_buffer_tail_timestamp;
-    if (diff < 0) diff += m_wrap_at;
-
+
-    float rate=(float)diff / (float)m_update_period;
-
+
-    int64_t timestamp;
-
+
-    pthread_mutex_lock(&m_framecounter_lock);
-
@@ -685 +685 @@
-
-    pthread_mutex_unlock(&m_framecounter_lock);
-
+
-    if(timestamp >= (int64_t)m_wrap_at) {
-        timestamp -= m_wrap_at;
@@ -691 +691 @@
-        timestamp += m_wrap_at;
-    }
-
+
-    return (uint64_t)timestamp;
-}
@@ -698 +698 @@
- * @brief Get timestamp for a specific position from the buffer head
- *
- 
+
- * buffer head
- *
@@ -721 +721 @@
-/**
- * Decrements the frame counter in a thread safe way.
- 
+
- * @param nbframes number of frames to decrement
- */
@@ -741 +741 @@
- */
-void TimestampedBuffer::incrementFrameCounter(int nbframes, uint64_t new_timestamp) {
-
+
-    // add the offsets
-    int64_t diff=m_buffer_next_tail_timestamp - m_buffer_tail_timestamp;
-    if (diff < 0) diff += m_wrap_at;
-
+
+
-    float rate=(float)diff / (float)m_update_period;
-
+
+
-    int64_t ts=new_timestamp;
-    ts += (int64_t)m_tick_offset;
-
+
-    if (ts >= (int64_t)m_wrap_at) {
-        ts -= m_wrap_at;
@@ -756 +758 @@
-        ts += m_wrap_at;
-    }
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Setting buffer tail timestamp for (%p) to %11llu => %11lld\n",
-                this, new_timestamp, ts);
-
+
-#ifdef DEBUG
-    if (new_timestamp >= m_wrap_at) {
-        debugWarning("timestamp not wrapped: %llu\n",new_timestamp);
-    
+
-    if ((ts >= (int64_t)m_wrap_at) || (ts < 0 )) {
-        debugWarning("ts not wrapped correctly: %lld\n",ts);
@@ -771 +773 @@
-    // update the DLL
-    diff = ts-(int64_t)m_buffer_next_tail_timestamp;
-
+
-#ifdef DEBUG
-    if ((diff > 1000) || (diff < -1000)) {
- 
+
-            this, diff, ts, m_buffer_next_tail_timestamp);
-    }
@@ -782 +784 @@
-    // diff = diff * nbframes/m_update_period
-    // m_buffer_next_tail_timestamp = m_buffer_tail_timestamp + diff
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "(%p): diff=%lld ",
-                this, diff);
-
+
-    // the maximal difference we can allow (64secs)
-    const int64_t max=m_wrap_at/2;
-
+
-    if(diff > max) {
-        diff -= m_wrap_at;
@@ -794 +796 @@
-        diff += m_wrap_at;
-    }
-
+
-    float err=diff;
-
+
-    debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, "diff2=%lld err=%f\n",
-                    diff, err);
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "B: FC=%10u, TS=%011llu, NTS=%011llu\n",
-                    m_framecounter, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp);
-
+
-    pthread_mutex_lock(&m_framecounter_lock);
-    m_framecounter += nbframes;
-
+
-    m_buffer_tail_timestamp=m_buffer_next_tail_timestamp;
-    m_buffer_next_tail_timestamp += (int64_t)(m_dll_b * err + m_dll_e2);
-
+
-    m_dll_e2 += m_dll_c*err;
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "U: FC=%10u, TS=%011llu, NTS=%011llu\n",
-                    m_framecounter, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp);
-
+
-    if (m_buffer_next_tail_timestamp >= m_wrap_at) {
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "Unwrapping next tail timestamp: %011llu",
-                m_buffer_next_tail_timestamp);
-
+
-        m_buffer_next_tail_timestamp -= m_wrap_at;
-
+
-        debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, " => %011llu\n",
-                m_buffer_next_tail_timestamp);
-
-    }
-
+
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "A: TS=%011llu, NTS=%011llu, DLLe2=%f, RATE=%f\n",
-                m_buffer_tail_timestamp, m_buffer_next_tail_timestamp, m_dll_e2, rate);
-
+
-    pthread_mutex_unlock(&m_framecounter_lock);
-
+
-    if(m_buffer_tail_timestamp>=m_wrap_at) {
-        debugError("Wrapping failed for m_buffer_tail_timestamp! %011llu\n",m_buffer_tail_timestamp);
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, " IN=%011lld, TS=%011llu, NTS=%011llu\n",
-                    ts, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp);
-
+
-    }
-    if(m_buffer_next_tail_timestamp>=m_wrap_at) {
@@ -840 +842 @@
-                    ts, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp);
-    }
-
+
-    // this DLL allows the calculation of any sample timestamp relative to the buffer tail,
-    // to the next period and beyond (through extrapolation)
@@ -846 +848 @@
-    // ts(x) = m_buffer_tail_timestamp +
-    //         (m_buffer_next_tail_timestamp - m_buffer_tail_timestamp)/(samples_between_updates)*x
-
+
-}
-
@@ -853 +855 @@
- */
-void TimestampedBuffer::dumpInfo() {
-
+
-    uint64_t ts_head, fc;
-    getBufferHeadTimestamp(&ts_head,&fc);
-
+
+
-    int64_t diff=(int64_t)ts_head - (int64_t)m_buffer_tail_timestamp;
+#endif
-
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  TimestampedBuffer (%p) info:\n",this);

trunk/libffado/src/libutil/TimestampedBuffer.h

@@ -2 +2 @@
-
-/*
-reeBob
-reeBob
-
-reebob
+FADO
+FADO
+
+fado
- *
- *   Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
@@ -23 +23 @@
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- 
+
- *
- */
-REEBOB
-REEBOB
+FADO
+FADO
-
-#include "../debugmodule/debugmodule.h"
@@ -39 +39 @@
- * \brief Class implementing a frame buffer that is time-aware
- *
- 
+
- * are written to the buffer, the timestamp corresponding to the last frame
- * in the buffer is updated. This allows to calculate the timestamp of any
@@ -50 +50 @@
- * - event_size: the storage size of the events (in bytes) (setEventSize())
- *
- 
+
- * buff_size*events_per_frame*event_size.
- *
@@ -63 +63 @@
- *
- * The TimestampedBuffer class is time unit agnostic. It can handle any time unit
- 
+
- * timestamps using (...).
- *
- 
+
- *
- * The first method uses conventional readFrames() and writeFrames() functions.
- *
- 
+
- * TimestampedBuffer is created, it is required that a TimestampedBufferClient is
- * registered. This client implements the processReadBlock and processWriteBlock
- * functions. These are block processing 'callbacks' that allow zero-copy processing
- * of the buffer contents. In order to initiate block processing, the
- 
+
- * TimestampedBuffer.
- *
@@ -86 +86 @@
-    TimestampedBuffer(TimestampedBufferClient *);
-    virtual ~TimestampedBuffer();
-
+
-    bool writeFrames(unsigned int nbframes, char *data, uint64_t ts);
-    bool readFrames(unsigned int nbframes, char *data);
-
+
-    bool blockProcessWriteFrames(unsigned int nbframes, int64_t ts);
-    bool blockProcessReadFrames(unsigned int nbframes);
-
+
-    bool init();
-    bool prepare();
-    bool reset();
-
+
-    bool setEventSize(unsigned int s);
-    bool setEventsPerFrame(unsigned int s);
-    bool setBufferSize(unsigned int s);
-    unsigned int getBufferSize() {return m_buffer_size;};
-
+
-    bool setWrapValue(uint64_t w);
-
+
-    unsigned int getBufferFill();
-
+
-    // timestamp stuff
-    int getFrameCounter() {return m_framecounter;};
@@ -111 +111 @@
-    void getBufferHeadTimestamp(uint64_t *ts, uint64_t *fc);
-    void getBufferTailTimestamp(uint64_t *ts, uint64_t *fc);
-
+
-    void setBufferTailTimestamp(uint64_t new_timestamp);
-    void setBufferHeadTimestamp(uint64_t new_timestamp);
-
+
-    uint64_t getTimestampFromTail(int nframes);
-    uint64_t getTimestampFromHead(int nframes);
-
+
-    // buffer offset stuff
-    /// return the tick offset value
-    signed int getTickOffset() {return m_tick_offset;};
-
+
-    bool setFrameOffset(int nframes);
-    bool setTickOffset(int nframes);
-
+
-    // dll stuff
-    bool setNominalRate(float r);
-    float getRate();
-
+
-    bool setUpdatePeriod(unsigned int t);
-
+
-    // misc stuff
-    void dumpInfo();
@@ -142 +142 @@
-protected:
-
-reebob
+fado
-    char* m_cluster_buffer;
-
+
-    unsigned int m_event_size; // the size of one event
-    unsigned int m_events_per_frame; // the number of events in a frame
@@ -150 +150 @@
-    unsigned int m_bytes_per_frame;
-    unsigned int m_bytes_per_buffer;
-
+
-    uint64_t m_wrap_at; // value to wrap at
-
+
-    TimestampedBufferClient *m_Client;
-
-    DECLARE_DEBUG_MODULE;
-
+
-private:
-    // the framecounter gives the number of frames in the buffer
-    signed int m_framecounter;
-
+
-    // the offset that define the timing of the buffer
-    signed int m_tick_offset;
-
+
-    // the buffer tail timestamp gives the timestamp of the last frame
-    // that was put into the buffer
-    uint64_t   m_buffer_tail_timestamp;
-    uint64_t   m_buffer_next_tail_timestamp;
-
+
-    // this mutex protects the access to the framecounter
-    // and the buffer head timestamp.
@@ -177 +177 @@
-    float m_dll_b;
-    float m_dll_c;
-
+
-    float m_nominal_rate;
-    unsigned int m_update_period;
@@ -197 +197 @@
-} // end of namespace Util
-
-REEBOB
-
-
+FADO
+
+

trunk/libffado/src/libutil/unittests.cpp

@@ -1 +1 @@
-/* unittests.cpp
-6,07
+5-2007 by
- *
-
+
+
- *
-
+
+
+
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-reeBoB
+FADO
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +17 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
@@ -416 +419 @@
-    testOC() {};
-    ~testOC() {};
-
+
-    bool test() {
-        bool result=true;
-
+
-        Option op1=Option();
-        result &= TEST_SHOULD_RETURN_FALSE(addOption(op1));
-
+
-        op1=Option("option1");
-        result &= TEST_SHOULD_RETURN_FALSE(addOption(op1));
@@ -432 +435 @@
-        result &= TEST_SHOULD_RETURN_FALSE(hasOption(op1));
-
-
+
-        op1=Option("option1", (int64_t)1);
-        result &= TEST_SHOULD_RETURN_TRUE(addOption(op1));
@@ -440 +443 @@
-        result &= TEST_SHOULD_RETURN_FALSE(hasOption(op1));
-
-
+
-        op1=Option("option1", (int64_t)(-1));
-        result &= TEST_SHOULD_RETURN_TRUE(addOption(op1));
@@ -447 +450 @@
-        result &= TEST_SHOULD_RETURN_FALSE(addOption(op2));
-
-
+
-        op2=Option("option2", (double)(1.75));
-        result &= TEST_SHOULD_RETURN_TRUE(addOption(op2));
@@ -454 +457 @@
-        result &= TEST_SHOULD_RETURN_TRUE(addOption(op3));
-
-
+
-        result &= TEST_SHOULD_RETURN_TRUE(countOptions() == 3);
-
@@ -466 +469 @@
-        }
-        result &= TEST_SHOULD_RETURN_TRUE(i==3);
-
+
-        clearOptions();
-        return result;
-    }
-
+
-    void prepare() {
-        Option op1=Option("option1", (int64_t)(-1));
@@ -476 +479 @@
-            printf( "prepare: could not add valid option (3)\n" );
-        }
-
+
-        Option op2=Option("option2", (double)(1.75));
-        if(!addOption(op2)) {
@@ -494 +497 @@
-    testOC oc;
-    result &= TEST_SHOULD_RETURN_TRUE(oc.test());
-
+
-    // now manipulate it externally
-    oc.prepare();
-
+
-    result &= TEST_SHOULD_RETURN_TRUE(oc.hasOption("option1"));
-    result &= TEST_SHOULD_RETURN_TRUE(oc.hasOption("option2"));
-    result &= TEST_SHOULD_RETURN_TRUE(oc.hasOption("option3"));
-    result &= TEST_SHOULD_RETURN_FALSE(oc.hasOption("option4"));
-
+
-    oc.setOption("option1", 1024);
-    int tst;
-    result &= TEST_SHOULD_RETURN_TRUE(oc.getOption("option1", tst));
-    result &= TEST_SHOULD_RETURN_TRUE(tst == 1024);
-
+
-    return result;
-}

trunk/libffado/src/Makefile.am

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
-
-
+
+
+
+
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
@@ -23 +34 @@
-        -I$(top_srcdir) -I$(top_srcdir)/src
-
-reebob
-
-reebob
+fado
+
+fado
-        -version-info $(LT_VERSION) $(LIBRAW1394_LIBS)  \
-        $(LIBIEC61883_LIBS) $(LIBAVC1394_LIBS)          \
@@ -31 +42 @@
-        -lpthread -lrt
-
-reebob
+fado
-
-noinst_HEADERS = \
-    
-    
-    
-    
+       
+       
+       
+       
-        devicemanager.h fbtypes.h iavdevice.h threads.h bebob/bebob_avdevice.h \
-        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \
@@ -64 +75 @@
-
-# common sources
-reebob
-    
-        freebob
-        freebob
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+fado
+       
+           ffado
+           ffado
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
+       
-
-# class specific sources
-bebob_src = \
-    
-    
-    
-    
-    
-    
-    
-    
+       
+       
+       
+       
+       
+       
+       
+       
-
-motu_src = \
-    
-    
-    
-    
+       
+       
+       
+       
-
-dice_src = \
-    
+       
-
-bounce_src = \
-    
-    
-    
+       
+       
+       
-
-metric_halo_src = \
-    
+       
-
-rme_src = \
-    
+       
-
-amdtp_src = \
-    
-    
-    
+       
+       
+       
-
-# data
@@ -163 +174 @@
-
-#  class specific
-freebob-downloader fre
-
-freebob_downloader_SOURCES = freebob
-freebob_downloader_LDADD = $(top_builddir)/src/libfreebob
-
-freebob_sync_SOURCES = fre
-freebob_sync_LDADD = $(top_builddir)/src/libfreebob
+bridgeco-downloader b
+
+bridgeco_downloader_SOURCES = bridgeco
+bridgeco_downloader_LDADD = $(top_builddir)/src/libffado
+
+bebob_sync_SOURCES = b
+bebob_sync_LDADD = $(top_builddir)/src/libffado
-
-# programs not intended for installation
-# generic
-noinst_PROGRAMS = test-dll test-debugmodule \
-    
-    
+       
+       
-
-test_dll_SOURCES = libutil/test-dll.cpp
-reebob
+fado
-
-test_debugmodule_SOURCES = debugmodule/test_debugmodule.cpp
-reebob
+fado
-
-test_unittests_util_SOURCES = libutil/unittests.cpp
-reebob
+fado
-
-test_unittests_osc_SOURCES = libosc/unittests.cpp
-reebob
+fado
-
-test_ser_SOURCES = ser.cpp
-reebob
+fado
-
-# build customisation
-
-if BUILD_BEBOB
-reebob
+fado
-bin_PROGRAMS += $(bebob_bin)
-noinst_PROGRAMS += $(bebob_noinst)
@@ -202 +213 @@
-
-if BUILD_BOUNCE
-reebob
+fado
-bin_PROGRAMS += $(bounce_bin)
-noinst_PROGRAMS += $(bounce_noinst)
@@ -209 +220 @@
-
-if BUILD_DICE
-reebob
+fado
-bin_PROGRAMS += $(dice_bin)
-noinst_PROGRAMS += $(dice_noinst)
@@ -216 +227 @@
-
-if BUILD_MOTU
-reebob
+fado
-bin_PROGRAMS += $(motu_bin)
-noinst_PROGRAMS += $(motu_noinst)
@@ -223 +234 @@
-
-if BUILD_METRIC_HALO
-reebob
+fado
-bin_PROGRAMS += $(metric_halo_bin)
-noinst_PROGRAMS += $(metric_halo_noinst)
@@ -230 +241 @@
-
-if BUILD_RME
-reebob
+fado
-bin_PROGRAMS += $(rme_bin)
-noinst_PROGRAMS += $(rme_noinst)
@@ -237 +248 @@
-
-if BUILD_AMDTP
-reebob
+fado
-bin_PROGRAMS += $(amdtp_bin)
-noinst_PROGRAMS += $(amdtp_noinst)

trunk/libffado/src/maudio/fw410.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-reeBoB
+FADO
-  <Device>
-    <NodeId>0</NodeId>
@@ -257 +257 @@
-    </StreamFormats>
-  </Device>
-reeBoB
+FADO

trunk/libffado/src/maudio/fwap.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-reeBoB
+FADO
-  <Device>
-    <NodeId>0</NodeId>
@@ -155 +155 @@
-    </StreamFormats>
-  </Device>
-reeBoB
+FADO

trunk/libffado/src/maudio/maudio_avdevice.cpp

@@ -1 @@
- maudio_avdevice.cpp
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "maudio/maudio_avdevice.h"
-#include "bebob/bebob_avdevice.h"
@@ -91 +95 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -103 +107 @@
-                m_model->vendor_name, m_model->model_name);
-    } else return false;
-
+
-    return true;
-}

trunk/libffado/src/maudio/maudio_avdevice.h

@@ -1 @@
-
-
+
+
+
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -43 +47 @@
-    unsigned int model_id;
-    char *vendor_name;
- 
+
-    char *filename;
-};
@@ -50 +54 @@
-public:
-    AvDevice( std::auto_ptr<ConfigRom>( configRom ),
-       
+    
-              int nodeId );
-    virtual ~AvDevice();
@@ -56 +60 @@
-    static bool probe( ConfigRom& configRom );
-    bool discover();
-
+
-    void showDevice();
-
+
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    int getSamplingFrequency( );

trunk/libffado/src/maudio/refdesign.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-reeBoB
+FADO
-  <Device>
-    <NodeId>1</NodeId>
@@ -190 +190 @@
-    </StreamFormats>
-  </Device>
-reeBoB
+FADO

trunk/libffado/src/metrichalo/mh_avdevice.cpp

@@ -1 @@
- mh_avdevice.cpp
-
+
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -52 +55 @@
-    :  IAvDevice( configRom, ieee1394service, nodeId )
-    , m_model( NULL )
-
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created MetricHalo::MHAvDevice (NodeID %d)\n",
@@ -74 +77 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -95 +98 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -111 +114 @@
-}
-
- 
+
-MHAvDevice::getSamplingFrequency( ) {
-    return 0;
@@ -150 +153 @@
-}
-
- 
+
-MHAvDevice::getStreamCount() {
-    return 0;

trunk/libffado/src/metrichalo/mh_avdevice.h

@@ -1 @@
- mh_avdevice.h
-
+
+5-200
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -45 +48 @@
-public:
-    MHAvDevice( std::auto_ptr<ConfigRom>( configRom ),
-       
-               
+    
+        
-    virtual ~MHAvDevice();
-
@@ -69 +72 @@
-    signed int getIsoRecvChannel(void);
-    signed int getIsoSendChannel(void);
-
+
-protected:
-    struct VendorModelEntry *m_model;

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -1 @@
- motu_avdevice.cpp
-6,
-6
+
+5-
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "motu/motu_avdevice.h"
-
@@ -62 +66 @@
-    , m_receiveProcessor ( 0 )
-    , m_transmitProcessor ( 0 )
-
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Motu::MotuDevice (NodeID %d)\n",
@@ -95 +99 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
- 
- 
+
+
+
-           )
-        {
@@ -120 +124 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
- 
- 
+
+
+
-           )
-        {
@@ -139 +143 @@
-}
-
- 
+
-MotuDevice::getSamplingFrequency( ) {
-/*
- * Retrieve the current sample rate from the MOTU device.
- */
-       
-       
-
-       
-               
-                       
-                       
-               
-                       
-                       
-       
-       
-               
-                       
-                       
-               
-                       
-                       
-       
-       
+    
+    
+
+    
+        
+            
+            
+        
+            
+            
+    
+    
+        
+            
+            
+        
+            
+            
+    
+    
-}
-
@@ -172 +176 @@
- * Set the MOTU device's samplerate.
- */
-       
-       
-       
-
-       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-               
-                       
-                       
-                               
-                               
-                       
-                               
-                       
-               
-                       
-                       
-                               
-                               
-                       
-                               
-                       
-               
-                       
-       
-
-       
-       
-       
-       
-               
-
-               
-               
-               
-               
-               
-                       
-               
-
-               
-               
-
-               
-               
-               
-               
-               
-               
-               
-               
-               
-                       
-               
-                       
-               
-
-
-               
-               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                               
-                                       
-                               
-                                       
-                               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                               
-                               
-                       
-                               
-               
-               
-
-                               
-                       
-               
-       
-       
+    
+    
+    
+
+    
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+            
+        
+            
+            
+                
+                
+            
+                
+            
+        
+            
+            
+                
+                
+            
+                
+            
+        
+            
+    
+
+    
+    
+    
+    
+        
+
+        
+        
+        
+        
+        
+            
+        
+
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+            
+        
+            
+        
+
+
+        
+        
+            
+                
+                
+            
+                
+                
+            
+                
+                    
+                
+                    
+                
+            
+                
+                
+            
+                
+                
+            
+                
+                
+            
+                
+                
+            
+                
+        
+        
+
+                
+            
+        
+    
+    
-}
-
@@ -312 +316 @@
-MotuDevice::prepare() {
-
-       
-       
-       
-       
-       
-
-       
-
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-       
-
-       
-       
-               
-
-       
-               
-
-       
-               
-
-       
-               
-               
-                       
-               
-                       
-
-               
-               
-       
-
-       
-               
-
-       
-       
-       
-               
-               
-       
-       
-
-       
-       
-
-       
-       
-
-       
+    
+    
+    
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+        
+
+    
+        
+
+    
+        
+
+    
+        
+        
+            
+        
+            
+
+        
+        
+    
+
+    
+        
+
+    
+    
+    
+        
+        
+    
+    
+
+    
+    
+
+    
+    
+
+    
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
-    }
-
-       
-       
-               
-       
-
-       
-       
-       
-       
-       
-               
-       
-               
-       
-               
-                       
-                       
-                       
-               
-                       
-               
-       
-       
-
-       
+
+    
+    
+        
+    
+
+    
+    
+    
+    
+    
+        
+    
+        
+    
+        
+            
+            
+            
+        
+            
+        
+    
+    
+
+    
-//    asprintf(&buff,"%s_cap_%s",id.c_str(),"myportnamehere");
-//    p=new Streaming::MotuControlPort(
-//            buff,
- 
- 
+
+
-//              // need to pass by extending MotuXXXPort and MotuPortInfo
-//    );
@@ -431 +435 @@
-//    }
-
-       
-       
-               
-
-       
-
-       
-               
-               
-       
-
-       
-       
-
-       
-       
-               
-       
-
-       
-       
-       
-       
-       
-               
-       
-               
-       
-               
-                       
-                       
-                       
-               
-                       
-               
-       
-       
-
-       
+    
+    
+        
+
+    
+
+    
+        
+        
+    
+
+    
+    
+
+    
+    
+        
+    
+
+    
+    
+    
+    
+    
+        
+    
+        
+    
+        
+            
+            
+            
+        
+            
+        
+    
+    
+
+    
-//    asprintf(&buff,"%s_pbk_%s",id.c_str(),"myportnamehere");
-    
+
-//    p=new Streaming::MotuControlPort(
-//            buff,
- 
- 
+
+
-//              // need to pass by extending MotuXXXPort and MotuPortInfo
-//    );
@@ -490 +494 @@
-//        }
-//    }
-
-       
-
-
- 
+
+    
+
+
+
-MotuDevice::getStreamCount() {
-      
+    
-}
-
-Streaming::StreamProcessor *
-MotuDevice::getStreamProcessorByIndex(int i) {
-       
-       
-               
-       
-              
-       
-               
-       
-       
+    
+    
+        
+    
+        
+    
+        
+    
+    
-}
-
@@ -517 +521 @@
-quadlet_t isoctrl = ReadRegister(MOTUFW_REG_ISOCTRL);
-
-       
-       
-       
-               
-               
-
-
-               
-               
-
-               
-               
-               
-               
-               
-               
-               
-               
-               
-       
-               
-               
-
-
-               
-               
-
-               
-               
-               
-               
-               
-               
-               
-               
-               
-
-       
-               
-       
-
-       
+    
+    
+    
+        
+        
+
+
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+    
+        
+        
+
+
+        
+        
+
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+    
+        
+    
+
+    
-}
-
@@ -566 +570 @@
-quadlet_t isoctrl = ReadRegister(MOTUFW_REG_ISOCTRL);
-
-       
-       
-
-       
-       
-       
-               
-               
-               
-               
-               
-               
-               
-       
-               
-               
-               
-               
-               
-               
-               
-
-       
-               
-       
-
-       
+    
+    
+
+    
+    
+    
+        
+        
+        
+        
+        
+        
+        
+    
+        
+        
+        
+        
+        
+        
+        
+
+    
+        
+    
+
+    
-}
-
-signed int MotuDevice::getIsoRecvChannel(void) {
-       
+    
-}
-
-signed int MotuDevice::getIsoSendChannel(void) {
-       
+    
-}
-
-unsigned int MotuDevice::getOpticalMode(unsigned int dir) {
-       
+    
-
-debugOutput(DEBUG_LEVEL_VERBOSE, "optical mode: %x %x %x %x\n",dir, reg, reg & MOTUFW_OPTICAL_IN_MODE_MASK,
-reg & MOTUFW_OPTICAL_OUT_MODE_MASK);
-
-       
-               
-       
-               
+    
+        
+    
+        
-}
-
-signed int MotuDevice::setOpticalMode(unsigned int dir, unsigned int mode) {
-       
-       
-
-       
-
-       
-       
-       
-               
-       
-               
-
-       
-               
-               
-               
-                       
-               
-                       
-       
-       
-               
-               
-               
-                       
-               
-                       
-       
-
-
-       
-       
-       
+    
+    
+
+    
+
+    
+    
+    
+        
+    
+        
+
+    
+        
+        
+        
+            
+        
+            
+    
+    
+        
+        
+        
+            
+        
+            
+    
+
+
+    
+    
+    
-}
-
@@ -668 +672 @@
-signed int size = 4+6+8*3;
-
- 
+
-        // use
-        if (sample_rate <= 96000)
@@ -674 +678 @@
-
-        // 2 channels of (coax) SPDIF is present for 1x or 2x sample rates so
-  
-   
-  
+
+
+
-        // 2 channels here for 1x or 2x sample rates regardless of the optical
-        // mode.
@@ -692 +696 @@
-                size += 4*3;
-
-       
-       
-       
-       
-               
+    
+    
+    
+    
+        
-
-        // Finally round size up to the next quadlet boundary
@@ -704 +708 @@
-
-bool MotuDevice::addPort(Streaming::StreamProcessor *s_processor,
- 
+
-  int position, int size) {
-/*
- 
+
- * This just saves the unnecessary replication of what is essentially
- * boilerplate code.  Note that the port name is freed by this function
@@ -714 +718 @@
-Streaming::Port *p=NULL;
-
-       
-
-       
-               
-       
-               
-                       
-                       
-                       
-               
-                       
-               
-               
-       
-       
-       
+    
+
+    
+        
+    
+        
+            
+            
+            
+        
+            
+        
+        
+    
+    
+    
-}
-/* ======================================================================= */
-
-bool MotuDevice::addDirPorts(
- 
+
-  unsigned int sample_rate, unsigned int optical_mode) {
-/*
@@ -750 +754 @@
-char *buff;
-
-       
+    
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
@@ -756 +760 @@
-    }
-
-       
-               
-       
-               
-       
-       
-       
-
-
-       
-       
-               
-                       
-                       
-                       
-                               
-               
-       
-
-       
-       
-       
-               
-               
-                       
-       
-
-
-       
-       
-       
-       
-               
-                       
-                               
-                       
-                               
-                                       
-                               
-                                       
-                       
-                       
-                               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-                               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-                               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-                               
-               
-       
-
-       
-       
-       
-               
-                       
-                       
-                               
-               
-       
-
-       
+    
+        
+    
+        
+    
+    
+    
+
+
+    
+    
+        
+            
+            
+            
+                
+        
+    
+
+    
+    
+    
+        
+        
+            
+    
+
+
+    
+    
+    
+    
+        
+            
+                
+            
+                
+                    
+                
+                    
+            
+            
+                
+        
+    
+
+    
+    
+    
+        
+            
+            
+                
+        
+    
+
+    
+    
+    
+        
+            
+            
+                
+        
+    
+
+    
+    
+    
+        
+            
+            
+                
+        
+    
+
+    
+    
+    
+        
+            
+            
+                
+        
+    
+
+    
-}
-/* ======================================================================== */
@@ -853 +857 @@
-quadlet_t quadlet;
-assert(m_p1394Service);
-
+
-  quadlet = 0;
-  // Note: 1394Service::read() expects a physical ID, not the node id

trunk/libffado/src/motu/motu_avdevice.h

@@ -1 @@
- motu_avdevice.h
-6
-6
+
+5-2007
+5-2007 by
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -40 +43 @@
-#define MOTUFW_RATE_MULTIPLIER_MASK     (0x00000030)
-
-                
-       
-    
-    
-   
-       
+        
+    
+    
+    
+    
+    
-
-             
-         
-     
-    
-            
-                
-                
-          
+        
+        
+    
+    
+        
+        
+        
+        
-
-                  
-                 
-               
+            
+            
+        
-
-/* Device registers */
-             
-                
-            
+        
+        
+        
-#define MOTUFW_REG_ROUTE_PORT_CONF      0x0c04
-                
+        
-
-class ConfigRom;
@@ -93 +96 @@
-    MotuDevice( std::auto_ptr<ConfigRom>( configRom ),
-          Ieee1394Service& ieee1394Service,
-               
+        
-    virtual ~MotuDevice();
-
@@ -110 +113 @@
-    bool lock();
-    bool unlock();
-
+
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
@@ -120 +123 @@
-
-    signed int getEventSize(unsigned int dir);
-
+
-protected:
-    signed int       m_motu_model;
@@ -126 +129 @@
-    signed int m_iso_recv_channel, m_iso_send_channel;
-    signed int m_bandwidth;
-
-       
-       
+
+    
+    
-
-private:
-       
-
-               
-               
-       
-               
-               
-
-       
-       
+    
+
+        
+        
+    
+        
+        
+
+    
+    
-
-};

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -1 @@
- rme_avdevice.cpp
-6
-6,
+
+5-2007
+5-
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#warning RME support is currently useless (detection only)
-

trunk/libffado/src/rme/rme_avdevice.h

@@ -1 @@
- rme_avdevice.h
-6
-6,
+
+5-2007 by
+5-
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBob
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef RMEDEVICE_H
-#define RMEDEVICE_H

trunk/libffado/src/ser.cpp

@@ +1 @@
+/*
+ * Copyright (C) 2005-2007 by Daniel Wagner
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * FFADO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FFADO; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
-#include "devicemanager.h"
-#include "libutil/serialize.h"
@@ -14 +37 @@
-        return false;
-    }
-
+
-//     devMgr.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-
+
-    if (!devMgr.discover( )) {
-        std::cerr << "could not discover devices" << std::endl;
@@ -42 +65 @@
-        port=atoi(argv[1]);
-    }
-
+
-    if ( !serialize( FileName, port ) ) {
-        std::cerr << "serializing failed" << std::endl;

trunk/libffado/src/threads.h

@@ -1 @@
- threads.h
-6
+
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
-
@@ -40 +43 @@
-{
-public:
- 
- 
+
+
-            bool bDelete = true )
-        : m_pCallee( pCallee )
@@ -49 +52 @@
-        {}
-
- 
- 
+
+
-            sem_t* pSem,
-            bool bDelete = true )
@@ -64 +67 @@
-    virtual void operator() ()
-        {
- 
+
-            if ( m_pSem ) {
-                sem_post( m_pSem);
@@ -85 +88 @@
-{
-public:
- 
- 
+
+
-            Parm0 parm0,
-            bool bDelete = true)
@@ -93 +96 @@
-        , m_parm0( parm0 )
-        , m_pSem( 0 )
- 
+
-        {}
-
- 
- 
+
+
-            Parm0 parm0,
-            sem_t* pSem,
@@ -112 +115 @@
-    virtual void operator() ()
-    {
- 
+
-            if ( m_pSem ) {
-                sem_post( m_pSem);

trunk/libffado/support/jack/ffado_driver.c

@@ -1 +1 @@
-/*
-
-
+
+
+
- *
-reebob
+fado
- *   http://jackit.sf.net
- *
- Pieter Palmers <pieterpalmers@users.sourceforge.net>
+-2007 Pieter Palmers
- *
- *   This program is free software; you can redistribute it and/or modify
@@ -42 +43 @@
-#include <sysdeps/time.h>
-
-reebob
+fado
-
-#define SAMPLE_MAX_24BIT  8388608.0f
-#define SAMPLE_MAX_16BIT  32768.0f
-
-reebob_driver_stop (freebob
-
-REEBOB_DRIVER_WITH
-reebob_driver_midi_handle_t *freebob_driver_midi_init(freebob
-reebob_driver_midi_finish (freebob
-reebob_driver_midi_start (freebob
-reebob_driver_midi_stop (freebob
+fado_driver_stop (ffado
+
+FADO_DRIVER_WITH_ASEQ
+fado_driver_midi_handle_t *ffado_driver_midi_init(ffado
+fado_driver_midi_finish (ffado
+fado_driver_midi_start (ffado
+fado_driver_midi_stop (ffado
-#endif
-
@@ -60 +61 @@
-
-static int
-reebob_driver_attach (freebob
+fado_driver_attach (ffado
-{
-        char buf[64];
@@ -77 +78 @@
-        
-        driver->device_options.packetizer_priority=driver->engine->control->client_priority +
-REEBOB
+FADO
-        if (driver->device_options.packetizer_priority>98) {
-                driver->device_options.packetizer_priority=98;
-        }
-
-reebob
+fado
-
-        if(!driver->dev) {
-freebob
+FFADO
-                return -1;
-        }
-
-REEBOB_DRIVER_WITH
-reebob
+FADO_DRIVER_WITH_ASEQ
+fado
-        if(!driver->midi_handle) {
-                printError("-----------------------------------------------------------");
-                printError("Error creating midi device!");
-FreeBob
+The FireWire backend
-                printError("Consult the above error messages to solve the problem. ");
-                printError("-----------------------------------------------------------\n\n");
@@ -110 +111 @@
-        port_flags = JackPortIsOutput|JackPortIsPhysical|JackPortIsTerminal;
-
-reebob
+fado
-
-        for (chn = 0; chn < driver->capture_nchannels; chn++) {
-                
-reebob
+fado
-                
-reebob_streaming_get_capture_stream_type(driver->dev, chn) != freebob
+fado_streaming_get_capture_stream_type(driver->dev, chn) != ffado
-                        printMessage ("Don't register capture port %s", buf);
-
@@ -133 +134 @@
-                                jack_slist_append (driver->capture_ports, port);
-                        // setup port parameters
-reebob_streaming_set_capture_buffer_type(driver->dev, chn, freebob
+fado_streaming_set_capture_buffer_type(driver->dev, chn, ffado
-                                printError(" cannot set port buffer type for %s", buf);
-                        }
-reebob
+fado
-                                printError(" cannot configure initial port buffer for %s", buf);
-                        }
-reebob
+fado
-                                printError(" cannot enable port %s", buf);
-                        }
@@ -149 +150 @@
-        port_flags = JackPortIsInput|JackPortIsPhysical|JackPortIsTerminal;
-
-reebob
+fado
-
-        for (chn = 0; chn < driver->playback_nchannels; chn++) {
-
-reebob
+fado
-                
-reebob_streaming_get_playback_stream_type(driver->dev, chn) != freebob
+fado_streaming_get_playback_stream_type(driver->dev, chn) != ffado
-                        printMessage ("Don't register playback port %s", buf);
-
@@ -173 +174 @@
-
-                        // setup port parameters
-reebob_streaming_set_playback_buffer_type(driver->dev, chn, freebob
+fado_streaming_set_playback_buffer_type(driver->dev, chn, ffado
-                                printError(" cannot set port buffer type for %s", buf);
-                        }
-reebob
+fado
-                                printError(" cannot configure initial port buffer for %s", buf);
-                        }
-reebob
+fado
-                                printError(" cannot enable port %s", buf);
-                        }
@@ -187 +188 @@
-        }
-
-reebob
+fado
-                printError("Could not prepare streaming device!");
-                return -1;
@@ -197 +198 @@
-
-static int 
-reebob_driver_detach (freebob
+fado_driver_detach (ffado
-{
-        JSList *node;
@@ -208 +209 @@
-             node = jack_slist_next (node)) {
-                // Don't try to unregister NULL entries added for non-audio
-reebob ports by freebob
+fado ports by ffado
-                if (node->data != NULL) {
-                        jack_port_unregister (driver->client,
@@ -220 +221 @@
-        for (node = driver->playback_ports; node;
-             node = jack_slist_next (node)) {
-
+
+
-                                      ((jack_port_t *) node->data));
+        }
-        }
-
@@ -227 +230 @@
-        driver->playback_ports = 0;
-
-reebob
+fado
-        driver->dev=NULL;
-
-REEBOB_DRIVER_WITH
+FADO_DRIVER_WITH_ASEQ
-        if(driver->midi_handle) {
-reebob
+fado
-        }
-        driver->midi_handle=NULL;
@@ -238 +241 @@
-
-        return 0;
-
-}
-
-static inline void 
-reebob_driver_read_from_channel (freebob
+fado_driver_read_from_channel (ffado
-                               channel_t channel,
-                               jack_default_audio_sample_t *dst,
@@ -248 +250 @@
-{
-        
-reebob
+fado
-        char *src=(char *)buffer;
-        
-reebob
+fado
-        
-        /* ALERT: signed sign-extension portability !!! */
@@ -265 +267 @@
-                *dst = x / SAMPLE_MAX_24BIT;
-                dst++;
-reebob
+fado
-        }
-        
@@ -271 +273 @@
-
-static int
-reebob_driver_read (freebob
+fado_driver_read (ffado
-{
-        jack_default_audio_sample_t* buf;
@@ -278 +280 @@
-        jack_port_t* port;
-        
-reebob
-
-reebob
+fado
+
+fado
-        
-        printEnter();
-        
-        for (chn = 0, node = driver->capture_ports; node; node = jack_slist_next (node), chn++) {
-reebob
-reebob
+fado
+fado
-                        port = (jack_port_t *) node->data;
-
@@ -292 +294 @@
-                        if(!buf) buf=(jack_default_audio_sample_t*)nullbuffer;
-                                
-reebob
+fado
-                }
-        }
-
-        // now transfer the buffers
-reebob
+fado
-        
-        printExit();
@@ -306 +308 @@
-
-static inline void 
-reebob_driver_write_to_channel (freebob
+fado_driver_write_to_channel (ffado
-                              channel_t channel, 
-                              jack_default_audio_sample_t *buf, 
@@ -312 +314 @@
-{
-    long long y;
-reebob
+fado
-        unsigned int i=0;       
-    char *dst=(char *)buffer;
@@ -330 +332 @@
-                memcpy (dst, (char *)&y + 5, 3);
-#endif
-reebob
+fado
-                buf++;
-        }
-        
-reebob
-reebob
+fado
+fado
-        
-}
-
-static int
-reebob_driver_write (freebob
+fado_driver_write (ffado
-{
-        channel_t chn;
@@ -348 +350 @@
-        jack_port_t *port;
-
-reebob
-
-reebob
-
-reebob
+fado
+
+fado
+
+fado
-
-        printEnter();
@@ -365 +367 @@
-
-        for (chn = 0, node = driver->playback_ports; node; node = jack_slist_next (node), chn++) {
-reebob
-reebob
+fado
+fado
-                        port = (jack_port_t *) node->data;
-
@@ -372 +374 @@
-                        if(!buf) buf=(jack_default_audio_sample_t*)nullbuffer;
-                                
-reebob
-
-
-
-reebob
+fado
+
+
+
+fado
-
-        printExit();
@@ -385 +387 @@
-//static inline jack_nframes_t 
-static jack_nframes_t 
-reebob_driver_wait (freebob
+fado_driver_wait (ffado
-                   float *delayed_usecs)
-{
@@ -408 +410 @@
-// *status = -4; extra FD
-
-reebob
+fado
-        
-        wait_ret = jack_get_microseconds ();
@@ -421 +423 @@
-        // transfer the streaming buffers
-        // we now do this in the read/write functions
-reebob
+fado
-        
-        if (nframes < 0) {
@@ -443 +445 @@
-
-static int
-reebob_driver_run_cycle (freebob
+fado_driver_run_cycle (ffado
-{
-        jack_engine_t *engine = driver->engine;
@@ -449 +451 @@
-        float delayed_usecs=0.0;
-
-reebob
+fado
-           &wait_status, &delayed_usecs);
-        
@@ -472 +474 @@
- */
-static int
-reebob_driver_null_cycle (freebob
+fado_driver_null_cycle (ffado
-{
-        channel_t chn;
@@ -478 +480 @@
-        snd_pcm_sframes_t nwritten;
-
-reebob
+fado
-
-        jack_default_audio_sample_t buff[nframes];
@@ -497 +499 @@
-
-        for (chn = 0, node = driver->playback_ports; node; node = jack_slist_next (node), chn++) {
-reebob
-
-reebob
-reebob
-
-
-
-reebob
+fado
+
+fado
+fado
+
+
+
+fado
-        
-        // read & discard from input ports
-        for (chn = 0, node = driver->capture_ports; node; node = jack_slist_next (node), chn++) {
-reebob
-reebob
-reebob
+fado
+fado
+fado
-                }
-        }
-
-        // now transfer the buffers
-reebob
+fado
-                
-        printExit();
@@ -522 +524 @@
-
-static int
-reebob_driver_start (freebob
+fado_driver_start (ffado
-{
-        int retval=0;
-
-REEBOB_DRIVER_WITH
+FADO_DRIVER_WITH_ASEQ
-        if(driver->midi_handle) {
-reebob
+fado
-                        printError("Could not start MIDI threads");
-                        return retval;
@@ -535 +537 @@
-#endif  
-
-reebob
+fado
-                printError("Could not start streaming threads");
-REEBOB_DRIVER_WITH
+FADO_DRIVER_WITH_ASEQ
-                if(driver->midi_handle) {
-reebob
+fado
-                }
-#endif  
@@ -550 +552 @@
-
-static int
-reebob_driver_stop (freebob
+fado_driver_stop (ffado
-{
-        int retval=0;
-        
-REEBOB_DRIVER_WITH
+FADO_DRIVER_WITH_ASEQ
-        if(driver->midi_handle) {
-reebob
+fado
-                        printError("Could not stop MIDI threads");
-                        return retval;
@@ -562 +564 @@
-        }
-#endif  
-reebob
+fado
-                printError("Could not stop streaming threads");
-                return retval;
@@ -572 +574 @@
-
-static int
-reebob_driver_bufsize (freebob
+fado_driver_bufsize (ffado
-{
-        printError("Buffer size change requested but not supported!!!");
@@ -591 +593 @@
-typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-
-reebob
-reebob
+fado
+fado
-                  char *name,
-reebob
-
-reebob
+fado
+
+fado
-
-        assert(params);
-
-reebob
-reebob version! (%s)", freebob
+fado
+fado version! (%s)", ffado
-                return NULL;
-        }
-
-reebob
-
-reebob
+fado
+
+fado
-
-        /* Setup the jack interfaces */  
-        jack_driver_nt_init ((jack_driver_nt_t *) driver);
-
-reebob
-reebob
-reebob
-reebob
-reebob
-reebob
-reebob
-reebob
-reebob
+fado
+fado
+fado
+fado
+fado
+fado
+fado
+fado
+fado
-        
-        /* copy command line parameter contents to the driver structure */
-reebob
+fado
-        
-        /* prepare all parameters */
@@ -646 +648 @@
-
-        if(!params->capture_ports) {
-REEBOB
+FADO
-        }
-
-        if(!params->playback_ports) {
-REEBOB
+FADO
-        }
-
@@ -659 +661 @@
-        debugPrint(DEBUG_LEVEL_STARTUP, "            sample rate: %d", driver->sample_rate);
-
-reebob
+fado
-
-}
-
-static void
-reebob_driver_delete (freebob
+fado_driver_delete (ffado
-{
-        jack_driver_nt_finish ((jack_driver_nt_t *) driver);
@@ -670 +672 @@
-}
-
-REEBOB_DRIVER_WITH
+FADO_DRIVER_WITH_ASEQ
-/*
- * MIDI support
@@ -677 +679 @@
-// the thread that will queue the midi events from the seq to the stream buffers
-
-reebob
-
-reebob_driver_midi_handle_t *m=(freebob
+fado
+
+fado_driver_midi_handle_t *m=(ffado
-        assert(m);
-        snd_seq_event_t *ev;
@@ -693 +695 @@
-                while ((snd_seq_event_input(m->seq_handle, &ev) > 0)) {
-                        // get the port this event is originated from
-reebob
+fado
-                        for (i=0;i<m->nb_output_ports;i++) {
-                                if(m->output_ports[i]->seq_port_nr == ev->dest.port) {
@@ -719 +721 @@
-        
-                        for(b=0;b<bytes_to_send;b++) {
-reebob
-reebob
+fado
+fado
-                                        printError(" Midi send buffer overrun");
-                                }
@@ -734 +736 @@
-
-// the dequeue thread (maybe we need one thread per stream)
-reebob
-reebob_driver_midi_handle_t *m=(freebob
+fado
+fado_driver_midi_handle_t *m=(ffado
-
-        int i;
@@ -750 +752 @@
-                        unsigned int buff[64];
-        
-reebob
+fado
-                
-                        if(!port) {
@@ -757 +759 @@
-                
-                        do {
-reebob
+fado
-                        
-                                for (s=0;s<samples_read;s++) {
@@ -779 +781 @@
-}
-
-reebob_driver_midi_handle_t *freebob_driver_midi_init(freebob
+fado_driver_midi_handle_t *ffado_driver_midi_init(ffado
-//      int err;
-
@@ -787 +789 @@
-        int i=0;
-
-reebob
+fado
-
-        assert(dev);
-
-reebob_driver_midi_handle_t *m=calloc(1,sizeof(freebob
+fado_driver_midi_handle_t *m=calloc(1,sizeof(ffado
-        if (!m) {
-                printError("not enough memory to create midi structure");
@@ -806 +808 @@
-
-        // find out the number of midi in/out ports we need to setup
-reebob
+fado
-
-        m->nb_input_ports=0;
-
-        for (chn = 0; chn < nchannels; chn++) { 
-reebob_streaming_get_capture_stream_type(dev, chn) == freebob
+fado_streaming_get_capture_stream_type(dev, chn) == ffado
-                        m->nb_input_ports++;
-                }
-        }
-
-reebob
+fado
-        if(!m->input_ports) {
-                printError("not enough memory to create midi structure");
@@ -825 +827 @@
-        i=0;
-        for (chn = 0; chn < nchannels; chn++) {
-reebob_streaming_get_capture_stream_type(dev, chn) == freebob
-reebob
+fado_streaming_get_capture_stream_type(dev, chn) == ffado
+fado
-                        if(!m->input_ports[i]) {
-                                // fixme
@@ -833 +835 @@
-                        }
-
-reebob
+fado
-                        printMessage("Register MIDI IN port %s", buf);
-
@@ -852 +854 @@
-                                        m->input_ports[i]->seq_port_nr=-1;
-                                } else {
-reebob_streaming_set_capture_buffer_type(dev, chn, freebob
+fado_streaming_set_capture_buffer_type(dev, chn, ffado
-                                                printError(" cannot set port buffer type for %s", buf);
-                                                m->input_ports[i]->stream_nr=-1;
-                                                m->input_ports[i]->seq_port_nr=-1;
-                                        }
-reebob
+fado
-                                                printError(" cannot enable port %s", buf);
-                                                m->input_ports[i]->stream_nr=-1;
@@ -871 +873 @@
-
-        // playback
-reebob
+fado
-
-        m->nb_output_ports=0;
-
-        for (chn = 0; chn < nchannels; chn++) { 
-reebob_streaming_get_playback_stream_type(dev, chn) == freebob
+fado_streaming_get_playback_stream_type(dev, chn) == ffado
-                        m->nb_output_ports++;
-                }
-        }
-
-reebob
+fado
-        if(!m->output_ports) {
-                printError("not enough memory to create midi structure");
@@ -894 +896 @@
-        i=0;
-        for (chn = 0; chn < nchannels; chn++) {
-reebob_streaming_get_playback_stream_type(dev, chn) == freebob
-reebob
+fado_streaming_get_playback_stream_type(dev, chn) == ffado
+fado
-                        if(!m->output_ports[i]) {
-                                // fixme
@@ -902 +904 @@
-                        }
-
-reebob
+fado
-                        printMessage("Register MIDI OUT port %s", buf);
-
@@ -922 +924 @@
-                                        m->output_ports[i]->seq_port_nr=-1;
-                                } else {
-reebob_streaming_set_playback_buffer_type(dev, chn, freebob
+fado_streaming_set_playback_buffer_type(dev, chn, ffado
-                                                printError(" cannot set port buffer type for %s", buf);
-                                                m->input_ports[i]->stream_nr=-1;
-                                                m->input_ports[i]->seq_port_nr=-1;
-                                        }
-reebob
+fado
-                                                printError(" cannot enable port %s", buf);
-                                                m->input_ports[i]->stream_nr=-1;
@@ -946 +948 @@
-
-static int
-reebob_driver_midi_start (freebob
+fado_driver_midi_start (ffado
-{
-        assert(m);
@@ -954 +956 @@
-        m->queue_thread_priority=
-                m->driver->engine->control->client_priority +
-REEBOB
+FADO
-
-        if (m->queue_thread_priority>98) {
@@ -966 +968 @@
-        }
-
-reebob
+fado
-                printError(" cannot create midi queueing thread");
-                return -1;
-        }
-
-reebob
+fado
-                printError(" cannot create midi dequeueing thread");
-                return -1;
@@ -979 +981 @@
-
-static int
-reebob_driver_midi_stop (freebob
+fado_driver_midi_stop (ffado
-{
-        assert(m);
@@ -993 +995 @@
-
-static void
-reebob_driver_midi_finish (freebob
+fado_driver_midi_finish (ffado
-{
-        assert(m);
@@ -1018 +1020 @@
- */
-
-reebob
+irewire
-
-const jack_driver_desc_t *
@@ -1029 +1031 @@
-        desc = calloc (1, sizeof (jack_driver_desc_t));
-
-reebob
+irewire
-        desc->nparams = 8;
-  
@@ -1115 +1117 @@
-        const jack_driver_param_t * param;
-
-reebob
+fado
-        
-    char *device_name="hw:0"; 
@@ -1197 +1199 @@
-    jack_error("Freebob using Firewire port %d, node %d",cmlparams.port,cmlparams.node_id);
-    
-reebob_driver_new (client, "freebob
+fado_driver_new (client, "ffado
-
-        return driver;
@@ -1205 +1207 @@
-driver_finish (jack_driver_t *driver)
-{
-reebob_driver_t *drv=(freebob
+fado_driver_t *drv=(ffado
-        // If jack hasn't called the detach method, do it now.  As of jack 0.101.1
-        // the detach method was not being called explicitly on closedown, and 
-        // we need it to at least deallocate the iso resources.
-        if (drv->dev != NULL)
-reebob
-reebob
-
+fado
+fado
+

trunk/libffado/support/jack/ffado_driver.h

@@ -1 @@
- freebob_driver.h
-
-FreeBob Backend for Jack
-reeBob
-
-reebob
+
+   FireWire Backend for Jack
+using FFADO
+FADO
+
+fado
- *   http://jackit.sf.net
- *
- Pieter Palmers <pieterpalmers@users.sourceforge.net>
+-2007 Pieter Palmers
- *
- *   This program is free software; you can redistribute it and/or modify
@@ -29 +29 @@
- */ 
- 
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-#include <jack/driver.h>
@@ -114 +113 @@
-
-// thread priority setup
-REEBOB
-
-REEBOB_DRIVER_WITH
+FADO
+
+FADO_DRIVER_WITH_ASEQ
-
-        #define ALSA_SEQ_BUFF_SIZE 1024
@@ -125 +124 @@
-        // but I think it should be smaller than the packetizer thread in order not 
-        // to lose any packets
-REEBOB
-
-
-
-reebob_driver freebob
+FADO
+
+
+
+fado_driver ffado
-
-/*
@@ -135 +134 @@
- */
-
-reebob_jack_settings freebob
-reebob
+fado_jack_settings ffado
+fado
-    int period_size_set;
-    jack_nframes_t period_size;
@@ -158 +157 @@
-    int snoop_mode;
-    
-reebob
+fado
-};
-
-
-
+
-
-typedef struct {
@@ -169 +167 @@
-        snd_midi_event_t *parser;
-        snd_seq_t *seq_handle;
-reebob
-
-reebob
-reebob
-reebob
+fado
+
+fado
+fado
+fado
-
-        snd_seq_t *seq_handle;
@@ -185 +183 @@
-        int nb_output_ports;
-
-reebob
-reebob
-
-reebob
+fado
+fado
+
+fado
-        int *output_port_stream_map;
-
-
-reebob
+fado
-
-#endif
@@ -200 +198 @@
- 
-
-reebob
+fado
-{
-        JACK_DRIVER_NT_DECL
@@ -220 +218 @@
-        
-        /* settings from the command line */
-reebob
+fado
-        
-        /* the freebob virtual device */
-reebob
+fado
-        
-    JSList                       *capture_ports;
@@ -231 +229 @@
-    channel_t                     capture_nchannels;
-        
-reebob
-reebob
-
-REEBOB_DRIVER_WITH
-reebob
+fado
+fado
+
+FADO_DRIVER_WITH_ASEQ
+fado
-#endif
-
@@ -242 +240 @@
-
-
-REEBOB
-
-
+FADO
+
+

trunk/libffado/tests/Makefile.am

@@ -1 @@
-
-
+
-#
-
+
+
-#
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
-
-
+
+
+
+
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
- SUBDIRS = 
+SUBDIRS=
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src $(LIBXML_CFLAGS) \
-        $(LIBAVC1394_CFLAGS) $(LIBXMLCPP_CFLAGS)
-
+
-noinst_PROGRAMS =
-
-if BUILD_TESTS
-reebob
-               
-               
+fado
+            
+            
-endif
-
- 
+
-
-reebob_SOURCES = test-freebob
-reebob_LDADD   = $(top_builddir)/src/libfreebob
+fado_SOURCES = test-ffado
+fado_LDADD   = $(top_builddir)/src/libffado
-        $(LIBXML_LIBS) $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
-
-test_extplugcmd_SOURCES = test-extplugcmd.cpp
-reebob
+fado
-        $(LIBAVC1394_LIBS)
-
-test_volume_SOURCES = test-volume.cpp
-reebob
+fado
-        $(LIBAVC1394_LIBS)
-
-test_mixer_SOURCES = test-mixer.cpp
-reebob
+fado
-        $(LIBAVC1394_LIBS)
-
@@ -51 +59 @@
-
-test_ieee1394service_SOURCES = test-ieee1394service.cpp
-reebob
-    
+fado
+       
-
-#TESTS_ENVIRONMENT
-reebob
+fado
-
-reebob
+fado
-        $(LIBRAW1394_LIBS) $(LIBAVC1394_LIBS)
-test_cycletimer_SOURCES = test-cycletimer.cpp
-
-reebob
+fado
-        $(LIBRAW1394_LIBS) $(LIBAVC1394_LIBS)
-test_sytmonitor_SOURCES = test-sytmonitor.cpp SytMonitor.cpp \
-    
+       
-
-reebob
+fado
-        $(LIBRAW1394_LIBS) $(LIBAVC1394_LIBS)
-test_timestampedbuffer_SOURCES = test-timestampedbuffer.cpp

trunk/libffado/tests/streaming/debugtools.c

@@ +1 @@
+/*
+ * Copyright (C) 2005-2007 by by Daniel Wagner
+ * Copyright (C) 2005-2007 by by Pieter Palmers
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * FFADO is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FFADO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FFADO; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
-#include <libfreebob/freebob.h>
-#include <libraw1394/raw1394.h>

trunk/libffado/tests/streaming/debugtools.h

@@ +1 @@
+/*
+ * Copyright (C) 2005-2007 by by Daniel Wagner
+ * Copyright (C) 2005-2007 by by Pieter Palmers
+ *
+ * This file is part of FFADO
+ * FFADO = Free Firewire (pro-)audio drivers for linux
+ *
+ * FFADO is based upon FreeBoB.
+ *
+ * FFADO is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * FFADO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with FFADO; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA.
+ */
+
-#ifndef DEBUG_TOOLS_H
-#define DEBUG_TOOLS_H

trunk/libffado/tests/streaming/Makefile.am

@@ -1 @@
-
-
-
+
-#
-
+
+
-#
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
-
-
+
+
+
+
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
@@ -23 +30 @@
-
-teststreaming_SOURCES = teststreaming.c debugtools.c
-reebob
+fado
-        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
-
-teststreaming2_SOURCES = teststreaming2.c debugtools.c
-reebob
+fado
-        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
-
-teststreaming3_SOURCES = teststreaming3.c debugtools.c
-reebob
+fado
-        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)
-
-testmidistreaming1_SOURCES = testmidistreaming1.c debugtools.c
-reebob
+fado
-        $(LIBAVC1394_LIBS) $(LIBIEC61883_LIBS)

trunk/libffado/tests/streaming/test-isohandling.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_CONFIG_H
@@ -46 +50 @@
-static void sighandler (int sig)
-{
-       
+    
-}
-
@@ -52 +56 @@
-{
-
-       
-       
-       
-
-       
-       
-
-       printf("Freebob
-       
-
-       
-
-       
-       
-               
-               
-       
-       
-
-       
-
-    
-    
-            
-            
-    
-    
-
-      
-    
-       
-               
-               
-       
-       
-       
-
-      
-    
-       
-               
-               
-       
-       
-       
-
-    
-    
-            
-            
-    
-    
-
-
-       
-       
-               
-               
-       
-       
-
-       
-               
-               
-       
-       
-
-       
-
-
-
-
-
-               
-               
-       
-               
-               
-       
-
-       
-
-       
-
-       
-               
-               
-       
-
-       
-
-
-       
-
-       
-       
-       
-
-       
-               
-               
-       
-       
-
-       
-       
-       
-               
-              
-                       
-                       
-                       
-                       
-                     
-                       
-                       
-                       
-                       
-                       
-              
-               
-               
-
-       
-
-       
-
-       
-
-    
-       
-       
-
-       
-
-       
-
-    
-       
-       
-
-       
+    
+    
+    
+
+    
+    
+
+    printf("FFADO
+    
+
+    
+
+    
+    
+        
+        
+    
+    
+
+    
+
+    
+    
+        
+        
+    
+    
+
+    
+    
+    
+        
+        
+    
+    
+    
+
+    
+    
+    
+        
+        
+    
+    
+    
+
+    
+    
+        
+        
+    
+    
+
+
+    
+    
+        
+        
+    
+    
+
+    
+        
+        
+    
+    
+
+    
+
+
+
+
+
+        
+        
+    
+        
+        
+    
+
+    
+
+    
+
+    
+        
+        
+    
+
+    
+
+
+    
+
+    
+    
+    
+
+    
+        
+        
+    
+    
+
+    
+    
+    
+        
+        
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+        
+        
+        
+
+    
+
+    
+
+    
+
+    
+    
+    
+
+    
+
+    
+
+    
+    
+    
+
+    
-
-

trunk/libffado/tests/streaming/testmidistreaming1.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/libffado/tests/streaming/teststreaming.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/**
- * Test application for the per-stream decode API

trunk/libffado/tests/streaming/teststreaming2.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/libffado/tests/streaming/teststreaming3.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/libffado/tests/SytMonitor.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2005,2006,2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
+
+
+
+
+
- *
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- *
- */
@@ -41 +37 @@
-SytMonitor::SytMonitor(int port)
-    : IsoStream(IsoStream::EST_Receive, port) {
-reebob
+fado
-
-}
-
-SytMonitor::~SytMonitor() {
-       freebob
+    ffado
-
-}
-
- 
- 
- 
+
+
+
-                  unsigned int cycle, unsigned int dropped) {
-    enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
-
+
-    struct iec61883_packet *packet = (struct iec61883_packet *) data;
-    unsigned int syt_timestamp=ntohs(packet->syt);
-
+
-    if (syt_timestamp == 0xFFFF) {
-        return RAW1394_ISO_OK;
-    }
-
+
-    uint32_t m_full_timestamp;
-    uint32_t m_full_timestamp_ticks;
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE,"%2u,%2u: CY=%4u, SYT=%08X (%3u secs + %4u cycles + %04u ticks)\n",
-        m_port,channel,
-        cycle,syt_timestamp,
- 
- 
+
+
-        CYCLE_TIMER_GET_OFFSET(syt_timestamp)
-
+
-        );
-
+
-    // reconstruct the full cycle
-    unsigned int cc=m_handler->getCycleTimer();
-
+
-    unsigned int cc_cycles=CYCLE_TIMER_GET_CYCLES(cc);
-
+
-    unsigned int cc_seconds=CYCLE_TIMER_GET_SECS(cc);
-
-
+
+
-    // the cycletimer has wrapped since this packet was received
- 
+
-    // was received
-    if (cycle>cc_cycles) cc_seconds--;
-
+
-    m_full_timestamp_ticks=sytRecvToFullTicks((uint32_t)syt_timestamp, cycle, cc);
-    m_full_timestamp=TICKS_TO_CYCLE_TIMER(m_full_timestamp_ticks);
-
+
-    struct cycle_info cif;
-    cif.cycle=cycle;
-    cif.seconds=cc_seconds;
-
+
-    cif.syt=packet->syt;
-    cif.full_syt=m_full_timestamp;
-
+
-    // now we reconstruct the presentation time
-    cif.pres_seconds = CYCLE_TIMER_GET_SECS(m_full_timestamp);
@@ -103 +99 @@
-    cif.pres_offset  = CYCLE_TIMER_GET_OFFSET(m_full_timestamp);
-    cif.pres_ticks   = m_full_timestamp_ticks;
-
+
-    if (cif.pres_offset != (syt_timestamp & 0xFFF)) {
- 
+
-        cif.pres_offset, syt_timestamp & 0xFFF, m_full_timestamp, syt_timestamp);
-    }
-    if ((cif.pres_cycle & 0xF) != ((syt_timestamp & 0xF000)>>12)) {
- 
+
-            cif.pres_cycle &0xF, (syt_timestamp & 0xF000)>>12, m_full_timestamp, syt_timestamp);
-    }
-
+
-    putCycleInfo(&cif);
-
@@ -119 +115 @@
-
-bool SytMonitor::putCycleInfo(struct cycle_info *cif) {
-
-
-
-
-
-
-
-
-
+
-        !=sizeof(struct cycle_info)) {
-        return false;
-    }
-    return true;
-
+
+
+
+
+
+
+
+
+
-}
-
-bool SytMonitor::consumeNextCycleInfo() {
-    struct cycle_info cif;
-reebob
+fado
-        !=sizeof(struct cycle_info)) {
-        return false;
@@ -147 +143 @@
-{
-    IsoStream::dumpInfo();
-       
-          freebob
+    
+       ffado
-};

trunk/libffado/tests/SytMonitor.h

@@ -1 @@
-/* $Id$ */
-
-/*
-
-
+
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
+
+
+
+
+
- *
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- *
- */
-
-
+
+
+
-#include "src/libstreaming/IsoStream.h"
-#include "src/libstreaming/cip.h"
@@ -46 +43 @@
-};
-
- 
+
-    : public IsoStream
-{
@@ -53 +50 @@
-        SytMonitor(int port);
-        virtual ~SytMonitor();
-
-
-
-
-                       
-
-               
-               
-               
-
+
+
+
+
+        
+
+        
+        
+        
+
-        bool readNextCycleInfo(struct cycle_info *cif);
-        bool consumeNextCycleInfo();
-
+
-        bool putCycleInfo(struct cycle_info *cif);
-
+
-        IsoHandler * getHandler() {return m_handler;};
-        
-        protected:
-           freebob_ringbuffer_t * m_cinfo_buffer;
-        
-        
-                DECLARE_DEBUG_MODULE;
-                
-           
-
+    protected:
+        ffado_ringbuffer_t * m_cinfo_buffer;
+
+        DECLARE_DEBUG_MODULE;
-};
-
-
-
-
-
+

trunk/libffado/tests/test-cycletimer.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_CONFIG_H
@@ -51 +56 @@
-
-struct CYCLE_TIMER_REGISTER {
-       
-       
-       
+    
+    
+    
-};
-
-uint64_t ctr_to_quadlet(struct CYCLE_TIMER_REGISTER x) {
-    uint64_t retval=0;
-
+
-    x.seconds &= 0x7F;
-
+
-    x.cycles &= 0x1FFF;
-    x.cycles %= 8000;
-
+
-    x.offset &= 0xFFF;
-    x.offset %= 3072;
-
+
-    retval = (x.seconds << 25) + (x.cycles << 12) + (x.offset);
-    return retval & 0xFFFFFFFF;
@@ -73 +78 @@
-static void sighandler (int sig)
-{
-       
+    
-}
-
-int do_cycletimer_test() {
-
+
-    struct CYCLE_TIMER_REGISTER cycle_timer;
-    uint32_t *cycle_timer_as_uint=(uint32_t *)&cycle_timer;
-
+
-    uint32_t i=0;
-    uint32_t targetval=0;
-
+
-    int failures=0;
-
-
+
+
-    // test 1
- 
-
+
+
-    *cycle_timer_as_uint=0;
-    for (i=0;i<3072;i++) {
-        cycle_timer.offset=i;
-        targetval=CYCLE_TIMER_GET_OFFSET(ctr_to_quadlet(cycle_timer));
-
+
-        if(targetval != i) {
-            debugOutput(DEBUG_LEVEL_NORMAL, "  test1 failed on i=%d (%08X), returns %d (%08X)\n",i,i,targetval,targetval);
@@ -100 +105 @@
-        }
-    }
-
+
-    for (i=0;i<8000;i++) {
-        cycle_timer.cycles=i;
-        targetval=CYCLE_TIMER_GET_CYCLES(ctr_to_quadlet(cycle_timer));
-
+
-        if(targetval != i) {
-            debugOutput(DEBUG_LEVEL_NORMAL, "  test2 failed on i=%d (%08X), returns %d (%08X)\n",i,i,targetval,targetval);
@@ -110 +115 @@
-        }
-    }
-
+
-    for (i=0;i<128;i++) {
-        cycle_timer.seconds=i;
-        targetval=CYCLE_TIMER_GET_SECS(ctr_to_quadlet(cycle_timer));
-
+
-        if(targetval != i) {
-            debugOutput(DEBUG_LEVEL_NORMAL, "  test3 failed on i=%d (%08X), returns %d (%08X)\n",i,i,targetval,targetval);
@@ -120 +125 @@
-        }
-    }
-
-
+
+
-    // a value in ticks
-    // should be: 10sec, 1380cy, 640ticks
@@ -128 +133 @@
-    cycle_timer.cycles  = TICKS_TO_CYCLES(targetval);
-    cycle_timer.offset  = TICKS_TO_OFFSET(targetval);
-
+
-    if((cycle_timer.seconds != 10) |
-        (cycle_timer.cycles != 1380) |
@@ -139 +144 @@
-         debugOutput(DEBUG_LEVEL_NORMAL, "  test4 ok\n");
-    }
-
+
-    i=TICKS_TO_CYCLE_TIMER(targetval);
-    if (i != 0x14564280) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  test5 failed: (0x%08X,0x14564280)\n",
-            i);
-   
+
-    } else {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  test5 ok\n");
-    }
-
+
-    targetval=CYCLE_TIMER_TO_TICKS(i);
-    if (targetval!=250000000L) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  test6 failed: (%u,250000000)\n",
-            targetval);
-   
+
-    } else {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  test6 ok\n");
-    }
-
+
-    int32_t subs;
-    subs=diffTicks(10, 8);
@@ -163 +168 @@
-         debugOutput(DEBUG_LEVEL_NORMAL, "  diffTicks(10, 8) != 2 : %ld\n",
-            subs);
-   
-
-
+
+
+
-    subs=diffTicks(10, 12);
-    if (subs != -2) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  diffTicks(10, 12) != -2 : %ld\n",
-            subs);
-   
-
-
+
+
+
-    subs=diffTicks(TICKS_PER_SECOND*128L + 10, 8);
-    if (subs != 2) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  diffTicks(TICKS_PER_SECOND*128L + 10, 8) != 2 : %ld\n",
-            subs);
-   
-
-
+
+
+
-    subs=diffTicks(TICKS_PER_SECOND*128L + 10, 12);
-    if (subs != -2) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  diffTicks(TICKS_PER_SECOND*128L + 10, 12) != -2 : %ld\n",
-            subs);
-   
-
-
+
+
+
-    subs=diffTicks(10, TICKS_PER_SECOND*128L + 8);
-    if (subs != 2) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  diffTicks(10, TICKS_PER_SECOND*128L + 8) != 2 : %ld\n",
-            subs);
-   
-
-
+
+
+
-    subs=diffTicks(10, TICKS_PER_SECOND*128L + 12);
-    if (subs != -2) {
@@ -200 +205 @@
-        failures++;
-    }
-
+
-    //---------
-    // now = 10sec, 1380cy, 640ticks
-
+
-    uint32_t st=sytRecvToFullTicks(0x1234, 1000, 0x14564280);
-    if (st != 248860212LLU) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  sytToRecvFullTicks(0x1234, 1000, 0x14564280) != 248860212 : %011lu\n",
-            st);
-   
-
-
+
+
+
-    st=sytRecvToFullTicks(0xB2B6, 7000, TICKS_TO_CYCLE_TIMER(3118082282LU));
-    if (st != 3118089910LLU) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  sytToRecvFullTicks(0x1234, 1000, %08X) != 3118089910 : %011lu\n",
-            TICKS_TO_CYCLE_TIMER(3118082282LU), st);
-   
-
-
+
+
+
-    st=sytXmitToFullTicks(0xC4EA, 3000, TICKS_TO_CYCLE_TIMER(2958285668LU));
-    if (st != 2958349546LLU) {
-         debugOutput(DEBUG_LEVEL_NORMAL, "  sytToXmitFullTicks(0x1234, 1000, %08X) != 2958349546 : %011lu\n",
-            TICKS_TO_CYCLE_TIMER(2958285668LU), st);
-   
-
-
+
+
+
-    if (failures) {
-        debugOutput(DEBUG_LEVEL_NORMAL, " %d failures\n",failures);
@@ -237 +242 @@
-{
-
-       
-
-       
-
-     
+    
+
+    
+
+
-    IsoStream *s=NULL;
-#endif
-     
+
-    IsoStream *s2=NULL;
-#endif
@@ -251 +256 @@
-#endif
-
-       
-       
-
-       debugOutput(DEBUG_LEVEL_NORMAL, "Freebob
-
-       
-       
-       
-       
-       
-       
-       
-
-    
-
-       
-
-       
-               
-               
-       
-
-       
-
-       
-               
-               
-       
-
-
-     
-       
-       
-
-       
-               
-               
-
-
-       
-
-       
-               
-               
-       
-
-       
-
-       
-               
-               
-       
-
-
-     
-       
-       
-
-       
-               
-               
-
-
-       
-
-       
-               
-               
-       
-
-       
-
-       
-               
-               
-       
-
-
-             
-       
-       
-
-       
-               
-               
-
-
-       
-
-       
-               
-               
-       
-
-       
-
-       
-               
-               
-       
-
-
-       
-       
-               
-               
-       
-
-       
-       
-               
-               
-       
-
-       
+    
+    
+
+    debugOutput(DEBUG_LEVEL_NORMAL, "FFADO
+
+    
+    
+    
+    
+    
+    
+    
+
+    
+
+    
+
+    
+        
+        
+    
+
+    
+
+    
+        
+        
+    
+
+
+
+    
+    
+
+    
+        
+        
+
+
+    
+
+    
+        
+        
+    
+
+    
+
+    
+        
+        
+    
+
+
+
+    
+    
+
+    
+        
+        
+
+
+    
+
+    
+        
+        
+    
+
+    
+
+    
+        
+        
+    
+
+
+
+    
+    
+
+    
+        
+        
+
+
+    
+
+    
+        
+        
+    
+
+    
+
+    
+        
+        
+    
+
+
+    
+    
+        
+        
+    
+
+    
+    
+        
+        
+    
+
+    
-        sleep(1);
-        m_isoManager->dumpInfo();
-       
-
-       
-       
-       
-       
-       
-
-     
-       
-               
-               
-       
-       
-
-
-     
-       
-               
-               
-       
-       
-
-
-     
-       
-               
-               
-       
-       
-
-
+    
+
+    
+    
+    
+    
+    
+
+
+    
+        
+        
+    
+    
+
+
+
+    
+        
+        
+    
+    
+
+
+
+    
+        
+        
+    
+    
+
+
-    delete m_isoManager;
-
-finish:
-       
+    
-
-  return EXIT_SUCCESS;

trunk/libffado/tests/test-extplugcmd.cpp

@@ -1 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-reeBoB
+FADO
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +17 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
+ *
- */
-
@@ -34 +38 @@
-////////////////////////////////////////////////
-const char *argp_program_version = "test-extplugcmd 0.2";
-reebob
+fado
-static char doc[] = "test-extplugcmd -- tests some extended plug info commands on a BeBoB device";
-static char args_doc[] = "NODE_ID";
@@ -206 +210 @@
-    int node_id = strtol(arguments.args[0], &tail, 0);
-    if (errno) {
-       
-       
+    
+    
-    }
-    Ieee1394Service ieee1394service;

trunk/libffado/tests/test-ffado.cpp

@@ -1 @@
- test-freebob.c
-
-7
+
+-2007 by
+5-2007 by
- *
-
+
+
- *
-
+
+
+
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-reeBoB
+FADO
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -15 +18 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
@@ -26 +29 @@
-#include <config.h>
-
-reebob/freebob
+fado/ffado
-
-#include "debugmodule/debugmodule.h"
@@ -60 +63 @@
-string osc_value;
-
- 
+
-    void *data, void *user_data);
-
- 
+
+
-    void *data, void *user_data);
-
- 
+
+
-    void *data, void *user_data);
-
+
-void osc_error_handler(int num, const char *msg, const char *path);
-
@@ -83 +86 @@
-
-// Program documentation.
-reeBoB
+FADO
-                    "OPERATION: Discover\n"
-                    "           SetSamplerate\n"
@@ -99 +102 @@
-    int   node_id;
-    int   node_id_set;
-  
+
-};
-
@@ -134 +137 @@
-            arguments->verbose = strtol( arg, &tail, 0 );
-            if ( errno ) {
-debugError(
+fprintf( stderr,
-                return ARGP_ERR_UNKNOWN;
-            }
@@ -143 +146 @@
-            arguments->port = strtol( arg, &tail, 0 );
-            if ( errno ) {
-debugError(
+fprintf( stderr,
-                return ARGP_ERR_UNKNOWN;
-            }
-        } else {
-            if ( errno ) {
-debugError(
+fprintf( stderr,
-                return ARGP_ERR_UNKNOWN;
-            }
@@ -157 +160 @@
-            arguments->node_id = strtol( arg, &tail, 0 );
-            if ( errno ) {
-debugError(
+fprintf( stderr,
-                return ARGP_ERR_UNKNOWN;
-            }
@@ -163 +166 @@
-        } else {
-            if ( errno ) {
-debugError(
+fprintf( stderr,
-                return ARGP_ERR_UNKNOWN;
-            }
@@ -197 +200 @@
-    // Default values.
-    arguments.silent      = 0;
-DEBUG_LEVEL_NORMAL
+0
-    arguments.port        = 0;
-    arguments.node_id     = 0;
@@ -207 +210 @@
-    // be reflected in `arguments'.
-    if ( argp_parse ( &argp, argc, argv, 0, 0, &arguments ) ) {
-debugError(
+fprintf( stderr,
-        return -1;
-    }
-
-
-
-
-
-
-
+
+
+
+
-    if ( strcmp( arguments.args[0], "Discover" ) == 0 ) {
-        DeviceManager *m_deviceManager = new DeviceManager();
-        if ( !m_deviceManager ) {
-debugError(
+fprintf( stderr,
-            return -1;
-        }
-        if ( !m_deviceManager->initialize( arguments.port ) ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-
-
+
+
+
-        if ( !m_deviceManager->discover() ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-        
-        int devices_on_bus = m_deviceManager->getNbDevices();
-        debugOutput(DEBUG_LEVEL_NORMAL, "port = %d, devices_on_bus = %d\n", arguments.port, devices_on_bus);
-        
-        for(int i=0;i<devices_on_bus;i++) {
-            int node_id=m_deviceManager->getDeviceNodeId(i);
-            debugOutput(DEBUG_LEVEL_NORMAL, " device = %d, node = %d\n", i, node_id);
-            IAvDevice* avDevice = m_deviceManager->getAvDevice( node_id );
-            if ( avDevice ) {
-                avDevice->showDevice();
-            }
-        }
-        
-        delete m_deviceManager;
-        return 0;
@@ -254 +243 @@
-        int samplerate = strtol( arguments.args[1], &tail, 0 );
-        if ( errno ) {
-debugError(
-
-
-
+fprintf( stderr,
+
+
+
-        DeviceManager *m_deviceManager = new DeviceManager();
-        if ( !m_deviceManager ) {
-debugError(
+fprintf( stderr,
-            return -1;
-        }
-        if ( !m_deviceManager->initialize( arguments.port ) ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-
-
+
+
+
-        if ( !m_deviceManager->discover() ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-
+
-        if(arguments.node_id_set) {
-            IAvDevice* avDevice = m_deviceManager->getAvDevice( arguments.node_id );
-            if ( avDevice ) {
-eRate
+ingFrequency
-                    m_deviceManager->discover();
-                } else {
-debugError(
+fprintf( stderr,
-                }
-            }
-        } else {
-            int i=0;
-
+
-            int devices_on_bus = m_deviceManager->getNbDevices();
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
+printf(
+
-            for(i=0;i<devices_on_bus;i++) {
-                int node_id=m_deviceManager->getDeviceNodeId(i);
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-                IAvDevice* avDevice = m_deviceManager->getAvDevice( node_id );
-                if ( avDevice ) {
-eRate
-debugError(
+ingFrequency
+fprintf( stderr,
-                    }
-                }
@@ -307 +297 @@
-        // list osc space by using OSC messages
-        // a server is assumed to be present
-
+
-        /* start a new server.
-        when sending a message from this context, the response
@@ -314 +304 @@
-        lo_server s = lo_server_new(NULL, osc_error_handler);
-        lo_address t = lo_address_new(NULL, "17820");
-
+
-        list_osc_paths(s, t, "/");
-
+
-        lo_address_free(t);
-        lo_server_free(s);
-
+
-    } else if ( strcmp( arguments.args[0], "OscServer" ) == 0 ) {
-        DeviceManager *m_deviceManager = new DeviceManager();
-        if ( !m_deviceManager ) {
-debugError(
+fprintf( stderr,
-            return -1;
-        }
-        if ( !m_deviceManager->initialize( arguments.port ) ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-
-
+
+
+
-        if ( !m_deviceManager->discover() ) {
-debugError(
+fprintf( stderr,
-            delete m_deviceManager;
-            return -1;
-        }
-
-debugOutput(DEBUG_LEVEL_NORMAL, 
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
+printf(
+printf(
+
-        signal (SIGINT, sighandler);
-
+
-        run=1;
-        while(run) {
@@ -351 +342 @@
-        }
-        signal (SIGINT, SIG_DFL);
-
-debugOutput(DEBUG_LEVEL_NORMAL, 
+
+printf(
-        delete m_deviceManager;
-        return 0;
-
+
-    } else {
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-    }
-
@@ -364 +355 @@
-void list_osc_paths(lo_server s, lo_address t, const char *path) {
-    vector<string> my_paths;
-
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
+
+printf(
+
-    osc_paths.clear();
-    lo_server_add_method(s, "/response", NULL, osc_path_response_handler, NULL);
-
-    if (lo_send(t, path, "s", "list") == -1) {
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-    }
-
-    if (lo_server_recv_noblock(s, 1000) == 0) {
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-        return;
-    }
-
+
-    lo_server_del_method(s, "/response", NULL);
-
+
-    list_osc_params(s, t, path);
-
+
-    my_paths=osc_paths;
-    for ( vector<string>::iterator it = my_paths.begin();
@@ -397 +388 @@
-void list_osc_params(lo_server s, lo_address t, const char *path) {
-    vector<string> my_paths;
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
+printf(
+
-    osc_params.clear();
-    lo_server_add_method(s, "/response", NULL, osc_param_response_handler, NULL);
-
-    if (lo_send(t, path, "s", "params") == -1) {
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
-
+printf(
+
+
-    if (lo_server_recv_noblock(s, 1000) == 0) {
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-        return;
-    }
-
+
-    lo_server_del_method(s, "/response", NULL);
-
+
-    vector<string> my_params=osc_params;
-
+
-    for ( vector<string>::iterator it = my_params.begin();
-            it != my_params.end();
@@ -420 +411 @@
-    {
-        string value=osc_param_get_value(s, t, path, (*it).c_str());
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-    }
-
@@ -429 +420 @@
-
-    if (lo_send(t, path, "ss", "get", param) == -1) {
-debugOutput(DEBUG_LEVEL_NORMAL, 
-
-
+printf(
+
+
-    if (lo_server_recv_noblock(s, 1000) == 0) {
-        return string("timeout");
-    }
-
+
-    lo_server_del_method(s, "/response", NULL);
-    return osc_value;
@@ -442 +433 @@
-void osc_error_handler(int num, const char *msg, const char *path)
-{
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-}
-
@@ -455 +446 @@
-                break;
-            default:
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-        }
-    }
@@ -471 +462 @@
-                break;
-            default:
-debugOutput(DEBUG_LEVEL_NORMAL, 
+printf(
-        }
-    }
@@ -481 +472 @@
-{
-    std::ostringstream str;
-
+
-    if(argc==1) {
-        switch (lo_type(types[0])) {

trunk/libffado/tests/test-fw410.cpp

@@ -1 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
-reeBoB
+FADO
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -14 +17 @@
- *
- * You should have received a copy of the GNU General Public License
-reeBoB
+FADO
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA.
+ *
- */
-
@@ -32 +36 @@
-////////////////////////////////////////////////
-const char *argp_program_version = "test-fw410 0.1";
-reebob
+fado
-static char doc[] = "test-fw410 -- test program to get the fw410 streaming";
-static char args_doc[] = "NODE_ID";
@@ -115 +119 @@
-    int iNodeId = strtol(arguments.args[0], &tail, 0);
-    if (errno) {
-       
-       
+    
+    
-    }
-
@@ -158 +162 @@
-        Connection* pCons = &cons[i];
-
- 
+
-        // some default values.
-        pCons->m_iBandwith = iec61883_cmp_calc_bandwidth ( pHandle,

trunk/libffado/tests/test-ieee1394service.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_CONFIG_H
@@ -64 +69 @@
-    signal (SIGPIPE, sighandler);
-
-reebob
-
+FADO
+
-    Ieee1394Service *m_service=NULL;
-
-    m_service=new Ieee1394Service();
-    m_service->initialize(2);
-
+
-    MyFunctor *test_busreset=new MyFunctor();
-
+
-    printf(" adding (%p) as busreset handler\n", test_busreset);
-
-    
-
+
+
+
-    nodeaddr_t addr =  m_service->findFreeARMBlock(0x0000FFFFE0000000ULL, 4, 4 );
-
+
-    ARMHandler *test_arm=new ARMHandler(addr,
-                         4,
@@ -84 +89 @@
-                         RAW1394_ARM_READ | RAW1394_ARM_WRITE | RAW1394_ARM_LOCK,
-                         0);
-
+
-    printf(" adding (%p) as arm handler\n", test_arm);
-
+
-    if (!m_service->registerARMHandler(test_arm)) {
-        printf("  failed\n");
-    }
-
+
-    addr =  m_service->findFreeARMBlock(0x0000FFFFE0000000ULL, 4, 4 );
-
+
-    ARMHandler *test_arm2=new ARMHandler(addr,
-                         4,
@@ -100 +105 @@
-
-    printf(" adding (%p) as arm handler\n", test_arm2);
-
+
-    if (!m_service->registerARMHandler(test_arm2)) {
-        printf("  failed\n");
-    }
-
+
-    while(run) {
-        fflush(stderr);
@@ -115 +120 @@
-    delete test_arm;
-    delete test_arm2;
-
+
-    printf("Bye...\n");
-

trunk/libffado/tests/test-mixer.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include "libavc/avc_function_block.h"
@@ -50 +54 @@
-        ieee1394service.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
-    }
-
+
-    if ( !fbCmd.fire() ) {
-        printf( "cmd failed\n" );

trunk/libffado/tests/test-sytmonitor.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_CONFIG_H
@@ -51 +55 @@
-int run;
-// Program documentation.
-reeBoB
+FADO
-
-// A description of the arguments we accept.
@@ -109 +113 @@
-        case 'R':
-        arguments->realtime = true;
-         
+
-        case 'r':
-            if (arg) {
@@ -118 +122 @@
-            }
-            }
-                 
+
-        case ARGP_KEY_ARG:
-            if (state->arg_num >= 128) {
@@ -124 +128 @@
-            argp_usage( state );
-            }
-
- 
- 
+
+
+
-            &arguments->args[state->arg_num].channel) != 2) {
-        fprintf( stderr,  "Could not parse port-channel specification ('%s')\n", arg);
-
+
-            } else {
-            printf("Adding Port %d, Channel %d to list...\n",
@@ -166 +170 @@
-    struct sched_param params;
-    uint64_t last_print_time=0;
-
+
-    SystemTimeSource masterTimeSource;
-
+
-    IsoHandlerManager *m_isoManager=NULL;
-
+
-    SytMonitor *monitors[128];
-    int64_t stream_offset_ticks[128];
@@ -189 +193 @@
-        goto finish;
-    }
-
+
-    memset(&stream_offset_ticks, 0, sizeof(int64_t) * 128);
-
+
-    run=1;
-
+
-    run_realtime=arguments.realtime;
-    realtime_prio=arguments.rtprio;
@@ -200 +204 @@
-    signal (SIGPIPE, sighandler);
-
-reebob
-
+FADO
+
-    m_isoManager=new IsoHandlerManager();
-
+
-    if(!m_isoManager) {
-        debugOutput(DEBUG_LEVEL_NORMAL, "Could not create IsoHandlerManager\n");
-        goto finish;
-    }
-
+
-    m_isoManager->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-
+
-    if(!m_isoManager->init()) {
-        debugOutput(DEBUG_LEVEL_NORMAL, "Could not init() IsoHandlerManager\n");
@@ -219 +223 @@
-        for (i=0;i<arguments.nb_combos;i++) {
-            debugOutput(DEBUG_LEVEL_NORMAL, "Registering SytMonitor %d\n",i);
-
+
-            // add a stream to the manager so that it has something to do
-            monitors[i]=new SytMonitor(arguments.args[i].port);
-
+
-            if (!monitors[i]) {
-                debugOutput(DEBUG_LEVEL_NORMAL, "Could not create SytMonitor %d\n", i);
-                goto finish;
-  
-
+
+
-            monitors[i]->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-
+
-            if (!monitors[i]->init()) {
-                debugOutput(DEBUG_LEVEL_NORMAL, "Could not init SytMonitor %d\n", i);
-                goto finish;
-            }
-
+
-            monitors[i]->setChannel(arguments.args[i].channel);
-
+
-            if(!m_isoManager->registerStream(monitors[i])) {
-                debugOutput(DEBUG_LEVEL_NORMAL, "Could not register SytMonitor %d with isoManager\n", i);
@@ -258 +262 @@
-                goto finish;
-        }
-
+
-        if (arguments.realtime) {
-            // get rt priority for this thread too.
@@ -266 +270 @@
-            }
-        }
-
+
-        // do the actual work
-        nb_iter=0;
-
+
-        while(run) {
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"--- Iterate ---\n");
-
+
-//         if(!m_isoManager->iterate()) {
-//             debugFatal("Could not iterate the isoManager\n");
-//             return false;
-//         }
-
+
-        if(!masterTimeSource.updateTimeSource()) {
-            debugFatal("Could not update the masterTimeSource\n");
-            return false;
-        }
-
+
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"--- Process ---\n");
-        // process the cycle info's
@@ -288 +292 @@
-            int master_guard=0;
-            struct cycle_info master_cif;
-
+
-            bool advance_master=true;
-
+
-            while (advance_master && monitors[0]->readNextCycleInfo(&master_cif)) {
-                advance_master=true;
-
+
-                master_guard++;
-                if(master_guard>1000) {
-                    debugWarning("Guard passed on master sync!\n");
-                    break;
-            
+
-                // we try to match the packets received on equal cycles
-
+
-                // unwrap the seconds counter
-                if (master_cif.seconds==0) master_cif.seconds+=128;
-
+
-                debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"MASTER: [%2d: %04us %04uc, %04X]\n",
-                    0,master_cif.seconds,master_cif.cycle,master_cif.syt);
-
+
-                for (i=1;i<arguments.nb_combos;i++) {
-                    struct cycle_info cif;
-                    int slave_guard=0;
-                    bool read_slave=monitors[i]->readNextCycleInfo(&cif);
-
+
-                    while(read_slave) {
-                        slave_guard++;
@@ -326 +330 @@
-                                i,cif.seconds, cif.cycle,cif.syt);
-                            monitors[i]->consumeNextCycleInfo();
-
+
-                            // we have a match ;)
-                            if ((cif.syt != 0xFFFF) && (master_cif.syt != 0xFFFF)) {
@@ -338 +342 @@
-                            // average out the offset
-                                int64_t err=(((uint64_t)master_cif.pres_ticks) - ((uint64_t)cif.pres_ticks));
-
+
-                                debugOutput(DEBUG_LEVEL_NORMAL,"Diff for %d at cycle %04d: %6lld (MTS: %11llu | STS: %11llu\n",
-                                    i,cif.cycle,err, master_cif.pres_ticks, cif.pres_ticks);
-
+
-                                err = err - stream_offset_ticks[i];
-
+
-                                if(err>50000 || err < -50000) {
-                                    debugOutput(DEBUG_LEVEL_NORMAL,
-                                        " Large Diff: %dticks, delta=%d; avg=%d\n",
-                                        err,(((int)master_cif.pres_ticks) - ((int)cif.pres_ticks)),stream_offset_ticks[i]);
-
+
-                                    debugOutput(DEBUG_LEVEL_NORMAL,
-                                        "  Master   : %04X -> %10u (%04us %04uc %04ut)\n",
- 
+
-                                        master_cif.pres_seconds, master_cif.pres_cycle, master_cif.pres_offset
-                                        );
@@ -359 +363 @@
-                                        master_cif.syt, CYCLE_TIMER_GET_CYCLES(master_cif.syt),
-                                        CYCLE_TIMER_GET_OFFSET(master_cif.syt));
-
+
-                                    debugOutput(DEBUG_LEVEL_NORMAL,
-                                        "  Current  : %04X -> %10u (%04us %04uc %04ut)\n",
- 
+
-                                        cif.pres_seconds, cif.pres_cycle, cif.pres_offset
-                                        );
@@ -372 +376 @@
-                                    debugOutput(DEBUG_LEVEL_NORMAL,"\n");
-                                }
-
+
-                                stream_offset_ticks[i] += err/1000;
-
+
-                                debugOutput(DEBUG_LEVEL_VERY_VERBOSE," Difference: %dticks\n",
-                                        (((int)master_cif.pres_ticks) - ((int)cif.pres_ticks)));
-                            }
-
+
-                            break;
-                        } else {
- 
- 
+
+
-                                && (cif.cycle < master_cif.cycle))) {
-
+
-                                debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"  LAGS : [%2d: %04us %04uc, %04X]\n",
-                                    i,cif.seconds, cif.cycle,cif.syt);
-                                // the stream lags behind
-
+
-                                // advance the read pointer
- 
+
-                                // in this while()
-                                monitors[i]->consumeNextCycleInfo();
@@ -396 +400 @@
-                                debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"  LEADS: [%2d: %04us %04uc, %04X]\n",
-                                    i,cif.seconds, cif.cycle,cif.syt);
-
+
-                                // the stream is too far ahead,
-                                // don't do anything
@@ -418 +422 @@
-            }
-        }
-
+
-            // show info every x iterations
- 
+
-                - last_print_time > 1000000L) {
-
+
-                m_isoManager->dumpInfo();
-                for (i=0;i<arguments.nb_combos;i++) {
@@ -432 +436 @@
-                last_print_time=masterTimeSource.getCurrentTimeAsUsecs();
-            }
-
+
-            // 125us/packet, so sleep for a while
-            usleep(100);
@@ -442 +446 @@
-            goto finish;
-        }
-
+
-        // unregister monitors
-        for (i=0;i<arguments.nb_combos;i++) {
-        debugOutput(DEBUG_LEVEL_NORMAL, "Unregistering SytMonitor %d\n",i);
-
+
-        if(!m_isoManager->unregisterStream(monitors[i])) {
-            debugOutput(DEBUG_LEVEL_NORMAL, "Could not unregister SytMonitor %d\n",i);
@@ -453 +457 @@
-            delete monitors[i];
-    }
-
+
-    delete m_isoManager;
-

trunk/libffado/tests/test-timestampedbuffer.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifdef HAVE_CONFIG_H
@@ -41 +45 @@
-using namespace Util;
-
- 
+
-    : public TimestampedBufferClient {
-public:
-    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};
-
+
-    void setVerboseLevel(int l) {setDebugLevel(l);};
-private:
@@ -58 +62 @@
-int run;
-// Program documentation.
-reeBoB
+FADO
-
-// A description of the arguments we accept.
@@ -212 +216 @@
-                }
-            }
-                        
+
-       default:
-            return ARGP_ERR_UNKNOWN;
@@ -230 +234 @@
-int main(int argc, char *argv[])
-{
-
+
-    TimestampedBuffer *t=NULL;
-    TimestampedBufferTestClient *c=NULL;
-
+
-    struct arguments arguments;
-
@@ -245 +249 @@
-    arguments.buffersize = 1024;
-    arguments.start_at_cycle = 0;
-
+
-    // Parse our arguments; every option seen by `parse_opt' will
-    // be reflected in `arguments'.
@@ -252 +256 @@
-        exit(1);
-    }
-
+
-    setDebugLevel(arguments.verbose);
-
+
-    run=1;
-
-    signal (SIGINT, sighandler);
-    signal (SIGPIPE, sighandler);
-
+
-    c=new TimestampedBufferTestClient();
-
+
-    if(!c) {
-        debugOutput(DEBUG_LEVEL_NORMAL, "Could not create TimestampedBufferTestClient\n");
@@ -267 +271 @@
-    }
-    c->setVerboseLevel(arguments.verbose);
-
+
-    t=new TimestampedBuffer(c);
-
+
-    if(!t) {
-        debugOutput(DEBUG_LEVEL_NORMAL, "Could not create TimestampedBuffer\n");
@@ -278 +282 @@
-
-    t->init();
-
- 
+
+
-    t->setBufferSize(arguments.buffersize);
-    t->setEventSize(sizeof(int));
@@ -286 +290 @@
-    t->setUpdatePeriod(arguments.frames_per_packet);
-    t->setNominalRate(arguments.rate);
-
+
-    t->setWrapValue(arguments.wrap_at);
-
+
-    t->setTickOffset(10000);
-
+
-    t->prepare();
-
+
-    usleep(1000);
-
+
-    debugOutput(DEBUG_LEVEL_NORMAL, "Start setBufferHeadTimestamp test...\n");
-    {
@@ -300 +304 @@
-        uint64_t time=arguments.start_at_cycle*3072;
-        int dummyframe_in[arguments.events_per_frame*arguments.frames_per_packet];
-
+
-        // initialize the timestamp
-        uint64_t timestamp=time;
@@ -307 +311 @@
-            timestamp %= arguments.wrap_at;
-        }
-
+
-        // account for the fact that there is offset,
-        // and that setBufferHeadTimestamp doesn't take offset
@@ -315 +319 @@
-            timestamp2-=arguments.wrap_at;
-        }
-
+
-        t->setBufferHeadTimestamp(timestamp2);
-
+
-        timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
-        if (timestamp >= arguments.wrap_at) {
-            timestamp -= arguments.wrap_at;
-        }
-
+
-        // write some packets
-        for (unsigned int i=0;i<20;i++) {
@@ -331 +335 @@
-            }
-        }
-
+
-        for(unsigned int cycle=arguments.start_at_cycle;
- 
+
-            cycle++) {
-                uint64_t ts_head, fc_head;
-
+
-                t->setBufferHeadTimestamp(timestamp);
-                t->getBufferHeadTimestamp(&ts_head, &fc_head);
-
+
-                if (timestamp != ts_head) {
-                    debugError(" cycle %4u error: %011llu != %011llu\n",
@@ -345 +349 @@
-                        pass=false;
-                }
-
+
-                timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
-                if (timestamp >= arguments.wrap_at) {
-                    timestamp -= arguments.wrap_at;
-                }
-
+
-            // simulate the cycle timer clock in ticks
-            time += 3072;
@@ -356 +360 @@
-                time -= arguments.wrap_at;
-            }
-
+
-            // allow for the messagebuffer thread to catch up
-            usleep(200);
-
+
-            if(!run) break;
-        }
-
+
-        if(!pass) {
-            debugError("Test failed, exiting...\n");
-
+
-            delete t;
-            delete c;
-
+
-            return -1;
-
-
-
-
-
-
+
+
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL, "Start read/write test...\n");
-    {
-        int dummyframe_in[arguments.events_per_frame*arguments.frames_per_packet];
-        int dummyframe_out[arguments.events_per_frame*arguments.frames_per_packet];
-
+
-        for (unsigned int i=0;i<arguments.events_per_frame*arguments.frames_per_packet;i++) {
-            dummyframe_in[i]=i;
-        }
-
+
-        uint64_t time=arguments.start_at_cycle*3072;
-
+
-        // initialize the timestamp
-        uint64_t timestamp=time;
@@ -394 +398 @@
-        }
-        t->setBufferTailTimestamp(timestamp);
-
+
-        timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
-        if (timestamp >= arguments.wrap_at) {
-            timestamp -= arguments.wrap_at;
-        }
-
+
-        for(unsigned int cycle=arguments.start_at_cycle;
- 
+
-            cycle++) {
-
+
-            // simulate the rate adaptation
-            int64_t diff=(time%arguments.wrap_at)-timestamp;
-
+
-            if (diff>(int64_t)arguments.wrap_at/2) {
-                diff -= arguments.wrap_at;
@@ -412 +416 @@
-                diff += arguments.wrap_at;
-            }
-
+
-            debugOutput(DEBUG_LEVEL_NORMAL, "Simulating cycle %d @ time=%011llu, diff=%lld\n",cycle,time,diff);
-
+
-            if(diff>0) {
-                uint64_t ts_head, fc_head;
-                uint64_t ts_tail, fc_tail;
-
+
-                // write one packet
-                t->writeFrames(arguments.frames_per_packet, (char *)&dummyframe_in, timestamp);
-
+
-                // read the buffer head timestamp
-                t->getBufferHeadTimestamp(&ts_head, &fc_head);
-                t->getBufferTailTimestamp(&ts_tail, &fc_tail);
- 
+
-                        " TS after write: HEAD: %011llu, FC=%04u\n",
-                        ts_head,fc_head);
- 
+
-                        "                 TAIL: %011llu, FC=%04u\n",
-                        ts_tail,fc_tail);
-
+
-                // read one packet
-                t->readFrames(arguments.frames_per_packet, (char *)&dummyframe_out);
-
+
-                // read the buffer head timestamp
-                t->getBufferHeadTimestamp(&ts_head, &fc_head);
-                t->getBufferTailTimestamp(&ts_tail, &fc_tail);
- 
+
-                        " TS after write: HEAD: %011llu, FC=%04u\n",
-                        ts_head,fc_head);
- 
+
-                        "                 TAIL: %011llu, FC=%04u\n",
-                        ts_tail,fc_tail);
-
+
-                // check
-                bool pass=true;
@@ -453 +457 @@
-                    debugOutput(DEBUG_LEVEL_NORMAL, "write/read check for cycle %d failed\n",cycle);
-                }
-
+
-                // update the timestamp
-                timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
@@ -460 +464 @@
-                }
-            }
-
+
-            // simulate the cycle timer clock in ticks
-            time += 3072;
@@ -466 +470 @@
-                time -= arguments.wrap_at;
-            }
-
+
-            // allow for the messagebuffer thread to catch up
-            usleep(200);
-
+
-            if(!run) break;
-        }
-    }
-
+
-    // second run, now do block processing
-    debugOutput(DEBUG_LEVEL_NORMAL, "Start block read test...\n");
@@ -480 +484 @@
-        int dummyframe_out_block[arguments.events_per_frame*arguments.frames_per_packet*blocksize];
-        int dummyframe_in[arguments.events_per_frame*arguments.frames_per_packet];
-
+
-        for (unsigned int i=0;i<arguments.events_per_frame*arguments.frames_per_packet;i++) {
-            dummyframe_in[i]=i;
-        }
-
+
-        uint64_t time=arguments.start_at_cycle*3072;
-
+
-        // initialize the timestamp
-        uint64_t timestamp=time;
@@ -494 +498 @@
-        }
-        t->setBufferTailTimestamp(timestamp);
-
+
-        timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
-        if (timestamp >= arguments.wrap_at) {
-            timestamp -= arguments.wrap_at;
-        }
-
+
-        for(unsigned int cycle=arguments.start_at_cycle;
- 
+
-            cycle++) {
-
+
-            // simulate the rate adaptation
-            int64_t diff=(time%arguments.wrap_at)-timestamp;
-
+
-            if (diff>(int64_t)arguments.wrap_at/2) {
-                diff -= arguments.wrap_at;
@@ -512 +516 @@
-                diff += arguments.wrap_at;
-            }
-
+
-            debugOutput(DEBUG_LEVEL_NORMAL, "Simulating cycle %d @ time=%011llu, diff=%lld\n",cycle,time,diff);
-
+
-            if(diff>0) {
-                uint64_t ts_head, fc_head;
-                uint64_t ts_tail, fc_tail;
-
+
-                // write one packet
-                t->writeFrames(arguments.frames_per_packet, (char *)&dummyframe_in, timestamp);
-
+
-                // read the buffer head timestamp
-                t->getBufferHeadTimestamp(&ts_head, &fc_head);
-                t->getBufferTailTimestamp(&ts_tail, &fc_tail);
- 
+
-                        " TS after write: HEAD: %011llu, FC=%04u\n",
-                        ts_head,fc_head);
- 
+
-                        "                 TAIL: %011llu, FC=%04u\n",
-                        ts_tail,fc_tail);
-
+
-                if (fc_head > blocksize) {
-                    debugOutput(DEBUG_LEVEL_NORMAL,"Reading one block (%u frames)\n",blocksize);
-
+
-                    // read one block
-                    t->readFrames(blocksize, (char *)&dummyframe_out_block);
-
+
-                    // read the buffer head timestamp
-                    t->getBufferHeadTimestamp(&ts_head, &fc_head);
-                    t->getBufferTailTimestamp(&ts_tail, &fc_tail);
- 
+
-                            " TS after read: HEAD: %011llu, FC=%04u\n",
-                            ts_head,fc_head);
- 
+
-                            "                TAIL: %011llu, FC=%04u\n",
-                            ts_tail,fc_tail);
-                }
-
+
-                // update the timestamp
-                timestamp += (uint64_t)(arguments.rate * arguments.frames_per_packet);
@@ -555 +559 @@
-                }
-            }
-
+
-            // simulate the cycle timer clock in ticks
-            time += 3072;
@@ -561 +565 @@
-                time -= arguments.wrap_at;
-            }
-
+
-            // allow for the messagebuffer thread to catch up
-            usleep(200);
-
+
-            if(!run) break;
-        }
@@ -571 +575 @@
-    delete t;
-    delete c;
-
+
-    return EXIT_SUCCESS;
-}

trunk/libffado/tests/test-volume.cpp

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include "libavc/avc_function_block.h"