Changeset 445

Timestamp:

04/02/07 12:35:17 (16 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: ";
-       
-
-       
-               
-               
-       
-               
-               
-       
+    
+
+