Show
Ignore:
Timestamp:
11/28/07 12:02:08 (13 years ago)
Author:
ppalmers
Message:

- Adapt the ffado external API (upgrade to v3)

NEEDS NEW JACK BACKEND

- simplify FFADODevice constructor even more
- implement first framework support for supporting multiple adapters.

currently all firewire adapters are scanned for supported devices unless specified otherwise
however attaching devices to separate adapters is not supported. using multiple adapters at
that are connected together might work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libieee1394/configrom.cpp

    r736 r739  
    6262ConfigRom::ConfigRom( Ieee1394Service& ieee1394service, fb_nodeid_t nodeId ) 
    6363    : Control::Element("ConfigRom") 
    64     , m_1394Service( &ieee1394service ) 
     64    , m_1394Service( ieee1394service ) 
    6565    , m_nodeId( nodeId ) 
    6666    , m_avcDevice( false ) // FIXME: this does not seem veryu 
     
    8989ConfigRom::ConfigRom() 
    9090    : Control::Element("ConfigRom") 
    91     , m_1394Service( 0
     91    , m_1394Service( *(new Ieee1394Service())
    9292    , m_nodeId( -1 ) 
    9393    , m_avcDevice( false ) // FIXME: this does not seem veryu 
     
    114114} 
    115115 
    116 ConfigRom::~ConfigRom() 
    117 
     116Ieee1394Service& 
     117ConfigRom::get1394Service() 
     118
     119    return m_1394Service; 
    118120} 
    119121 
     
    133135{ 
    134136     struct config_csr_info csr_info; 
    135      csr_info.service = m_1394Service; 
     137     csr_info.service = &m_1394Service; 
    136138     csr_info.nodeId = 0xffc0 | m_nodeId; 
    137139 
     
    140142                                 &csr_info ); 
    141143    if (!m_csr || csr1212_parse_csr( m_csr ) != CSR1212_SUCCESS) { 
    142         debugError( "Could not parse config rom of node %d on port %d\n", m_nodeId, m_1394Service->getPort() ); 
     144        debugError( "Could not parse config rom of node %d on port %d\n", m_nodeId, m_1394Service.getPort() ); 
    143145        if (m_csr) { 
    144146            csr1212_destroy_csr(m_csr); 
     
    451453    struct csr1212_csr* csr = NULL; 
    452454    for ( fb_nodeid_t nodeId = 0; 
    453           nodeId < m_1394Service->getNodeCount(); 
     455          nodeId < m_1394Service.getNodeCount(); 
    454456          ++nodeId ) 
    455457    { 
    456458        struct config_csr_info csr_info; 
    457         csr_info.service = m_1394Service; 
     459        csr_info.service = &m_1394Service; 
    458460        csr_info.nodeId = 0xffc0 | nodeId; 
    459461        debugOutput( DEBUG_LEVEL_VERBOSE, "Looking at node %d...\n", nodeId); 
     
    577579    } 
    578580 
    579     pConfigRom->m_1394Service = &ieee1394Service; 
     581    pConfigRom->m_1394Service = ieee1394Service; 
    580582 
    581583    bool result;