Changeset 908

Show
Ignore:
Timestamp:
03/06/08 18:54:19 (13 years ago)
Author:
jwoithe
Message:

Make the skeleton RME device driver compile again.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/rme/rme_avdevice.cpp

    r864 r908  
    5050}; 
    5151 
    52 RmeDevice::RmeDevice( Ieee1394Service& ieee1394Service
     52RmeDevice::RmeDevice( DeviceManager& d
    5353                      std::auto_ptr<ConfigRom>( configRom )) 
    54     : FFADODevice( ieee1394Service, configRom ) 
     54    : FFADODevice( d, configRom ) 
    5555    , m_model( NULL ) 
    5656{ 
     
    8686 
    8787FFADODevice * 
    88 RmeDevice::createDevice( Ieee1394Service& ieee1394Service, 
    89                          std::auto_ptr<ConfigRom>( configRom )) 
    90 
    91     return new RmeDevice(ieee1394Service, configRom ); 
     88RmeDevice::createDevice(DeviceManager& d, std::auto_ptr<ConfigRom>( configRom )) 
     89
     90    return new RmeDevice(d, configRom ); 
    9291} 
    9392 
     
    9594RmeDevice::discover() 
    9695{ 
    97     unsigned int vendorId = m_pConfigRom->getNodeVendorId(); 
    98     unsigned int modelId = m_pConfigRom->getModelId(); 
     96    unsigned int vendorId = getConfigRom().getNodeVendorId(); 
     97    unsigned int modelId = getConfigRom().getModelId(); 
    9998 
    10099    for ( unsigned int i = 0; 
  • trunk/libffado/src/rme/rme_avdevice.h

    r864 r908  
    4949public: 
    5050 
    51     RmeDevice( Ieee1394Service& ieee1394Service
     51    RmeDevice( DeviceManager& d
    5252               std::auto_ptr<ConfigRom>( configRom )); 
    5353    virtual ~RmeDevice(); 
    5454 
    5555    static bool probe( ConfigRom& configRom ); 
    56     static FFADODevice * createDevice( Ieee1394Service& ieee1394Service
     56    static FFADODevice * createDevice( DeviceManager& d
    5757                                        std::auto_ptr<ConfigRom>( configRom )); 
    5858    static int getConfigurationId( );