Changeset 424

Timestamp:

02/27/07 03:31:33 (17 years ago)

Author:

pieterpalmers

Message:

- The library can now be started in 'slave mode', creating a BounceSlaveDevice?.

On a discovering node, this slave device is discovered as a BounceDevice?.
Streaming does not work yet, something wrong with the timestamps.

- Implemented the 'snoop mode', that allows a client to 'snoop' the streams

between another host and a device. It is only implemented for BeBoB devices.
The channel numbers and stream configuration are automatically detected.
Note that it currently relies on a rather hackish support for reading the
{i,o}PCR plugs by using private functions of libiec61883

- changed jack backend to support these two new features

Files:

• branches/streaming-rework/libfreebob/freebob_streaming.h (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (12 diffs)
• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (8 diffs)
• branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (4 diffs)
• branches/streaming-rework/src/bounce/bounce_slave_avdevice.cpp (modified) (2 diffs)
• branches/streaming-rework/src/bounce/bounce_slave_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/devicemanager.cpp (modified) (15 diffs)
• branches/streaming-rework/src/devicemanager.h (modified) (3 diffs)
• branches/streaming-rework/src/freebob_streaming.cpp (modified) (2 diffs)
• branches/streaming-rework/src/iavdevice.h (modified) (1 diff)
• branches/streaming-rework/src/libieee1394/IEC61883.cpp (added)
• branches/streaming-rework/src/libieee1394/IEC61883.h (added)
• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (modified) (1 diff)
• branches/streaming-rework/src/libieee1394/ieee1394service.h (modified) (2 diffs)
• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (1 diff)
• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.h (modified) (2 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.cpp (modified) (2 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.h (modified) (3 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessorManager.h (modified) (4 diffs)
• branches/streaming-rework/src/Makefile.am (modified) (3 diffs)
• branches/streaming-rework/support/jack/freebob_driver.c (modified) (5 diffs)
• branches/streaming-rework/support/jack/freebob_driver.h (modified) (1 diff)

branches/streaming-rework/libfreebob/freebob_streaming.h

@@ -122 +122 @@
-        /* verbosity */
-        int verbose;
+        
+        /* slave mode */
+        int slave_mode;
+        
+        /* snoop mode */
+        int snoop_mode;
-
-} freebob_options_t;

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

@@ -725 +725 @@
-AvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -955 +970 @@
-bool
-AvDevice::lock() {
+    bool snoopMode=false;
+    if(!getOption("snoopMode", snoopMode)) {
+        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
+    }
+
+    if (snoopMode) {
+        // don't lock
+    } else {
+    
+    }
-
-    return true;
-}
-
-
-bool
-AvDevice::unlock() {
-
+
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -972 +1005 @@
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
+
-    ///////////
-    // get plugs
@@ -989 +1022 @@
-    int samplerate=outputPlug->getSampleRate();
-    
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n");
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
@@ -1013 +1047 @@
-
-    // do the transmit processor
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing transmit processor%s...\n",
+            (snoopMode?" in snoop mode":""));
-    if (snoopMode) {
-        // we are snooping, so this is receive too.
@@ -1039 +1075 @@
-            return false;
-        }
-        m_receiveProcessors.push_back(p);
-    } else {
-        if (!addPlugToProcessor(*inputPlug,p,
@@ -1046 +1081 @@
-            return false;
-        }
-
-
+
+
+
+
+
+
+
-
-    return true;
@@ -1157 +1197 @@
-AvDevice::startStreamByIndex(int i) {
-    int iso_channel=-1;
-
+
+
+
+
+
-    if (i<(int)m_receiveProcessors.size()) {
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(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);
@@ -1178 +1240 @@
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        if (iso_channel<0) {
@@ -1187 +1267 @@
-        }
-        
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Started SP %d on channel %d\n",i,iso_channel);
+        
-        p->setChannel(iso_channel);
-        return true;
@@ -1197 +1279 @@
-bool
-AvDevice::stopStreamByIndex(int i) {
-
+
+
+
+
+
+
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        p->setChannel(-1);
@@ -1214 +1305 @@
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-        
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        p->setChannel(-1);

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

@@ -45 +45 @@
-static VendorModelEntry supportedDeviceList[] =
-{
-, 0x0B0001, 0x0B0001
+LU, 0x0B0001LU, 0x0B0001LU
-};
-
@@ -58 +58 @@
-    , m_p1394Service( &ieee1394service )
-    , m_nodeId( nodeId )
-
+
+
-    , m_samplerate (44100)
-    , m_model( NULL )
@@ -85 +86 @@
-BounceDevice::probe( ConfigRom& configRom )
-{
+
+    debugOutput( DEBUG_LEVEL_VERBOSE, "probing BounceDevice\n");
-//     unsigned int vendorId = configRom.getNodeVendorId();
-    unsigned int modelId = configRom.getModelId();
-    unsigned int unitSpecifierId = configRom.getUnitSpecifierId();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "modelId = 0x%08X, specid = 0x%08X\n", modelId, unitSpecifierId);
-
-    for ( unsigned int i = 0;
@@ -109 +113 @@
-BounceDevice::discover()
-{
-
-
-
-
+
+
+
-//     unsigned int vendorId = m_configRom->getNodeVendorId();
-    unsigned int modelId = m_configRom->getModelId();
@@ -135 +138 @@
-        return true;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -212 +187 @@
-    debugOutput(DEBUG_LEVEL_NORMAL, "Node              :  %d\n", m_nodeId);
-    debugOutput(DEBUG_LEVEL_NORMAL, "GUID              :  0x%016llX\n", m_configRom->getGuid());
-    debugOutput(DEBUG_LEVEL_NORMAL, "AVC test response :  %s\n", xmlDescription.c_str());
-    debugOutput(DEBUG_LEVEL_NORMAL, "\n" );
-}
@@ -434 +408 @@
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
-T
+R
-            debugError("Could not write ISO_CHANNEL register\n");
-            p->setChannel(-1);
@@ -451 +425 @@
-bool
-BounceDevice::stopStreamByIndex(int i) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

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

@@ -51 +51 @@
-// struct to define the supported devices
-struct VendorModelEntry {
-nsigned in
-nsigned in
-nsigned in
+int32_
+int32_
+int32_
-    char *vendor_name;
-    char *model_name;
@@ -69 +69 @@
-
-    static bool probe( ConfigRom& configRom );
-virtual 
-virtual 
+
+
-    
-virtual 
+
-    
-virtual 
-       virtual
+
+   
-    
-       virtual
+   
-    bool lock();
-    bool unlock();
-
-       virtual
-
-       virtual
-
+
+   
+
+   
+
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-    
-irtual v
-virtual 
+
+
-
-protected:
@@ -97 +97 @@
-    int              m_verboseLevel;
-
-private:
-        std::string xmlDescription;
-
@@ -117 +116 @@
-    int allocateIsoChannel(unsigned int packet_size);
-    bool deallocateIsoChannel(int channel);
-
-ivate
+
+otected
-    // quadlet read/write routines
-    bool readReg(fb_nodeaddr_t, fb_quadlet_t *);

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

@@ -26 +26 @@
- *
- */
-
-
+
+
+
+
+
+
+
+
-
-namespace Bounce {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -41 +61 @@
-}
-
+bool
+BounceSlaveDevice::probe( ConfigRom& configRom )
+{
+    // we are always capable of constructing a slave device
+    return true;
+}
+
+bool
+BounceSlaveDevice::discover()
+{
+    m_model = &(supportedDeviceList[0]);
+    if (m_model != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "found %s %s\n",
+                m_model->vendor_name, m_model->model_name);
+        return true;
+    }
+    return false;
+}
+
+bool BounceSlaveDevice::initMemSpace() {
+    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
+    if (!writeReg(BOUNCE_REGISTER_TX_ISOCHANNEL, result)) {
+        debugError("Could not initalize ISO channel register for TX\n");
+        return false;
+    }
+    if (!writeReg(BOUNCE_REGISTER_RX_ISOCHANNEL, result)) {
+        debugError("Could not initalize ISO channel register for TX\n");
+        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_configRom->initialize() ) {
+        // \todo If a PHY on the bus is in power safe mode then
+        // the config rom is missing. So this might be just
+        // such this case and we can safely skip it. But it might
+        // be there is a real software problem on our side.
+        // This should be handled more carefuly.
+        debugError( "Could not reread config rom from device (node id %d).\n",
+                     m_nodeId );
+        return false;
+    }
+    return true;
+}
+
+bool BounceSlaveDevice::restoreMemSpace() {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Restoring memory space...\n");
+    restore_config_rom( m_p1394Service->getHandle(), m_original_config_rom);
+    return true;
+}
+
+bool
+BounceSlaveDevice::lock() {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Locking %s %s at node %d\n", 
+        m_model->vendor_name, m_model->model_name, m_nodeId);
+    
+    // get a notifier to handle device notifications
+    nodeaddr_t notify_address;
+    notify_address = m_p1394Service->findFreeARMBlock(
+                        BOUNCE_REGISTER_BASE,
+                        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");
+        delete m_Notifier;
+        m_Notifier=NULL;
+        return false;
+    }
+    
+    // (re)initialize the memory space
+    if (!initMemSpace()) {
+        debugError("Could not initialize memory space\n");
+        return false;
+    }
+    
+    return true;
+}
+
+bool
+BounceSlaveDevice::unlock() {
+    // (re)initialize the memory space
+    if (!restoreMemSpace()) {
+        debugError("Could not restore memory space\n");
+        return false;
+    }
+    m_p1394Service->unregisterARMHandler(m_Notifier);
+    delete m_Notifier;
+    m_Notifier=NULL;
+
+    return true;
+}
+
+bool
+BounceSlaveDevice::prepare() {
+    // snooping does not make sense for a slave device
+    setOption("snoopMode", false);
+    
+    // prepare the base class
+    // FIXME: when doing proper discovery this won't work anymore
+    //        as it relies on a completely symmetric transmit/receive
+    if(!BounceDevice::prepare()) {
+        debugError("Base class preparation failed\n");
+        return false;
+    }
+    
+    // do any customisations here
+    
+    return true;
+}
+
+// this has to wait until the ISO channel numbers are written
+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
+        if (!readReg(iso_channel_offset, &result)) {
+            debugError("Could not read ISO channel register for stream %d\n",i);
+            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
+        if (!readReg(iso_channel_offset, &result)) {
+            debugError("Could not read ISO channel register for stream %d\n",i);
+            return false;
+        }
+        
+        // set ISO channel
+        p->setChannel(result);
+
+        return true;
+
+    }
+    
+    debugError("SP index %d out of range!\n",i);
+    
+    return false;
+}
+
+bool
+BounceSlaveDevice::stopStreamByIndex(int i) {
+    // nothing special to do I guess...
+    return false;
+}
+
+// helpers
+bool
+BounceSlaveDevice::waitForRegisterNotEqualTo(nodeaddr_t offset, fb_quadlet_t v) {
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Waiting for StreamProcessor streams to start running...\n");
+    // we have to wait until all streamprocessors indicate that they are running
+    // i.e. that there is actually some data stream flowing
+    int timeoutSecs=120;
+    if(!getOption("isoTimeoutSecs", timeoutSecs)) {
+        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--;
+        if (!readReg(offset,&reg)) {
+            debugError("Could not read register\n");
+            return false;
+        }
+        usleep(100000);
+    }
+
+    if(!wait_cycles) { // timout has occurred
+        return false;
+    }
+    
+    return true;
+}
+
+// configrom helpers
+// FIXME: should be changed into a better framework
+
+
+struct BounceSlaveDevice::configrom_backup 
+BounceSlaveDevice::save_config_rom(raw1394handle_t handle)
+{
+    int retval;
+    struct configrom_backup tmp;
+    /* get the current rom image */
+    retval=raw1394_get_config_rom(handle, tmp.rom, 0x100, &tmp.rom_size, &tmp.rom_version);
+//      tmp.rom_size=rom1394_get_size(tmp.rom);
+//     printf("save_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,tmp.rom_size,tmp.rom_version);
+
+    return tmp;
+}
+
+int 
+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;
+    unsigned char current_rom_version;
+
+    retval=raw1394_get_config_rom(handle, current_rom, 0x100, &current_rom_size, &current_rom_version);
+//     printf("restore_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,current_rom_size,current_rom_version);
+
+//     printf("restore_config_rom restoring to romsize %d, rom_version %d:\n",old.rom_size,old.rom_version);
+
+    retval = raw1394_update_config_rom(handle, old.rom, old.rom_size, current_rom_version);
+//     printf("restore_config_rom update_config_rom returned %d\n",retval);
+
+    /* get the current rom image */
+    retval=raw1394_get_config_rom(handle, current_rom, 0x100, &current_rom_size, &current_rom_version);
+    current_rom_size = rom1394_get_size(current_rom);
+//     printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,current_rom_size,current_rom_version);
+//     for (i = 0; i < current_rom_size; i++)
+//     {
+//         if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+//         printf(" %08x", ntohl(current_rom[i]));
+//     }
+//     printf("\n");
+
+    return retval;
+}
+
+int 
+BounceSlaveDevice::init_config_rom(raw1394handle_t handle)
+{
+    int retval, i;
+    quadlet_t rom[0x100];
+    size_t rom_size;
+    unsigned char rom_version;
+    rom1394_directory dir;
+    char *leaf;
+    
+    /* get the current rom image */
+    retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
+    rom_size = rom1394_get_size(rom);
+//     printf("get_config_rom returned %d, romsize %d, rom_version %d:",retval,rom_size,rom_version);
+//     for (i = 0; i < rom_size; i++)
+//     {
+//         if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+//         printf(" %08x", ntohl(rom[i]));
+//     }
+//     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]);
+    strncpy(dir.textual_leafs[0], FREEBOB_BOUNCE_SERVER_VENDORNAME "                                          ", i);
+    
+    dir.vendor_id=FREEBOB_BOUNCE_SERVER_VENDORID;
+    dir.model_id=FREEBOB_BOUNCE_SERVER_MODELID;
+    
+    /* update the rom */
+    retval = rom1394_set_directory(rom, &dir);
+//     printf("rom1394_set_directory returned %d, romsize %d:",retval,rom_size);
+//     for (i = 0; i < rom_size; i++)
+//     {
+//         if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+//         printf(" %08x", ntohl(rom[i]));
+//     }
+//     printf("\n");
+    
+    /* free the allocated mem for the textual leaves */
+    rom1394_free_directory( &dir);
+    
+    /* add an AV/C unit directory */
+    dir.unit_spec_id    = FREEBOB_BOUNCE_SERVER_SPECID;
+    dir.unit_sw_version = 0x00010001;
+    leaf = FREEBOB_BOUNCE_SERVER_MODELNAME;
+    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++)
+//     {
+//         if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+//         printf(" %08x", ntohl(rom[i]));
+//     }
+//     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);
+//     for (i = 0; i < rom_size; i++)
+//     {
+//         if (i % 4 == 0) printf("\n0x%04x:", CSR_CONFIG_ROM+i*4);
+//         printf(" %08x", ntohl(rom[i]));
+//     }
+//     printf("\n");
+    
+//      printf("You need to reload your ieee1394 modules to reset the rom.\n");
+    
+    return 0;
+}
+
+
+// the notifier
+
+BounceSlaveDevice::BounceSlaveNotifier::BounceSlaveNotifier(BounceSlaveDevice *d, nodeaddr_t start)
+ : ARMHandler(start, BOUNCE_REGISTER_LENGTH, 
+              RAW1394_ARM_READ | RAW1394_ARM_WRITE, // allowed operations
+              0, //RAW1394_ARM_READ | RAW1394_ARM_WRITE, // operations to be notified of
+              0)                                    // operations that are replied to by us (instead of kernel)
+ , m_bounceslavedevice(d)
+{
+
+}
+
+BounceSlaveDevice::BounceSlaveNotifier::~BounceSlaveNotifier() 
+{
+
+}
+
-} // end of namespace Bounce

branches/streaming-rework/src/bounce/bounce_slave_avdevice.h

@@ -29 +29 @@
-#define __FREEBOB_BOUNCESLAVEDEVICE__
-
-
+
+
-
-namespace Bounce {
-
-
-
+: public BounceDevice 
+
-public:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-protected:
-    DECLARE_DEBUG_MODULE;
+private:
+    bool waitForRegisterNotEqualTo(nodeaddr_t offset, fb_quadlet_t v);
+    bool initMemSpace();
+    bool restoreMemSpace();
+    
+private: // configrom shit
-
+    struct configrom_backup {
+        quadlet_t rom[0x100];
+        size_t rom_size;
+        unsigned char rom_version;
+    };
+    struct configrom_backup m_original_config_rom;
+    
+    struct configrom_backup 
+        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;
+    /**
+     * this class reacts on the ohter side writing to the 
+     * hosts address space
+     */
+    class BounceSlaveNotifier : public ARMHandler
+    {
+    public:
+        BounceSlaveNotifier(BounceSlaveDevice *, nodeaddr_t start);
+        virtual ~BounceSlaveNotifier();
+        
+    private:
+        BounceSlaveDevice *m_bounceslavedevice;
+    };
-};
-

branches/streaming-rework/src/devicemanager.cpp

@@ -43 +43 @@
-#ifdef ENABLE_BOUNCE
-    #include "bounce/bounce_avdevice.h"
+    #include "bounce/bounce_slave_avdevice.h"
-#endif
-
@@ -68 +69 @@
-    : m_1394Service( 0 )
-{
-
+
+
-}
-
@@ -105 +107 @@
-DeviceManager::discover( int verboseLevel )
-{
+    bool slaveMode=false;
+    if(!getOption("slaveMode", slaveMode)) {
+        debugWarning("Could not retrieve slaveMode parameter, defauling to false\n");
+    }
+    bool snoopMode=false;
+    if(!getOption("snoopMode", snoopMode)) {
+        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
+    }
-
-    setDebugLevel( verboseLevel );
@@ -117 +127 @@
-    m_avDevices.clear();
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        std::auto_ptr<ConfigRom> configRom =
@@ -141 +212 @@
-                         "Skip device discovering for this node\n",
-                         nodeId );
-
-
-
-
-
-
+
+
+
+
-        if ( avDevice ) {
-            debugOutput( DEBUG_LEVEL_NORMAL,
@@ -155 +224 @@
-                debugError( "discover: could not discover device\n" );
-                delete avDevice;
-continu
+return fals
-            }
-
@@ -167 +236 @@
-            m_avDevices.push_back( avDevice );
-        }
-}
-
-return true;
+
+
+}
-}
-
@@ -178 +247 @@
-{
-#ifdef ENABLE_BEBOB
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying BeBoB...\n" );
-    if ( BeBoB::AvDevice::probe( *configRom.get() ) ) {
-        return new BeBoB::AvDevice( configRom, *m_1394Service, id, level );
@@ -184 +254 @@
-
-#ifdef ENABLE_BEBOB
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying M-Audio...\n" );
-    if ( MAudio::AvDevice::probe( *configRom.get() ) ) {
-        return new MAudio::AvDevice( configRom, *m_1394Service, id, level );
@@ -190 +261 @@
-
-#ifdef ENABLE_MOTU
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Motu...\n" );
-    if ( Motu::MotuDevice::probe( *configRom.get() ) ) {
-        return new Motu::MotuDevice( configRom, *m_1394Service, id, level );
@@ -196 +268 @@
-
-#ifdef ENABLE_DICE
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Dice...\n" );
-    if ( Dice::DiceAvDevice::probe( *configRom.get() ) ) {
-        return new Dice::DiceAvDevice( configRom, *m_1394Service, id, level );
@@ -202 +275 @@
-
-#ifdef ENABLE_METRIC_HALO
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Metric Halo...\n" );
-    if ( MetricHalo::MHAvDevice::probe( *configRom.get() ) ) {
-        return new MetricHalo::MHAvDevice( configRom, *m_1394Service, id, level );
@@ -208 +282 @@
-
-#ifdef ENABLE_RME
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying RME...\n" );
-    if ( Rme::RmeDevice::probe( *configRom.get() ) ) {
-        return new Rme::RmeDevice( configRom, *m_1394Service, id, level );
@@ -214 +289 @@
-
-#ifdef ENABLE_BOUNCE
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Trying Bounce...\n" );
-    if ( Bounce::BounceDevice::probe( *configRom.get() ) ) {
-        return new Bounce::BounceDevice( configRom, *m_1394Service, id, level );
+    }
+#endif
+
+    return 0;
+}
+
+IAvDevice*
+DeviceManager::getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ), int level )
+{
+
+#ifdef ENABLE_BOUNCE
+    if ( Bounce::BounceSlaveDevice::probe( *configRom.get() ) ) {
+        return new Bounce::BounceSlaveDevice( configRom, *m_1394Service, level );
-    }
-#endif
@@ -300 +389 @@
-DeviceManager::getSyncSource() {
-    IAvDevice* device = getAvDeviceByIndex(0);
-
-
+
+
+
+
+
+
-    #warning TEST CODE FOR BOUNCE DEVICE !!
-
+
+
+
+
-        return device->getStreamProcessorByIndex(0);
-    } else {
-        return device->getStreamProcessorByIndex(1);
-    }
-    

branches/streaming-rework/src/devicemanager.h

@@ -25 +25 @@
-
-#include "libfreebob/xmlparser.h"
+#include "libutil/OptionContainer.h"
-
-#include <glibmm/ustring.h>
@@ -42 +43 @@
-
-
-
+ : public Util::OptionContainer 
- public:
-    DeviceManager();
@@ -71 +72 @@
-                                   int id,
-                                   int level );
+    IAvDevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ),
+                                   int level );
-
-protected:

branches/streaming-rework/src/freebob_streaming.cpp

@@ -109 +109 @@
-                return 0;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // discover the devices on the bus
-        if(!dev->m_deviceManager->discover(DEBUG_LEVEL_NORMAL)) {
-                debugFatal("Could not discover devices\n");
+                delete dev->processorManager;
+                delete dev->m_deviceManager;
+                delete dev;
+                return 0;
+        }
+        
+        // are there devices on the bus?
+        if(dev->m_deviceManager->getAvDeviceCount()==0) {
+                debugFatal("There are no devices on the bus\n");
-                delete dev->processorManager;
-                delete dev->m_deviceManager;
@@ -177 +199 @@
-
-int freebob_streaming_prepare(freebob_device_t *dev) {
-    
-
-    
+
+
+
-        debugFatal("Could not prepare streaming...\n");
-        return false;
-    
-
-    
+
+
+
-}
-

branches/streaming-rework/src/iavdevice.h

@@ -216 +216 @@
-        virtual bool stopStreamByIndex(int i) = 0;
-
+    /**
+     * set verbosity level
+     */
+    virtual void setVerboseLevel(int l) {setDebugLevel(l);};
-};
-

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

@@ -117 +117 @@
-    m_default_arm_handler = raw1394_set_arm_tag_handler( m_resetHandle,
-                                   this->armHandlerLowLevel );
+    
-    startRHThread();
-

branches/streaming-rework/src/libieee1394/ieee1394service.h

@@ -28 +28 @@
-#include "debugmodule/debugmodule.h"
-
+#include "IEC61883.h"
+
-#include <libraw1394/raw1394.h>
-#include <pthread.h>
@@ -35 +37 @@
-class ARMHandler;
-
-
+ : public IEC61883 
-public:
-    Ieee1394Service();

branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -1211 +1211 @@
-        }
-
-
-
-
-
-
-
-
-
-       
+
+
+
+
+
+
+
+
+    
-
-}

branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.h

@@ -145 +145 @@
-    int encodeSilencePortToMBLAEvents(AmdtpAudioPort *, quadlet_t *data,
-                                unsigned int offset, unsigned int nevents);
-
+
+
-    unsigned long m_last_timestamp;
-
@@ -216 +217 @@
-    
-    int decodeMBLAEventsToPort(AmdtpAudioPort *, quadlet_t *data, unsigned int offset, unsigned int nevents);
+    void updatePreparedState();
-
-    int m_dimension;

branches/streaming-rework/src/libstreaming/StreamProcessor.cpp

@@ -185 +185 @@
-
-bool StreamProcessor::isRunning() {
-       
+    
-}
-
@@ -215 +215 @@
-
-    m_disabled=false;
-    
-    return true;
-}
-
-bool StreamProcessor::disable()  {
-    
-    m_disabled=true;
-
-
-
+
-}
-

branches/streaming-rework/src/libstreaming/StreamProcessor.h

@@ -37 +37 @@
-
-#include "libutil/StreamStatistics.h"
-
-#include "libutil/TimestampedBuffer.h"
+#include "libutil/OptionContainer.h"
-
-namespace Streaming {
@@ -54 +54 @@
-class StreamProcessor : public IsoStream, 
-                        public PortManager, 
-
+
+
-
-    friend class StreamProcessorManager;
@@ -112 +113 @@
-    Util::TimestampedBuffer *m_data_buffer;
-
-
-
+
-    void setManager(StreamProcessorManager *manager) {m_manager=manager;};
-    void clearManager() {m_manager=0;};
-
+
+
-    unsigned int m_nb_buffers; ///< cached from manager->getNbBuffers(), the number of periods to buffer
-    unsigned int m_period; ///< cached from manager->getPeriod(), the period size

branches/streaming-rework/src/libstreaming/StreamProcessorManager.cpp

@@ -48 +48 @@
-
-StreamProcessorManager::StreamProcessorManager(unsigned int period, unsigned int nb_buffers)
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -195 +201 @@
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Preparing...\n");
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // if there are no stream processors registered, 
@@ -818 +837 @@
-        xmt_bf = (*it)->getBufferFill();
-    }
-
+Y_VER
-        m_time_of_transfer,rcv_bf,xmt_bf,rcv_bf+xmt_bf);
-    

