Changeset 413

Show
Ignore:
Timestamp:
02/22/07 09:08:05 (14 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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/streaming-rework/src/bebob/bebob_avdevice.cpp

    r412 r413  
    2121#include "bebob/bebob_avdevice.h" 
    2222#include "bebob/bebob_avdevice_subunit.h" 
    23 #include "configrom.h" 
     23 
     24#include "libieee1394/configrom.h" 
     25#include "libieee1394/ieee1394service.h" 
    2426 
    2527#include "libfreebobavc/avc_plug_info.h" 
     
    2830#include "libfreebobavc/avc_extended_stream_format.h" 
    2931#include "libfreebobavc/avc_serialize.h" 
    30 #include "libfreebobavc/ieee1394service.h" 
    3132#include "libfreebobavc/avc_definitions.h" 
    3233 
  • branches/streaming-rework/src/bebob/bebob_avdevice_subunit.cpp

    r407 r413  
    2323#include "bebob/bebob_avdevice.h" 
    2424#include "bebob/bebob_avplug.h" 
    25 #include "configrom.h" 
     25#include "libieee1394/configrom.h" 
    2626 
    2727#include "libfreebobavc/avc_plug_info.h" 
  • branches/streaming-rework/src/bebob/bebob_avdevice_xml.cpp

    r407 r413  
    2121 
    2222#include "bebob/bebob_avdevice.h" 
    23 #include "configrom.h" 
     23#include "libieee1394/configrom.h" 
    2424 
    25 #include "libfreebobavc/ieee1394service.h" 
     25#include "libieee1394/ieee1394service.h" 
    2626 
    2727namespace BeBoB { 
  • branches/streaming-rework/src/bebob/bebob_avplug.cpp

    r407 r413  
    2121#include "bebob/bebob_avplug.h" 
    2222#include "bebob/bebob_avdevice.h" 
    23 #include "configrom.h" 
    24  
    25 #include "libfreebobavc/ieee1394service.h" 
     23#include "libieee1394/configrom.h" 
     24 
     25#include "libieee1394/ieee1394service.h" 
    2626#include "libfreebobavc/avc_serialize.h" 
    2727 
  • branches/streaming-rework/src/bebob/bebob_avplug_xml.cpp

    r407 r413  
    2222 
    2323#include "bebob/bebob_avplug.h" 
    24 #include "configrom.h" 
    25  
    26 #include "libfreebobavc/ieee1394service.h" 
     24#include "libieee1394/configrom.h" 
     25 
     26#include "libieee1394/ieee1394service.h" 
    2727 
    2828namespace BeBoB { 
  • branches/streaming-rework/src/bebob/bebob_dl_mgr.cpp

    r407 r413  
    2222#include "bebob_dl_bcd.h" 
    2323 
    24 #include "configrom.h" 
    25 #include "libfreebobavc/ieee1394service.h" 
     24#include "libieee1394/configrom.h" 
     25#include "libieee1394/ieee1394service.h" 
     26 
    2627#include "libfreebobavc/avc_serialize.h" 
    2728 
  • branches/streaming-rework/src/bebob/bebob_functionblock.cpp

    r407 r413  
    2121#include "bebob/bebob_avdevice_subunit.h" 
    2222#include "bebob/bebob_avdevice.h" 
    23 #include "configrom.h" 
    24  
     23#include "libieee1394/configrom.h" 
    2524 
    2625IMPL_DEBUG_MODULE( BeBoB::FunctionBlock, BeBoB::FunctionBlock, DEBUG_LEVEL_NORMAL ); 
  • branches/streaming-rework/src/bounce/bounce_avdevice.cpp

    r412 r413  
    2020 */ 
    2121#include "bounce/bounce_avdevice.h" 
    22 #include "configrom.h" 
     22 
     23#include "libieee1394/configrom.h" 
     24#include "libieee1394/ieee1394service.h" 
    2325 
    2426#include "libfreebobavc/avc_plug_info.h" 
     
    2729#include "libfreebobavc/avc_extended_stream_format.h" 
    2830#include "libfreebobavc/avc_serialize.h" 
    29 #include "libfreebobavc/ieee1394service.h" 
    3031#include "libfreebobavc/avc_definitions.h" 
    3132 
  • branches/streaming-rework/src/devicemanager.cpp

    r408 r413  
    2323#include "devicemanager.h" 
    2424#include "iavdevice.h" 
    25 #include "configrom.h" 
    26  
    27 #include "libfreebobavc/ieee1394service.h" 
     25 
     26#include "libieee1394/configrom.h" 
     27#include "libieee1394/ieee1394service.h" 
     28 
    2829#include "debugmodule/debugmodule.h" 
    2930 
  • branches/streaming-rework/src/dice/dice_avdevice.cpp

    r412 r413  
    2323#include "dice/dice_defines.h" 
    2424 
    25 #include "configrom.h" 
    26 #include "libfreebobavc/ieee1394service.h" 
     25#include "libieee1394/configrom.h" 
     26#include "libieee1394/ieee1394service.h" 
     27 
    2728#include "libstreaming/AmdtpStreamProcessor.h" 
    2829 
  • branches/streaming-rework/src/freebob-downloader.cpp

    r336 r413  
    2222#include "bebob/bebob_dl_bcd.h" 
    2323 
    24 #include "configrom.h" 
    25  
    26 #include "libfreebobavc/ieee1394service.h" 
     24#include "libieee1394/configrom.h" 
     25#include "libieee1394/ieee1394service.h" 
    2726 
    2827#include <argp.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_connect.cpp

    r375 r413  
    2121#include "avc_connect.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_extended_cmd_generic.cpp

    r365 r413  
    2121#include "avc_extended_cmd_generic.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525UnitPlugAddress::UnitPlugAddress( EPlugType plugType,  plug_type_t plugId ) 
  • branches/streaming-rework/src/libfreebobavc/avc_extended_plug_info.cpp

    r375 r413  
    2121#include "avc_extended_plug_info.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_extended_stream_format.cpp

    r375 r413  
    2121#include "avc_extended_stream_format.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_extended_subunit_info.cpp

    r375 r413  
    2121#include "avc_extended_subunit_info.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_function_block.cpp

    r375 r413  
    2121#include "avc_function_block.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
    24  
     23#include "libieee1394/ieee1394service.h" 
    2524 
    2625///////////////////////////////// 
  • branches/streaming-rework/src/libfreebobavc/avc_generic.cpp

    r377 r413  
    2121#include "avc_generic.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include "debugmodule/debugmodule.h" 
  • branches/streaming-rework/src/libfreebobavc/avc_plug_info.cpp

    r375 r413  
    2121#include "avc_plug_info.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_signal_source.cpp

    r375 r413  
    2121#include "avc_signal_source.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_subunit_info.cpp

    r375 r413  
    2121#include "avc_subunit_info.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libfreebobavc/avc_unit_info.cpp

    r375 r413  
    2121#include "avc_unit_info.h" 
    2222#include "avc_serialize.h" 
    23 #include "ieee1394service.h" 
     23#include "libieee1394/ieee1394service.h" 
    2424 
    2525#include <netinet/in.h> 
  • branches/streaming-rework/src/libieee1394/configrom.cpp

    r405 r413  
    2020 
    2121#include "configrom.h" 
    22 #include "libfreebobavc/ieee1394service.h" 
     22#include "ieee1394service.h" 
    2323 
    2424#include <stdio.h> 
  • branches/streaming-rework/src/Makefile.am

    r407 r413  
    3232libfreebob_la_LIBADD = -lrt 
    3333 
    34 noinst_HEADERS = configrom.h csr1212.h debugmodule/debugmodule.h \ 
     34noinst_HEADERS = libieee1394/configrom.h libieee1394/csr1212.h \ 
     35    libieee1394/ieee1394service.h debugmodule/debugmodule.h \ 
    3536        devicemanager.h fbtypes.h iavdevice.h threads.h bebob/bebob_avdevice.h \ 
    3637        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \ 
     
    4344        libfreebobavc/avc_extended_subunit_info.h libfreebobavc/avc_function_block.h libfreebobavc/avc_generic.h \ 
    4445        libfreebobavc/avc_plug_info.h libfreebobavc/avc_serialize.h libfreebobavc/avc_signal_source.h \ 
    45         libfreebobavc/avc_subunit_info.h libfreebobavc/avc_unit_info.h libfreebobavc/ieee1394service.h
     46        libfreebobavc/avc_subunit_info.h libfreebobavc/avc_unit_info.h
    4647        libstreaming/AmdtpPort.h libstreaming/AmdtpPortInfo.h libstreaming/AmdtpStreamProcessor.h \ 
    4748        libstreaming/cip.h libstreaming/cycletimer.h libstreaming/IsoHandler.h \ 
     
    5758# common sources 
    5859libfreebob_la_SOURCES = \ 
    59         configrom.cpp \ 
    60         csr1212.c \ 
    6160        devicemanager.cpp \ 
    6261        freebob.cpp \ 
     
    7776        libfreebobavc/avc_subunit_info.cpp \ 
    7877        libfreebobavc/avc_unit_info.cpp \ 
    79         libfreebobavc/ieee1394service.cpp \ 
     78        libieee1394/configrom.cpp \ 
     79        libieee1394/csr1212.c \ 
     80        libieee1394/ieee1394service.cpp \ 
    8081        libstreaming/cip.c \ 
    8182        libstreaming/IsoHandler.cpp \ 
  • branches/streaming-rework/src/maudio/maudio_avdevice.cpp

    r412 r413  
    1919 */ 
    2020#include "maudio/maudio_avdevice.h" 
    21 #include "configrom.h" 
    22  
    23 #include "libfreebobavc/ieee1394service.h" 
     21 
     22#include "libieee1394/configrom.h" 
     23#include "libieee1394/ieee1394service.h" 
     24 
    2425#include "libfreebobavc/avc_definitions.h" 
    2526 
  • branches/streaming-rework/src/metrichalo/mh_avdevice.cpp

    r412 r413  
    2222 
    2323#include "metrichalo/mh_avdevice.h" 
    24 #include "configrom.h" 
    25  
    26 #include "libfreebobavc/ieee1394service.h" 
     24 
     25#include "libieee1394/configrom.h" 
     26#include "libieee1394/ieee1394service.h" 
     27 
    2728#include "libfreebobavc/avc_definitions.h" 
    2829 
  • branches/streaming-rework/src/motu/motu_avdevice.cpp

    r412 r413  
    2020 */ 
    2121#include "motu/motu_avdevice.h" 
    22 #include "configrom.h" 
    23  
    24 #include "libfreebobavc/ieee1394service.h" 
     22 
     23#include "libieee1394/configrom.h" 
     24#include "libieee1394/ieee1394service.h" 
     25 
    2526#include "libfreebobavc/avc_definitions.h" 
    2627 
  • branches/streaming-rework/src/rme/rme_avdevice.cpp

    r412 r413  
    2222 
    2323#include "rme/rme_avdevice.h" 
    24 #include "configrom.h" 
    25  
    26 #include "libfreebobavc/ieee1394service.h" 
    27 #include "libfreebobavc/avc_definitions.h" 
     24 
     25#include "libieee1394/configrom.h" 
     26#include "libieee1394/ieee1394service.h" 
    2827 
    2928#include "debugmodule/debugmodule.h" 
    30  
    31 //#include "libstreaming/MotuStreamProcessor.h" 
    32 //#include "libstreaming/MotuPort.h" 
    33  
    34 #include "libutil/DelayLockedLoop.h" 
    3529 
    3630#include <string> 
  • branches/streaming-rework/tests/test-extplugcmd.cpp

    r375 r413  
    2222#include "libfreebobavc/avc_plug_info.h" 
    2323#include "libfreebobavc/avc_serialize.h" 
    24 #include "libfreebobavc/ieee1394service.h" 
     24 
     25#include "libieee1394/configrom.h" 
     26#include "libieee1394/ieee1394service.h" 
    2527 
    2628#include <argp.h> 
  • branches/streaming-rework/tests/test-ieee1394service.cpp

    r412 r413  
    3333 
    3434#include "src/threads.h" 
    35 #include "src/libfreebobavc/ieee1394service.h" 
     35 
     36#include "src/libieee1394/configrom.h" 
     37#include "src/libieee1394/ieee1394service.h" 
     38 
    3639#include <libraw1394/raw1394.h> 
    3740 
  • branches/streaming-rework/tests/test-mixer.cpp

    r375 r413  
    2121#include "libfreebobavc/avc_function_block.h" 
    2222#include "libfreebobavc/avc_serialize.h" 
    23 #include "libfreebobavc/ieee1394service.h" 
     23 
     24#include "libieee1394/ieee1394service.h" 
    2425 
    2526const bool bVerbose = true; 
  • branches/streaming-rework/tests/test-volume.cpp

    r375 r413  
    2121#include "libfreebobavc/avc_function_block.h" 
    2222#include "libfreebobavc/avc_serialize.h" 
    23 #include "libfreebobavc/ieee1394service.h" 
     23 
     24#include "libieee1394/ieee1394service.h" 
    2425 
    2526const bool bVerbose = false;