Changeset 1550

Timestamp:

05/10/09 07:50:57 (14 years ago)

Author:

ppalmers

Message:

- Implement basic HSS1394 support for the Stanton SCS devices
- Start of the implementation of a generic TCAT DICE EAP control
- Reworked part of the busreset / ARM handler code

Files:

• trunk/libffado/config_debug.h.in (modified) (1 diff)
• trunk/libffado/src/bounce/bounce_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.h (modified) (1 diff)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (27 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (8 diffs)
• trunk/libffado/src/dice/dice_eap.cpp (added)
• trunk/libffado/src/dice/dice_eap.h (added)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (3 diffs)
• trunk/libffado/src/genericavc/stanton (added)
• trunk/libffado/src/genericavc/stanton/scs.cpp (added)
• trunk/libffado/src/genericavc/stanton/scs.h (added)
• trunk/libffado/src/libieee1394/ARMHandler.cpp (modified) (6 diffs)
• trunk/libffado/src/libieee1394/ARMHandler.h (deleted)
• trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (25 diffs)
• trunk/libffado/src/libieee1394/ieee1394service.h (modified) (6 diffs)
• trunk/libffado/src/libieee1394/IsoHandlerManager.cpp (modified) (2 diffs)
• trunk/libffado/src/libieee1394/vendor_model_ids.h (modified) (2 diffs)
• trunk/libffado/src/libutil/ByteSwap.h (modified) (3 diffs)
• trunk/libffado/src/libutil/PosixThread.cpp (modified) (6 diffs)
• trunk/libffado/src/libutil/PosixThread.h (modified) (2 diffs)
• trunk/libffado/src/SConscript (modified) (2 diffs)
• trunk/libffado/support/alsa/SConscript (modified) (1 diff)
• trunk/libffado/tests/scan-devreg.cpp (modified) (6 diffs)
• trunk/libffado/tests/SConscript (modified) (1 diff)
• trunk/libffado/tests/test-ieee1394service.cpp (modified) (3 diffs)
• trunk/libffado/tests/test-scs.cpp (added)

trunk/libffado/config_debug.h.in

@@ -13 +13 @@
-
-// use an RT thread for reading out the messagebuffer.
-but not
-recommended
-0
+and
+avoids priority inversion issues
+1
-#define DEBUG_MESSAGE_BUFFER_REALTIME_PRIO   1
-

trunk/libffado/src/bounce/bounce_avdevice.h

@@ -35 +35 @@
-#include "libstreaming/amdtp/AmdtpPortInfo.h"
-
-ARMHandler
+ieee1394service
-
-#include "ffadodevice.h"
@@ -54 +54 @@
-class ConfigRom;
-class DeviceManager;
+
+namespace Util {
+    class Configuration;
+}
-
-namespace Bounce {
@@ -121 +125 @@
-    #define BOUNCE_NOTIFIER_BASE_ADDRESS 0x0000FFFFE0000000ULL
-    #define BOUNCE_NOTIFIER_BLOCK_LENGTH 4
-
+Ieee1394Service::
-    {
-    public:
-*
+&
-        virtual ~BounceNotifier();
-
-    private:
-*
+&
-    };
-};

trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

@@ -126 +126 @@
-    }
-
-
+*
-
-    if(!m_Notifier) {
@@ -443 +443 @@
-// the notifier
-
-*
-
+&
+d.get1394Service(), 
-              RAW1394_ARM_READ | RAW1394_ARM_WRITE, // allowed operations
-              0, //RAW1394_ARM_READ | RAW1394_ARM_WRITE, // operations to be notified of

trunk/libffado/src/bounce/bounce_slave_avdevice.h

@@ -84 +84 @@
-     * hosts address space
-     */
-
+Ieee1394Service::
-    {
-    public:
-*
+&
-        virtual ~BounceSlaveNotifier();
-
-    private:
-*
+&
-    };
-};

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -571 +571 @@
-    debugOutput(DEBUG_LEVEL_NORMAL,"  Samplerate       : 0x%08X (%lu)\n",tmp_quadlet,tmp_quadlet);
-
+    readGlobalRegBlock(DICE_REGISTER_GLOBAL_VERSION, reinterpret_cast<fb_quadlet_t *>(&tmp_quadlet), sizeof(fb_quadlet_t));
+    debugOutput(DEBUG_LEVEL_NORMAL,"  Version          : 0x%08X\n", tmp_quadlet);
+    
-    readGlobalReg(DICE_REGISTER_GLOBAL_VERSION, &tmp_quadlet);
-    debugOutput(DEBUG_LEVEL_NORMAL,"  Version          : 0x%08X (%u.%u.%u.%u)\n",
@@ -1026 +1029 @@
-        }
-    
-=new Device::DiceNotifier(
+ = new Device::Notifier(*
-    
-        if(!m_notifier) {
@@ -1438 +1441 @@
-    char namestring[DICE_TX_NAMES_SIZE+1];
-
-Swapped
+
-                        (fb_quadlet_t *)namestring, DICE_TX_NAMES_SIZE)) {
-        debugError("Could not read TX name string \n");
@@ -1444 +1447 @@
-    }
-
+    // Strings from the device are always little-endian,
+    // so byteswap for big-endian machines
+    #if __BYTE_ORDER == __BIG_ENDIAN
+    byteSwapBlock((quadlet_t *)namestring, DICE_TX_NAMES_SIZE/4);
+    #endif
-    namestring[DICE_TX_NAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1453 +1461 @@
-    char namestring[DICE_RX_NAMES_SIZE+1];
-
-Swapped
+
-                        (fb_quadlet_t *)namestring, DICE_RX_NAMES_SIZE)) {
-        debugError("Could not read RX name string \n");
@@ -1459 +1467 @@
-    }
-
+    // Strings from the device are always little-endian,
+    // so byteswap for big-endian machines
+    #if __BYTE_ORDER == __BIG_ENDIAN
+    byteSwapBlock((quadlet_t *)namestring, DICE_RX_NAMES_SIZE/4);
+    #endif
-    namestring[DICE_RX_NAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1468 +1481 @@
-    char namestring[DICE_CLOCKSOURCENAMES_SIZE+1];
-
-Swapped
+
-                      (fb_quadlet_t *)namestring, DICE_CLOCKSOURCENAMES_SIZE)) {
-        debugError("Could not read CLOCKSOURCE name string \n");
@@ -1474 +1487 @@
-    }
-
+    // Strings from the device are always little-endian,
+    // so byteswap for big-endian machines
+    #if __BYTE_ORDER == __BIG_ENDIAN
+    byteSwapBlock((quadlet_t *)namestring, DICE_CLOCKSOURCENAMES_SIZE/4);
+    #endif
-    namestring[DICE_CLOCKSOURCENAMES_SIZE]='\0';
-    return splitNameString(std::string(namestring));
@@ -1482 +1500 @@
-    char namestring[DICE_NICK_NAME_SIZE+1];
-
-Swapped
+
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not read nickname string \n");
@@ -1488 +1506 @@
-    }
-
+    // Strings from the device are always little-endian,
+    // so byteswap for big-endian machines
+    #if __BYTE_ORDER == __BIG_ENDIAN
+    byteSwapBlock((quadlet_t *)namestring, DICE_NICK_NAME_SIZE/4);
+    #endif
-    namestring[DICE_NICK_NAME_SIZE]='\0';
-    return std::string(namestring);
@@ -1497 +1520 @@
-    strncpy(namestring, name.c_str(), DICE_NICK_NAME_SIZE);
-
-
+
+
+
+
+
+
+
-                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
-        debugError("Could not write nickname string \n");
@@ -1510 +1539 @@
-
-    // find the end of the string
-=
+ = 
-    // cut the end
-=
+ = 
-
-    string::size_type cut;
@@ -1533 +1562 @@
-
-    // offsets and sizes are returned in quadlets, but we use byte values
-
-    if(!readReg(DICE_REGISTER_GLOBAL_PAR_SPACE_OFF, &m_global_reg_offset)) {
-        debugError("Could not initialize m_global_reg_offset\n");
@@ -1648 +1676 @@
-    }
-
-=
-=
+ = 
+ = 
-
-    if(!get1394Service().read_quadlet( nodeId, addr, result ) ) {
@@ -1656 +1684 @@
-    }
-
-=
+ = 
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
@@ -1673 +1701 @@
-    }
-
-=
-=
+ = 
+ = 
-
-    if(!get1394Service().write_quadlet( nodeId, addr, CondSwapToBus32(data) ) ) {
@@ -1685 +1713 @@
-bool
-Device::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-
-
+
+
+
-
-    if(offset >= DICE_INVALID_OFFSET) {
@@ -1693 +1722 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -1712 +1758 @@
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08llX, length: %u\n",
-        offset, length);
+    const int blocksize_quads = 512/4;
-
-    if(offset >= DICE_INVALID_OFFSET) {
@@ -1718 +1765 @@
-    }
-
-    fb_nodeaddr_t addr=DICE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=getNodeId() | 0xFFC0;
-
-    fb_quadlet_t data_out[length/4];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1791 +1801 @@
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading global register offset 0x%04llX\n", offset);
-
-=
+ = 
-    return readReg(m_global_reg_offset + offset_gl, result);
-}
@@ -1800 +1810 @@
-        offset, data);
-
-=
+ = 
-    return writeReg(m_global_reg_offset + offset_gl, data);
-}
@@ -1809 +1819 @@
-        offset, length);
-
-=
+ = 
-    return readRegBlock(m_global_reg_offset + offset_gl, data, length);
-}
@@ -1818 +1828 @@
-        offset, length);
-
-=
+ = 
-    return writeRegBlock(m_global_reg_offset + offset_gl, data, length);
-}
-
-bool
-Device::readGlobalRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading global register block offset 0x%04llX, length %u bytes\n",
-        offset, length);
-
-    fb_nodeaddr_t offset_gl=globalOffsetGen(offset, length);
-    return readRegBlockSwapped(m_global_reg_offset + offset_gl, data, length);
-}
-
-bool
-Device::writeGlobalRegBlockSwapped(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing global register block offset 0x%04llX, length %u bytes\n",
-        offset, length);
-
-    fb_nodeaddr_t offset_gl=globalOffsetGen(offset, length);
-    return writeRegBlockSwapped(m_global_reg_offset + offset_gl, data, length);
-}
-
@@ -1891 +1883 @@
-    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, length);
-    return writeRegBlock(m_tx_reg_offset + offset_tx, data, length);
-}
-
-bool
-Device::readTxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading rx register block offset 0x%04llX, length %u bytes\n",
-        offset, length);
-
-    fb_nodeaddr_t offset_tx=txOffsetGen(i, offset, length);
-    return readRegBlockSwapped(m_tx_reg_offset + offset_tx, data, length);
-}
-
@@ -1969 +1952 @@
-}
-
-bool
-Device::readRxRegBlockSwapped(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading rx register block offset 0x%04llX, length %u bytes\n",
-        offset, length);
-
-    fb_nodeaddr_t offset_rx=rxOffsetGen(i, offset, length);
-    return readRegBlockSwapped(m_rx_reg_offset + offset_rx, data, length);
-}
-
-fb_nodeaddr_t
-Device::rxOffsetGen(unsigned int i, fb_nodeaddr_t offset, size_t length) {
@@ -2012 +1986 @@
-// the notifier
-
-DiceNotifier::DiceNotifier(Device *
-
+Notifier::Notifier(Device &
+d.get1394Service(), 
-              RAW1394_ARM_READ | RAW1394_ARM_WRITE | RAW1394_ARM_LOCK,
-              RAW1394_ARM_WRITE, 0)
-iced
+
-{
-
-
-
-
+
+
+
+
+
-{
-

trunk/libffado/src/dice/dice_avdevice.h

@@ -33 +33 @@
-#include "libstreaming/amdtp/AmdtpTransmitStreamProcessor.h"
-#include "libstreaming/amdtp/AmdtpPort.h"
-
+
+
-
-#include <string>
@@ -41 +42 @@
-class Ieee1394Service;
-
+namespace Util {
+    class Configuration;
+}
+
-namespace Dice {
-
-Dice
+
-
-class Device : public FFADODevice {
-
-
+
+
+
+
+
-public:
-    Device( DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ));
@@ -141 +149 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool readRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
-    bool readGlobalReg(fb_nodeaddr_t, fb_quadlet_t *);
@@ -148 +154 @@
-    bool readGlobalRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeGlobalRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool readGlobalRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeGlobalRegBlockSwapped(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    fb_nodeaddr_t globalOffsetGen(fb_nodeaddr_t, size_t);
-
@@ -156 +160 @@
-    bool readTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool writeTxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool readTxRegBlockSwapped(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);
-
@@ -163 +166 @@
-    bool readRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool writeRxRegBlock(unsigned int i, fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length);
-    bool readRxRegBlockSwapped(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);
-
@@ -182 +184 @@
-    fb_quadlet_t m_rx_size;
-
-
+
+
-    // notification
-Dice
+
-
-    /**
@@ -192 +195 @@
-    #define DICE_NOTIFIER_BASE_ADDRESS 0x0000FFFFE0000000ULL
-    #define DICE_NOTIFIER_BLOCK_LENGTH 4
-DiceNotifier : public 
+Notifier : public Ieee1394Service::
-    {
-    public:
-DiceNotifier(Device *
-Dice
+Notifier(Device &
+
-
-    private:
-*m_dice
+&m_
-    };
+
+    /**
+     * this class represents the EAP interface
+     * available on some devices
+     */
+    class EAP
+    {
+    public:
+        class Router;
+        class Mixer;
+
+    private:
+        enum eWaitReturn {
+            eWR_Error,
+            eWR_Timeout,
+            eWR_Busy,
+            eWR_Done,
+        };
+        enum eRegBase {
+            eRT_Base,
+            eRT_Capability,
+            eRT_Command,
+            eRT_Mixer,
+            eRT_Peak,
+            eRT_NewRouting,
+            eRT_NewStreamCfg,
+            eRT_CurrentCfg,
+            eRT_Standalone,
+            eRT_Application,
+        };
+
+    public:
+        EAP(Device &);
+        virtual ~EAP();
+
+        static bool supportsEAP(Device &);
+        bool init();
+
+        void show();
+        enum eWaitReturn operationBusy();
+        enum eWaitReturn waitForOperationEnd(int max_wait_time_ms = 100);
+        bool loadRouterConfig(bool low, bool mid, bool high);
+        bool loadStreamConfig(bool low, bool mid, bool high);
+        bool loadRouterAndStreamConfig(bool low, bool mid, bool high);
+        bool loadFlashConfig();
+        bool storeFlashConfig();
+        
+    private:
+        bool     m_router_exposed;
+        bool     m_router_readonly;
+        bool     m_router_flashstored;
+        uint16_t m_router_nb_entries;
+
+        bool     m_mixer_exposed;
+        bool     m_mixer_readonly;
+        bool     m_mixer_flashstored;
+        uint8_t  m_mixer_input_id;
+        uint8_t  m_mixer_output_id;
+        uint8_t  m_mixer_nb_inputs;
+        uint8_t  m_mixer_nb_outputs;
+
+        bool     m_general_support_dynstream;
+        bool     m_general_support_flash;
+        bool     m_general_peak_enabled;
+        uint8_t  m_general_max_tx;
+        uint8_t  m_general_max_rx;
+        bool     m_general_stream_cfg_stored;
+        uint16_t m_general_chip;
+
+        bool commandHelper(fb_quadlet_t cmd);
+
+        bool readReg(enum eRegBase, unsigned offset, quadlet_t *);
+        bool writeReg(enum eRegBase, unsigned offset, quadlet_t);
+        bool readRegBlock(enum eRegBase, unsigned, fb_quadlet_t *, size_t);
+        bool writeRegBlock(enum eRegBase, unsigned, fb_quadlet_t *, size_t);
+        bool readRegBlockSwapped(enum eRegBase, unsigned, fb_quadlet_t *, size_t);
+        bool writeRegBlockSwapped(enum eRegBase, unsigned, fb_quadlet_t *, size_t);
+        fb_nodeaddr_t offsetGen(enum eRegBase, unsigned, size_t);
+
+        Device &m_device;
+        DECLARE_DEBUG_MODULE_REFERENCE;
+
+        fb_quadlet_t m_capability_offset;
+        fb_quadlet_t m_capability_size;
+        fb_quadlet_t m_cmd_offset;
+        fb_quadlet_t m_cmd_size;
+        fb_quadlet_t m_mixer_offset;
+        fb_quadlet_t m_mixer_size;
+        fb_quadlet_t m_peak_offset;
+        fb_quadlet_t m_peak_size;
+        fb_quadlet_t m_new_routing_offset;
+        fb_quadlet_t m_new_routing_size;
+        fb_quadlet_t m_new_stream_cfg_offset;
+        fb_quadlet_t m_new_stream_cfg_size;
+        fb_quadlet_t m_curr_cfg_offset;
+        fb_quadlet_t m_curr_cfg_size;
+        fb_quadlet_t m_standalone_offset;
+        fb_quadlet_t m_standalone_size;
+        fb_quadlet_t m_app_offset;
+        fb_quadlet_t m_app_size;
+
+    public: // mixer subclass
+        class Mixer {
+        public:
+            Mixer(EAP &);
+            ~Mixer();
+
+            bool init();
+            void show();
+            bool updateCoefficients();
+
+        private:
+            EAP &m_parent;
+            fb_quadlet_t *m_coeff;
+
+            DECLARE_DEBUG_MODULE_REFERENCE;
+        };
+
+        class Router {
+        public:
+            Router(EAP &);
+            ~Router();
+
+            bool init();
+            void show();
+
+        private:
+            EAP &m_parent;
+
+            DECLARE_DEBUG_MODULE_REFERENCE;
+        };
+
+    };
+
-};
-

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -23 +23 @@
- */
-
-//#include "config.h"
-#include "devicemanager.h"
-#include "genericavc/avc_avdevice.h"
@@ -45 +44 @@
-
-#include <libraw1394/csr.h>
+
+#include "stanton/scs.h"
-
-namespace GenericAVC {
@@ -109 +110 @@
-Device::createDevice(DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ))
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libffado/src/libieee1394/ARMHandler.cpp

@@ -25 +25 @@
-#include <cstdlib>
-
-ARMHandler
+ieee1394service
-
-IMPL_DEBUG_MODULE( ARMHandler, ARMHandler, DEBUG_LEVEL_NORMAL);
-/**
+ * @param parent         the 1394service that created this handler
- * @param start          identifies addressrange
- * @param length         identifies addressrange length (in bytes)
@@ -49 +49 @@
- *
- */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-=
-0,
+ = 
+ 0, 
-}
-
-
+Ieee1394Service::
-    if(m_buffer)
-        delete m_buffer;
-}
-
-
+
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Read\n");
-    printRequest(req);
@@ -76 +79 @@
-}
-
-
+
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Write\n");
-    printRequest(req);
@@ -82 +86 @@
-}
-
-
+
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Lock\n");
-    printRequest(req);
@@ -111 +116 @@
-// } *raw1394_arm_request_response_t;
-
-
+
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, " request info: \n");
-    debugOutput(DEBUG_LEVEL_VERBOSE, "  from node 0x%04X to node 0x%04X\n",
@@ -125 +131 @@
-
-void
-
+Ieee1394Service::
-{
-

trunk/libffado/src/libieee1394/ieee1394service.cpp

@@ -26 +26 @@
-
-#include "ieee1394service.h"
-#include "ARMHandler.h"
-#include "cycletimer.h"
-#include "IsoHandlerManager.h"
@@ -37 +36 @@
-#include "libutil/Watchdog.h"
-#include "libutil/PosixMutex.h"
+#include "libutil/PosixThread.h"
-#include "libutil/Configuration.h"
-
@@ -53 +53 @@
-Ieee1394Service::Ieee1394Service()
-    : m_configuration( NULL )
+    , m_resetHelper( NULL )
+    , m_armHelperNormal( NULL )
+    , m_armHelperRealtime( NULL )
-    , m_handle( 0 )
-    , m_handle_lock( new Util::PosixMutex("SRCVHND") )
-    , m_resetHandle( 0 )
-    , m_util_handle( 0 )
-    , m_port( -1 )
-    , m_RHThread_lock( new Util::PosixMutex("SRVCRH") )
-    , m_threadRunning( false )
-    , m_realtime ( false )
-    , m_base_priority ( 0 )
@@ -81 +81 @@
-Ieee1394Service::Ieee1394Service(bool rt, int prio)
-    : m_configuration( NULL )
+    , m_resetHelper( NULL )
+    , m_armHelperNormal( NULL )
+    , m_armHelperRealtime( NULL )
-    , m_handle( 0 )
-    , m_handle_lock( new Util::PosixMutex("SRCVHND") )
-    , m_resetHandle( 0 )
-    , m_util_handle( 0 )
-    , m_port( -1 )
-    , m_RHThread_lock( new Util::PosixMutex("SRVCRH") )
-    , m_threadRunning( false )
-    , m_realtime ( rt )
-    , m_base_priority ( prio )
@@ -113 +113 @@
-    delete m_pIsoManager;
-    delete m_pCTRHelper;
-
+
+
+
+
+
-    for ( arm_handler_vec_t::iterator it = m_armHandlers.begin();
-          it != m_armHandlers.end();
@@ -119 +123 @@
-    {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Unregistering ARM handler for 0x%016llX\n", (*it)->getStart());
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }
@@ -132 +140 @@
-    delete m_handle_lock;
-
- ( m_resetHandle ) {
-    raw1394_destroy_handle( m_resetHandle )
-}
-
+(m_resetHelper) delete m_resetHelper;
+if(m_armHelperNormal) delete m_armHelperNormal
+if(m_armHelperRealtime) delete m_armHelperRealtime;
+
-    if ( m_util_handle ) {
-        raw1394_destroy_handle( m_util_handle );
@@ -229 +237 @@
-        debugFatal("Requested port (%d) out of range (# ports: %d)\n", port, nb_ports);
-    }
+    m_port = port;
-
-    if(!m_pWatchdog) {
@@ -251 +260 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    m_util_handle = raw1394_new_handle_on_port( port );
-    if ( !m_util_handle ) {
@@ -279 +317 @@
-    uint32_t cycle_timer;
-    uint64_t local_time;
-=raw1394_read_cycle_timer(m
+ = raw1394_read_cycle_timer(m_util
-    if(err) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "raw1394_read_cycle_timer failed.\n");
@@ -295 +333 @@
-    }
-
-    m_port = port;
-
-    // obtain port name
-    raw1394handle_t tmp_handle = raw1394_new_handle();
@@ -323 +359 @@
-    // set userdata
-    raw1394_set_userdata( m_handle, this );
-    raw1394_set_userdata( m_resetHandle, this );
-    raw1394_set_userdata( m_util_handle, this );
-
-
-
-
-
-
+
+
-    int split_timeout = IEEE1394SERVICE_MIN_SPLIT_TIMEOUT_USECS;
-    if(m_configuration) {
@@ -371 +402 @@
-        return false;
-    }
-
-    startRHThread();
-
-    // make sure that the thread parameters of all our helper threads are OK
@@ -393 +422 @@
-                                         rt, priority);
-        result &= m_pIsoManager->setThreadParameters(rt, priority);
-
+ //else debugError("Bogus isomanager\n");
-    if (m_pCTRHelper) {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Switching CycleTimerHelper to (rt=%d, prio=%d)\n", 
@@ -400 +429 @@
-        result &= m_pCTRHelper->setThreadParameters(rt && IEEE1394SERVICE_CYCLETIMER_HELPER_RUN_REALTIME,
-                                                    IEEE1394SERVICE_CYCLETIMER_HELPER_PRIO);
-
+
+
+
+
-    return result;
-}
@@ -1001 +1033 @@
-{
-    raw1394_update_generation ( handle, generation );
-
-
-
+
+
+
+
+
+
+
+
+
-
-    return 0;
@@ -1038 +1076 @@
-        h, h->getStart(), h->getLength());
-
-
-
-
-
-
+
+
+
+
+
+
-    if (err) {
-        debugError("Failed to register ARM handler for 0x%016llX\n", h->getStart());
@@ -1048 +1087 @@
-        return false;
-    }
-
-    m_armHandlers.push_back( h );
-
-    return true;
-}
@@ -1063 +1100 @@
-    {
-        if((*it) == h) {
-=raw1394_arm_unregister(m_resetHandle
+ = raw1394_arm_unregister(m_armHelperNormal->get1394Handle()
-            if (err) {
-                debugError("Failed to unregister ARM handler (%p)\n", h);
@@ -1092 +1129 @@
-    const int maxcnt=10;
-    int err=1;
+    Util::MutexLockHelper lock(*m_handle_lock);
-    while(err && cnt++ < maxcnt) {
-        // try to register
-=raw1394_arm_register(m_resetH
+ = raw1394_arm_register(m_h
-
-        if (err) {
@@ -1102 +1140 @@
-        } else {
-            debugOutput(DEBUG_LEVEL_VERBOSE, " -> use 0x%016llX\n", start);
-=raw1394_arm_unregister(m_resetH
+ = raw1394_arm_unregister(m_h
-            if (err) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, " error unregistering test handler\n");
@@ -1117 +1155 @@
-int
-Ieee1394Service::armHandlerLowLevel(raw1394handle_t handle,
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1139 +1184 @@
-        if((*it) == (ARMHandler *)arm_tag) {
-            struct raw1394_arm_request_response *arm_req_resp;
- 
-=
-=
+
+ = 
+ = 
-
-            debugOutput(DEBUG_LEVEL_VERBOSE,"ARM handler for address 0x%016llX called\n",
-                (*it)->getStart());
-
-
+ 
+ 
-
-            switch(request_type) {
-                case RAW1394_ARM_READ:
-                    (*it)->handleRead(arm_req);
-=
+ = 
-                    break;
-                case RAW1394_ARM_WRITE:
-                    (*it)->handleWrite(arm_req);
-=
+ = 
-                    break;
-                case RAW1394_ARM_LOCK:
-                    (*it)->handleLock(arm_req);
-=
+ = 
-                    break;
-                default:
-                    debugWarning("Unknown request type received, ignoring...\n");
-            }
-
-            return true;
-        }
@@ -1171 +1215 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE,"default ARM handler called\n");
-
-resetHandle
+armHelperNormal->get1394Handle()
-    return true;
-}
-
-bool
-Ieee1394Service::startRHThread()
-{
-    int i;
-
-    if ( m_threadRunning ) {
-        return true;
-    }
-    m_RHThread_lock->Lock();
-    i = pthread_create( &m_thread, 0, rHThread, this );
-    m_RHThread_lock->Unlock();
-    if (i) {
-        debugFatal("Could not start ieee1394 service thread\n");
-        return false;
-    }
-    m_threadRunning = true;
-
-    return true;
-}
-
-void
-Ieee1394Service::stopRHThread()
-{
-    if ( m_threadRunning ) {
-        // wait for the thread to finish it's work
-        m_RHThread_lock->Lock();
-        pthread_cancel (m_thread);
-        pthread_join (m_thread, 0);
-        m_RHThread_lock->Unlock();
-        m_threadRunning = false;
-    }
-}
-
-void*
-Ieee1394Service::rHThread( void* arg )
-{
-    Ieee1394Service* pIeee1394Service = (Ieee1394Service*) arg;
-
-    while (true) {
-        // protect ourselves from dying
-        {
-            // use a scoped lock such that it is unlocked
-            // even if we are cancelled while running
-            // FIXME: check if this is true!
-//             Util::MutexLockHelper lock(*(pIeee1394Service->m_RHThread_lock));
-            raw1394_loop_iterate (pIeee1394Service->m_resetHandle);
-        }
-        pthread_testcancel ();
-    }
-
-    return 0;
-}
-
@@ -1548 +1539 @@
-    if (m_pIsoManager) m_pIsoManager->dumpInfo();
-}
+
+// the helper thread class
+Ieee1394Service::HelperThread::HelperThread(Ieee1394Service &parent, std::string name)
+: m_parent( parent )
+, m_name( name )
+, m_handle( NULL )
+, m_thread( *(new Util::PosixThread(this, name, false, 0, PTHREAD_CANCEL_DEFERRED)) )
+, m_iterate( false )
+, m_debugModule(parent.m_debugModule)
+{
+    m_handle = raw1394_new_handle_on_port( parent.m_port );
+    if(!m_handle) {
+        debugError("Could not allocate handle\n");
+        // FIXME: better error handling required
+    }
+    raw1394_set_userdata( m_handle, this );
+}
+
+Ieee1394Service::HelperThread::HelperThread(Ieee1394Service &parent, std::string name, bool rt, int prio)
+: m_parent( parent )
+, m_name( name )
+, m_handle( NULL )
+, m_thread( *(new Util::PosixThread(this, name, rt, prio, PTHREAD_CANCEL_DEFERRED)) )
+, m_iterate( false )
+, m_debugModule(parent.m_debugModule)
+{
+    m_handle = raw1394_new_handle_on_port( parent.m_port );
+    if(!m_handle) {
+        debugError("Could not allocate handle\n");
+        // FIXME: better error handling required
+    }
+    raw1394_set_userdata( m_handle, this );
+}
+
+Ieee1394Service::HelperThread::~HelperThread()
+{
+    m_thread.Stop();
+    delete &m_thread;
+    if(m_handle) {
+        raw1394_destroy_handle(m_handle);
+    }
+}
+
+bool
+Ieee1394Service::HelperThread::Init()
+{
+    m_iterate = true;
+    return true;
+}
+
+bool
+Ieee1394Service::HelperThread::Execute()
+{
+    if(m_iterate) {
+        int err;
+        err = raw1394_loop_iterate (m_handle);
+        if(err < 0) {
+            debugError("Failed to iterate handler\n");
+            return false;
+        } else {
+            return true;
+        }
+    } else {
+        Util::SystemTimeSource::SleepUsecRelative(1000);
+        return true;
+    }
+}
+
+void
+Ieee1394Service::HelperThread::setThreadParameters(bool rt, int priority)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) switch to: (rt=%d, prio=%d)...\n", this, rt, priority);
+    if (priority > THREAD_MAX_RTPRIO) priority = THREAD_MAX_RTPRIO; // cap the priority
+    if (rt) {
+        m_thread.AcquireRealTime(priority);
+    } else {
+        m_thread.DropRealTime();
+    }
+}
+
+bool
+Ieee1394Service::HelperThread::Start()
+{
+    return m_thread.Start() == 0;
+}
+
+bool
+Ieee1394Service::HelperThread::Stop()
+{
+    // request to stop iterating
+    m_iterate = false;
+    // poke the handler such that the iterate() returns
+    raw1394_wake_up(m_handle);
+    // stop the thread
+    return m_thread.Stop() == 0;
+}

trunk/libffado/src/libieee1394/ieee1394service.h

@@ -29 +29 @@
-#include "libutil/Functors.h"
-#include "libutil/Mutex.h"
+#include "libutil/Thread.h"
-
-#include "debugmodule/debugmodule.h"
@@ -40 +41 @@
-#include <string>
-
-class ARMHandler;
-
-#define MAX_FCP_BLOCK_SIZE_BYTES (512)
@@ -54 +54 @@
-
-class Ieee1394Service : public IEC61883 {
+public:
+    class ARMHandler;
+
-public:
-    Ieee1394Service();
@@ -392 +395 @@
-
-private:
+    // this class will create a new 1394 handle
+    // and a thread that will iterate it
+    class HelperThread : public Util::RunnableInterface
+    {
+    public:
+        HelperThread(Ieee1394Service &, std::string);
+        HelperThread(Ieee1394Service &, std::string, bool rt, int prio);
+        virtual ~HelperThread();
+
+        raw1394handle_t get1394Handle() {return m_handle;};
+        Ieee1394Service &get1394Service() {return m_parent;};
+
+        virtual bool Init();
+        virtual bool Execute();
+
+        void setThreadParameters(bool rt, int priority);
+
+        bool Start();
+        bool Stop();
+
+    private:
+        Ieee1394Service &m_parent;
+        std::string      m_name;
+        raw1394handle_t  m_handle;
+        Util::Thread &   m_thread;
+        bool             m_iterate;
+
+        DECLARE_DEBUG_MODULE_REFERENCE;
+    };
+
+    HelperThread *m_resetHelper;
+    HelperThread *m_armHelperNormal;
+    HelperThread *m_armHelperRealtime;
+
+private: // unsorted
-    bool configurationUpdated();
-
-    bool startRHThread();
-    void stopRHThread();
-    static void* rHThread( void* arg );
-
-    void printBuffer( unsigned int level, size_t length, fb_quadlet_t* buffer ) const;
@@ -414 +448 @@
-    raw1394handle_t m_handle;
-    Util::Mutex*    m_handle_lock;
-
-
+
-    int             m_port;
-    std::string     m_portName;
-
-    pthread_t       m_thread;
-    Util::Mutex*    m_RHThread_lock;
-    bool            m_threadRunning;
-
-    bool            m_realtime;
@@ -487 +516 @@
-private:
-    DECLARE_DEBUG_MODULE;
+    
+public:
+    /**
+    * @brief Class to handle AddressRangeMappings
+    *
+    * This class is intended to help with implementing
+    * address range mapping, i.e. implementing handlers
+    * that react to reads/writes of certain addresses
+    * in 1394 memory space
+    *
+    * see the _arm_ functions in raw1394.h for more insight
+    *
+    */
+
+    class ARMHandler {
+    public:
+        ARMHandler(Ieee1394Service &parent,
+                nodeaddr_t start, size_t length,
+                unsigned int access_rights,
+                unsigned int notification_options,
+                unsigned int client_transactions
+                );
+    
+        virtual ~ARMHandler();
+    
+        virtual bool handleRead(struct raw1394_arm_request  *);
+        virtual bool handleWrite(struct raw1394_arm_request  *);
+        virtual bool handleLock(struct raw1394_arm_request  *);
+    
+        struct raw1394_arm_response *getResponse() {return &m_response;};
+    
+        nodeaddr_t getStart() {return m_start;};
+        size_t getLength() {return m_length;};
+        unsigned int getAccessRights() {return m_access_rights;};
+        unsigned int getNotificationOptions() {return m_notification_options;};
+        unsigned int getClientTransactions() {return m_client_transactions;};
+    
+        byte_t *getBuffer() {return m_buffer;};
+    
+    private:
+        Ieee1394Service &m_parent;
+        nodeaddr_t m_start;
+        size_t m_length;
+        unsigned int m_access_rights;
+        unsigned int m_notification_options;
+        unsigned int m_client_transactions;
+    protected:
+        byte_t *m_buffer;
+    
+        struct raw1394_arm_response m_response;
+        
+        void printBufferBytes( unsigned int level, size_t length, byte_t* buffer ) const;
+        void printRequest(struct raw1394_arm_request *arm_req);
+
+        DECLARE_DEBUG_MODULE_REFERENCE;
+    
+    };
+
-};
-

trunk/libffado/src/libieee1394/IsoHandlerManager.cpp

@@ -97 +97 @@
-{
-    bool retval = true;
+    if(!m_running) {
+        // nothing to do here
+        return true;
+    }
-    m_in_busreset = true;
-    requestShadowMapUpdate();
-    if(request_update) {
-        debugError("shadow map update request not honored\n");
-        return false;
-    }
-
-    unsigned int i, max;
@@ -122 +122 @@
-    m_in_busreset = false;
-    requestShadowMapUpdate();
-    if(request_update) {
-        debugError("shadow map update request not honored\n");
-        return false;
-    }
-    return retval;
-}

trunk/libffado/src/libieee1394/vendor_model_ids.h

@@ -40 +40 @@
-#define FW_VENDORID_ALESIS       0x000595
-#define FW_VENDORID_WEISS        0x001C6A
+#define FW_VENDORID_STANTON      0x001260
-
-// this is the one we assign ourselves
@@ -45 +46 @@
-#define FW_VENDORID_FFADO        0x0B0001
-
-
-#endif /* VENDOR_MODEL_IDS */

trunk/libffado/src/libutil/ByteSwap.h

@@ -58 +58 @@
-}
-
+static inline void
+byteSwapBlock(quadlet_t *data, unsigned int nb_elements)
+{
+    unsigned int i=0;
+    for(; i<nb_elements; i++) {
+        *data = ByteSwap32(*data);
+        data++;
+    }
+}
-
-#if __BYTE_ORDER == __BIG_ENDIAN
@@ -254 +263 @@
-byteSwapToBus(quadlet_t *data, unsigned int nb_elements)
-{
-
-
-
-
-
+
-}
-
@@ -264 +269 @@
-byteSwapFromBus(quadlet_t *data, unsigned int nb_elements)
-{
-
-
-
-
-
+
-}
-

trunk/libffado/src/libutil/PosixThread.cpp

@@ -64 +64 @@
-    int err;
-
+    obj->m_lock.Lock();
+
-    if ((err = pthread_setcanceltype(obj->fCancellation, NULL)) != 0) {
-        debugError("pthread_setcanceltype err = %s\n", strerror(err));
@@ -78 +80 @@
-    // If Init succeed start the thread loop
-    bool res = true;
+
+    obj->m_lock.Unlock();
-    while (obj->fRunning && res) {
-        debugOutputExtreme( DEBUG_LEVEL_VERY_VERBOSE, "(%s) ThreadHandler: run %p\n", obj->m_id.c_str(), obj);
@@ -140 +144 @@
-        }
-
-
+
+
+
+
-            debugError("Cannot create realtime thread (%d: %s)\n", res, strerror(res));
-            debugError(" priority: %d %s\n", fPriority);
@@ -150 +157 @@
-        debugOutput( DEBUG_LEVEL_VERBOSE, "(%s) Create non RT thread %p\n", m_id.c_str(), this);
-
-
+
+
+
+
-            debugError("Cannot create thread %d %s\n", res, strerror(res));
-            return -1;
@@ -165 +175 @@
-        void* status;
-        pthread_cancel(fThread);
+        m_lock.Lock();
-        pthread_join(fThread, &status);
+        m_lock.Unlock();
-        debugOutput( DEBUG_LEVEL_VERBOSE, "(%s) Killed %p (thread: %p)\n", m_id.c_str(), this, fThread);
-        return 0;
@@ -179 +191 @@
-        void* status;
-        fRunning = false; // Request for the thread to stop
+        m_lock.Lock();
-        pthread_join(fThread, &status);
+        fThread = NULL;
+        m_lock.Unlock();
-        debugOutput( DEBUG_LEVEL_VERBOSE, "(%s) Stopped %p (thread: %p)\n", m_id.c_str(), this, fThread);
-        return 0;

trunk/libffado/src/libutil/PosixThread.h

@@ -54 +54 @@
-#include "Thread.h"
-#include <pthread.h>
+#include "PosixMutex.h"
-
-namespace Util
@@ -74 +75 @@
-
-        static void* ThreadHandler(void* arg);
-
+
-    public:
-
-        PosixThread(RunnableInterface* runnable, bool real_time, int priority, int cancellation)
-                : Thread(runnable), fThread((pthread_t)NULL), fPriority(priority), fRealTime(real_time), fRunning(false), fCancellation(cancellation)
+                , m_lock(*(new Util::PosixMutex("THREAD")))
-        {}
-        PosixThread(RunnableInterface* runnable)
-                : Thread(runnable), fThread((pthread_t)NULL), fPriority(0), fRealTime(false), fRunning(false), fCancellation(PTHREAD_CANCEL_DEFERRED)
+                , m_lock(*(new Util::PosixMutex("THREAD")))
-        {}
-        PosixThread(RunnableInterface* runnable, int cancellation)
-                : Thread(runnable), fThread((pthread_t)NULL), fPriority(0), fRealTime(false), fRunning(false), fCancellation(cancellation)
+                , m_lock(*(new Util::PosixMutex("THREAD")))
-        {}
-
-        PosixThread(RunnableInterface* runnable, std::string id, bool real_time, int priority, int cancellation)
-                : Thread(runnable, id), fThread((pthread_t)NULL), fPriority(priority), fRealTime(real_time), fRunning(false), fCancellation(cancellation)
+                , m_lock(*(new Util::PosixMutex(id)))
-        {}
-        PosixThread(RunnableInterface* runnable, std::string id)
-                : Thread(runnable, id), fThread((pthread_t)NULL), fPriority(0), fRealTime(false), fRunning(false), fCancellation(PTHREAD_CANCEL_DEFERRED)
+                , m_lock(*(new Util::PosixMutex(id)))
-        {}
-        PosixThread(RunnableInterface* runnable, std::string id, int cancellation)
-                : Thread(runnable, id), fThread((pthread_t)NULL), fPriority(0), fRealTime(false), fRunning(false), fCancellation(cancellation)
+                , m_lock(*(new Util::PosixMutex(id)))
-        {}
-
-        virtual ~PosixThread()
-
+ delete &m_lock; 
-
-        virtual int Start();

trunk/libffado/src/SConscript

@@ -113 +113 @@
-genericavc_source =  env.Split( '\
-        genericavc/avc_avdevice.cpp \
+        genericavc/stanton/scs.cpp \
-' )
-
@@ -156 +157 @@
-dice_source = env.Split( '\
-        dice/dice_avdevice.cpp \
+        dice/dice_eap.cpp \
-' )
-

trunk/libffado/support/alsa/SConscript

@@ -35 +35 @@
-
-#if not env.GetOption( "clean" ):
-env.MergeFlags( env["ALSA_FLAGS"] )
-env.MergeFlags( "-DPIC" )
-
-sources = ["alsa_plugin.cpp"]
-
-if env['ALSA_FLAGS']:
+    env.MergeFlags( env["ALSA_FLAGS"] )
+    env.MergeFlags( "-DPIC" )
-    alsaplugin = env.SharedLibrary( "asound_module_pcm_ffado", sources )

trunk/libffado/tests/scan-devreg.cpp

@@ -44 +44 @@
-#define MAX_ARGS 1000
-
-#define MOTU_BASE_ADDR 0xfffff
-
+// #define SCAN_BASE_ADDR 0xffff0
+
-// If changing these be sure to update the option help text
-#define DEFAULT_SCAN_START_REG 0x0b00
@@ -84 +84 @@
-    signed int   verbose;
-    bool         test;
-
-
-
-
+          
+          
+long long 
+long long 
-} arguments;
-
@@ -113 +113 @@
-    case 's':
-        errno = 0;
-
+l
-        if (errno) {
-            perror("argument parsing failed:");
@@ -125 +125 @@
-    case 'l':
-        errno = 0;
-
+l
-        if (errno) {
-            perror("argument parsing failed:");
@@ -232 +232 @@
-            // only MOTU devices but this can be expanded on an as-needs
-            // basis.
-
+
+
-                node_id = node;
-                port = i;
@@ -262 +263 @@
-
-    quadlet_t old_vals[arguments.scan_length/4+1], quadlet;
-unsigned int present[arguments.scan_length/(4*32)
+char present[arguments.scan_length/4
-    memset(old_vals, 0x00, sizeof(old_vals));
-    // Assume all registers are present until proven otherwise
-    memset(present, 0xff, sizeof(present));
-    
+    printf("Scanning from %012llX to %012llX (len: %lld)\n",
+           SCAN_BASE_ADDR + arguments.scan_start,
+           SCAN_BASE_ADDR + arguments.scan_start + arguments.scan_length,
+           arguments.scan_length);
-    printf("Scanning initial register values, please wait\n");
-    chr[0] = 0;
-    while(chr[0]!='q') {
-
-
-
-
-
-
-
+
+
+
+
+
-                continue;
-            }
-
-MOTU
+SCAN
-                // Flag the register as not being present so we don't keep trying to read it
-
+
+
-                continue;
-            } else {
-                quadlet = CondSwapFromBus32(quadlet);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (old_vals[reg_index] != quadlet) {
-                if (loop != 0) {
-4x changed from %08X to %08X\n", 
+12llx changed from %08X to %08X\n", SCAN_BASE_ADDR+
-                }
-                old_vals[reg_index] = quadlet;

trunk/libffado/tests/SConscript

@@ -66 +66 @@
-if env['ENABLE_BEBOB']:
-        apps.update( { "test-focusrite" : "test-focusrite.cpp" } )
+if env['ENABLE_GENERICAVC']:
+        env.MergeFlags( env["ALSA_FLAGS"] ) # FIXME: only used here
+        apps.update( { "test-scs" : "test-scs.cpp" } )
-if env['ENABLE_FIREWORKS']:
-        apps.update( { "test-echomixer" : "test-echomixer.cpp" } )
+if env['ENABLE_DICE']:
+        apps.update( { "test-dice-eap" : "test-dice-eap.cpp" } )
-
-for app in apps.keys():

trunk/libffado/tests/test-ieee1394service.cpp

@@ -41 +41 @@
-#include "src/libieee1394/configrom.h"
-#include "src/libieee1394/ieee1394service.h"
-#include "src/libieee1394/ARMHandler.h"
-
-#include "src/libutil/Thread.h"
@@ -343 +342 @@
-    nodeaddr_t addr =  m_service->findFreeARMBlock(0x0000FFFFE0000000ULL, 4, 4 );
-
-ARMHandler *test_arm=new ARMHandler(
-
-
-
-
+Ieee1394Service::ARMHandler *test_arm = new Ieee1394Service::ARMHandler(*m_service, 
+  
+  
+  
+  
-
-    printf(" adding (%p) as arm handler\n", test_arm);
@@ -357 +356 @@
-    addr =  m_service->findFreeARMBlock(0x0000FFFFE0000000ULL, 4, 4 );
-
-ARMHandler *test_arm2=new ARMHandler(
-
-
-
-
+Ieee1394Service::ARMHandler *test_arm2 = new Ieee1394Service::ARMHandler(*m_service, 
+   
+   
+   
+   
-
-    printf(" adding (%p) as arm handler\n", test_arm2);