Skip to content
Snippets Groups Projects
Commit 5a418341 authored by David Mapstone's avatar David Mapstone
Browse files

Restructured Debug Controller

parent 33fb0d88
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
controller/verilog/nanosoc_stream_adp_io.v deleted 100755 → 0
+ 0
− 89
View file @ 33fb0d88
//-----------------------------------------------------------------------------
// NanoSoC ASCII Debug Protocol Controller
// A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
//
// Contributors
//
// David Flynn (d.w.flynn@soton.ac.uk)
//
// Copyright � 2021-2, SoC Labs (www.soclabs.org)
//-----------------------------------------------------------------------------
// TODO: DM - I think this file is redundant if we move to nanosoc_manager_adp
module nanosoc_stream_adp_io #(
parameter PROMPT_CHAR = "]"
)(
// Ports of Axi Slave Bus Interface com_rx
input wire ahb_hclk,
input wire ahb_hresetn,
output wire com_rx_tready,
input wire [7:0] com_rx_tdata,
input wire com_rx_tvalid,
// Ports of Axi Master Bus Interface com_tx
output wire com_tx_tvalid,
output wire [7:0] com_tx_tdata,
input wire com_tx_tready,
// Ports of Axi Slave Bus Interface stdio_rx
output wire stdio_rx_tready,
input wire [7:0] stdio_rx_tdata,
input wire stdio_rx_tvalid,
// Ports of Axi Master Bus Interface stdio_tx
output wire stdio_tx_tvalid,
output wire [7:0] stdio_tx_tdata,
input wire stdio_tx_tready,
output wire [7 : 0] gpo8,
input wire [7 : 0] gpi8,
output wire [31:0] ahb_haddr,
output wire [ 2:0] ahb_hburst,
output wire ahb_hmastlock,
output wire [ 3:0] ahb_hprot,
output wire [ 2:0] ahb_hsize,
output wire [ 1:0] ahb_htrans,
output wire [31:0] ahb_hwdata,
output wire ahb_hwrite,
input wire [31:0] ahb_hrdata,
input wire ahb_hready,
input wire ahb_hresp
);
nanosoc_adp_control #(
.PROMPT_CHAR (PROMPT_CHAR)
) u_adp_control (
.HCLK (ahb_hclk ),
.HRESETn (ahb_hresetn ),
.HADDR32_o (ahb_haddr ),
.HBURST3_o (ahb_hburst ),
.HMASTLOCK_o (ahb_hmastlock ),
.HPROT4_o (ahb_hprot ),
.HSIZE3_o (ahb_hsize ),
.HTRANS2_o (ahb_htrans ),
.HWDATA32_o (ahb_hwdata ),
.HWRITE_o (ahb_hwrite ),
.HRDATA32_i (ahb_hrdata ),
.HREADY_i (ahb_hready ),
.HRESP_i (ahb_hresp ),
.GPO8_o (gpo8 ),
.GPI8_i (gpi8 ),
.COMRX_TREADY_o(com_rx_tready),
.COMRX_TDATA_i(com_rx_tdata),
.COMRX_TVALID_i(com_rx_tvalid),
.STDRX_TREADY_o(stdio_rx_tready),
.STDRX_TDATA_i(stdio_rx_tdata),
.STDRX_TVALID_i(stdio_rx_tvalid),
.COMTX_TVALID_o(com_tx_tvalid),
.COMTX_TDATA_o(com_tx_tdata),
.COMTX_TREADY_i(com_tx_tready),
.STDTX_TVALID_o(stdio_tx_tvalid),
.STDTX_TDATA_o(stdio_tx_tdata),
.STDTX_TREADY_i(stdio_tx_tready)
);
endmodule
controller/verilog/socdebug_adp_control.v
+ 3
− 1
View file @ 5a418341
...@@ -30,9 +30,11 @@ module socdebug_adp_control #( ...@@ -30,9 +30,11 @@ module socdebug_adp_control #(
input wire HREADY_i, input wire HREADY_i,
input wire HRESP_i, input wire HRESP_i,
// COMIO interface // GPIO Interface
output wire [ 7:0] GPO8_o, output wire [ 7:0] GPO8_o,
input wire [ 7:0] GPI8_i, input wire [ 7:0] GPI8_i,
// COMIO interface
input wire [ 7:0] COMRX_TDATA_i, input wire [ 7:0] COMRX_TDATA_i,
input wire COMRX_TVALID_i, input wire COMRX_TVALID_i,
output wire COMRX_TREADY_o, output wire COMRX_TREADY_o,
......
controller/verilog/socdebug_ahb.v
+ 156
− 67
View file @ 5a418341
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
module socdebug_ahb #( module socdebug_ahb #(
parameter PROMPT_CHAR = "]" parameter PROMPT_CHAR = "]",
parameter integer FT1248_WIDTH = 1, // FTDI Interface 1,2,4 width supported
parameter integer FT1248_CLKON = 0 // FTDI clock always on - else quiet when no access
)( )(
// AHB-lite Master Interface // AHB-lite Master Interface - ADP
input wire HCLK, input wire HCLK,
input wire HRESETn, input wire HRESETn,
output wire [31:0] HADDR32_o, output wire [31:0] HADDR32_o,
...@@ -27,68 +29,86 @@ module socdebug_ahb #( ...@@ -27,68 +29,86 @@ module socdebug_ahb #(
input wire HREADY_i, input wire HREADY_i,
input wire HRESP_i, input wire HRESP_i,
// APB Slave Interface // APB Slave Interface - USRT
input wire PCLK, // Clock input wire PCLK, // Clock
input wire PCLKG, // Gated Clock input wire PCLKG, // Gated Clock
input wire PRESETn, // Reset input wire PRESETn, // Reset
input wire PSEL, // Device select input wire PSEL_i, // Device select
input wire [11:2] PADDR, // Address input wire [11:2] PADDR_i, // Address
input wire PENABLE, // Transfer control input wire PENABLE_i, // Transfer control
input wire PWRITE, // Write control input wire PWRITE_i, // Write control
input wire [31:0] PWDATA, // Write data input wire [31:0] PWDATA_i, // Write data
output wire [31:0] PRDATA, // Read data output wire [31:0] PRDATA_o, // Read data
output wire PREADY, // Device ready output wire PREADY_o, // Device ready
output wire PSLVERR, // Device error response output wire PSLVERR_o, // Device error response
// FT1248 Interace - FT1248
output wire FT_CLK_O, // SCLK
output wire FT_SSN_O, // SS_N
input wire FT_MISO_I, // MISO
output wire [FT1248_WIDTH-1:0] FT_MIOSIO_O, // MIOSIO tristate output when enabled
output wire [FT1248_WIDTH-1:0] FT_MIOSIO_E, // MIOSIO tristate output enable (active hi)
output wire [FT1248_WIDTH-1:0] FT_MIOSIO_Z, // MIOSIO tristate output enable (active lo)
input wire [FT1248_WIDTH-1:0] FT_MIOSIO_I, // MIOSIO tristate input
input wire [7:0] FT_CLKDIV, // divider prescaler to ensure SCLK <1MHz
// GPIO interface // GPIO interface
output wire [7:0] GPO8_o, output wire [7:0] GPO8_o,
input wire [7:0] GPI8_i input wire [7:0] GPI8_i
); );
// COMIO interface // FT1248 to ADP Bus
wire [ 7:0] COMRX_TDATA_i; wire FT1248_ADP_TVALID;
wire COMRX_TVALID_i; wire [ 7:0] FT1248_ADP_TDATA;
wire COMRX_TREADY_o; wire FT1248_ADP_TREADY;
wire [ 7:0] COMTX_TDATA_o;
wire COMTX_TVALID_o; // ADP to FT1248 Bus
wire COMTX_TREADY_i; wire ADP_FT1248_TVALID;
wire [ 7:0] ADP_FT1248_TDATA;
// STDIO interface wire ADP_FT1248_TREADY;
wire [ 7:0] STDRX_TDATA_i;
wire STDRX_TVALID_i; // USRT to ADP Bus
wire STDRX_TREADY_o; wire USRT_ADP_TVALID;
wire [ 7:0] STDTX_TDATA_o; wire [ 7:0] USRT_ADP_TDATA;
wire STDTX_TVALID_o; wire USRT_ADP_TREADY;
wire STDTX_TREADY_i;
// ADP to USRT Bus
// Instantiation of USRT Device wire ADP_USRT_TVALID;
socdebug_apb_usrt u_apb_usrt_com ( wire [ 7:0] ADP_USRT_TDATA;
.PCLK (PCLK), // Peripheral clock wire ADP_USRT_TREADY;
// Instantiation of USRT Controller
socdebug_usrt_control u_usrt_control (
// APB Clock and Reset Signals
.PCLK (PCLK),
.PCLKG (PCLKG), // Gated PCLK for bus .PCLKG (PCLKG), // Gated PCLK for bus
.PRESETn (PRESETn), // Reset .PRESETn (PRESETn),
.PSEL (PSEL), // APB interface inputs // APB Interface Signals
.PADDR (PADDR), .PSEL (PSEL_i),
.PENABLE (PENABLE), .PADDR (PADDR_i),
.PWRITE (PWRITE), .PENABLE (PENABLE_i),
.PWDATA (PWDATA), .PWRITE (PWRITE_i),
.PWDATA (PWDATA_i),
.PRDATA (PRDATA), // APB interface outputs .PRDATA (PRDATA_o),
.PREADY (PREADY), .PREADY (PREADY_o),
.PSLVERR (PSLVERR), .PSLVERR (PSLVERR_o),
.ECOREVNUM (4'h0), // Engineering-change-order revision bits .ECOREVNUM (4'h0),
.TX_VALID_o (stdio_rx_valid), // ADP Interface - From USRT to ADP
.TX_DATA8_o (stdio_rx_data8), .TX_VALID_o (USRT_ADP_TVALID),
.TX_READY_i (stdio_rx_ready), .TX_DATA8_o (USRT_ADP_TDATA),
.TX_READY_i (USRT_ADP_TREADY),
.RX_VALID_i (stdio_tx_valid),
.RX_DATA8_i (stdio_tx_data8), // ADP Interface - From ADP to USRT
.RX_READY_o (stdio_tx_ready), .RX_VALID_i (ADP_USRT_TVALID),
.RX_DATA8_i (ADP_USRT_TDATA),
.RX_READY_o (ADP_USRT_TREADY),
// Interrupt Interfaces
.TXINT ( ), // Transmit Interrupt .TXINT ( ), // Transmit Interrupt
.RXINT ( ), // Receive Interrupt .RXINT ( ), // Receive Interrupt
.TXOVRINT ( ), // Transmit Overrun Interrupt .TXOVRINT ( ), // Transmit Overrun Interrupt
...@@ -96,9 +116,78 @@ module socdebug_ahb #( ...@@ -96,9 +116,78 @@ module socdebug_ahb #(
.UARTINT ( ) // Combined Interrupt .UARTINT ( ) // Combined Interrupt
); );
// Instantiation of FT1248 Bus Master // Instantiation of FT1248 Controller
socdebug_ft1248_control #(
.FT1248_WIDTH (FT1248_WIDTH),
.FT1248_CLKON (FT1248_CLKON)
) u_ft1248_control (
.clk (HCLK),
.resetn (HRESETn),
.ft_clkdiv (FT_CLKDIV),
.ft_clk_o (FT_CLK_O),
.ft_ssn_o (FT_SSN_O),
.ft_miso_i (FT_MISO_I),
.ft_miosio_o (FT_MIOSIO_O),
.ft_miosio_e (FT_MIOSIO_E),
.ft_miosio_z (FT_MIOSIO_Z),
.ft_miosio_i (FT_MIOSIO_I),
// ADP Interface - FT1248 to ADP
.txd_tvalid (FT1248_ADP_TVALID),
.txd_tdata (FT1248_ADP_TDATA),
.txd_tready (FT1248_ADP_TREADY),
.txd_tlast ( ),
// ADP Interface - ADP to FT1248
.rxd_tvalid (ADP_FT1248_TVALID),
.rxd_tdata (ADP_FT1248_TDATA),
.rxd_tready (ADP_FT1248_TREADY),
.rxd_tlast (1'b0)
);
// Instantiation of ADP AHB Controller // Instantiation of ADP AHB Controller
socdebug_adp_control #(
.PROMPT_CHAR (PROMPT_CHAR)
) u_adp_control (
// AHB Interface
.HCLK (HCLK),
.HRESETn (HRESETn),
.HADDR32_o (HADDR32_o),
.HBURST3_o (HBURST3_o),
.HMASTLOCK_o (HMASTLOCK_o),
.HPROT4_o (HPROT4_o),
.HSIZE3_o (HSIZE3_o),
.HTRANS2_o (HTRANS2_o),
.HWDATA32_o (HWDATA32_o),
.HWRITE_o (HWRITE_o),
.HRDATA32_i (HRDATA32_i),
.HREADY_i (HREADY_i),
.HRESP_i (HRESP_i),
// GPIO Interface
.GPO8_o (GPO8_o),
.GPI8_i (GPI8_i),
// USRT Interface - From ADP to USRT
.STDTX_TVALID_o (ADP_USRT_TVALID),
.STDTX_TDATA_o (ADP_USRT_TDATA),
.STDTX_TREADY_i (ADP_USRT_TREADY),
// USRT Interface - From USRT to ADP
.STDRX_TVALID_i (USRT_ADP_TVALID),
.STDRX_TDATA_i (USRT_ADP_TDATA),
.STDRX_TREADY_o (USRT_ADP_TREADY),
// FT1248 Interface - From FT1248 to ADP
.COMRX_TVALID_i (FT1248_ADP_TVALID),
.COMRX_TDATA_i (FT1248_ADP_TDATA),
.COMRX_TREADY_o (FT1248_ADP_TREADY),
// FT1248 Interface - From ADP to FT1248
.COMTX_TVALID_o (ADP_FT1248_TVALID),
.COMTX_TDATA_o (ADP_FT1248_TDATA),
.COMTX_TREADY_i (ADP_FT1248_TREADY)
);
endmodule endmodule
\ No newline at end of file
controller/verilog/socdebug_ft1248_stream.v → controller/verilog/socdebug_ft1248_control.v
+ 4
− 4
View file @ 5a418341
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// Copyright � 2022, SoC Labs (www.soclabs.org) // Copyright � 2022, SoC Labs (www.soclabs.org)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
module socdebug_ft1248_stream #( module socdebug_ft1248_control #(
parameter integer FT1248_WIDTH = 1, // FTDI Interface 1,2,4 width supported parameter integer FT1248_WIDTH = 1, // FTDI Interface 1,2,4 width supported
parameter integer FT1248_CLKON = 1 // FTDI clock always on - else quiet when no access parameter integer FT1248_CLKON = 1 // FTDI clock always on - else quiet when no access
)( )(
......
controller/verilog/socdebug_apb_usrt.v → controller/verilog/socdebug_usrt_control.v
+ 1
− 1
View file @ 5a418341
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
// 0x3E0 - 0x3FC ID registers // 0x3E0 - 0x3FC ID registers
//------------------------------------- //-------------------------------------
module socdebug_apb_usrt ( module socdebug_usrt_control (
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Port Definitions // Port Definitions
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment