mirror of
https://github.com/wfjm/w11.git
synced 2026-05-05 15:44:35 +00:00
- interim release w11a_V0.531 (untagged)
- many small changes to prepare upcoming support for Spartan-6 and usage of Cypress FX2 USB interface on nexys2/3 and atlys boards
This commit is contained in:
Walter F.J. Mueller
@@ -1,14 +1,15 @@
|
||||
# $Id: Makefile 311 2010-06-30 17:52:37Z mueller $
|
||||
# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
|
||||
#
|
||||
# Revision History:
|
||||
# Date Rev Version Comment
|
||||
# 2011-08-13 405 1.2 use includes from rtl/make
|
||||
# 2007-07-06 64 1.1 use Makefile.xflow
|
||||
# 2007-06-03 45 1.0 Initial version
|
||||
#
|
||||
VBOM_all = $(wildcard *.vbom)
|
||||
NGC_all = $(VBOM_all:.vbom=.ngc)
|
||||
#
|
||||
.phony : all clean
|
||||
.PHONY : all clean
|
||||
#
|
||||
all : $(NGC_all)
|
||||
#
|
||||
@@ -16,7 +17,7 @@ clean : ise_clean
|
||||
#
|
||||
#----
|
||||
#
|
||||
include $(RETROBASE)/rtl/vlib/Makefile.xflow
|
||||
include $(RETROBASE)/rtl/make/generic_xflow.mk
|
||||
#
|
||||
include $(VBOM_all:.vbom=.dep_xst)
|
||||
#
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-- $Id: comlib.vhd 314 2010-07-09 17:38:41Z mueller $
|
||||
-- $Id: comlib.vhd 400 2011-07-31 09:02:16Z mueller $
|
||||
--
|
||||
-- Copyright 2007- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
|
||||
-- Copyright 2007-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
|
||||
--
|
||||
-- This program is free software; you may redistribute and/or modify it under
|
||||
-- the terms of the GNU General Public License as published by the Free
|
||||
@@ -16,9 +16,10 @@
|
||||
-- Description: communication components
|
||||
--
|
||||
-- Dependencies: -
|
||||
-- Tool versions: xst 8.1, 8.2, 9.1, 9.2, 11.4; ghdl 0.18-0.26
|
||||
-- Tool versions: xst 8.1, 8.2, 9.1, 9.2, 11.4, 12.1; ghdl 0.18-0.29
|
||||
-- Revision History:
|
||||
-- Date Rev Version Comment
|
||||
-- 2011-07-30 400 1.3 added byte2word, word2byte
|
||||
-- 2007-10-12 88 1.2.1 avoid ieee.std_logic_unsigned, use cast to unsigned
|
||||
-- 2007-07-08 65 1.2 added procedure crc8_update_tbl
|
||||
-- 2007-06-29 61 1.1.1 rename for crc8 SALT->INIT
|
||||
@@ -34,6 +35,34 @@ use work.slvtypes.all;
|
||||
|
||||
package comlib is
|
||||
|
||||
component byte2word is -- 2 byte -> 1 word stream converter
|
||||
port (
|
||||
CLK : in slbit; -- clock
|
||||
RESET : in slbit; -- reset
|
||||
DI : in slv8; -- input data (byte)
|
||||
ENA : in slbit; -- write enable
|
||||
BUSY : out slbit; -- write port hold
|
||||
DO : out slv16; -- output data (word)
|
||||
VAL : out slbit; -- read valid
|
||||
HOLD : in slbit; -- read hold
|
||||
ODD : out slbit -- odd byte pending
|
||||
);
|
||||
end component;
|
||||
|
||||
component word2byte is -- 1 word -> 2 byte stream converter
|
||||
port (
|
||||
CLK : in slbit; -- clock
|
||||
RESET : in slbit; -- reset
|
||||
DI : in slv16; -- input data (word)
|
||||
ENA : in slbit; -- write enable
|
||||
BUSY : out slbit; -- write port hold
|
||||
DO : out slv8; -- output data (byte)
|
||||
VAL : out slbit; -- read valid
|
||||
HOLD : in slbit; -- read hold
|
||||
ODD : out slbit -- odd byte pending
|
||||
);
|
||||
end component;
|
||||
|
||||
component cdata2byte is -- 9bit comma,data -> byte stream
|
||||
generic (
|
||||
CPREF : slv4 := "1000"; -- comma prefix
|
||||
@@ -83,7 +112,7 @@ end component;
|
||||
procedure crc8_update_tbl (crc : inout slv8;
|
||||
data : in slv8);
|
||||
|
||||
end comlib;
|
||||
end package comlib;
|
||||
|
||||
-- ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-- $Id: crc8.vhd 314 2010-07-09 17:38:41Z mueller $
|
||||
-- $Id: crc8.vhd 406 2011-08-14 21:06:44Z mueller $
|
||||
--
|
||||
-- Copyright 2007- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
|
||||
-- Copyright 2007-2011 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
|
||||
--
|
||||
-- This program is free software; you may redistribute and/or modify it under
|
||||
-- the terms of the GNU General Public License as published by the Free
|
||||
@@ -31,9 +31,10 @@
|
||||
-- Dependencies: -
|
||||
-- Test bench: -
|
||||
-- Target Devices: generic
|
||||
-- Tool versions: xst 8.1, 8.2, 9.1, 9.2; ghdl 0.18-0.25
|
||||
-- Tool versions: xst 8.1, 8.2, 9.1, 9.2,.., 13.1; ghdl 0.18-0.25
|
||||
-- Revision History:
|
||||
-- Date Rev Version Comment
|
||||
-- 2011-08-14 406 1.0.1 remove superfluous variable r
|
||||
-- 2007-07-08 65 1.0 Initial version
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
@@ -78,13 +79,9 @@ begin
|
||||
end process proc_regs;
|
||||
|
||||
proc_next: process (R_CRC, DI, ENA)
|
||||
|
||||
variable r : slv8 := INIT;
|
||||
variable n : slv8 := INIT;
|
||||
|
||||
begin
|
||||
|
||||
r := R_CRC;
|
||||
n := R_CRC;
|
||||
|
||||
if ENA = '1' then
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
# $Id: Makefile 311 2010-06-30 17:52:37Z mueller $
|
||||
# $Id: Makefile 405 2011-08-14 08:16:28Z mueller $
|
||||
#
|
||||
# Revision History:
|
||||
# Date Rev Version Comment
|
||||
# 2011-08-13 405 1.1 use includes from rtl/make
|
||||
# 2007-11-26 98 1.0 Initial version
|
||||
#
|
||||
EXE_all = gen_crc8_tbl gen_crc8_tbl_check
|
||||
#
|
||||
#
|
||||
.phony : all clean
|
||||
.PHONY : all clean
|
||||
#
|
||||
all : $(EXE_all)
|
||||
#
|
||||
@@ -15,7 +16,7 @@ clean : ghdl_clean
|
||||
#
|
||||
#-----
|
||||
#
|
||||
include $(RETROBASE)/rtl/vlib/Makefile.ghdl
|
||||
include $(RETROBASE)/rtl/make/generic_ghdl.mk
|
||||
#
|
||||
VBOM_all = $(wildcard *.vbom)
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user