Skip to content

Commit

Permalink
listservice, unpackdescriptors cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
fhaus1 committed Nov 22, 2024
1 parent 55feb8d commit 4c18b06
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions hw/newusb/new_usb_listservice.sv
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
module new_usb_listservice import new_usb_ohci_pkg::*; (

/// control
input logic clk_i,
input logic rst_ni,
input logic clk_i,
input logic rst_ni,
input logic start_i, // start list service
input logic frame_periodic_i, // frame is currently in periodic or nonperiodic zone
input logic counter_is_threshold_i, // nonperiodic counter full, switch to bulk
Expand Down
14 changes: 7 additions & 7 deletions hw/newusb/new_usb_ohci.sv
Original file line number Diff line number Diff line change
Expand Up @@ -169,30 +169,30 @@ module new_usb_ohci import new_usb_ohci_pkg::*; #(
.rst_ni,
.counter_is_threshold_o(counter_is_threshold),
.cbsr_i(reg2hw.hccontrol.cbsr.q),

/// nextis
.nextis_valid_o // needs to be one clock cycle
.nextis_ed_o, // 0 if empty ed rerequest or td
.nextis_type_o,
.nextis_address_o,
.nextis_ready_i,

/// processed
.processed,
.processed_ed_store_o, // store request
.processed_store_type_o, // isochronousTD, generalTD, ED

/// newcurrentED
.newcurrentED_o,
.newcurrentED_valid_o,

/// ID
.id_valid_i,
.id_type_i,

/// DMA
.dma_data_i,
.dma_valid_i,
.dma_ready_o,

/// periodic
.context_switch_np2p_i,
.context_switch_p2np_i,

/// head state
.sent_head_i
);

Expand Down
23 changes: 12 additions & 11 deletions hw/newusb/new_usb_unpackdescriptors.sv
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@
// Todo: only one package flying
// Todo: TD management in ED, overwrite HeadP if servedTD, halted or toggle Carry?

module new_usb_unpackdescriptors import new_usb_ohci_pkg::*; #(
module new_usb_unpackdescriptors
import new_usb_ohci_pkg::*; import new_usb_dmaoutputqueueED_pkg::*; #(
parameter int unsigned AxiDataWidth = 0
)(
/// control
input logic clk_i,
input logic rst_ni,
input logic clk_i,
input logic rst_ni,
input logic [1:0] cbsr_i,
output logic counter_is_threshold_o,
/// next address element
output logic nextis_valid_o // needs to be one clock cycle
output logic nextis_ed_o, // 0 if empty ed rerequest or td
output channel nextis_type_o,
output logic [27:0] nextis_address_o,
input logic nextis_ready_i,
output logic nextis_valid_o // needs to be one clock cycle
output logic nextis_ed_o, // 0 if empty ed rerequest or td
output channel nextis_type_o,
output logic [27:0] nextis_address_o,
input logic nextis_ready_i,
/// Processed ED with data to write back, get address from currentED
output new_usb_dmaoutputqueueED_pkg::endpoint_descriptor processed,
output logic processed_ed_store_o, // store request
output store_type processed_store_type_o, // isochronousTD, generalTD, ED
output endpoint_descriptor processed,
output logic processed_ed_store_o, // store request
output store_type processed_store_type_o, // isochronousTD, generalTD, ED
/// new currentED, updated after processed accessed it
output logic [27:0] newcurrentED_o,
output logic newcurrentED_valid_o,
Expand Down

0 comments on commit 4c18b06

Please sign in to comment.