Show
Ignore:
Timestamp:
03/04/11 04:57:40 (13 years ago)
Author:
jwoithe
Message:

digidesign: fix bug identified by compile-testing the new skeleton driver

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/digidesign/digidesign_avdevice.cpp

    r1959 r1964  
    8484bool 
    8585Device::buildMixer() { 
    86     signed int i; 
    87     bool result = true; 
    8886 
    8987    destroyMixer(); 
     
    10199bool 
    102100Device::destroyMixer() { 
    103     bool ret = true; 
    104101    debugOutput(DEBUG_LEVEL_VERBOSE, "destroy mixer...\n"); 
    105102 
     
    136133Device::discover() 
    137134{ 
    138     signed int i; 
    139135    unsigned int vendorId = getConfigRom().getNodeVendorId(); 
    140     unsigned int modelId = configRom.getModelId(); 
     136    unsigned int modelId = getConfigRom().getModelId(); 
    141137     
    142138    Util::Configuration &c = getDeviceManager().getConfiguration(); 
     
    274270Device::prepare() { 
    275271 
    276     signed int mult, bandwidth; 
    277     signed int freq, init_samplerate; 
     272    signed int bandwidth; 
    278273    signed int err = 0; 
    279     unsigned int stat[4]; 
    280274 
    281275    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing Device...\n" ); 
     
    354348    // Set up receive stream processor, initialise it and set DLL bw 
    355349    m_receiveProcessor = new Streaming::DigidesignReceiveStreamProcessor(*this,  
    356       m_digidesign_model, event_size); 
     350      event_size); 
    357351    m_receiveProcessor->setVerboseLevel(getDebugLevel()); 
    358352    if (!m_receiveProcessor->init()) { 
     
    378372    /* Now set up the transmit stream processor */ 
    379373    m_transmitProcessor = new Streaming::DigidesignTransmitStreamProcessor(*this, 
    380       m_digidesign_model, event_size); 
     374      event_size); 
    381375    m_transmitProcessor->setVerboseLevel(getDebugLevel()); 
    382376    if (!m_transmitProcessor->init()) { 
     
    447441    // For some devices this is fixed, while for others it depends on the 
    448442    // current sampling rate. 
    449     signed int freq = getSamplingFrequency(); 
     443    // 
     444    // Getting the current sample rate is as simple as: 
     445    //   signed int freq = getSamplingFrequency(); 
    450446 
    451447    // This needs to be set as required. 
  • trunk/libffado/src/digidesign/digidesign_avdevice.h

    r1959 r1964  
    9797 
    9898    /* General information functions */ 
    99     signed int getDigidesignModel(void) { return m_digdesign_model; } 
     99    signed int getDigidesignModel(void) { return m_digidesign_model; } 
    100100 
    101101protected: