Changeset 1945

Show
Ignore:
Timestamp:
01/14/11 06:17:19 (13 years ago)
Author:
adi
Message:

Infrastructure for Mackie Onyx i.

Original patch provided by Holger Dehnhardt.

Note that this commit alone isn't sufficient to make the Onyx work. The
next commit to avc_plug.cpp will be required, but I wanted to separate
commits just in case the next one breaks something.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/configuration

    r1942 r1945  
    1616    mixer       = "MackieOnyx"; 
    1717    xmit_max_cycles_early_transmit = 4; 
     18}, 
     19{ # entries provided by Holger Dehnhardt 
     20    vendorid    = 0x000ff2; 
     21    modelid     = 0x081216; 
     22    vendorname  = "Loud Technologies Inc."; 
     23    modelname   = "Onyx-i"; 
     24    driver      = 4; # Oxford 
    1825}, 
    1926{ 
  • trunk/libffado/src/libstreaming/amdtp-oxford/AmdtpOxfordReceiveStreamProcessor.cpp

    r1764 r1945  
    8686    // that we receive a bit too much payload such that the total is more 
    8787    // than one packet 
     88    // 
     89    // adi@2011-1-14: Holger Dehnhardt says that using 4*4*2 instead of 4*4 
     90    // makes his Mackie Onyx work 
    8891    FFADO_ASSERT( m_temp_buffer == NULL ); 
    8992    if( !(m_temp_buffer = ffado_ringbuffer_create( 
    90             packet_payload_size_events * 4 * 4))) { 
     93            packet_payload_size_events * 4 * 4 * 2))) { 
    9194        debugFatal("Could not allocate memory event ringbuffer\n"); 
    9295        return false; 
     
    208211        { 
    209212            debugFatal("Temporary ringbuffer full (wrote %u bytes of %u)\n", written, write_size); 
    210 //             return eCRV_Error; 
     213             return eCRV_Error; 
    211214        } 
    212215 
  • trunk/libffado/src/libstreaming/generic/StreamProcessor.h

    r1763 r1945  
    224224        eCRV_Again, 
    225225        eCRV_Defer, 
     226        eCR_Error, 
    226227    }; 
    227228    // to be implemented by the children