branches/streaming-rework/src/libstreaming/StreamProcessorManager.h

@@ -29 +29 @@
-#define __FREEBOB_STREAMPROCESSORMANAGER__
-
-
-
+
+
+
-#include <semaphore.h>
-#include "Port.h"
@@ -50 +51 @@
- 
-*/
-
-
+
+
+
-public:
-
@@ -108 +110 @@
-    virtual void setVerboseLevel(int l);
-    void dumpInfo();
-
+
+
+
-    
-    // the sync source stuff
@@ -118 +122 @@
-    StreamProcessor * getSyncSource();
-
-    
-protected:
+
-    // thread sync primitives
-    bool m_xrun_happened; 

branches/streaming-rework/src/Makefile.am

@@ -35 +35 @@
-    libieee1394/configrom.h libieee1394/csr1212.h \
-    libieee1394/ieee1394service.h libieee1394/ARMHandler.h \
+    libieee1394/IEC61883.h \
-    debugmodule/debugmodule.h \
-        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 \
-
+bounce/bounce_slave_avdevice.h 
-        maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \
-        metrichalo/mh_avdevice.h dice/dice_avdevice.h \
@@ -83 +84 @@
-        libieee1394/csr1212.c \
-        libieee1394/ieee1394service.cpp \
+        libieee1394/IEC61883.cpp \
-        libstreaming/cip.c \
-        libstreaming/IsoHandler.cpp \
@@ -126 +128 @@
-
-bounce_src = \
-
+
+
-
-metric_halo_src = \

branches/streaming-rework/support/jack/freebob_driver.c

@@ -642 +642 @@
-        driver->device_options.node_id=params->node_id;
-        driver->device_options.port=params->port;
+        driver->device_options.slave_mode=params->slave_mode;
+        driver->device_options.snoop_mode=params->snoop_mode;
-
-        if(!params->capture_ports) {
@@ -1028 +1030 @@
-
-        strcpy (desc->name, "freebob");
-6
+8
-  
-        params = calloc (desc->nparams, sizeof (jack_driver_param_desc_t));
@@ -1079 +1081 @@
-        params[i].value.ui   = 1U;
-        strcpy (params[i].short_desc, "Provide playback ports.");
+        strcpy (params[i].long_desc, params[i].short_desc);
+
+        i++;
+        strcpy (params[i].name, "slave");
+        params[i].character  = 'x';
+        params[i].type       = JackDriverParamUInt;
+        params[i].value.ui   = 0U;
+        strcpy (params[i].short_desc, "Act as a BounceDevice slave");
+        strcpy (params[i].long_desc, params[i].short_desc);
+
+        i++;
+        strcpy (params[i].name, "slave");
+        params[i].character  = 'X';
+        params[i].type       = JackDriverParamUInt;
+        params[i].value.ui   = 0U;
+        strcpy (params[i].short_desc, "Operate in snoop mode");
-        strcpy (params[i].long_desc, params[i].short_desc);
-
@@ -1115 +1133 @@
-        cmlparams.playback_ports=1;
-        cmlparams.capture_ports=1;
+        cmlparams.slave_mode=0;
+        cmlparams.snoop_mode=0;
-        
-        for (node = params; node; node = jack_slist_next (node))
@@ -1143 +1163 @@
-                        cmlparams.playback_ports = param->value.ui;
-                        break;
+                case 'x':
+                        cmlparams.slave_mode = param->value.ui;
+                        break;
+                case 'X':
+                        cmlparams.snoop_mode = param->value.ui;
+                        break;
-                }
-        }

branches/streaming-rework/support/jack/freebob_driver.h

@@ -137 +137 @@
-typedef struct _freebob_jack_settings freebob_jack_settings_t;
-struct _freebob_jack_settings {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-