Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Platform-independent core collection
Manage
Activity
Members
Labels
Plan
Issues
15
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
Projects
Platform-independent core collection
Commits
a8af2cd4
Commit
a8af2cd4
authored
5 years ago
by
A. Hahn
Browse files
Options
Downloads
Patches
Plain Diff
wishbone_pkg.vhd: removed merge artifacts
parent
d659b59c
Branches
wrpc-v4.2_gsi_a10
Branches containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/wishbone/wishbone_pkg.vhd
+0
-10
0 additions, 10 deletions
modules/wishbone/wishbone_pkg.vhd
with
0 additions
and
10 deletions
modules/wishbone/wishbone_pkg.vhd
+
0
−
10
View file @
a8af2cd4
...
...
@@ -227,15 +227,6 @@ package wishbone_pkg is
function
f_sdb_extract_synthesis
(
sdb_record
:
t_sdb_record
)
return
t_sdb_synthesis
;
-- Automatic crossbar mapping functions
<<<<<<<
HEAD
function
f_sdb_auto_device
(
device
:
t_sdb_device
;
enable
:
boolean
:
=
true
)
return
t_sdb_record
;
function
f_sdb_auto_bridge
(
bridge
:
t_sdb_bridge
;
enable
:
boolean
:
=
true
)
return
t_sdb_record
;
function
f_sdb_auto_msi
(
msi
:
t_sdb_msi
;
enable
:
boolean
:
=
true
)
return
t_sdb_record
;
function
f_sdb_auto_layout
(
records
:
t_sdb_record_array
)
return
t_sdb_record_array
;
function
f_sdb_auto_layout
(
slaves
:
t_sdb_record_array
;
masters
:
t_sdb_record_array
)
return
t_sdb_record_array
;
function
f_sdb_auto_sdb
(
records
:
t_sdb_record_array
)
return
t_wishbone_address
;
function
f_sdb_auto_sdb
(
slaves
:
t_sdb_record_array
;
masters
:
t_sdb_record_array
)
return
t_wishbone_address
;
=======
function
f_sdb_auto_device
(
device
:
t_sdb_device
;
enable
:
boolean
:
=
true
)
return
t_sdb_record
;
function
f_sdb_auto_bridge
(
bridge
:
t_sdb_bridge
;
enable
:
boolean
:
=
true
)
return
t_sdb_record
;
function
f_sdb_auto_device_with_name
(
device
:
t_sdb_device
;
enable
:
boolean
:
=
true
;
name
:
string
:
=
""
)
return
t_sdb_record
;
...
...
@@ -245,7 +236,6 @@ package wishbone_pkg is
function
f_sdb_auto_layout
(
slaves
:
t_sdb_record_array
;
masters
:
t_sdb_record_array
)
return
t_sdb_record_array
;
function
f_sdb_auto_sdb
(
records
:
t_sdb_record_array
)
return
t_wishbone_address
;
function
f_sdb_auto_sdb
(
slaves
:
t_sdb_record_array
;
masters
:
t_sdb_record_array
)
return
t_wishbone_address
;
>>>>>>>
aaa742e15a802c37cd90b013241b3454bf9836cd
-- For internal use by the crossbar
function
f_sdb_bus_end
(
g_wraparound
:
boolean
;
g_layout
:
t_sdb_record_array
;
g_sdb_addr
:
t_wishbone_address
;
msi
:
boolean
)
return
unsigned
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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