Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
NanoSoC Tech
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
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
Show more breadcrumbs
SoCLabs
NanoSoC Tech
Commits
49063d05
Commit
49063d05
authored
2 years ago
by
dwf1m12
Browse files
Options
Downloads
Patches
Plain Diff
fix Task() calls with no argument warning
parent
3e86c769
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
system/test_io/verilog/nanosoc_adp_manager.v
+11
-11
11 additions, 11 deletions
system/test_io/verilog/nanosoc_adp_manager.v
with
11 additions
and
11 deletions
system/test_io/verilog/nanosoc_adp_manager.v
+
11
−
11
View file @
49063d05
...
@@ -590,7 +590,7 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -590,7 +590,7 @@ always @(posedge HCLK or negedge HRESETn)
begin
adp_state
<=
ADP_SYSCTL
;
end
begin
adp_state
<=
ADP_SYSCTL
;
end
end
end
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_R
)
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_R
)
begin
ADP_BUSREADINC_next
()
;
adp_state
<=
ADP_READ
;
begin
ADP_BUSREADINC_next
;
adp_state
<=
ADP_READ
;
`ifndef
ADPBASIC
`ifndef
ADPBASIC
adp_count_dec
<=
1'b1
;
// optional loop param
adp_count_dec
<=
1'b1
;
// optional loop param
`endif
`endif
...
@@ -598,7 +598,7 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -598,7 +598,7 @@ always @(posedge HCLK or negedge HRESETn)
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_S
)
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_S
)
begin
adp_state
<=
ADP_SYSCHK
;
end
begin
adp_state
<=
ADP_SYSCHK
;
end
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_W
)
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_W
)
begin
adp_bus_data
<=
adp_param
[
31
:
0
];
ADP_BUSWRITEINC_next
()
;
adp_state
<=
ADP_WRITE
;
end
begin
adp_bus_data
<=
adp_param
[
31
:
0
];
ADP_BUSWRITEINC_next
;
adp_state
<=
ADP_WRITE
;
end
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_X
)
else
if
(
FNvalid_cmd
(
adp_cmd
)
==
CMD_X
)
begin
com_tx_byte
<=
8'h0a
;
com_tx_req
<=
1
;
adp_state
<=
ADP_EXIT
;
end
begin
com_tx_byte
<=
8'h0a
;
com_tx_req
<=
1
;
adp_state
<=
ADP_EXIT
;
end
`ifndef
ADPBASIC
`ifndef
ADPBASIC
...
@@ -622,12 +622,12 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -622,12 +622,12 @@ always @(posedge HCLK or negedge HRESETn)
ADP_WRITE:
// perform bus write at current address pointer (and auto increment)
ADP_WRITE:
// perform bus write at current address pointer (and auto increment)
if
(
adp_bus_done
)
begin
adp_state
<=
ADP_ECHOCMD
;
adp_bus_err
<=
HRESP_i
;
end
if
(
adp_bus_done
)
begin
adp_state
<=
ADP_ECHOCMD
;
adp_bus_err
<=
HRESP_i
;
end
else
begin
ADP_BUSWRITEINC_next
()
;
end
// extend request
else
begin
ADP_BUSWRITEINC_next
;
end
// extend request
ADP_READ:
// perform bus read at current adp address (and auto increment) - and report in hex
ADP_READ:
// perform bus read at current adp address (and auto increment) - and report in hex
if
(
adp_bus_done
)
begin
adp_bus_data
<=
HRDATA32_i
;
adp_bus_err
<=
HRESP_i
;
ADP_txchar_next
(
"R"
);
adp_state
<=
ADP_ECHOBUS
;
end
if
(
adp_bus_done
)
begin
adp_bus_data
<=
HRDATA32_i
;
adp_bus_err
<=
HRESP_i
;
ADP_txchar_next
(
"R"
);
adp_state
<=
ADP_ECHOBUS
;
end
else
begin
else
begin
ADP_BUSREADINC_next
()
;
ADP_BUSREADINC_next
;
`ifndef
ADPBASIC
`ifndef
ADPBASIC
adp_count_dec
<=
1'b1
;
adp_count_dec
<=
1'b1
;
`endif
`endif
...
@@ -649,12 +649,12 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -649,12 +649,12 @@ always @(posedge HCLK or negedge HRESETn)
else
com_rx_ack
<=
1
;
// extend stream request if not ready
else
com_rx_ack
<=
1
;
// extend stream request if not ready
ADP_UREADB3:
// read raw binary byte 3
ADP_UREADB3:
// read raw binary byte 3
if
(
com_rx_done
)
if
(
com_rx_done
)
begin
adp_bus_data
[
31
:
24
]
<=
com_rx_byte
;
ADP_BUSWRITEINC_next
()
;
adp_count_dec
<=
1
;
adp_state
<=
ADP_UWRITE
;
end
begin
adp_bus_data
[
31
:
24
]
<=
com_rx_byte
;
ADP_BUSWRITEINC_next
;
adp_count_dec
<=
1
;
adp_state
<=
ADP_UWRITE
;
end
else
com_rx_ack
<=
1
;
// extend stream request if not ready
else
com_rx_ack
<=
1
;
// extend stream request if not ready
ADP_UWRITE:
// Write word to Addr++
ADP_UWRITE:
// Write word to Addr++
if
(
adp_bus_done
)
begin
// auto address++, count--
if
(
adp_bus_done
)
begin
// auto address++, count--
if
(
FNcount_down_zero_next
(
adp_count
))
adp_state
<=
ADP_ECHOCMD
;
else
begin
adp_state
<=
ADP_UREADB0
;
adp_bus_err
<=
adp_bus_err
|
HRESP_i
;
end
if
(
FNcount_down_zero_next
(
adp_count
))
adp_state
<=
ADP_ECHOCMD
;
else
begin
adp_state
<=
ADP_UREADB0
;
adp_bus_err
<=
adp_bus_err
|
HRESP_i
;
end
end
else
begin
ADP_BUSWRITEINC_next
()
;
adp_count_dec
<=
1
;
end
// extend request
end
else
begin
ADP_BUSWRITEINC_next
;
adp_count_dec
<=
1
;
end
// extend request
// >>>>>>>>>>>>>>>> ADP BUS READ LOOP >>>>>>>>>>>>>>>>>>>>>>
// >>>>>>>>>>>>>>>> ADP BUS READ LOOP >>>>>>>>>>>>>>>>>>>>>>
ADP_POLL:
// set poll value
ADP_POLL:
// set poll value
...
@@ -669,17 +669,17 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -669,17 +669,17 @@ always @(posedge HCLK or negedge HRESETn)
// >>>>>>>>>>>>>>>> ADP (ZERO) FILL MEMORY >>>>>>>>>>>>>>>>>>>>>>
// >>>>>>>>>>>>>>>> ADP (ZERO) FILL MEMORY >>>>>>>>>>>>>>>>>>>>>>
ADP_FCTRL:
// set control value
ADP_FCTRL:
// set control value
begin
adp_bus_data
<=
adp_val
;
ADP_BUSWRITEINC_next
()
;
adp_count_dec
<=
1
;
adp_state
<=
ADP_FWRITE
;
end
begin
adp_bus_data
<=
adp_val
;
ADP_BUSWRITEINC_next
;
adp_count_dec
<=
1
;
adp_state
<=
ADP_FWRITE
;
end
ADP_FWRITE:
// Write word to Addr++
ADP_FWRITE:
// Write word to Addr++
if
(
adp_bus_done
)
begin
// auto address++, count--
if
(
adp_bus_done
)
begin
// auto address++, count--
if
(
FNcount_down_zero_next
(
adp_count
))
adp_state
<=
ADP_ECHOCMD
;
else
begin
adp_state
<=
ADP_FCTRL
;
adp_bus_err
<=
adp_bus_err
|
HRESP_i
;
end
if
(
FNcount_down_zero_next
(
adp_count
))
adp_state
<=
ADP_ECHOCMD
;
else
begin
adp_state
<=
ADP_FCTRL
;
adp_bus_err
<=
adp_bus_err
|
HRESP_i
;
end
end
else
begin
ADP_BUSWRITEINC_next
()
;
adp_count_dec
<=
1
;
end
// extend request
end
else
begin
ADP_BUSWRITEINC_next
;
adp_count_dec
<=
1
;
end
// extend request
`endif
`endif
// >>>>>>>>>>>>>>>> ADP MISC >>>>>>>>>>>>>>>>>>>>>>
// >>>>>>>>>>>>>>>> ADP MISC >>>>>>>>>>>>>>>>>>>>>>
ADP_UNKNOWN:
// output "?"
ADP_UNKNOWN:
// output "?"
if
(
com_tx_done
)
begin
ADP_LINEACK_next
()
;
end
if
(
com_tx_done
)
begin
ADP_LINEACK_next
;
end
else
com_tx_req
<=
1
;
// extend stream request if not ready
else
com_tx_req
<=
1
;
// extend stream request if not ready
ADP_EXIT:
// exit ADP mode
ADP_EXIT:
// exit ADP mode
...
@@ -740,7 +740,7 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -740,7 +740,7 @@ always @(posedge HCLK or negedge HRESETn)
ADP_WRITEHEX0:
// output hex nibble 0 (if not startup banner then scan to end of line before lineack
ADP_WRITEHEX0:
// output hex nibble 0 (if not startup banner then scan to end of line before lineack
if
(
com_tx_done
)
begin
if
(
com_tx_done
)
begin
adp_bus_err
<=
1'b0
;
// clear sticky bus error flag
adp_bus_err
<=
1'b0
;
// clear sticky bus error flag
if
(
banner
)
begin
ADP_LINEACK_next
()
;
end
if
(
banner
)
begin
ADP_LINEACK_next
;
end
else
begin
ADP_txchar_next
(
8'h0A
);
com_tx_req
<=
1
;
adp_state
<=
ADP_LINEACK
;
end
// newline and prompt
else
begin
ADP_txchar_next
(
8'h0A
);
com_tx_req
<=
1
;
adp_state
<=
ADP_LINEACK
;
end
// newline and prompt
end
else
com_tx_req
<=
1
;
// extend
end
else
com_tx_req
<=
1
;
// extend
...
@@ -753,7 +753,7 @@ always @(posedge HCLK or negedge HRESETn)
...
@@ -753,7 +753,7 @@ always @(posedge HCLK or negedge HRESETn)
if
(
banner
)
begin
banner
<=
0
;
adp_state
<=
STD_IOCHK
;
end
if
(
banner
)
begin
banner
<=
0
;
adp_state
<=
STD_IOCHK
;
end
`ifndef
ADPBASIC
`ifndef
ADPBASIC
else
if
((
FNvalid_cmd
(
adp_cmd
)
==
CMD_R
)
&
|
adp_count
)
//// non-zero count
else
if
((
FNvalid_cmd
(
adp_cmd
)
==
CMD_R
)
&
|
adp_count
)
//// non-zero count
begin
ADP_BUSREADINC_next
()
;
adp_count_dec
<=
1'b1
;
adp_state
<=
ADP_READ
;
end
//
begin
ADP_BUSREADINC_next
;
adp_count_dec
<=
1'b1
;
adp_state
<=
ADP_READ
;
end
//
`endif
`endif
else
begin
ADP_txchar_next
(
PROMPT_CHAR
);
adp_state
<=
ADP_PROMPT
;
end
else
begin
ADP_txchar_next
(
PROMPT_CHAR
);
adp_state
<=
ADP_PROMPT
;
end
end
else
com_tx_req
<=
1
;
// extend
end
else
com_tx_req
<=
1
;
// extend
...
...
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