Changeset 705 for branches/ppalmers-streaming/src/libstreaming
- Timestamp:
- 11/04/07 04:40:10 (16 years ago)
- Files:
-
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPort.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPortInfo.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpSlaveStreamProcessor.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpSlaveStreamProcessor.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpSlaveStreamProcessor.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpSlaveStreamProcessor.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpStreamProcessor.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpStreamProcessor.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/IsoStream.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoStream.cpp)
- branches/ppalmers-streaming/src/libstreaming/generic/IsoStream.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoStream.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/Port.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/Port.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/Port.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/Port.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/PortManager.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/PortManager.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/PortManager.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/PortManager.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/StreamProcessor.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/StreamProcessor.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/motu/MotuPort.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.cpp (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.cpp (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.h (modified) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/cip.c (moved) (moved from branches/ppalmers-streaming/src/libstreaming/cip.c) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/cip.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/cip.h)
- branches/ppalmers-streaming/src/libstreaming/util/cycletimer.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/cycletimer.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/IsoHandler.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoHandler.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/IsoHandler.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoHandler.h) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoHandlerManager.cpp) (1 diff)
- branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/IsoHandlerManager.h) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPort.h
r703 r705 29 29 */ 30 30 31 #include " ../debugmodule/debugmodule.h"32 #include " Port.h"31 #include "debugmodule/debugmodule.h" 32 #include "../generic/Port.h" 33 33 #include "AmdtpPortInfo.h" 34 34 branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPortInfo.h
r703 r705 25 25 #define __FFADO_AMDTPPORTINFO__ 26 26 27 #include " ../debugmodule/debugmodule.h"27 #include "debugmodule/debugmodule.h" 28 28 #include <string> 29 29 branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpSlaveStreamProcessor.cpp
r506 r705 24 24 #include "AmdtpSlaveStreamProcessor.h" 25 25 26 #include " cycletimer.h"26 #include "../util/cycletimer.h" 27 27 28 28 #include <netinet/in.h> branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpSlaveStreamProcessor.h
r445 r705 29 29 */ 30 30 #include "AmdtpStreamProcessor.h" 31 #include "../util/cip.h" 31 32 32 #include " ../debugmodule/debugmodule.h"33 #include "debugmodule/debugmodule.h" 33 34 34 #include "cip.h"35 35 #include <libiec61883/iec61883.h> 36 36 #include <pthread.h> branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.cpp
r703 r705 23 23 24 24 #include "AmdtpStreamProcessor.h" 25 #include "Port.h"26 25 #include "AmdtpPort.h" 27 26 28 #include " cycletimer.h"27 #include "../util/cycletimer.h" 29 28 30 29 #include <netinet/in.h> branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.h
r703 r705 29 29 */ 30 30 31 #include "../debugmodule/debugmodule.h" 32 #include "StreamProcessor.h" 33 34 #include "cip.h" 31 #include "debugmodule/debugmodule.h" 32 33 #include "../generic/StreamProcessor.h" 34 #include "../util/cip.h" 35 35 36 #include <libiec61883/iec61883.h> 36 37 #include <pthread.h> branches/ppalmers-streaming/src/libstreaming/generic/IsoStream.h
r445 r705 25 25 #define __FFADO_ISOSTREAM__ 26 26 27 #include "../util/IsoHandler.h" 28 29 #include "debugmodule/debugmodule.h" 30 27 31 #include <libraw1394/raw1394.h> 28 #include "../debugmodule/debugmodule.h"29 #include "IsoHandler.h"30 32 31 33 namespace Streaming branches/ppalmers-streaming/src/libstreaming/generic/Port.cpp
r554 r705 23 23 24 24 #include "Port.h" 25 25 26 #include <stdlib.h> 26 27 #include <assert.h> branches/ppalmers-streaming/src/libstreaming/generic/Port.h
r554 r705 25 25 #define __FFADO_PORT__ 26 26 27 #include "libutil/ringbuffer.h" 28 29 #include "debugmodule/debugmodule.h" 30 31 #include <string> 27 32 #include <stdint.h> 28 29 #include "../debugmodule/debugmodule.h"30 #include <string>31 #include "libutil/ringbuffer.h"32 33 33 34 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/generic/PortManager.cpp
r554 r705 24 24 #include "PortManager.h" 25 25 #include "Port.h" 26 26 27 #include <assert.h> 27 28 branches/ppalmers-streaming/src/libstreaming/generic/PortManager.h
r554 r705 25 25 #define __FFADO_PORTMANAGER__ 26 26 27 #include "../debugmodule/debugmodule.h"28 27 #include "Port.h" 28 29 #include "debugmodule/debugmodule.h" 29 30 30 31 #include <vector> branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp
r703 r705 22 22 */ 23 23 24 #include "StreamProcessor.h" 25 #include "../util/cycletimer.h" 26 #include "../StreamProcessorManager.h" 27 24 28 #include "libutil/Atomic.h" 25 26 #include "StreamProcessor.h"27 #include "StreamProcessorManager.h"28 #include "cycletimer.h"29 29 30 30 #include <assert.h> branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h
r703 r705 25 25 #define __FFADO_STREAMPROCESSOR__ 26 26 27 #include "../debugmodule/debugmodule.h"28 29 27 #include "IsoStream.h" 30 28 #include "PortManager.h" 31 32 #include <pthread.h>33 29 34 30 #include "libutil/StreamStatistics.h" 35 31 #include "libutil/TimestampedBuffer.h" 36 32 #include "libutil/OptionContainer.h" 33 34 #include "debugmodule/debugmodule.h" 35 36 #include <pthread.h> 37 37 38 38 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/motu/MotuPort.h
r703 r705 30 30 */ 31 31 32 #include "../debugmodule/debugmodule.h"33 #include "Port.h"34 32 #include "MotuPortInfo.h" 33 #include "../generic/Port.h" 34 35 #include "debugmodule/debugmodule.h" 35 36 36 37 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.cpp
r703 r705 24 24 25 25 #include "MotuPortInfo.h" 26 #include <assert.h>27 26 28 27 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.h
r703 r705 26 26 #define __FFADO_MOTUPORTINFO__ 27 27 28 #include " ../debugmodule/debugmodule.h"28 #include "debugmodule/debugmodule.h" 29 29 #include <string> 30 30 branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.cpp
r703 r705 24 24 25 25 #include "MotuStreamProcessor.h" 26 #include "Port.h"27 26 #include "MotuPort.h" 28 27 28 #include "../util/cycletimer.h" 29 29 30 #include <math.h> 30 31 31 #include <netinet/in.h> 32 33 #include "cycletimer.h"34 32 35 33 // in ticks branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.h
r703 r705 25 25 #ifndef __FFADO_MOTUSTREAMPROCESSOR__ 26 26 #define __FFADO_MOTUSTREAMPROCESSOR__ 27 28 #include "../generic/StreamProcessor.h" 29 30 #include "libutil/DelayLockedLoop.h" 31 #include "debugmodule/debugmodule.h" 32 27 33 #include <assert.h> 28 29 #include "../debugmodule/debugmodule.h"30 #include "StreamProcessor.h"31 32 #include "../libutil/DelayLockedLoop.h"33 34 34 35 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp
r703 r705 23 23 24 24 #include "StreamProcessorManager.h" 25 #include "StreamProcessor.h" 26 #include "Port.h" 25 #include "generic/StreamProcessor.h" 26 #include "generic/Port.h" 27 #include "util/cycletimer.h" 28 27 29 #include <errno.h> 28 30 #include <assert.h> 29 30 #include "libstreaming/cycletimer.h"31 31 32 32 #define CYCLES_TO_SLEEP_AFTER_RUN_SIGNAL 5 branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.h
r703 r705 25 25 #define __FFADO_STREAMPROCESSORMANAGER__ 26 26 27 #include "generic/Port.h" 28 #include "generic/StreamProcessor.h" 29 #include "util/IsoHandlerManager.h" 30 27 31 #include "debugmodule/debugmodule.h" 28 32 #include "libutil/Thread.h" 29 33 #include "libutil/OptionContainer.h" 30 #include <semaphore.h>31 #include "Port.h"32 #include "StreamProcessor.h"33 #include "IsoHandlerManager.h"34 34 35 35 #include <vector> 36 #include <semaphore.h> 36 37 37 38 namespace Streaming { branches/ppalmers-streaming/src/libstreaming/util/cip.c
r386 r705 19 19 */ 20 20 21 #include "cip.h" 22 23 #include <netinet/in.h> 21 24 #include <libiec61883/iec61883.h> 22 #include "cip.h"23 24 #include <netinet/in.h>25 25 26 26 branches/ppalmers-streaming/src/libstreaming/util/cycletimer.h
r703 r705 27 27 #define __CYCLETIMER_H__ 28 28 29 #include "debugmodule/debugmodule.h" 30 29 31 #include <inttypes.h> 30 #include "debugmodule/debugmodule.h"31 32 32 33 #define CSR_CYCLE_TIME 0x200 branches/ppalmers-streaming/src/libstreaming/util/IsoHandler.cpp
r679 r705 23 23 24 24 #include "IsoHandler.h" 25 #include "IsoStream.h"26 25 #include "cycletimer.h" 26 #include "../generic/IsoStream.h" 27 27 28 28 #include "libutil/TimeSource.h" branches/ppalmers-streaming/src/libstreaming/util/IsoHandler.h
r445 r705 25 25 #define __FFADO_ISOHANDLER__ 26 26 27 #include " ../debugmodule/debugmodule.h"27 #include "debugmodule/debugmodule.h" 28 28 29 29 #include <libraw1394/raw1394.h> branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.cpp
r703 r705 24 24 #include "IsoHandlerManager.h" 25 25 #include "IsoHandler.h" 26 #include "IsoStream.h" 26 #include "../generic/IsoStream.h" 27 28 #include "libutil/PosixThread.h" 29 27 30 #include <assert.h> 28 29 #include "../libutil/PosixThread.h"30 31 31 32 32 #define MINIMUM_INTERRUPTS_PER_PERIOD 2U branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.h
r703 r705 25 25 #define __FFADO_ISOHANDLERMANAGER__ 26 26 27 #include "../debugmodule/debugmodule.h" 28 #include "../libutil/Thread.h" 27 #include "debugmodule/debugmodule.h" 28 29 #include "libutil/Thread.h" 29 30 30 31 #include <sys/poll.h>