Skip to content
Snippets Groups Projects
Commit 4a6f6718 authored by Patrick Robbe's avatar Patrick Robbe
Browse files

Merge pull request #4 in BIDU/software from 6links_KLMtests to 6links

* commit 'ddde7dbf':
  Add USE_PCIE40 flag
  Try to slow down streaming speed for KLM tests
parents 93ee2db3 ddde7dbf
No related branches found
No related tags found
2 merge requests!46links KLMtests,!56links
...@@ -369,7 +369,7 @@ int pcie40_writestream( int dev , int ch , char * filename ) { ...@@ -369,7 +369,7 @@ int pcie40_writestream( int dev , int ch , char * filename ) {
count++ ; count++ ;
data.push_back( (int) ( ( ( 0x70 << 8 ) | ( c & 0xFF ) ) & 0xFFFFFFFF ) ) ; data.push_back( (int) ( ( ( 0x70 << 8 ) | ( c & 0xFF ) ) & 0xFFFFFFFF ) ) ;
if ( 14 == count ) { if ( 6 == count ) {
data.push_back( 0xEEEE ) ; data.push_back( 0xEEEE ) ;
ret = pcie40_writeToFifo( dev , ch , data ) ; ret = pcie40_writeToFifo( dev , ch , data ) ;
if ( ret != 0 ) { if ( ret != 0 ) {
......
...@@ -17,7 +17,9 @@ ...@@ -17,7 +17,9 @@
#define SLC_RFIFO_ADD 0x00060000 #define SLC_RFIFO_ADD 0x00060000
// Functions to read/write registers and stream files to Front End // Functions to read/write registers and stream files to Front End
extern "C" { #ifndef USE_PCIE40
extern "C" {
#endif
int pcie40_readfee8(int dev, int ch, int adr); int pcie40_readfee8(int dev, int ch, int adr);
int pcie40_writefee8(int dev, int ch, int adr, int val); int pcie40_writefee8(int dev, int ch, int adr, int val);
...@@ -29,6 +31,10 @@ int pcie40_writefee32(int dev, int ch, int adr, int val); ...@@ -29,6 +31,10 @@ int pcie40_writefee32(int dev, int ch, int adr, int val);
int pcie40_writestream(int dev, int ch, char *filename); int pcie40_writestream(int dev, int ch, char *filename);
int pcie40_writebytestream(int dev, int ch, int len, const char *bytes); int pcie40_writebytestream(int dev, int ch, int len, const char *bytes);
#ifndef USE_PCIE40
} }
#endif
#endif // PCIE40_B2SLC_H #endif // PCIE40_B2SLC_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment