Changeset 1857

Show
Ignore:
Timestamp:
06/18/10 06:50:55 (2 years ago)
Author:
jwoithe
Message:

RME: more streaming-related tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.cpp

    r1851 r1857  
    6363  unsigned int model, unsigned int event_size) 
    6464    : StreamProcessor(parent, ePT_Receive) 
     65    , n_hw_tx_buffer_samples ( -1 ) 
    6566    , m_rme_model( model ) 
    6667    , m_event_size( event_size ) 
    …… 
    145146  ((adata[5] & 0xff) << 8) | (adata[0] & 0xff), 
    146147  ((adata[4] & 0xff) << 8) | (adata[1] & 0xff)); 
     148n_hw_tx_buffer_samples = adata[7] & 0xff; 
     149debugOutput(DEBUG_LEVEL_VERBOSE, "  hw tx: 0x%02x\n", n_hw_tx_buffer_samples); 
    147150        return eCRV_OK; 
    148151    } else { 

  • trunk/libffado/src/libstreaming/rme/RmeReceiveStreamProcessor.h

    r1674 r1857  
    7575    virtual unsigned int getNominalFramesPerPacket(); 
    7676 
     77    /* For testing only at this stage */ 
     78    signed int n_hw_tx_buffer_samples; 
     79 
    7780protected: 
    7881    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset); 

  • trunk/libffado/src/libstreaming/rme/RmeTransmitStreamProcessor.cpp

    r1856 r1857  
    116116    // they will contain data. 
    117117    *sy = 0x00; 
     118    *length = 0; 
    118119 
    119120    signed int fc; 
    …… 
    289290//            *quadlet = CondSwapToBus32(fullTicksToSph(ts_frame)); 
    290291//        } 
    291  
     292        // FIXME: temporary 
     293        if (*length > 0) { 
     294            memset(data, *length, 0); 
     295        } 
    292296        return eCRV_OK; 
    293297    } 
    …… 
    324328    if (isDryRunning()) { 
    325329//        unsigned int cycle = CYCLE_TIMER_GET_CYCLES(pkt_ctr); 
     330RmeReceiveStreamProcessor *rxsp = static_cast<Rme::Device *> 
     331  (&m_Parent)->getRxSP(); 
     332debugOutput(DEBUG_LEVEL_VERBOSE, "hw tx: 0x%08x\n", rxsp->n_hw_tx_buffer_samples); 
     333if (rxsp->n_hw_tx_buffer_samples < 0x38) 
    326334        *length = getMaxPacketSize(); 
     335debugOutput(DEBUG_LEVEL_VERBOSE, "  txsize=%d\n", *length); 
    327336    } 
    328337 

  • trunk/libffado/src/rme/rme_avdevice.h

    r1749 r1857  
    117117    signed int getRmeModel(void) { return m_rme_model; } 
    118118    signed int getTcoPresent(void) { return dev_config->tco_present; } 
     119    Streaming::RmeReceiveStreamProcessor *getRxSP(void) { return m_receiveProcessor; } 
    119120 
    120121protected: