Changeset 413

Timestamp:

02/22/07 09:08:05 (17 years ago)

Author:

pieterpalmers

Message:

- moved all generic IEEE1394 classes into libieee1394

src/libieee1394/ieee1394service.h
src/libieee1394/csr1212.h
src/libieee1394/configrom.cpp
src/libieee1394/configrom.h
src/libieee1394/ieee1394service.cpp
src/libieee1394/csr1212.c

Files:

• branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• branches/streaming-rework/src/bebob/bebob_avdevice_subunit.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avdevice_xml.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avplug_xml.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_functionblock.cpp (modified) (1 diff)
• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (2 diffs)
• branches/streaming-rework/src/devicemanager.cpp (modified) (1 diff)
• branches/streaming-rework/src/dice/dice_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/freebob-downloader.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_connect.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_extended_cmd_generic.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_extended_plug_info.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_extended_stream_format.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_extended_subunit_info.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_function_block.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_generic.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_plug_info.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_signal_source.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_subunit_info.cpp (modified) (1 diff)
• branches/streaming-rework/src/libfreebobavc/avc_unit_info.cpp (modified) (1 diff)
• branches/streaming-rework/src/libieee1394 (added)
• branches/streaming-rework/src/libieee1394/configrom.cpp (moved) (moved from branches/streaming-rework/src/configrom.cpp) (1 diff)
• branches/streaming-rework/src/libieee1394/configrom.h (moved) (moved from branches/streaming-rework/src/configrom.h)
• branches/streaming-rework/src/libieee1394/csr1212.c (moved) (moved from branches/streaming-rework/src/csr1212.c)
• branches/streaming-rework/src/libieee1394/csr1212.h (moved) (moved from branches/streaming-rework/src/csr1212.h)
• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (moved) (moved from branches/streaming-rework/src/libfreebobavc/ieee1394service.cpp)
• branches/streaming-rework/src/libieee1394/ieee1394service.h (moved) (moved from branches/streaming-rework/src/libfreebobavc/ieee1394service.h)
• branches/streaming-rework/src/Makefile.am (modified) (4 diffs)
• branches/streaming-rework/src/maudio/maudio_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/metrichalo/mh_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-extplugcmd.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-ieee1394service.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-mixer.cpp (modified) (1 diff)
• branches/streaming-rework/tests/test-volume.cpp (modified) (1 diff)

branches/streaming-rework/src/bebob/bebob_avdevice.cpp

@@ -21 +21 @@
-#include "bebob/bebob_avdevice.h"
-#include "bebob/bebob_avdevice_subunit.h"
-
+
+
+
-
-#include "libfreebobavc/avc_plug_info.h"
@@ -28 +30 @@
-#include "libfreebobavc/avc_extended_stream_format.h"
-#include "libfreebobavc/avc_serialize.h"
-#include "libfreebobavc/ieee1394service.h"
-#include "libfreebobavc/avc_definitions.h"
-

branches/streaming-rework/src/bebob/bebob_avdevice_subunit.cpp

@@ -23 +23 @@
-#include "bebob/bebob_avdevice.h"
-#include "bebob/bebob_avplug.h"
-
+libieee1394/
-
-#include "libfreebobavc/avc_plug_info.h"

branches/streaming-rework/src/bebob/bebob_avdevice_xml.cpp

@@ -21 +21 @@
-
-#include "bebob/bebob_avdevice.h"
-
+libieee1394/
-
-freebobavc
+ieee1394
-
-namespace BeBoB {

branches/streaming-rework/src/bebob/bebob_avplug.cpp

@@ -21 +21 @@
-#include "bebob/bebob_avplug.h"
-#include "bebob/bebob_avdevice.h"
-
-
-freebobavc
+libieee1394/
+
+ieee1394
-#include "libfreebobavc/avc_serialize.h"
-

branches/streaming-rework/src/bebob/bebob_avplug_xml.cpp

@@ -22 +22 @@
-
-#include "bebob/bebob_avplug.h"
-
-
-freebobavc
+libieee1394/
+
+ieee1394
-
-namespace BeBoB {

branches/streaming-rework/src/bebob/bebob_dl_mgr.cpp

@@ -22 +22 @@
-#include "bebob_dl_bcd.h"
-
-
-
+
+
+
-#include "libfreebobavc/avc_serialize.h"
-

branches/streaming-rework/src/bebob/bebob_functionblock.cpp

@@ -21 +21 @@
-#include "bebob/bebob_avdevice_subunit.h"
-#include "bebob/bebob_avdevice.h"
-
-
+
-
-IMPL_DEBUG_MODULE( BeBoB::FunctionBlock, BeBoB::FunctionBlock, DEBUG_LEVEL_NORMAL );

branches/streaming-rework/src/bounce/bounce_avdevice.cpp

@@ -20 +20 @@
- */
-#include "bounce/bounce_avdevice.h"
-
+
+
+
-
-#include "libfreebobavc/avc_plug_info.h"
@@ -27 +29 @@
-#include "libfreebobavc/avc_extended_stream_format.h"
-#include "libfreebobavc/avc_serialize.h"
-#include "libfreebobavc/ieee1394service.h"
-#include "libfreebobavc/avc_definitions.h"
-

branches/streaming-rework/src/devicemanager.cpp

@@ -23 +23 @@
-#include "devicemanager.h"
-#include "iavdevice.h"
-
-
-
+
+
+
+
-#include "debugmodule/debugmodule.h"
-

branches/streaming-rework/src/dice/dice_avdevice.cpp

@@ -23 +23 @@
-#include "dice/dice_defines.h"
-
-
-
+
+
+
-#include "libstreaming/AmdtpStreamProcessor.h"
-

branches/streaming-rework/src/freebob-downloader.cpp

@@ -22 +22 @@
-#include "bebob/bebob_dl_bcd.h"
-
-
-
-
+
+
-
-#include <argp.h>

branches/streaming-rework/src/libfreebobavc/avc_connect.cpp

@@ -21 +21 @@
-#include "avc_connect.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_extended_cmd_generic.cpp

@@ -21 +21 @@
-#include "avc_extended_cmd_generic.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-UnitPlugAddress::UnitPlugAddress( EPlugType plugType,  plug_type_t plugId )

branches/streaming-rework/src/libfreebobavc/avc_extended_plug_info.cpp

@@ -21 +21 @@
-#include "avc_extended_plug_info.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_extended_stream_format.cpp

@@ -21 +21 @@
-#include "avc_extended_stream_format.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_extended_subunit_info.cpp

@@ -21 +21 @@
-#include "avc_extended_subunit_info.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_function_block.cpp

@@ -21 +21 @@
-#include "avc_function_block.h"
-#include "avc_serialize.h"
-
-
+
-
-/////////////////////////////////

branches/streaming-rework/src/libfreebobavc/avc_generic.cpp

@@ -21 +21 @@
-#include "avc_generic.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include "debugmodule/debugmodule.h"

branches/streaming-rework/src/libfreebobavc/avc_plug_info.cpp

@@ -21 +21 @@
-#include "avc_plug_info.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_signal_source.cpp

@@ -21 +21 @@
-#include "avc_signal_source.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_subunit_info.cpp

@@ -21 +21 @@
-#include "avc_subunit_info.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libfreebobavc/avc_unit_info.cpp

@@ -21 +21 @@
-#include "avc_unit_info.h"
-#include "avc_serialize.h"
-
+libieee1394/
-
-#include <netinet/in.h>

branches/streaming-rework/src/libieee1394/configrom.cpp

@@ -20 +20 @@
-
-#include "configrom.h"
-libfreebobavc/
+
-
-#include <stdio.h>

branches/streaming-rework/src/Makefile.am

@@ -32 +32 @@
-libfreebob_la_LIBADD = -lrt
-
-
+
+
-        devicemanager.h fbtypes.h iavdevice.h threads.h bebob/bebob_avdevice.h \
-        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \
@@ -43 +44 @@
-        libfreebobavc/avc_extended_subunit_info.h libfreebobavc/avc_function_block.h libfreebobavc/avc_generic.h \
-        libfreebobavc/avc_plug_info.h libfreebobavc/avc_serialize.h libfreebobavc/avc_signal_source.h \
-libfreebobavc/ieee1394service.h 
+
-        libstreaming/AmdtpPort.h libstreaming/AmdtpPortInfo.h libstreaming/AmdtpStreamProcessor.h \
-        libstreaming/cip.h libstreaming/cycletimer.h libstreaming/IsoHandler.h \
@@ -57 +58 @@
-# common sources
-libfreebob_la_SOURCES = \
-        configrom.cpp \
-        csr1212.c \
-        devicemanager.cpp \
-        freebob.cpp \
@@ -77 +76 @@
-        libfreebobavc/avc_subunit_info.cpp \
-        libfreebobavc/avc_unit_info.cpp \
-
+
+
+
-        libstreaming/cip.c \
-        libstreaming/IsoHandler.cpp \

branches/streaming-rework/src/maudio/maudio_avdevice.cpp

@@ -19 +19 @@
- */
-#include "maudio/maudio_avdevice.h"
-
-
-
+
+
+
+
-#include "libfreebobavc/avc_definitions.h"
-

branches/streaming-rework/src/metrichalo/mh_avdevice.cpp

@@ -22 +22 @@
-
-#include "metrichalo/mh_avdevice.h"
-
-
-
+
+
+
+
-#include "libfreebobavc/avc_definitions.h"
-

branches/streaming-rework/src/motu/motu_avdevice.cpp

@@ -20 +20 @@
- */
-#include "motu/motu_avdevice.h"
-
-
-
+
+
+
+
-#include "libfreebobavc/avc_definitions.h"
-

branches/streaming-rework/src/rme/rme_avdevice.cpp

@@ -22 +22 @@
-
-#include "rme/rme_avdevice.h"
-
-
-
-
+
+
+
-
-#include "debugmodule/debugmodule.h"
-
-//#include "libstreaming/MotuStreamProcessor.h"
-//#include "libstreaming/MotuPort.h"
-
-#include "libutil/DelayLockedLoop.h"
-
-#include <string>

branches/streaming-rework/tests/test-extplugcmd.cpp

@@ -22 +22 @@
-#include "libfreebobavc/avc_plug_info.h"
-#include "libfreebobavc/avc_serialize.h"
-
+
+
+
-
-#include <argp.h>

branches/streaming-rework/tests/test-ieee1394service.cpp

@@ -33 +33 @@
-
-#include "src/threads.h"
-
+
+
+
+
-#include <libraw1394/raw1394.h>
-

branches/streaming-rework/tests/test-mixer.cpp

@@ -21 +21 @@
-#include "libfreebobavc/avc_function_block.h"
-#include "libfreebobavc/avc_serialize.h"
-
+
+
-
-const bool bVerbose = true;

branches/streaming-rework/tests/test-volume.cpp

@@ -21 +21 @@
-#include "libfreebobavc/avc_function_block.h"
-#include "libfreebobavc/avc_serialize.h"
-
+
+
-
-const bool bVerbose = false;