HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r519:7d6d07e76b74

(MINI-LFR) WFP_MS-0.1-53

pellion -

r519:7d6d07e76b74 JC

parent child

Context file:

r519:7d6d07e76b74

Collapse all files

designs/MINI-LFR_WFP_MS/MINI_LFR_top.vhd +2 -2

                    pirq_ms                => 6,
                    pirq_wfp               => 14,
                    hindex                 => 2,
-                   top_lfr_version        => X"000134")  -- aa.bb.cc version
+                   top_lfr_version        => X"000135")  -- aa.bb.cc version
                  PORT MAP (
                    clk             => clk_25,
                    rstn            => LFR_rstn,
                sample_hk <= "0001000100010001" WHEN HK_SEL = "00" ELSE
                             "0010001000100010" WHEN HK_SEL = "10" ELSE
-                            "0100010001000100" WHEN HK_SEL = "10" ELSE
+                            "0100010001000100" WHEN HK_SEL = "11" ELSE
                             (OTHERS => '0');

lib/lpp/general_purpose/data_type_pkg.vhd +2 0

              PACKAGE data_type_pkg IS
+               TYPE array_integer IS ARRAY (NATURAL RANGE <>) OF INTEGER;
-               TYPE sample_vector IS ARRAY(NATURAL RANGE <>, NATURAL RANGE <>) OF STD_LOGIC;
              END data_type_pkg;

lib/lpp/lfr_management/apb_lfr_management.vhd +34 -27

                LFR_soft_rstn <= NOT r.LFR_soft_reset;
                PROCESS(resetn, clk25MHz)
+                 VARIABLE paddr : STD_LOGIC_VECTOR(7 DOWNTO 2);
                BEGIN
                  IF resetn = '0' THEN
                      soft_reset <= '0';
                    END IF;
-             --APB Write OP
-                   IF (apbi.psel(pindex) AND apbi.penable AND apbi.pwrite) = '1' THEN
-                     CASE apbi.paddr(7 DOWNTO 2) IS
-                       WHEN ADDR_LFR_MANAGMENT_CONTROL =>
-                         r.ctrl              <= apbi.pwdata(0);
-                         r.soft_reset        <= apbi.pwdata(1);
-                         r.LFR_soft_reset    <= apbi.pwdata(2);
-                       WHEN ADDR_LFR_MANAGMENT_TIME_LOAD =>
-                         r.coarse_time_load     <= apbi.pwdata(30 DOWNTO 0);
-                         coarsetime_reg_updated <= '1';
-                       WHEN OTHERS =>
-                         NULL;
-                     END CASE;
-                   ELSE
-                     IF r.ctrl = '1' THEN
-                       r.ctrl <= '0';
-                     END if;
-                     IF r.soft_reset = '1' THEN
-                       r.soft_reset <= '0';
-                     END if;
-                   END IF;
+                   paddr             := "000000";
+                   paddr(7 DOWNTO 2) := apbi.paddr(7 DOWNTO 2);
+                   Rdata             <= (OTHERS => '0');
+                   IF apbi.psel(pindex) = '1' THEN
              --APB READ OP
-                   IF (apbi.psel(pindex) AND (NOT apbi.pwrite)) = '1' THEN
-                     CASE apbi.paddr(7 DOWNTO 2) IS
+                     CASE paddr(7 DOWNTO 2) IS
                        WHEN ADDR_LFR_MANAGMENT_CONTROL =>
-                         Rdata(0)            <= r.ctrl;
-                         Rdata(1)            <= r.soft_reset;
-                         Rdata(2)            <= r.LFR_soft_reset;
-                         Rdata(31 DOWNTO 3)  <= (others => '0');
+                         Rdata(31 DOWNTO 3) <= (OTHERS => '0');
                        WHEN ADDR_LFR_MANAGMENT_TIME_LOAD =>
-                         Rdata(30 DOWNTO 0)  <= r.coarse_time_load(30 DOWNTO 0);
                        WHEN ADDR_LFR_MANAGMENT_TIME_COARSE =>
                          Rdata(31 DOWNTO 16) <= (OTHERS => '0');
                          Rdata(15 DOWNTO 0)  <= r.HK_temp_2;
                        WHEN OTHERS =>
-                         Rdata(31 DOWNTO 0)  <= (others => '0');
+                         Rdata(31 DOWNTO 0) <= (OTHERS => '0');
                      END CASE;
+                     --APB Write OP
+                     IF (apbi.pwrite AND apbi.penable) = '1' THEN
+                       CASE paddr(7 DOWNTO 2) IS
+                         WHEN ADDR_LFR_MANAGMENT_CONTROL =>
+                           r.ctrl           <= apbi.pwdata(0);
+                           r.soft_reset     <= apbi.pwdata(1);
+                           r.LFR_soft_reset <= apbi.pwdata(2);
+                         WHEN ADDR_LFR_MANAGMENT_TIME_LOAD =>
+                           r.coarse_time_load     <= apbi.pwdata(30 DOWNTO 0);
+                           coarsetime_reg_updated <= '1';
+                         WHEN OTHERS =>
+                           NULL;
+                       END CASE;
+                     ELSE
+                       IF r.ctrl = '1' THEN
+                         r.ctrl <= '0';
+                       END IF;
+                       IF r.soft_reset = '1' THEN
+                         r.soft_reset <= '0';
+                       END IF;
+                     END IF;
-                   END IF;
                  END IF;
                    HK_sel_s <= "00";
-                 ELSIF clk25MHz'event AND clk25MHz = '1' THEN  -- rising clock edge
+                 ELSIF clk25MHz'EVENT AND clk25MHz = '1' THEN  -- rising clock edge
                    IF HK_val = '1' THEN
                      CASE HK_sel_s IS
                HK_sel <= HK_sel_s;
-             END Behavioral;
  No newline at end of file
+             END Behavioral;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages