Changeset 8 in XOpenSparcT1 for trunk/NOR-flash

Timestamp:

03/22/11 11:51:17 (14 years ago)

Author:

pntsvt00

Message:

modifiche per la sintesi su Xilinx

File:

• trunk/NOR-flash/WBFLASH.v (modified) (3 diffs)

trunk/NOR-flash/WBFLASH.v

@@ -47 +47 @@
     input             wb1_cab_i,
 
-    output reg [24:0] flash_addr,
+    output reg [21:0] flash_addr,
     input      [15:0] flash_data,
     output            flash_oen,
     output            flash_wen,
-    output            flash_cen,
-    input      [ 1:0] flash_rev
+    output            flash_cen
+    //input      [ 1:0] flash_rev
      //output            flash_ldn
 );
@@ -132 +132 @@
 assign wb1_dat_o=wb1_dat;
 
-wire [1:0] flash_rev_d;
+//wire [1:0] flash_rev_d;
 
-assign flash_rev_d=wb_rst_i ? flash_rev:flash_rev_d;
+//assign flash_rev_d=wb_rst_i ? flash_rev:flash_rev_d;
 
-always @( * )
+/*always @( * )
    case({wb1_stb_i,flash_rev_d})
       3'b000:flash_addr<={wb_adr_i[25:3],wordcnt}+25'h0000000;
@@ -146 +146 @@
       3'b110:flash_addr<={wb1_adr_i[25:3],wordcnt}+25'h0400000;
       3'b111:flash_addr<={wb1_adr_i[25:3],wordcnt}+25'h0400000;
-   endcase
+   endcase*/
+
+always @( * )
+ if (wb1_stb_i)
+      flash_addr<={wb_adr_i[25:3],wordcnt}+25'h0400000;
+ else   
+      flash_addr<={wb_adr_i[25:3],wordcnt}+25'h0000000;
 
 assign flash_oen=((wb_cyc_i && wb_stb_i) || (wb1_cyc_i && wb1_stb_i) ? 0:1);