[FFADO-svn] r908 - trunk/libffado/src/rme

[<tr...@ff...>]

Author: jwoithe
Date: 2008-03-06 18:54:19 -0800 (Thu, 06 Mar 2008)
New Revision: 908

Modified:
   trunk/libffado/src/rme/rme_avdevice.cpp
   trunk/libffado/src/rme/rme_avdevice.h
Log:
Make the skeleton RME device driver compile again.


Modified: trunk/libffado/src/rme/rme_avdevice.cpp
===================================================================
--- trunk/libffado/src/rme/rme_avdevice.cpp	2008-03-06 19:18:43 UTC (rev 907)
+++ trunk/libffado/src/rme/rme_avdevice.cpp	2008-03-07 02:54:19 UTC (rev 908)
@@ -49,9 +49,9 @@
     {FW_VENDORID_RME, 0x0001, "RME", "Fireface-800"},  // RME Fireface-800
 };
 
-RmeDevice::RmeDevice( Ieee1394Service& ieee1394Service,
+RmeDevice::RmeDevice( DeviceManager& d,
                       std::auto_ptr<ConfigRom>( configRom ))
-    : FFADODevice( ieee1394Service, configRom )
+    : FFADODevice( d, configRom )
     , m_model( NULL )
 {
     debugOutput( DEBUG_LEVEL_VERBOSE, "Created Rme::RmeDevice (NodeID %d)\n",
@@ -85,17 +85,16 @@
 }
 
 FFADODevice *
-RmeDevice::createDevice( Ieee1394Service& ieee1394Service,
-                         std::auto_ptr<ConfigRom>( configRom ))
+RmeDevice::createDevice(DeviceManager& d, std::auto_ptr<ConfigRom>( configRom ))
 {
-    return new RmeDevice(ieee1394Service, configRom );
+    return new RmeDevice(d, configRom );
 }
 
 bool
 RmeDevice::discover()
 {
-    unsigned int vendorId = m_pConfigRom->getNodeVendorId();
-    unsigned int modelId = m_pConfigRom->getModelId();
+    unsigned int vendorId = getConfigRom().getNodeVendorId();
+    unsigned int modelId = getConfigRom().getModelId();
 
     for ( unsigned int i = 0;
           i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) );

Modified: trunk/libffado/src/rme/rme_avdevice.h
===================================================================
--- trunk/libffado/src/rme/rme_avdevice.h	2008-03-06 19:18:43 UTC (rev 907)
+++ trunk/libffado/src/rme/rme_avdevice.h	2008-03-07 02:54:19 UTC (rev 908)
@@ -48,12 +48,12 @@
 class RmeDevice : public FFADODevice {
 public:
 
-    RmeDevice( Ieee1394Service& ieee1394Service,
+    RmeDevice( DeviceManager& d,
                std::auto_ptr<ConfigRom>( configRom ));
     virtual ~RmeDevice();
 
     static bool probe( ConfigRom& configRom );
-    static FFADODevice * createDevice( Ieee1394Service& ieee1394Service,
+    static FFADODevice * createDevice( DeviceManager& d,
                                         std::auto_ptr<ConfigRom>( configRom ));
     static int getConfigurationId( );
     virtual bool discover();