Loading .gitignore +5 −1 Original line number Diff line number Diff line Loading @@ -18,8 +18,12 @@ x393.prj *.bad *.pyc *.pickle *.tmp py393/dbg* debug debug/* html/* man/* includes/x393_cur_params_sim.vh includes/x393_cur_params_target_*.vh py393/exp_gpio.py Loading axi/axibram_read.v +14 −10 Original line number Diff line number Diff line /******************************************************************************* * Module: axibram_read * Date:2014-03-18 * Author: Andrey Filippov * Description: Read block RAM memory over AXI PS Master GP0 /*! * <b>Module:</b>axibram_read * @file axibram_read.v * @date 2014-03-18 * @author Andrey Filippov * * @brief Read block RAM memory over AXI PS Master GP0 * * @copyright Copyright (c) 2014 Elphel, Inc. * * <b>License:</b> * * Copyright (c) 2014 Elphel, Inc. * axibram_read.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -30,7 +35,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ // Check that this fix did not break anything: `include "system_defines.vh" `define USE_SHORT_REN_REGEN Loading Loading @@ -227,7 +232,6 @@ module axibram_read #( assign bram_reg_re_w= dev_ready && read_in_progress_or && (!rvalid || rready); // slower/simplier // assign bram_reg_re_w= rready? read_in_progress : bram_reg_re_0; // faster - more verification assign last_in_burst_w=bram_reg_re_w && (read_left==4'b0); // slower/simplier // assign last_in_burst_w=rready? (read_in_progress && (read_left==4'b0)): (bram_reg_re_0 && (read_left==4'b0)); // assign last_in_burst_w=rready? last_in_burst_1: last_in_burst_0; // faster (unfinished) - more verification Loading axi/axibram_write.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: axibram_write * Date:2014-03-18 * Author: Andrey Filippov * Description: Read block RAM memory (or memories?) over AXI PS Master GP0 /*! * <b>Module:</b>axibram_write * @file axibram_write.v * @date 2014-03-18 * @author Andrey Filippov * * @brief Read block RAM memory (or memories?) over AXI PS Master GP0 * Memory is supposed to be fast enough * * Copyright (c) 2014 Elphel, Inc. * @copyright Copyright (c) 2014 Elphel, Inc. * * <b>License:</b> * * axibram_write.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -31,7 +36,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ //`define DEBUG_FIFO 1 `include "system_defines.vh" `ifdef DEBUG_FIFO Loading axi/cmprs_afi_mux.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: cmprs_afi_mux * Date:2015-06-26 * Author: Andrey Filippov * Description: Writes comressor data from up to 4 channels to system memory over AXI_HP /*! * <b>Module:</b>cmprs_afi_mux * @file cmprs_afi_mux.v * @date 2015-06-26 * @author Andrey Filippov * * @brief Writes comressor data from up to 4 channels to system memory over AXI_HP * * @copyright Copyright (c) 2015 Elphel, Inc. * * <b>License:</b> * * Copyright (c) 2015 Elphel, Inc. * cmprs_afi_mux.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -30,7 +35,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ `timescale 1ns/1ps module cmprs_afi_mux#( Loading axi/cmprs_afi_mux_ptr.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: cmprs_afi_mux_ptr * Date:2015-06-28 * Author: Andrey Filippov * Description: Maintain 4-channel chunk pointers (before AXI) /*! * <b>Module:</b>cmprs_afi_mux_ptr * @file cmprs_afi_mux_ptr.v * @date 2015-06-28 * @author Andrey Filippov * * @brief Maintain 4-channel chunk pointers (before AXI) * Advance 32-byte chunk pointers for each AXI burst and each frame (4*2=8 pointers) * * Copyright (c) 2015 Elphel, Inc. * @copyright Copyright (c) 2015 Elphel, Inc. * * <b>License:</b> * * cmprs_afi_mux_ptr.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -31,7 +36,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ `timescale 1ns/1ps module cmprs_afi_mux_ptr( Loading Loading
.gitignore +5 −1 Original line number Diff line number Diff line Loading @@ -18,8 +18,12 @@ x393.prj *.bad *.pyc *.pickle *.tmp py393/dbg* debug debug/* html/* man/* includes/x393_cur_params_sim.vh includes/x393_cur_params_target_*.vh py393/exp_gpio.py Loading
axi/axibram_read.v +14 −10 Original line number Diff line number Diff line /******************************************************************************* * Module: axibram_read * Date:2014-03-18 * Author: Andrey Filippov * Description: Read block RAM memory over AXI PS Master GP0 /*! * <b>Module:</b>axibram_read * @file axibram_read.v * @date 2014-03-18 * @author Andrey Filippov * * @brief Read block RAM memory over AXI PS Master GP0 * * @copyright Copyright (c) 2014 Elphel, Inc. * * <b>License:</b> * * Copyright (c) 2014 Elphel, Inc. * axibram_read.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -30,7 +35,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ // Check that this fix did not break anything: `include "system_defines.vh" `define USE_SHORT_REN_REGEN Loading Loading @@ -227,7 +232,6 @@ module axibram_read #( assign bram_reg_re_w= dev_ready && read_in_progress_or && (!rvalid || rready); // slower/simplier // assign bram_reg_re_w= rready? read_in_progress : bram_reg_re_0; // faster - more verification assign last_in_burst_w=bram_reg_re_w && (read_left==4'b0); // slower/simplier // assign last_in_burst_w=rready? (read_in_progress && (read_left==4'b0)): (bram_reg_re_0 && (read_left==4'b0)); // assign last_in_burst_w=rready? last_in_burst_1: last_in_burst_0; // faster (unfinished) - more verification Loading
axi/axibram_write.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: axibram_write * Date:2014-03-18 * Author: Andrey Filippov * Description: Read block RAM memory (or memories?) over AXI PS Master GP0 /*! * <b>Module:</b>axibram_write * @file axibram_write.v * @date 2014-03-18 * @author Andrey Filippov * * @brief Read block RAM memory (or memories?) over AXI PS Master GP0 * Memory is supposed to be fast enough * * Copyright (c) 2014 Elphel, Inc. * @copyright Copyright (c) 2014 Elphel, Inc. * * <b>License:</b> * * axibram_write.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -31,7 +36,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ //`define DEBUG_FIFO 1 `include "system_defines.vh" `ifdef DEBUG_FIFO Loading
axi/cmprs_afi_mux.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: cmprs_afi_mux * Date:2015-06-26 * Author: Andrey Filippov * Description: Writes comressor data from up to 4 channels to system memory over AXI_HP /*! * <b>Module:</b>cmprs_afi_mux * @file cmprs_afi_mux.v * @date 2015-06-26 * @author Andrey Filippov * * @brief Writes comressor data from up to 4 channels to system memory over AXI_HP * * @copyright Copyright (c) 2015 Elphel, Inc. * * <b>License:</b> * * Copyright (c) 2015 Elphel, Inc. * cmprs_afi_mux.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -30,7 +35,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ `timescale 1ns/1ps module cmprs_afi_mux#( Loading
axi/cmprs_afi_mux_ptr.v +12 −7 Original line number Diff line number Diff line /******************************************************************************* * Module: cmprs_afi_mux_ptr * Date:2015-06-28 * Author: Andrey Filippov * Description: Maintain 4-channel chunk pointers (before AXI) /*! * <b>Module:</b>cmprs_afi_mux_ptr * @file cmprs_afi_mux_ptr.v * @date 2015-06-28 * @author Andrey Filippov * * @brief Maintain 4-channel chunk pointers (before AXI) * Advance 32-byte chunk pointers for each AXI burst and each frame (4*2=8 pointers) * * Copyright (c) 2015 Elphel, Inc. * @copyright Copyright (c) 2015 Elphel, Inc. * * <b>License:</b> * * cmprs_afi_mux_ptr.v is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or Loading @@ -31,7 +36,7 @@ * the combined code. This permission applies to you if the distributed code * contains all the components and scripts required to completely simulate it * with at least one of the Free Software programs. *******************************************************************************/ */ `timescale 1ns/1ps module cmprs_afi_mux_ptr( Loading