Added missing signals to sensitivity and extended writeback

[calu.git] / cpu / src / extension_pkg.vhd

diff --git a/cpu/src/extension_pkg.vhd b/cpu/src/extension_pkg.vhd
index 5d3eb12d55f2744a6d250888884a68282c415f19..35c13d747ce60614c6c12cb5c2f344294e616f4d 100644 (file)
--- a/cpu/src/extension_pkg.vhd
+++ b/cpu/src/extension_pkg.vhd
@@ -21,7 +21,7 @@ subtype paddr_t is std_logic_vector(log2c(PCOUNT)-1 downto 0);
         type extmod_rec is record
                 sel   : std_logic;
                 wr_en : std_logic;
-                byte_en : std_logic_vector(gp_register_t'length/byte_t'length-1 downto 0); 
+                byte_en : byte_en_t;
                 data : gp_register_t;
                 addr : ext_addr_t;     
         end record; 
@@ -34,11 +34,12 @@ type status_rec is record
                carry : std_logic;
 end record;
 
-constant EXT_7SEG_ADDR:   ext_addrid_t := x"FFFFFFA";
+constant EXT_7SEG_ADDR:   ext_addrid_t := x"0000201";
 constant EXT_EXTMEM_ADDR: ext_addrid_t := x"FFFFFFB";
 constant EXT_TIMER_ADDR:  ext_addrid_t := x"FFFFFFC";
 constant EXT_AC97_ADDR:   ext_addrid_t := x"FFFFFFD";
-constant EXT_UART_ADDR:   ext_addrid_t := x"FFFFFFE";
+-- constant EXT_UART_ADDR:   ext_addrid_t := x"FFFFFFE";
+constant EXT_UART_ADDR:   ext_addrid_t := x"0000200";
 constant EXT_GPMP_ADDR:    ext_addrid_t := x"FFFFFFF";
 
  component extension_gpm is
@@ -61,7 +62,8 @@ constant EXT_GPMP_ADDR:    ext_addrid_t := x"FFFFFFF";
                        pwr_en  : in std_logic;
                -- Ouput
                         psw     : out status_rec;
-                        pval    : out gp_register_t
+                        pval    : out gp_register_t;
+                        pval_nxt : out gp_register_t
                );
  end component extension_gpm;