Changeset 445 for trunk/libffado/src/bounce

Timestamp:

04/02/07 12:35:17 (16 years ago)

Author:

pieterpalmers

Message:

* name change from FreeBoB to FFADO
* replaced tabs by 4 spaces
* got rid of end-of-line spaces
* made all license and copyrights conform

library becomes LGPL, apps become GPL
explicitly state LGPL v2.1 and GPL v2 (don't like v3 draft)

copyrights are 2005-2007 Daniel & Pieter
except for the MotU stuff (C) Jonathan, Pieter

Files:

• trunk/libffado/src/bounce/bounce_avdevice.cpp (modified) (31 diffs)
• trunk/libffado/src/bounce/bounce_avdevice.h (modified) (6 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.cpp (modified) (27 diffs)
• trunk/libffado/src/bounce/bounce_slave_avdevice.h (modified) (7 diffs)

trunk/libffado/src/bounce/bounce_avdevice.cpp

@@ -1 @@
- bounce_avdevice.cpp
-6
-6
+
+5-2007
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#include "bounce/bounce_avdevice.h"
-
@@ -45 +49 @@
-static VendorModelEntry supportedDeviceList[] =
-{
-reeBoB
+FADO
-};
-
@@ -80 +84 @@
-          ++i )
-    {
- 
+
-//             ( supportedDeviceList[i].vendor_id == vendorId )
-             ( supportedDeviceList[i].model_id == modelId )
- 
+
-           )
-        {
@@ -98 +102 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "discovering BounceDevice (NodeID %d)\n",
-                 m_nodeId );
-
+
-//     unsigned int vendorId = m_pConfigRom->getNodeVendorId();
-    unsigned int modelId = m_pConfigRom->getModelId();
@@ -108 +112 @@
-    {
-        if ( //( supportedDeviceList[i].vendor_id == vendorId )
- 
- 
+
+
-           )
-        {
@@ -168 +172 @@
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Adding ports to processor\n");
-
+
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
-    }
-
+
-    int i=0;
-    for (i=0;i<BOUNCE_NB_AUDIO_CHANNELS;i++) {
@@ -205 +209 @@
-        free(buff);
-    }
-
+
-    for (i=0;i<BOUNCE_NB_MIDI_CHANNELS;i++) {
-        char *buff;
@@ -237 +241 @@
-     }
-
-       
+    
-}
-
@@ -243 +247 @@
-BounceDevice::prepare() {
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing BounceDevice...\n" );
-
+
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
@@ -251 +255 @@
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+
-    p=new Streaming::AmdtpReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
@@ -285 +289 @@
-                                BOUNCE_NB_AUDIO_CHANNELS+(BOUNCE_NB_MIDI_CHANNELS?1:0));
-    }
-
+
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor %s!\n",
@@ -335 +339 @@
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -343 +347 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -358 +362 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -367 +371 @@
-            return false;
-        }
-
+
-        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);
-
+
-        // allocate ISO channel
-        int isochannel=allocateIsoChannel(p->getMaxPacketSize());
@@ -381 +385 @@
-        }
-        p->setChannel(isochannel);
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -396 +400 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=isochannel;
@@ -405 +409 @@
-            return false;
-        }
-
+
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -420 +424 @@
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -431 +435 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -438 +442 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -444 +448 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        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);
-
+
-        unsigned int isochannel=p->getChannel();
-
+
-        fb_quadlet_t reg_isoch;
-        // check value of ISO_CHANNEL register
@@ -464 +468 @@
-            return false;
-        }
-
+
-        // write value of ISO_CHANNEL register
-        reg_isoch=0xFFFFFFFFUL;
@@ -471 +475 @@
-            return false;
-        }
-
+
-        // deallocate ISO channel
-        if(!deallocateIsoChannel(isochannel)) {
@@ -477 +481 @@
-            return false;
-        }
-
+
-        p->setChannel(-1);
-        return true;
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-    return false;
@@ -491 +495 @@
-int BounceDevice::allocateIsoChannel(unsigned int packet_size) {
-    unsigned int bandwidth=8+packet_size;
-
+
-    int ch=m_p1394Service->allocateIsoChannelGeneric(bandwidth);
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "allocated channel %d, bandwidth %d\n",
-        ch, bandwidth);
-
+
-    return ch;
-}
@@ -510 +514 @@
-BounceDevice::readReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX\n", offset);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read_quadlet( nodeId, addr, result ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, addr);
@@ -524 +528 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
-
+
-    return true;
-}
@@ -530 +534 @@
-bool
-BounceDevice::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
-  
+
-        offset, data);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->write_quadlet( nodeId, addr, data ) ) {
-        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr);
@@ -548 +552 @@
-}
-
- 
+
-BounceDevice::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
- 
+
-        offset, length);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
-
+
-    if(!m_p1394Service->read( nodeId, addr, length, data ) ) {
-        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
@@ -568 +572 @@
-}
-
- 
+
-BounceDevice::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
-  
+
-        offset, length);
-
+
-    if(offset >= BOUNCE_INVALID_OFFSET) {
-        debugError("invalid offset: 0x%016llX\n", offset);
-        return false;
-    }
-
+
-    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
-    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;

