Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Software
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmytro Levit
Software
Commits
b1ec1810
Commit
b1ec1810
authored
5 years ago
by
Patrick Robbe
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation errors
parent
081128df
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!5
6links
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Pcie40Libraries/pcie40_b2slc.cpp
+3
-3
3 additions, 3 deletions
Pcie40Libraries/pcie40_b2slc.cpp
Pcie40Libraries/pcie40_b2slc.h
+2
-2
2 additions, 2 deletions
Pcie40Libraries/pcie40_b2slc.h
Scripts/b2slc.py
+0
-1
0 additions, 1 deletion
Scripts/b2slc.py
with
5 additions
and
6 deletions
Pcie40Libraries/pcie40_b2slc.cpp
+
3
−
3
View file @
b1ec1810
...
...
@@ -72,7 +72,7 @@ int pcie40_waitRead( int dev , int ch , int length ) {
printf
(
"Timeout
\n
"
)
;
return
-
1
;
}
return
ret
;
return
0
;
}
int
pcie40_readData
(
int
dev
,
int
ch
,
std
::
vector
<
int
>
&
result
,
int
length
)
{
...
...
@@ -181,12 +181,12 @@ unsigned long pcie40_readfee32( int dev , int ch , int adr ) {
if
(
ret
!=
0
)
return
-
1
;
// Wait for the result to come back
ret
=
pcie40_waitRead
(
dev
,
ch
,
4
)
;
ret
=
pcie40_waitRead
(
dev
,
ch
,
56
)
;
if
(
ret
!=
0
)
return
-
1
;
// Read the value
std
::
vector
<
int
>
result
;
ret
=
pcie40_readData
(
dev
,
ch
,
result
,
5
6
)
;
ret
=
pcie40_readData
(
dev
,
ch
,
result
,
6
)
;
int
t_ret1
=
result
.
at
(
0
);
int
t_ret2
=
result
.
at
(
1
);
...
...
This diff is collapsed.
Click to expand it.
Pcie40Libraries/pcie40_b2slc.h
+
2
−
2
View file @
b1ec1810
...
...
@@ -15,7 +15,7 @@
#define SLC_RFIFO_ADD 0x00060000
// Functions to read/write registers and stream files to Front End
extern
"C"
{
int
pcie40_readfee8
(
int
dev
,
int
ch
,
int
adr
);
int
pcie40_writefee8
(
int
dev
,
int
ch
,
int
adr
,
int
val
);
...
...
@@ -27,6 +27,6 @@ int pcie40_writefee32(int dev, int ch, int adr, int val);
int
pcie40_writestream
(
int
dev
,
int
ch
,
char
*
filename
);
int
pcie40_writebytestream
(
int
dev
,
int
ch
,
int
len
,
const
char
*
bytes
);
}
#endif // PCIE40_B2SLC_H
This diff is collapsed.
Click to expand it.
Scripts/b2slc.py
+
0
−
1
View file @
b1ec1810
...
...
@@ -23,7 +23,6 @@ if ( args.read ):
if
result
==
-
1
:
print
"
Error Value =
"
,
result
else
:
print
'
Read value {0} (address = {1})
'
.
format
(
result
,
args
.
address
)
else
:
print
args
.
address
,
args
.
write
if
args
.
type
==
'
32b
'
:
result
=
lli
.
pcie40_writefee32
(
0
,
args
.
channel
,
args
.
address
,
args
.
write
)
else
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment