wishbone: moved wb_slave_adapter to separate subdir

modules/wishbone/Manifest.py

 modules =  { "local" :
 	
 						[ 
-#						"wb_async_bridge",
+						"wb_async_bridge",
 						"wb_onewire_master",
 						"wb_i2c_master",
 						"wb_bus_fanout",
 						"wb_conmax",
+						"wb_dpram",
 						"wb_gpio_port",
 						"wb_simple_timer",
 						"wb_uart",
 						"wb_vic",
 						"wb_spi",
 						"wb_virtual_uart",
+						"wb_crossbar",
+						"wb_lm32",
+						"wb_slave_adapter",
 						"wbgen2"
 						 ]};
 

modules/wishbone/wb_slave_adapter/Manifest.py

+files = ["wb_slave_adapter.vhd"]

modules/wishbone/wb_slave_adapter.vhd → modules/wishbone/wb_slave_adapter/wb_slave_adapter.vhd

@@ -177,7 +177,13 @@ begin  -- rtl
       end if;
       slave_out.stall <= '0';
     elsif(g_slave_mode = CLASSIC and g_master_mode = PIPELINED) then
-      master_out.stb <= slave_in.stb;
+
+      if(fsm_state = WAIT4ACK) then
+        master_out.stb <= '1';
+      else
+        master_out.stb <= slave_in.stb;
+      end if;
+      
       if(master_out.cyc = '1') then
         slave_out.stall <= '0';
       else
@@ -189,7 +195,7 @@ begin  -- rtl
     end if;
   end process;
 
-  master_out.dat <= slave_in.adr;
+  master_out.dat <= slave_in.dat;
   master_out.cyc <= slave_in.cyc;
   master_out.sel <= slave_in.sel;
   master_out.we  <= slave_in.we;