Merge branch 'hw-huffdctycc' into net-mjpeg

[fpga-leon-mjpeg/leon-mjpeg.git] / grlib-gpl-1.0.22-b4095 / lib / kuri / mjpeg / huff.vhd

diff --git a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/huff.vhd b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/huff.vhd
index 04be1db..423acf6 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/huff.vhd
+++ b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/huff.vhd
@@ -1090,9 +1090,9 @@ end if;
        end if;
    when others =>
    end case;
-
+   
 -- reset part
-   if rst = '0' then
+   if rst = '0' or vstartgen = '1' then
        v.hreg.getscan := '0';
        v.hreg.rdscan := '0';
        v.hreg.getq := '0';
@@ -1107,14 +1107,6 @@ end if;
        v.hreg.rdoffset := '0';
        v.hreg.getval := '0';
        v.hreg.rdval := '0';
-       v.preg.sampf := '0';
-       v.preg.xmcumax := (others => '0');
-       v.preg.ymcumax := (others => '0');
-       v.preg.incaddy := (others => '0');
-       v.preg.incaddmcux := (others => '0');
-       v.preg.incaddmcuy := (others => '0');
-       v.preg.fbstartadd := (others => '0');       
-       v.preg.through_bit := '0';
        v.fetch_state := memwait;
        v.dec_state := standby;
        v.fifo_rp := (others => '0');
@@ -1139,6 +1131,18 @@ end if;
        v.capture := "00";
        v.skipcnt := (others => '0');
    end if;
+   if rst = '0' then
+       v.preg.sampf := '0';
+       v.preg.xmcumax := (others => '0');
+       v.preg.ymcumax := (others => '0');
+       v.preg.incaddy := (others => '0');
+       v.preg.incaddmcux := (others => '0');
+       v.preg.incaddmcuy := (others => '0');
+       v.preg.fbstartadd := (others => '0');       
+       v.preg.through_bit := '0';
+       v.preg.hardonly := '0';
+   end if;
+        
    
 -- signals
    rin <= v;