OpenCores
URL https://opencores.org/ocsvn/pcie_ds_dma/pcie_ds_dma/trunk

Subversion Repositories pcie_ds_dma

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /pcie_ds_dma/trunk/soft/linux/common/utils
    from Rev 41 to Rev 54
    ↔ Reverse comparison
  •

Rev 41 → Rev 54

/cl_ambpex.cpp
132,12 → 132,12
 
BRDC_fprintf( stderr, _BRDC("Allocation memory: \r\n")
_BRDC(" Type of buffer: system memory\r\n")
_BRDC(" Buffer size: %lld MB\r\n"), size );
_BRDC(" Buffer size: %ld MB\r\n"), size );
} else {
 
BRDC_fprintf( stderr, _BRDC("Allocation memory: \r\n")
_BRDC(" Type of buffer: userspace memory\r\n")
_BRDC(" Buffer size: %lld MB (%dx%d MB)\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
_BRDC(" Buffer size: %ld MB (%dx%d MB)\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
}
 
BRDctrl_StreamCBufAlloc sSCA = {
149,7 → 149,7
NULL,
};
 
u32 err = m_pBoard->dma_alloc( strm, &sSCA );
u32 err = m_pBoard->dma_allocate_memory( strm, &sSCA );
if(err != 0) {
throw( "Error allocate stream memory\n" );
return -1;
/cl_wbpex.cpp
101,12 → 101,12
 
BRDC_fprintf( stderr, _BRDC("Allocation memory: \r\n")
_BRDC(" Type of buffer: system memory\r\n")
_BRDC(" Buffer size: %lld MB (%dx%d MB)\r\n\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
_BRDC(" Buffer size: %ld MB (%dx%d MB)\r\n\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
} else {
 
BRDC_fprintf( stderr, _BRDC("Allocation memory: \r\n")
_BRDC(" Type of buffer: userspace memory\r\n")
_BRDC(" Buffer size: %lld MB (%dx%d MB)\r\n\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
_BRDC(" Buffer size: %ld MB (%dx%d MB)\r\n\r\n"), size, cnt_buf, size_one_buf_of_bytes/(1024*1024) );
}
 
BRDctrl_StreamCBufAlloc sSCA = {
118,7 → 118,7
NULL,
};
 
u32 err = m_pBoard->dma_alloc( strm, &sSCA );
u32 err = m_pBoard->dma_allocate_memory( strm, &sSCA );
if(err != 0) {
throw( "Error allocate stream memory\n" );
return -1;
245,7 → 245,7
 
DEBUG_PRINT("CL_AMBPEX::%s()\n", __FUNCTION__);
 
StreamParam *pStrm= m_streamParam+strm;
//StreamParam *pStrm= m_streamParam+strm;
 
//RegPokeInd( pStrm->trd, 0, 2 );
 
/tf_testbufm2.cpp
780,7 → 780,7
bit_error1[ii]=0;
}
 
for( int ii=0; ii<128*4; ii++ ) {
for( int ii=0; ii<128; ii++ ) {
word_error[ii]=0;
}
 
859,7 → 859,7
*/
 
// len=sprintf( ptr, "%4d Block: %-4d Index: %.8X Waiting: %.16LX Receive: %.16LX \r\n",
len=sprintf( ptr, "%4d Block: %-4d Index: %.8X Waiting: %.16llX Received: %.16llX \r\n",
len=sprintf( ptr, "%4d Block: %-4d Index: %.8X Waiting: %.16lX Received: %.16lX \r\n",
//" Bits: %s\r\n\r\n"
ii, nb, na, dout, din
//bit
/tf_testbufm2.h
82,7 → 82,7
U32 buf_cnt_error; //!< Число неправильных массивов.
U32 word_cnt_error; //!< Число неправильных слов.
U32 buf_current; //!< Номер текущего массива.
__int64 word_error[4*32]; //!< Список ошибок
__int64 word_error[128];//!< Список ошибок
 
char str[10240]; //!< Буфер сообщений
U32 block_mode; //!< Тип блока
/tf_workparam.cpp
166,11 → 166,11
//! Сохранение параметров в памяти
U32 TF_WorkParam::PutParamToMemory( char* ptr, U32 max_size )
{
char str[256];
int len;
//char str[256];
//int len;
int total=0;
U32 ii;
STR_CFG *cfg;
//U32 ii;
//STR_CFG *cfg;
/*
*((U32*)ptr)=max_item;
total=4;
216,12 → 216,12
//! Получение параметров из памяти
void TF_WorkParam::GetParamFromMemory( char* ptr )
{
char *src=ptr;
U32 len;
U32 n;
n=*((U32*)ptr);
U32 ii;
int total=4;
//char *src=ptr;
//U32 len;
//U32 n;
//n=*((U32*)ptr);
//U32 ii;
//int total=4;
/*
for( ii=0; ii<n; ii++ )
{

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.