Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
7d2aed3a
Commit
7d2aed3a
authored
Jun 18, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:Elphel/x393
parents
8314065a
ab94c373
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
jp_channel.v
compressor_jp/jp_channel.v
+4
-3
x393.v
x393.v
+0
-2
No files found.
compressor_jp/jp_channel.v
View file @
7d2aed3a
...
@@ -616,7 +616,7 @@ module jp_channel#(
...
@@ -616,7 +616,7 @@ module jp_channel#(
.
set_interrupts
(
set_interrupts_w
)
,
// input
.
set_interrupts
(
set_interrupts_w
)
,
// input
.
data_in
(
cmd_data
[
1
:
0
])
,
// input[1:0]
.
data_in
(
cmd_data
[
1
:
0
])
,
// input[1:0]
.
status
(
status_data
)
,
// output[9:0]
.
status
(
status_data
)
,
// output[9:0]
.
irq
(
irq
)
// output
.
irq
(
irq
)
// output
)
;
)
;
status_generate
#(
status_generate
#(
...
@@ -626,16 +626,17 @@ module jp_channel#(
...
@@ -626,16 +626,17 @@ module jp_channel#(
.
EXTRA_REG_ADDR
(
CMPRS_HIFREQ_REG_ADDR
)
.
EXTRA_REG_ADDR
(
CMPRS_HIFREQ_REG_ADDR
)
)
status_generate_i
(
)
status_generate_i
(
.
rst
(
1'b0
)
,
//
rst), //
input
.
rst
(
1'b0
)
,
// input
.
clk
(
mclk
)
,
// input
.
clk
(
mclk
)
,
// input
.
srst
(
mrst
)
,
// input
.
srst
(
mrst
)
,
// input
.
we
(
set_status_w
)
,
// input
.
we
(
set_status_w
)
,
// input
.
wd
(
cmd_data
[
7
:
0
])
,
// input[7:0]
.
wd
(
cmd_data
[
7
:
0
])
,
// input[7:0]
.
status
(
{
hifreq
,
status_data
,
2'b0
}
)
,
// input[
2
:0]
.
status
(
{
hifreq
,
status_data
,
2'b0
}
)
,
// input[
45
:0]
.
ad
(
status_ad
)
,
// output[7:0]
.
ad
(
status_ad
)
,
// output[7:0]
.
rq
(
status_rq
)
,
// output
.
rq
(
status_rq
)
,
// output
.
start
(
status_start
)
// input
.
start
(
status_start
)
// input
)
;
)
;
//hifreq
//hifreq
// Not needed?
// Not needed?
// reg emul64;
// reg emul64;
...
...
x393.v
View file @
7d2aed3a
...
@@ -37,8 +37,6 @@
...
@@ -37,8 +37,6 @@
* with at least one of the Free Software programs.
* with at least one of the Free Software programs.
*/
*/
`timescale
1
ns
/
1
ps
`timescale
1
ns
/
1
ps
//`define use200Mhz 1
//`define DEBUG_FIFO 1
`include
"system_defines.vh"
`include
"system_defines.vh"
module
x393
#(
module
x393
#(
`include
"includes/x393_parameters.vh"
// SuppressThisWarning VEditor - some not used
`include
"includes/x393_parameters.vh"
// SuppressThisWarning VEditor - some not used
...
...
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