From 31a822091b9d74ba1f533498df112c5efe2ac647 Mon Sep 17 00:00:00 2001 From: RuigeLee Date: Mon, 21 Aug 2023 11:51:25 +0800 Subject: [PATCH] Revert "devide gowin file" This reverts commit d162b8f75c3fddb90b970858330920ded385dc26. --- .../{goWinBusSlv.scala => goWinBus.scala} | 82 +++++++++++++++++ src/main/scala/backBoard/goWinBusMst.scala | 89 ------------------- 2 files changed, 82 insertions(+), 89 deletions(-) rename src/main/scala/backBoard/{goWinBusSlv.scala => goWinBus.scala} (54%) delete mode 100644 src/main/scala/backBoard/goWinBusMst.scala diff --git a/src/main/scala/backBoard/goWinBusSlv.scala b/src/main/scala/backBoard/goWinBus.scala similarity index 54% rename from src/main/scala/backBoard/goWinBusSlv.scala rename to src/main/scala/backBoard/goWinBus.scala index 2bce899..1c7f95c 100644 --- a/src/main/scala/backBoard/goWinBusSlv.scala +++ b/src/main/scala/backBoard/goWinBus.scala @@ -11,6 +11,88 @@ class CRC_ERR_Bundle extends Bundle{ val cdr_err = Bool() } +class Lvds_Bus_MasterIO extends Bundle{ + val rst_n = Input(Bool()) + val oser_pclk = Input(Bool()) + val oser_fclk = Input(Bool()) + val ides_pclk = Input(Bool()) + val ides_fclk = Input(Bool()) + + val lvds_down_dout = Output(Bool()) + val lvds_up_din = Input(Bool()) + + val frame_info_update_en = Input(Bool()) + val slave_type_num = Input(UInt(8.W)) + val slave_data_length = Input(UInt(8.W)) + val tx_start = Input(Bool()) + val tx_data_in = Input(UInt(8.W)) + val tx_data_ready = Output(Bool()) + val downstream_busy = Output(Bool()) + val rx_data_out = Output(UInt(8.W)) + val rx_data_valid = Output(Bool()) + + val upstream_crc_valid = Output(Bool()) + val upstream_crc_err = Output(Bool()) + val upstream_crc_err_count = Output(UInt(8.W)) + val upstream_cdr_err = Output(Bool()) + +} + +class Lvds_Bus_Master extends BlackBox with HasBlackBoxInline { + + val io: Lvds_Bus_MasterIO = IO(new Lvds_Bus_MasterIO) + + setInline("lvds_bus_master.v", + """ + | module Lvds_Bus_Master( + | input rst_n, + | input oser_pclk, + | input oser_fclk, + | input ides_pclk, + | input ides_fclk, + | output lvds_down_dout, + | input lvds_up_din, + | input frame_info_update_en, + | input [7:0] slave_type_num, + | input [7:0]slave_data_length, + | input tx_start, + | input [7:0] tx_data_in, + | output tx_data_ready, + | output downstream_busy, + | output [7:0] rx_data_out, + | output rx_data_valid, + | output upstream_crc_valid, + | output upstream_crc_err, + | output [7:0] upstream_crc_err_count, + | output upstream_cdr_err + | ); + | lvds_bus_master_top i_lvds_bus_master( + | .rst_n(rst_n), //input + | .oser_pclk(oser_pclk), //input + | .oser_fclk(oser_fclk), //input + | .ides_pclk(ides_pclk), //input + | .ides_fclk(ides_fclk), //input + | + | .lvds_down_dout(lvds_down_dout), //output + | .lvds_up_din(lvds_up_din), //input + | + | .frame_info_update_en(frame_info_update_en), //input + | .slave_type_num(slave_type_num), //input [7:0] + | .slave_data_length(slave_data_length), //input [7:0] + | .tx_start(tx_start), //input + | .tx_data_in(tx_data_in), //input [7:0] + | .tx_data_ready(tx_data_ready), //output + | .downstream_busy(downstream_busy), //output + | .rx_data_out(rx_data_out), //output [7:0] + | .rx_data_valid(rx_data_valid), //output + | .upstream_crc_valid(upstream_crc_valid), //output + | .upstream_crc_err(upstream_crc_err), //output + | .upstream_crc_err_count(upstream_crc_err_count), //output [7:0] + | .upstream_cdr_err(upstream_cdr_err) //output + | ); + |endmodule + """.stripMargin) +} class Lvds_Bus_SlaveIO extends Bundle{ val rst_n = Input(Bool()) diff --git a/src/main/scala/backBoard/goWinBusMst.scala b/src/main/scala/backBoard/goWinBusMst.scala deleted file mode 100644 index 75c58e6..0000000 --- a/src/main/scala/backBoard/goWinBusMst.scala +++ /dev/null @@ -1,89 +0,0 @@ -package BACK - -import chisel3._ -import chisel3.util._ - - - -class Lvds_Bus_MasterIO extends Bundle{ - val rst_n = Input(Bool()) - val oser_pclk = Input(Bool()) - val oser_fclk = Input(Bool()) - val ides_pclk = Input(Bool()) - val ides_fclk = Input(Bool()) - - val lvds_down_dout = Output(Bool()) - val lvds_up_din = Input(Bool()) - - val frame_info_update_en = Input(Bool()) - val slave_type_num = Input(UInt(8.W)) - val slave_data_length = Input(UInt(8.W)) - val tx_start = Input(Bool()) - val tx_data_in = Input(UInt(8.W)) - val tx_data_ready = Output(Bool()) - val downstream_busy = Output(Bool()) - val rx_data_out = Output(UInt(8.W)) - val rx_data_valid = Output(Bool()) - - val upstream_crc_valid = Output(Bool()) - val upstream_crc_err = Output(Bool()) - val upstream_crc_err_count = Output(UInt(8.W)) - val upstream_cdr_err = Output(Bool()) - -} - -class Lvds_Bus_Master extends BlackBox with HasBlackBoxInline { - - val io: Lvds_Bus_MasterIO = IO(new Lvds_Bus_MasterIO) - - setInline("lvds_bus_master.v", - """ - | module Lvds_Bus_Master( - | input rst_n, - | input oser_pclk, - | input oser_fclk, - | input ides_pclk, - | input ides_fclk, - | output lvds_down_dout, - | input lvds_up_din, - | input frame_info_update_en, - | input [7:0] slave_type_num, - | input [7:0]slave_data_length, - | input tx_start, - | input [7:0] tx_data_in, - | output tx_data_ready, - | output downstream_busy, - | output [7:0] rx_data_out, - | output rx_data_valid, - | output upstream_crc_valid, - | output upstream_crc_err, - | output [7:0] upstream_crc_err_count, - | output upstream_cdr_err - | ); - | lvds_bus_master_top i_lvds_bus_master( - | .rst_n(rst_n), //input - | .oser_pclk(oser_pclk), //input - | .oser_fclk(oser_fclk), //input - | .ides_pclk(ides_pclk), //input - | .ides_fclk(ides_fclk), //input - | - | .lvds_down_dout(lvds_down_dout), //output - | .lvds_up_din(lvds_up_din), //input - | - | .frame_info_update_en(frame_info_update_en), //input - | .slave_type_num(slave_type_num), //input [7:0] - | .slave_data_length(slave_data_length), //input [7:0] - | .tx_start(tx_start), //input - | .tx_data_in(tx_data_in), //input [7:0] - | .tx_data_ready(tx_data_ready), //output - | .downstream_busy(downstream_busy), //output - | .rx_data_out(rx_data_out), //output [7:0] - | .rx_data_valid(rx_data_valid), //output - | .upstream_crc_valid(upstream_crc_valid), //output - | .upstream_crc_err(upstream_crc_err), //output - | .upstream_crc_err_count(upstream_crc_err_count), //output [7:0] - | .upstream_cdr_err(upstream_cdr_err) //output - | ); - |endmodule - """.stripMargin) -} \ No newline at end of file