trunk/libffado/src/bounce/bounce_avdevice.h

@@ -1 @@
- bounce_avdevice.h
-6
-6
+
+5-2007
+5-2007
- *
-
+
+
- *
-
-
-
-
-
+
+
+
+
+
+
+
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-GNU
+ GNU
+Lesser
- *
-General Public License
-along with FreeBoB
-9 Temple Place, Suite 330
-1-1307 USA.
+Lesser General Public
+License along with this library
+1 Franklin Street, Fifth Floor
+0-1301 USA
- */
+
-#ifndef BOUNCEDEVICE_H
-#define BOUNCEDEVICE_H
@@ -66 +70 @@
-public:
-    BounceDevice( std::auto_ptr<ConfigRom>( configRom ),
-               
-               
+        
+        
-    virtual ~BounceDevice();
-
-    static bool probe( ConfigRom& configRom );
-    bool discover();
-
+
-    bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    int getSamplingFrequency( );
-
+
-    bool prepare();
-    bool lock();
@@ -86 +90 @@
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
+
-    void showDevice();
-
@@ -99 +103 @@
-
-    bool addPortsToProcessor(
- 
+
-       Streaming::Port::E_Direction direction);
-
+
-private: // generic helpers
-    int allocateIsoChannel(unsigned int packet_size);
@@ -112 +116 @@
-    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
-
+
-private:
-    BounceNotifier *m_Notifier;
-    /**
- 
+
-     * hosts address space
-     */
@@ -126 +130 @@
-        BounceNotifier(BounceDevice *, nodeaddr_t start);
-        virtual ~BounceNotifier();
-
+
-    private:
-        BounceDevice *m_bouncedevice;

trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

@@ -1 @@
-/* $Id$ */
-
-/*
-  FreeBob Streaming API
-  FreeBob = Firewire (pro-)audio for linux
+Copyright (C) 2005-2007 by Pieter Palmers
+Copyright (C) 2005-2007 by Daniel Wagner
- *
-
+
+
- *
-  Copyright (C) 2007 Pieter Palmers <pieterpalmers@users.sourceforge.net>
+FFADO is based upon FreeBoB
- *
-
-
-
-
+
+
+
- *
-  This program
-  but WITHOUT ANY WARRANTY {}
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU
+This library
+but WITHOUT ANY WARRANTY;
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser
- *
-
-
-
-
-
-
+
+
+
+
- */
-
@@ -42 +38 @@
-{
-  //{vendor_id, model_id, unit_specifier_id, vendor_name, model_name},
-reeBoB
+FADO
-};
-
@@ -80 +76 @@
-    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
@@ -91 +87 @@
-        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_pConfigRom->initialize() ) {
@@ -122 +118 @@
-bool
-BounceSlaveDevice::lock() {
- 
+
-        m_model->vendor_name, m_model->model_name, m_nodeId);
-
+
-    // get a notifier to handle device notifications
-    nodeaddr_t notify_address;
@@ -131 +127 @@
-                        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");
@@ -150 +146 @@
-        return false;
-    }
-
+
-    // (re)initialize the memory space
-    if (!initMemSpace()) {
@@ -156 +152 @@
-        return false;
-    }
-
+
-    return true;
-}
@@ -177 +173 @@
-BounceSlaveDevice::prepare() {
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing BounceSlaveDevice...\n" );
-
+
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
+
-    p=new Streaming::AmdtpSlaveReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
@@ -206 +202 @@
-                                m_samplerate,
-                                BOUNCE_NB_AUDIO_CHANNELS);
-
+
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor!\n");
@@ -227 +223 @@
-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
@@ -247 +243 @@
-            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
@@ -272 +268 @@
-            return false;
-        }
-
+
-        // set ISO channel
-        p->setChannel(result);
@@ -279 +275 @@
-
-    }
-
+
-    debugError("SP index %d out of range!\n",i);
-
+
-    return false;
-}
@@ -301 +297 @@
-        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--;
@@ -318 +314 @@
-        return false;
-    }
-
+
-    return true;
-}
@@ -326 +322 @@
-
-
- 
+
-BounceSlaveDevice::save_config_rom(raw1394handle_t handle)
-{
@@ -333 +329 @@
-    /* get the current rom image */
-    retval=raw1394_get_config_rom(handle, tmp.rom, 0x100, &tmp.rom_size, &tmp.rom_version);
-    
+    
-//     printf("save_config_rom get_config_rom returned %d, romsize %d, rom_version %d:\n",retval,tmp.rom_size,tmp.rom_version);
-
@@ -339 +335 @@
-}
-
- 
+
-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;
@@ -371 +367 @@
-}
-
- 
+
-BounceSlaveDevice::init_config_rom(raw1394handle_t handle)
-{
@@ -380 +376 @@
-    rom1394_directory dir;
-    char *leaf;
-
+
-    /* get the current rom image */
-    retval=raw1394_get_config_rom(handle, rom, 0x100, &rom_size, &rom_version);
@@ -391 +387 @@
-//     }
-//     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]);
-REEBOB
-
-REEBOB
-REEBOB
-
+FADO
+
+FADO
+FADO
+
-    /* update the rom */
-    retval = rom1394_set_directory(rom, &dir);
@@ -411 +407 @@
-//     }
-//     printf("\n");
-
+
-    /* free the allocated mem for the textual leaves */
-    rom1394_free_directory( &dir);
-
+
-    /* add an AV/C unit directory */
-REEBOB
+FADO
-    dir.unit_sw_version = 0x00010001;
-REEBOB
+FADO
-    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++)
@@ -435 +431 @@
-//     }
-//     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);
@@ -449 +445 @@
-//     }
-//     printf("\n");
-
-    
-
+
+    
+
-    return 0;
-}
@@ -459 +455 @@
-
-BounceSlaveDevice::BounceSlaveNotifier::BounceSlaveNotifier(BounceSlaveDevice *d, nodeaddr_t start)
- 
+
-              RAW1394_ARM_READ | RAW1394_ARM_WRITE, // allowed operations
-              0, //RAW1394_ARM_READ | RAW1394_ARM_WRITE, // operations to be notified of
@@ -468 +464 @@
-}
-
- 
+
-{
-

trunk/libffado/src/bounce/bounce_slave_avdevice.h

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#include "debugmodule/debugmodule.h"
-#include "bounce_avdevice.h"
-
-REEBOB
+FADO
-
-REEBOB_BOUNCE_SERVER_VENDORNAME  "FreeBoB
-REEBOB_BOUNCE_SERVER_MODELNAME   "freebob
+FADO_BOUNCE_SERVER_VENDORNAME  "FFADO
+FADO_BOUNCE_SERVER_MODELNAME   "ffado
-
-// NOTE: this is currently free, but it is not really allowed to use
-REEBOB
-REEBOB
-REEBOB
+FADO
+FADO
+FADO
-
-namespace Bounce {
@@ -51 +48 @@
-          Ieee1394Service& ieee1394Service );
-    virtual ~BounceSlaveDevice();
-
+
-    static bool probe( ConfigRom& configRom );
-    bool discover();
@@ -57 +54 @@
-    bool lock();
-    bool unlock();
-
+
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
@@ -65 +62 @@
-    bool initMemSpace();
-    bool restoreMemSpace();
-
+
-private: // configrom shit
-
@@ -74 +71 @@
-    };
-    struct configrom_backup m_original_config_rom;
-
- 
+
+
-        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;
-    /**
- 
+
-     * hosts address space
-     */
@@ -91 +88 @@
-        BounceSlaveNotifier(BounceSlaveDevice *, nodeaddr_t start);
-        virtual ~BounceSlaveNotifier();
-
+
-    private:
-        BounceSlaveDevice *m_bounceslavedevice;
@@ -99 +96 @@
-} // end of namespace Bounce
-
-REEBOB
+FADO
-
-