Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tapasco
tapasco
Commits
b426ec6c
Commit
b426ec6c
authored
Jan 25, 2018
by
Jens Korinth
Browse files
Fix for zero masters on PEs
parent
dcc6c418
Pipeline
#202
passed with stage
in 3 minutes and 6 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
platform/common/platform.tcl
View file @
b426ec6c
...
...
@@ -251,7 +251,7 @@ namespace eval platform {
set me
[
dict get $map $intf
]
}
puts
" address map info:
$me
]"
set range
[
dict get $me
"
range"
]
set range
[
expr
"max(
[
dict get $me range
]
, 4096)
"
]
set offset
[
dict get $me
"offset"
]
puts
" range:
$range
"
puts
" offset:
$offset
"
...
...
platform/zynq/zynq.tcl
View file @
b426ec6c
...
...
@@ -155,6 +155,8 @@ namespace eval ::platform {
}
proc create_subsystem_memory
{}
{
set mem_slaves
[
list
]
set mem_masters
[
list
]
set arch_masters
[
::arch::get_masters
]
set ps_slaves
[
list
"HP0"
"HP1"
"ACP"
]
puts
"Creating memory slave ports for
[
llength $arch_masters
]
masters ..."
...
...
@@ -172,7 +174,9 @@ namespace eval ::platform {
incr m_i
}
foreach s $mem_slaves m $mem_masters
{
connect_bd_intf_net $s $m
}
if
{[
llength $mem_slaves
]
> 0 &&
[
llength $mem_masters
]
> 0
}
{
foreach s $mem_slaves m $mem_masters
{
connect_bd_intf_net $s $m
}
}
}
# Create interrupt controller subsystem:
...
...
src/main/scala/tapasco/filemgmt/MultiFileWatcher.scala
View file @
b426ec6c
...
...
@@ -110,15 +110,15 @@ class MultiFileWatcher(pollInterval: Int = MultiFileWatcher.POLL_INTERVAL) exten
if
(
open
(
p
))
_waitingFor
.
synchronized
{
_waitingFor
-=
p
}
}
val
all_files
=
files
++
_files
.
synchronized
{
_files
.
toMap
}
logger
.
trace
(
"reading from files: {}"
,
files
)
files
foreach
{
case
(
p
,
br
)
=>
logger
.
trace
(
"reading from files: {}"
,
all_
files
)
all_
files
foreach
{
case
(
p
,
br
)
=>
val
lines
=
readFrom
(
br
)
if
(
lines
.
length
>
0
)
{
logger
.
trace
(
"read {} lines from {}"
,
lines
.
length
,
p
)
publish
(
LinesAdded
(
p
,
lines
))
}
}
lastWasEmpty
=
files
.
isEmpty
lastWasEmpty
=
all_
files
.
isEmpty
}
_watchThread
.
set
(
None
)
}
catch
{
case
e
:
InterruptedException
=>
_watchThread
.
set
(
None
)
}
...
...
@@ -141,6 +141,6 @@ object MultiFileWatcher {
/** Lines ls have been added to file at src. **/
final
case
class
LinesAdded
(
src
:
Path
,
ls
:
Traversable
[
String
])
extends
Event
}
/** Default polling interval for files: once every
5
seconds. **/
final
val
POLL_INTERVAL
=
5
000
//
5
sec
/** Default polling interval for files: once every
2
seconds. **/
final
val
POLL_INTERVAL
=
2
000
//
2
sec
}
Jens Korinth
@jk
mentioned in commit
17f0d672
·
Mar 05, 2018
mentioned in commit
17f0d672
mentioned in commit 17f0d67240ebf5d7e1d0be9162d272b04256c47d
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment