Changeset 2228

Show
Ignore:
Timestamp:
09/21/12 23:46:01 (12 years ago)
Author:
jwoithe
Message:

DICE EAP Saffire Pro14 6/7: correct some sources/destinations using information from the output of test-dice-eap provided by Tim Smith. Disable temporarily specific nickname management. From Philippe Carriere.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/dice/focusrite/saffire_pro14.cpp

    r2225 r2228  
    6060// 
    6161void SaffirePro14::SaffirePro14EAP::setupSources_low() { 
    62     addSource("SPDIF",  0,  2, eRS_AES, 1); 
    63     addSource("Mic/Lin", 0,  4, eRS_InS1, 1); 
     62    addSource("SPDIF",  6,  2, eRS_AES, 1); 
     63    addSource("Mic/Lin", 0,  4, eRS_InS0, 1); 
    6464    addSource("Mixer",  0, 16, eRS_Mixer, 1); 
    6565    addSource("1394",   0, 12, eRS_ARX0, 1); 
     
    6868 
    6969void SaffirePro14::SaffirePro14EAP::setupDestinations_low() { 
    70     addDestination("SPDIF",  0,  2, eRD_AES, 1); 
     70    addDestination("SPDIF",  6,  2, eRD_AES, 1); 
    7171    addDestination("Line", 0,  4, eRD_InS0, 1); 
    7272    addDestination("Mixer",  0, 16, eRD_Mixer0, 1); 
     
    195195} 
    196196 
    197 bool SaffirePro14::setNickname(std::string name) { 
    198     printMessage("Set Nickname not yet implemented for Pro 14\n"); 
    199     return false; 
     197// ** TODO (if available for Pro14) 
     198// bool SaffirePro14::setNickname(std::string name) { 
     199//    printMessage("Set Nickname not yet implemented for Pro 14\n"); 
     200//    return false; 
    200201//  The following is for Pro40 
    201202//    return getEAP()->writeRegBlock(Dice::EAP::eRT_Application, 0x44, (quadlet_t*)name.c_str(), name.size()); 
    202 
    203 std::string SaffirePro14::getNickname() { 
    204     char name[16]; 
    205     snprintf(name, 16, ""); // not yet implemented 
     203//
     204// std::string SaffirePro14::getNickname() { 
     205//    char name[16]; 
     206//    snprintf(name, 16, ""); // not yet implemented 
    206207//  The following is for Pro40 
    207208//    getEAP()->readRegBlock(Dice::EAP::eRT_Application, 0x44, (quadlet_t*)name, 16); 
    208     return std::string(name); 
    209 
     209//    return std::string(name); 
     210//
    210211 
    211212} 
  • trunk/libffado/src/dice/focusrite/saffire_pro14.h

    r2223 r2228  
    4545    virtual void showDevice(); 
    4646 
    47     bool canChangeNickname() { return true; } 
    48     bool setNickname(std::string); 
    49     std::string getNickname(); 
     47// ** TODO (if available for Pro 14) 
     48    bool canChangeNickname() { return false; } 
     49//    bool canChangeNickname() { return true; } 
     50//    bool setNickname(std::string); 
     51//    std::string getNickname(); 
    5052 
    5153private: