OpenCores

/trunk/tools/tcl/rlink/util.tcl

1,4 → 1,4

13,6 → 13,7

22,8 → 23,9

33,13 → 35,15

/trunk/tools/tcl/.tclshrc

1,8 → 1,10

/trunk/tools/tcl/rbs3hio/util.tcl

1,4 → 1,4

13,6 → 13,7

27,8 → 28,8

79,7 → 80,7

/trunk/tools/tcl/.wishrc

1,8 → 1,10

/trunk/tools/tcl/setup_packages

1,4 → 1,5

/trunk/tools/src/librlink/RlinkConnect.hpp

1,4 → 1,4

13,6 → 13,9

20,7 → 23,7

32,6 → 35,9

43,7 → 49,7

67,9 → 73,12

91,7 → 100,6

123,6 → 131,10

131,11 → 143,7

/trunk/tools/src/librlink/RlinkPort.hpp

1,4 → 1,4

13,6 → 13,7

20,7 → 21,7

30,6 → 31,8

36,7 → 39,7

106,12 → 109,6

/trunk/tools/src/librlink/Makefile

1,7 → 1,9

13,8 → 15,8

42,7 → 44,7

51,7 → 53,7

/trunk/tools/src/librlink/RlinkCommandList.cpp

1,4 → 1,4

13,6 → 13,7

19,7 → 20,7

26,6 → 27,9

62,7 → 66,7

224,8 → 228,8

254,7 → 258,8

/trunk/tools/src/librlink/RlinkPortTerm.cpp

1,4 → 1,4

13,12 → 13,13

155,6 → 156,39

/trunk/tools/src/librlink/RlinkConnect.cpp

1,4 → 1,4

13,6 → 13,8

19,14 → 21,15

33,6 → 36,7

52,10 → 56,12

88,7 → 94,7

128,13 → 134,41

/trunk/tools/src/librtools/RmethDscBase.ipp File deleted

/trunk/tools/src/librtools/RmethDscBase.hpp File deleted

/trunk/tools/src/librtools/RmethDsc.hpp File deleted

/trunk/tools/src/librtools/RmethDsc.ipp File deleted

/trunk/tools/src/librtools/RlogFile.hpp

1,4 → 1,4

13,12 → 13,13

29,9 → 30,11

53,13 → 56,6

/trunk/tools/src/librtools/RosPrintfBase.cpp

1,4 → 1,4

18,7 → 18,7

/trunk/tools/src/librtools/Rtools.cpp

1,4 → 1,4

19,7 → 19,7

/trunk/tools/src/librtools/Rtools.hpp

1,4 → 1,4

19,7 → 19,7

/trunk/tools/src/librtools/Makefile

1,7 → 1,8

42,7 → 43,7

51,7 → 52,7

/trunk/tools/src/librlinktpp/RtclRlinkConnect.cpp

1,4 → 1,4

13,6 → 13,7

20,7 → 21,7

29,11 → 30,12

55,20 → 57,19

/trunk/tools/src/librlinktpp/Makefile

1,7 → 1,9

14,7 → 16,7

39,7 → 41,7

48,7 → 50,7

/trunk/tools/src/librutiltpp/Makefile

1,7 → 1,9

14,7 → 16,7

39,7 → 41,7

48,7 → 50,7

/trunk/tools/src/librtcltools/RtclProxyBase.cpp

1,4 → 1,4

13,6 → 13,8

20,7 → 22,7

50,14 → 52,23

76,10 → 87,9

106,7 → 116,7

114,7 → 124,7

134,7 → 144,7

155,7 → 165,7

/trunk/tools/src/librtcltools/RtclProxyBase.hpp

1,4 → 1,4

13,6 → 13,9

19,7 → 22,7

31,24 → 34,28

60,9 → 67,8

78,11 → 84,6

/trunk/tools/src/librtcltools/RtclContext.hpp

1,4 → 1,4

13,6 → 13,7

20,7 → 21,7

33,12 → 34,14

73,12 → 76,6

/trunk/tools/src/librtcltools/RtclClassBase.hpp

1,4 → 1,4

13,6 → 13,7

19,7 → 20,7

26,11 → 27,13

64,13 → 67,6

/trunk/tools/src/librtcltools/Makefile

1,7 → 1,9

13,7 → 15,7

39,7 → 41,7

48,7 → 50,7

/trunk/tools/src/Makefile

1,4 → 1,4

5,6 → 5,7

18,9 → 19,9

44,8 → 45,8

/trunk/tools/bin/impact_wrapper File deleted

trunk/tools/bin/impact_wrapper Property changes : Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Index: trunk/tools/bin/ti_rri =================================================================== --- trunk/tools/bin/ti_rri (revision 11) +++ trunk/tools/bin/ti_rri (revision 12) @@ -1,6 +1,6 @@ #! /usr/bin/env tclsh # -*- tcl -*- -# $Id: ti_rri 376 2011-04-17 12:24:07Z mueller $ +# $Id: ti_rri 386 2011-07-01 17:31:03Z mueller $ # # Copyright 2011- by Walter F.J. Mueller # @@ -15,6 +15,7 @@ # # Revision History: # Date Rev Version Comment +# 2011-04-22 379 1.0.1 check for RETROBASE; proper exit handling; help text # 2011-04-17 376 1.0 Initial version # 2011-03-19 371 0.1 First draft # @@ -49,7 +50,30 @@ set clist {} set optsendseen 0 +set runpid {} +# +# cleanup handler +# must be in a proc so that it can be called from tclreadline +# must be defined before ::tclreadline::Loop called (all after ignored...) +# +proc exit_cleanup {} { + global opts + global runpid + + # now close rlink connection + if { $opts(fifo) || $opts(term) } { + rlc close + } + + # FIXME_code: should sync here with -run process run-down + # but no wait available in tcl (grr...) + if { "$runpid" ne "" } { + after 100; # currently just wait 100ms + } + return +} + foreach arg $argv { if { $optsendseen } { lappend clist $arg @@ -74,10 +98,56 @@ } if { $opts(help) } { - puts "usage: ti_rri" + # use {} as defimiter here to avoid that escaping of all [] + puts {usage: ti_rri [OPTION]... [COMMAND]...} + puts {} + puts {Options:} + puts { --run=CMD exec's CMD as subprocess before the rlink port opened} + puts { useful to start test benches, usually via 'tbw'} + puts { --fifo[=ARGS] open fifo type rlink port. Optional arguments are:} + puts { --fifo=[NAME[,KEEP]]} + puts { NAME fifo name prefix, default 'rlink_cext_fifo'} + puts { KEEP if non-empty the fifo is kept open on exit} + puts { --term[=ARGS] open term type rlink port. Optional arguments are:} + puts { --term=[NAME,[BAUD,[BREAK]]]} + puts { NAME tty device name, default 'USB0'} + puts { if not starting with '/' the name is} + puts { prefixed with '/dev/tty'} + puts { BAUD serial port baud rate, default '115k'} + puts { allowed baud rate settings are:} + puts { 9600, 19200, 19k, 38400, 38k, 57600, 57k} + puts { 115200, 115k, 230400, 230k, 460800, 460k} + puts { 500000, 500k, 921600, 921k, 1000000, 1M} + puts { 2000000, 2M, 3000000, 3M} + puts { --log=FILE set log file name. Default is to write to stdout.} + puts { --logl=LVL set log level, default is '2' allowed values:} + puts { 0 no logging} + puts { 1 log rlink commands with communication errors} + puts { 2 log rlink commands with failed checks} + puts { 3 log all rlink commands} + puts { --dmpl=LVL set dump level, default is '0', values like logl} + puts { --tiol=LVL set i/o trace level, default is '0', allowed values:} + puts { 0 no i/o trace} + puts { 1 trace buffer activities} + puts { 2 trace character activities} + puts { --int enter interactive mode even when commands given} + puts { --help display this help and exit} + puts { -- all following arguments are treated as tcl commands} + puts {} + puts {Command handling:} + puts { For arguments of the form '@.tcl' the respective file is} + puts { sourced. All other arguments are treated as Tcl commands and executed} + puts { with eval.} + puts {} + puts {For further details consults the ti_rri man page.} return 0 } +if {![info exists env(RETROBASE)]} { + puts "-E: RETROBASE environment variable not defined" + return 1 +} + if { $opts(fifo) && $opts(term) } { puts "-E: both --fifo and --term given, only one allowed" return 1 @@ -100,8 +170,7 @@ rlc config -logdumplevel $opts(dmpl_) rlc config -logtracelevel $opts(tiol_) -# first start, if specified with -run, the test bench -set runpid {} +# first start, if specified with --run, the test bench if { $opts(run_) ne "" } { if { [catch {eval "exec $opts(run_) &" } runpid] } { puts "-E: failed to execute \"$opts(run_)\" with error message\n $runpid" @@ -130,7 +199,7 @@ set brk [lindex $nlist 2] if {$dev eq ""} {set dev "USB0"} if {$baud eq ""} {set baud "115k"} - if {! [regexp -- {^/dev} $dev]} { + if {! [regexp -- {^/} $dev]} { set dev "/dev/tty$dev" } set url "term:$dev?baud=$baud" @@ -187,21 +256,11 @@ return "ti_rri > " } } + ::tclreadline::readline eofchar {::exit_cleanup; puts {}; exit} ::tclreadline::Loop } +} else { + exit_cleanup } -# -# now close rlink connection -# -if { $opts(fifo) || $opts(term) } { - rlc close -} - -# FIXME_code: should sync here with -run process run-down -# but no wait available in tcl (grr...) -if { $runpid } { - after 100; # currently just wait 100ms -} - return 0

/trunk/tools/bin/vbomconv

1,7 → 1,7

14,6 → 14,11

46,7 → 51,7

87,7 → 92,15

106,7 → 119,7

307,8 → 320,11

484,17 → 500,18

/trunk/tools/bin/isemsg_filter

0,0 → 1,200

trunk/tools/bin/isemsg_filter Property changes : Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/tools/bin/config_wrapper =================================================================== --- trunk/tools/bin/config_wrapper (nonexistent) +++ trunk/tools/bin/config_wrapper (revision 12) @@ -0,0 +1,246 @@ +#!/usr/bin/perl -w +# $Id: config_wrapper 402 2011-08-05 18:56:44Z mueller $ +# +# Copyright 2010-2011 by Walter F.J. Mueller +# +# 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 +# Software Foundation, either version 2, or at your option any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for complete details. +# +# Revision History: +# Date Rev Version Comment +# 2011-08-04 402 1.1.4 add atlys support; +# 2011-07-25 399 1.1.3 add nexys2-500 support; bsdl path for sp605 +# 2011-07-18 395 1.1.2 cleanup bsdl path creation for jtag +# 2011-07-17 394 1.1.1 add bit->svf conversion and config with jtag +# 2011-07-11 393 1.1 renamed from impact_wrapper; add function parameter, +# old action with 'iconfig' +# 2011-07-01 386 1.0.3 support sp605/xc6slx45t +# 2010-05-24 294 1.0.2 support nexys2/xc3s1200e +# 2010-04-24 282 1.0.1 proper error exit for GetOptions() +# 2010-04-24 281 1.0 Initial version +# + +use 5.005; # require Perl 5.005 or higher +use strict; # require strict checking +use FileHandle; + +use Getopt::Long; + +my %opts = (); + +GetOptions(\%opts, "help", "dry_run", "board=s", "path=s") or exit 1; + +# setup defaults for board and path +if (not defined $opts{board}) { + $opts{board} = "s3board"; +} +if (not defined $opts{path}) { + $opts{path} = "xc3s1000" if $opts{board} eq "s3board"; + $opts{path} = "xc3s1200e" if $opts{board} eq "nexys2"; + $opts{path} = "xc6slx45" if $opts{board} eq "atlys"; + $opts{path} = "xc6slx45t" if $opts{board} eq "sp605"; +} + +sub print_help; +sub run_command; + + +autoflush STDOUT 1 if (-p STDOUT); # autoflush if output into pipe + +if (exists $opts{help}) { + print_help; + exit 0; +} + +my $board = $opts{board}; +my $ipath = $opts{path}; + +$ipath =~ s/-.*$//; # trim all after first '-' + +# now setup JTAG chain config + +my @plist; +my $pfpga; + +# +# Note: when new targets are added update also the blist logic below +# +if ($board eq "s3board" && $ipath eq "xc3s200") { # S3BOARD-200 + @plist = ($ipath, "xcf02s"); + $pfpga = 1; +} elsif ($board eq "s3board" && $ipath eq "xc3s1000") { # S3BOARD-1200 + @plist = ($ipath, "xcf04s"); + $pfpga = 1; + +} elsif ($board eq "nexys2" && $ipath eq "xc3s1200e") { # nexys2-1200 + @plist = ($ipath, "xcf04s"); + $pfpga = 1; +} elsif ($board eq "nexys2" && $ipath eq "xc3s500e") { # nexys2-500 + @plist = ($ipath, "xcf04s"); + $pfpga = 1; + +} elsif ($board eq "atlys" && $ipath eq "xc6slx45") { # atlys + @plist = ($ipath); + $pfpga = 1; + +} elsif ($board eq "sp605" && $ipath eq "xc6slx45t") { # sp605 + @plist = ("xccace", $ipath); + $pfpga = 2; +} else { + print STDERR "config_wrapper-E: only s3board/nexys2/sp605 supported\n"; + exit 1; +} + +my @blist; +foreach my $part (@plist) { + if ($part =~ m/^xcf/) { push @blist, "xcf/data" } # proms + elsif ($part =~ m/^xc3s\d*$/) { push @blist, "spartan3/data" } # s-3 + elsif ($part =~ m/^xc3s\d*e$/) { push @blist, "spartan3e/data" } # s-3e + elsif ($part =~ m/^xc6slx\d*t?$/) { push @blist, "spartan6/data" }# s-6 lx + elsif ($part =~ m/^xccace$/) { push @blist, "acempm/data" } # sys-ace + else { + print STDERR "config_wrapper-E: no bsdl path known for $part\n"; + exit 1; + } +} + +my $cmd = shift @ARGV; +my $file = shift @ARGV; + +if (! defined $cmd) { + print STDERR "config_wrapper-E: no command specified\n"; + exit 1; +} + +if (! defined $file) { + print STDERR "config_wrapper-E: no bit or svf file specified\n"; + exit 1; +} +if (! -r $file) { + print STDERR "config_wrapper-E: input file not found or readable\n"; + exit 1; +} + +my $xilpath = $ENV{XILINX}; +if (! defined $xilpath) { + print STDERR "config_wrapper-E: XILINX environment variable not defined\n"; + exit 1; +} + +# ----- iconfig action -------------------------------------------------------- +if ($cmd eq "iconfig") { + + my $tmpfile = "tmp_config_wrapper.cmd"; + open (OFILE, ">$tmpfile") or die "Couldn't open tmp cmd file: $!"; + + print OFILE "setMode -bs\n"; + print OFILE "setCable -p auto\n"; + for (my $i = 0; $i<=$#plist; $i++) { + printf OFILE "addDevice -p %d -part %s\n", $i+1, $plist[$i]; + } + printf OFILE "assignFile -p %d -file %s\n", $pfpga, $file; + printf OFILE "program -p %d -verify\n", $pfpga; + print OFILE "quit\n"; + + close (OFILE) or die "Couldn't close tmp cmd file: $!"; + + my $rc = run_command("impact -batch", $tmpfile); + exit $rc; + +# ----- jconfig action -------------------------------------------------------- +} elsif ($cmd eq "jconfig") { + + my $bpath = join ";", map "$xilpath/$_",@blist; + + my $tmpfile = "tmp_config_wrapper.cmd"; + open (OFILE, ">$tmpfile") or die "Couldn't open tmp cmd file: $!"; + + # the UrJtag and Xilinx impact have different chain and part number schemes + # impact: 1-based, 1 is first in chain; + # UrJtag: 0-based, 0 is last in chain; + # e.g. on Digilent Nexys2: + # impact: (1) FPGA (2) PROM + # UrJtag: (1) FPGA (0) PROM + + my $jtag_part = $#plist + 1 - $pfpga; + + print OFILE "cable usbblaster\n"; + printf OFILE "bsdl path %s\n", $bpath; + print OFILE "detect\n"; + printf OFILE "part %d\n", $jtag_part; + printf OFILE "svf %s\n", $file; + + close (OFILE) or die "Couldn't close tmp cmd file: $!"; + + my $rc = run_command("jtag", $tmpfile); + exit $rc; + +# ----- bit2svf action -------------------------------------------------------- +} elsif ($cmd eq "bit2svf") { + my $ofile = $file; + $ofile =~ s/\.bit/\.svf/; + + my $tmpfile = "tmp_config_wrapper.cmd"; + open (OFILE, ">$tmpfile") or die "Couldn't open tmp cmd file: $!"; + + print OFILE "setMode -bs\n"; + printf OFILE "setCable -port svf -file %s\n", $ofile; + printf OFILE "addDevice -p 1 -file %s\n", $file; + print OFILE "program -p 1\n"; + print OFILE "quit\n"; + + close (OFILE) or die "Couldn't close tmp cmd file: $!"; + + my $rc = run_command("impact -batch", $tmpfile); + exit $rc; +} + +print STDERR "config_wrapper-E: command must be bit2svf, iconfig or jconfig\n"; +exit 1; + +#------------------------------------------------------------------------------- + +sub run_command { + + my ($cmd, $tmpfile) = @_; + + my $wrc; + if (defined $opts{dry_run}) { + print STDOUT "$cmd\n"; + $wrc = system "/bin/sh", "-c", "cat $tmpfile"; + } else { + $wrc = system "/bin/sh", "-c", "$cmd $tmpfile"; + } + + my $rc = 0; + if ($wrc != 0) { + my $rc = int($wrc/256); + if ($rc == 0) { + my $sig = $wrc % 256; + print STDERR "config_wrapper-I $cmd aborted by signal $sig\n"; + $rc = 1; + } else { + print STDERR "config_wrapper-I $cmd failed (rc=$rc) $?\n"; + } + } + + unlink $tmpfile or die "Couldn't delete tmp cmd file: $!"; + return $rc; +} + +#------------------------------------------------------------------------------- + +sub print_help { + print "usage: config_wrapper [--help] [--board=b] [--path=p] cmd file\n"; + print " cmd bit2svf or iconfig or jconfig\n"; + print " --help this message\n"; + print " --dry_run print impact command list\n"; + print " --board=b type of board\n"; + print " --path=p type of fpga\n"; +}

trunk/tools/bin/config_wrapper Property changes : Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/tools/bin/.cvsignore =================================================================== --- trunk/tools/bin/.cvsignore (nonexistent) +++ trunk/tools/bin/.cvsignore (revision 12) @@ -0,0 +1 @@ +cycfx2prog Index: trunk/tools/bin =================================================================== --- trunk/tools/bin (revision 11) +++ trunk/tools/bin (revision 12)

trunk/tools/bin Property changes : Modified: svn:ignore ## -30,3 +30,4 ## *_svn.log *_sum.log *_[dsft]sim.log +cycfx2prog Index: trunk/tools/dox/w11.Doxyfile =================================================================== --- trunk/tools/dox/w11.Doxyfile (revision 11) +++ trunk/tools/dox/w11.Doxyfile (revision 12) @@ -1,4 +1,4 @@ -# $Id: $ +# $Id: w11.Doxyfile 403 2011-08-06 17:36:22Z mueller $ # Revision History: # Date Rev Version Comment # 2011-01-09 354 1.0 Initial version Index: trunk/rtl/ibus/Makefile =================================================================== --- trunk/rtl/ibus/Makefile (revision 11) +++ trunk/rtl/ibus/Makefile (revision 12) @@ -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 # 2008-08-22 161 1.0 Initial version # VBOM_all = $(wildcard *.vbom) NGC_all = $(VBOM_all:.vbom=.ngc) # -.phony : all clean +.PHONY : all clean # all : $(NGC_all) # @@ -15,7 +16,7 @@ # #---- # -include $(RETROBASE)/rtl/vlib/Makefile.xflow +include $(RETROBASE)/rtl/make/generic_xflow.mk # include $(VBOM_all:.vbom=.dep_xst) # Index: trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.mfset =================================================================== --- trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.mfset (nonexistent) +++ trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.mfset (revision 12) @@ -0,0 +1,63 @@ +# $Id: sys_tst_rlink_n2.mfset 406 2011-08-14 21:06:44Z mueller $ +# +# ---------------------------------------------------------------------------- +[xst] +INFO:.*Mux is complete : default of case is discarded + +Node of sequential type is unconnected +Node of sequential type is unconnected +Node of sequential type is unconnected +Node of sequential type is unconnected + +Unconnected output port 'LOCKED' of component 'dcm_sp_sfs' +Unconnected output port 'OFIFO_SIZE' of component 'rlink_base' +Unconnected output port 'DOA' of component 'ram_1swar_1ar_gen' +Unconnected output port 'DOB' of component 'ram_2swsr_wfirst_gen' + +Input is never used +Input > is never used +Input is never used +Input is never used +Input is never used + +Signal > is assigned but never used +Signal is assigned but never used +Signal > is assigned but never used +ignal is assigned but never used +Signal is assigned but never used +Signal is assigned but never used +Signal > is assigned but never used +Signal > is assigned but never used +Signal > is assigned but never used +Signal is assigned but never used +Signal is assigned but never used +Signal is assigned but never used +Signal is assigned but never used + +FF/Latch in Unit is equivalent +FF/Latch in Unit is equivalent + +FF/Latch has a constant value of 0 +FF/Latch has a constant value of 0 + +# +# ---------------------------------------------------------------------------- +[tra] + +# +# ---------------------------------------------------------------------------- +[map] +The signal is incomplete +Logical network I_MEM_WAIT_IBUF has no load +INFO:.* + +# +# ---------------------------------------------------------------------------- +[par] +The signal I_MEM_WAIT_IBUF has no load +There are 1 loadless signals in this design +# +# ---------------------------------------------------------------------------- +[bgn] +Spartan-3 1200E and 1600E devices do not support bitstream +The signal is incomplete \ No newline at end of file Index: trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.ucf_cpp =================================================================== --- trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.ucf_cpp (revision 11) +++ trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.ucf_cpp (revision 12) @@ -1,4 +1,4 @@ -## $Id: mueller $ +## $Id: sys_tst_rlink_n2.ucf_cpp 403 2011-08-06 17:36:22Z mueller $ ## ## Revision History: ## Date Rev Version Comment Index: trunk/rtl/sys_gen/tst_rlink/nexys2/tb/Makefile =================================================================== --- trunk/rtl/sys_gen/tst_rlink/nexys2/tb/Makefile (revision 11) +++ trunk/rtl/sys_gen/tst_rlink/nexys2/tb/Makefile (revision 12) @@ -1,7 +1,8 @@ -# $Id: Makefile 351 2010-12-30 21:50:54Z 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 # 2010-12-29 351 1.0 Initial version # EXE_all = tb_tst_rlink_n2 @@ -8,7 +9,7 @@ # ISE_PATH = xc3s1200e-fg320-4 # -.phony : all all_ssim all_tsim clean +.PHONY : all all_ssim all_tsim clean # all : $(EXE_all) all_ssim : $(EXE_all:=_ssim) @@ -19,8 +20,8 @@ # #----- # -include $(RETROBASE)/rtl/vlib/Makefile.ghdl -include $(RETROBASE)/rtl/vlib/Makefile.xflow +include $(RETROBASE)/rtl/make/generic_ghdl.mk +include $(RETROBASE)/rtl/make/generic_xflow.mk # VBOM_all = $(wildcard *.vbom) # Index: trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vhd =================================================================== --- trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vhd (revision 11) +++ trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vhd (revision 12) @@ -1,4 +1,4 @@ --- $Id: sys_tst_rlink_n2.vhd 375 2011-04-02 07:56:47Z mueller $ +-- $Id: sys_tst_rlink_n2.vhd 406 2011-08-14 21:06:44Z mueller $ -- -- Copyright 2010-2011 by Walter F.J. Mueller -- @@ -17,7 +17,9 @@ -- -- Dependencies: vlib/xlib/dcm_sp_sfs -- vlib/genlib/clkdivce --- bplib/s3board/s3_rs232_iob_int_ext +-- bplib/bpgen/bp_rs232_2l4l_iob +-- bplib/bpgen/sn_humanio_rbus +-- tst_rlink -- vlib/nexys2/n2_cram_dummy -- -- Test bench: tb/tb_tst_rlink_n2 @@ -27,14 +29,34 @@ -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2011-06-26 385 12.1 M53d xc3s1200e-4 688 1500 68 993 t 16.2 -- 2011-04-02 375 12.1 M53d xc3s1200e-4 688 1572 68 994 t 13.8 -- 2010-12-29 351 12.1 M53d xc3s1200e-4 604 1298 68 851 t 14.7 -- -- Revision History: -- Date Rev Version Comment +-- 2011-07-09 391 1.1.2 use now bp_rs232_2l4l_iob +-- 2011-07-08 390 1.1.1 use now sn_humanio +-- 2011-06-26 385 1.1 move s3_humanio_rbus from tst_rlink to top level -- 2010-12-29 351 1.0 Initial version ------------------------------------------------------------------------------ +-- Usage of Nexys 2 Switches, Buttons, LEDs: -- +-- SWI(0): 0 -> main board RS232 port - implemented in bp_rs232_2l4l_iob +-- 1 -> Pmod B/top RS232 port / +-- (1:7): no function (only connected to s3_humanio_rbus) +-- +-- LED(0): timer 0 busy +-- LED(1): timer 1 busy +-- LED(2:6): no function (only connected to s3_humanio_rbus) +-- LED(7): RL_SER_MONI.abact +-- +-- DSP: RL_SER_MONI.clkdiv (from auto bauder) +-- DP(0): RL_SER_MONI.rxact +-- DP(1): RTS_N (shows rx back preasure) +-- DP(2): RL_SER_MONI.txact +-- DP(3): CTS_N (shows tx back preasure) +-- library ieee; use ieee.std_logic_1164.all; @@ -43,7 +65,9 @@ use work.slvtypes.all; use work.xlib.all; use work.genlib.all; -use work.s3boardlib.all; +use work.rblib.all; +use work.rlinklib.all; +use work.bpgenlib.all; use work.nexys2lib.all; use work.sys_conf.all; @@ -90,16 +114,28 @@ signal SWI : slv8 := (others=>'0'); signal BTN : slv4 := (others=>'0'); + signal LED : slv8 := (others=>'0'); + signal DSP_DAT : slv16 := (others=>'0'); + signal DSP_DP : slv4 := (others=>'0'); signal RESET : slbit := '0'; signal CE_USEC : slbit := '0'; signal CE_MSEC : slbit := '0'; + signal RB_MREQ_TOP : rb_mreq_type := rb_mreq_init; + signal RB_SRES_TOP : rb_sres_type := rb_sres_init; + signal RL_SER_MONI : rl_ser_moni_type := rl_ser_moni_init; + signal STAT : slv8 := (others=>'0'); + + constant rbaddr_hio : slv8 := "11000000"; -- 110000xx + begin assert (sys_conf_clksys mod 1000000) = 0 report "assert sys_conf_clksys on MHz grid" severity failure; + + RESET <= '0'; -- so far not used DCM : dcm_sp_sfs generic map ( @@ -125,9 +161,10 @@ CE_MSEC => CE_MSEC ); - IOB_RS232 : s3_rs232_iob_int_ext + IOB_RS232 : bp_rs232_2l4l_iob port map ( CLK => CLK, + RESET => '0', SEL => SWI(0), RXD => RXD, TXD => TXD, @@ -141,21 +178,21 @@ O_RTS1_N => O_FUSP_RTS_N ); - RLTEST : entity work.tst_rlink + HIO : sn_humanio_rbus generic map ( DEBOUNCE => sys_conf_hio_debounce, - CDINIT => sys_conf_ser2rri_cdinit) + RB_ADDR => rbaddr_hio) port map ( CLK => CLK, RESET => RESET, - CE_USEC => CE_USEC, CE_MSEC => CE_MSEC, - RXD => RXD, - TXD => TXD, - CTS_N => CTS_N, - RTS_N => RTS_N, + RB_MREQ => RB_MREQ_TOP, + RB_SRES => RB_SRES_TOP, SWI => SWI, BTN => BTN, + LED => LED, + DSP_DAT => DSP_DAT, + DSP_DP => DSP_DP, I_SWI => I_SWI, I_BTN => I_BTN, O_LED => O_LED, @@ -163,6 +200,24 @@ O_SEG_N => O_SEG_N ); + RLTEST : entity work.tst_rlink + generic map ( + CDINIT => sys_conf_ser2rri_cdinit) + port map ( + CLK => CLK, + RESET => RESET, + CE_USEC => CE_USEC, + CE_MSEC => CE_MSEC, + RXD => RXD, + TXD => TXD, + CTS_N => CTS_N, + RTS_N => RTS_N, + RB_MREQ_TOP => RB_MREQ_TOP, + RB_SRES_TOP => RB_SRES_TOP, + RL_SER_MONI => RL_SER_MONI, + STAT => STAT + ); + SRAM_PROT : n2_cram_dummy -- connect CRAM to protection dummy port map ( O_MEM_CE_N => O_MEM_CE_N, @@ -177,5 +232,16 @@ O_MEM_ADDR => O_MEM_ADDR, IO_MEM_DATA => IO_MEM_DATA ); - + + DSP_DAT <= RL_SER_MONI.clkdiv; + DSP_DP(0) <= RL_SER_MONI.rxact; + DSP_DP(1) <= RTS_N; + DSP_DP(2) <= RL_SER_MONI.txact; + DSP_DP(3) <= CTS_N; + + LED(7) <= RL_SER_MONI.abact; + LED(6 downto 2) <= (others=>'0'); + LED(1) <= STAT(1); + LED(0) <= STAT(0); + end syn;

/trunk/rtl/sys_gen/tst_rlink/nexys2/sys_tst_rlink_n2.vbom

2,7 → 2,9

9,7 → 11,8

/trunk/rtl/sys_gen/tst_rlink/nexys2/.cvsignore

1,3 → 1,4

/trunk/rtl/sys_gen/tst_rlink/nexys2/Makefile

1,7 → 1,8

10,7 → 11,7

24,8 → 25,8

/trunk/rtl/sys_gen/tst_rlink/nexys2

trunk/rtl/sys_gen/tst_rlink/nexys2 Property changes : Modified: svn:ignore ## -33,3 +33,4 ## _impactbatch.log sys_tst_rlink_n2.ucf *.dep_ucf_cpp +*.svf Index: trunk/rtl/sys_gen/tst_rlink/tst_rlink.vhd =================================================================== --- trunk/rtl/sys_gen/tst_rlink/tst_rlink.vhd (revision 11) +++ trunk/rtl/sys_gen/tst_rlink/tst_rlink.vhd (revision 12) @@ -1,6 +1,6 @@ --- $Id: tst_rlink.vhd 375 2011-04-02 07:56:47Z mueller $ +-- $Id: tst_rlink.vhd 385 2011-06-26 22:10:57Z mueller $ -- --- Copyright 2010- by Walter F.J. Mueller +-- Copyright 2010-2011 by Walter F.J. Mueller -- -- 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 @@ -21,7 +21,6 @@ -- rbus/rbd_rbmon -- rbus/rbd_eyemon -- rbus/rbd_timer --- s3board/s3_humanio_rbus -- rbus/rb_sres_or_4 -- -- Test bench: nexys2/tb/tb_tst_rlink_n2 @@ -31,24 +30,15 @@ -- -- Revision History: -- Date Rev Version Comment +-- 2011-06-26 385 1.1 remove s3_humanio_rbus (will be in board design); +-- remove hio interface ports, add rbus ports -- 2011-04-02 375 1.0.1 add rbd_eyemon and two timer -- 2010-12-29 351 1.0 Initial version (inspired by sys_tst_rri) ------------------------------------------------------------------------------ --- Usage of Nexys 2 Switches, Buttons, LEDs: --- --- SWI(0): 0 -> main board RS232 port - implemented in sys_tst_rlink_* --- 1 -> Pmod B/top RS232 port / --- (1:7): no function (only connected to s3_humanio_rbus) --- --- LED(0): timer 0 busy --- LED(1): timer 1 busy --- LED(2:7): no function (only connected to s3_humanio_rbus) --- --- DSP: RL_SER_MONI.clkdiv (from auto bauder) --- DP(0): RXSD (inverted to signal activity) --- DP(1): RTS_N (shows rx back preasure) --- DP(2): TXSD (inverted to signal activity) --- DP(3): CTS_N (shows tx back preasure) +-- Usage of STAT signal: +-- STAT(0): timer 0 busy +-- STAT(1): timer 1 busy +-- STAT(2:7): unused library ieee; use ieee.std_logic_1164.all; @@ -58,13 +48,11 @@ use work.rblib.all; use work.rbdlib.all; use work.rlinklib.all; -use work.s3boardlib.all; -- ---------------------------------------------------------------------------- entity tst_rlink is -- tester for rlink generic ( - DEBOUNCE : boolean := true; CDINIT : natural := 15); port ( CLK : in slbit; -- clock @@ -75,26 +63,15 @@ TXD : out slbit; -- transmit data (board view) CTS_N : in slbit; -- rs232 cts_n RTS_N : out slbit; -- rs232 rts_n - SWI : out slv8; -- switches (for top cntl) - BTN : out slv4; -- buttons (for top cntl) - I_SWI : in slv8; -- s3 switches - I_BTN : in slv4; -- s3 buttons - O_LED : out slv8; -- s3 leds - O_ANO_N : out slv4; -- 7 segment disp: anodes (act.low) - O_SEG_N : out slv8 -- 7 segment disp: segments (act.low) + RB_MREQ_TOP : out rb_mreq_type; -- rbus: request to top + RB_SRES_TOP : in rb_sres_type; -- rbus: response from top + RL_SER_MONI: out rl_ser_moni_type; -- rlink monitor + STAT : out slv8 -- status flags ); end tst_rlink; architecture syn of tst_rlink is - signal RTS_N_L : slbit := '0'; - signal DSP_DAT : slv16 := (others=>'0'); - signal DSP_DP : slv4 := (others=>'0'); - - signal SWI_L : slv8 := (others=>'0'); - signal BTN_L : slv4 := (others=>'0'); - signal LED : slv8 := (others=>'0'); - signal RB_MREQ : rb_mreq_type := rb_mreq_init; signal RB_SRES : rb_sres_type := rb_sres_init; signal RB_SRES_TEST : rb_sres_type := rb_sres_init; @@ -103,7 +80,6 @@ signal RB_SRES_EMON : rb_sres_type := rb_sres_init; signal RB_SRES_TIM0 : rb_sres_type := rb_sres_init; signal RB_SRES_TIM1 : rb_sres_type := rb_sres_init; - signal RB_SRES_HIO : rb_sres_type := rb_sres_init; signal RB_SRES_SUM1 : rb_sres_type := rb_sres_init; signal RB_LAM : slv16 := (others=>'0'); @@ -117,7 +93,7 @@ signal TIM1_BUSY : slbit := '0'; signal RL_MONI : rl_moni_type := rl_moni_init; - signal RL_SER_MONI : rl_ser_moni_type := rl_ser_moni_init; + signal RL_SER_MONI_L : rl_ser_moni_type := rl_ser_moni_init; constant rbaddr_mon : slv8 := "11111100"; -- 111111xx constant rbaddr_emon : slv8 := "11111000"; -- 111110xx @@ -125,7 +101,6 @@ constant rbaddr_test : slv8 := "11110000"; -- 111100xx constant rbaddr_tim1 : slv8 := "11100001"; -- 11100001 constant rbaddr_tim0 : slv8 := "11100000"; -- 11100000 - constant rbaddr_hio : slv8 := "11000000"; -- 110000xx begin @@ -150,13 +125,13 @@ RXSD => RXD, TXSD => TXD, CTS_N => CTS_N, - RTS_N => RTS_N_L, + RTS_N => RTS_N, RB_MREQ => RB_MREQ, RB_SRES => RB_SRES, RB_LAM => RB_LAM, RB_STAT => RB_STAT, RL_MONI => RL_MONI, - RL_SER_MONI => RL_SER_MONI + RL_SER_MONI => RL_SER_MONI_L ); RB_LAM(15 downto 2) <= RB_LAM_TEST(15 downto 2); @@ -207,7 +182,7 @@ RB_MREQ => RB_MREQ, RB_SRES => RB_SRES_EMON, RXSD => RXD, - RXACT => RL_SER_MONI.rxact + RXACT => RL_SER_MONI_L.rxact ); TIM0 : rbd_timer @@ -236,34 +211,12 @@ BUSY => TIM1_BUSY ); - HIO : s3_humanio_rbus - generic map ( - DEBOUNCE => DEBOUNCE, - RB_ADDR => rbaddr_hio) - port map ( - CLK => CLK, - RESET => RESET, - CE_MSEC => CE_MSEC, - RB_MREQ => RB_MREQ, - RB_SRES => RB_SRES_HIO, - SWI => SWI_L, - BTN => BTN_L, - LED => LED, - DSP_DAT => DSP_DAT, - DSP_DP => DSP_DP, - I_SWI => I_SWI, - I_BTN => I_BTN, - O_LED => O_LED, - O_ANO_N => O_ANO_N, - O_SEG_N => O_SEG_N - ); - RB_SRES_OR1 : rb_sres_or_4 port map ( RB_SRES_1 => RB_SRES_TEST, RB_SRES_2 => RB_SRES_BRAM, RB_SRES_3 => RB_SRES_MON, - RB_SRES_4 => RB_SRES_HIO, + RB_SRES_4 => RB_SRES_TOP, RB_SRES_OR => RB_SRES_SUM1 ); @@ -276,18 +229,11 @@ RB_SRES_OR => RB_SRES ); - DSP_DAT <= RL_SER_MONI.clkdiv; - DSP_DP(0) <= RL_SER_MONI.rxact; - DSP_DP(1) <= RTS_N_L; - DSP_DP(2) <= RL_SER_MONI.txact; - DSP_DP(3) <= CTS_N; + RB_MREQ_TOP <= RB_MREQ; + RL_SER_MONI <= RL_SER_MONI_L; - LED(0) <= TIM0_BUSY; - LED(1) <= TIM1_BUSY; - LED(7) <= RL_SER_MONI.abact; - - RTS_N <= RTS_N_L; - SWI <= SWI_L; - BTN <= BTN_L; - + STAT(0) <= TIM0_BUSY; + STAT(1) <= TIM1_BUSY; + STAT(7 downto 2) <= (others=>'0'); + end syn;

/trunk/rtl/sys_gen/tst_rlink/tst_rlink.vbom

3,7 → 3,6

11,7 → 10,6

/trunk/rtl/sys_gen/w11a/nexys2/balanced.opt File deleted

/trunk/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.mfset

0,0 → 1,148

/trunk/rtl/sys_gen/w11a/nexys2/tb/Makefile

1,7 → 1,8

9,7 → 10,7

19,8 → 20,8

/trunk/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd

1,6 → 1,6

17,8 → 17,8

33,7 → 33,7

62,6 → 62,8

116,7 → 118,7

263,9 → 265,10

279,7 → 282,7

/trunk/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vbom

4,7 → 4,7

14,8 → 14,8

/trunk/rtl/sys_gen/w11a/nexys2/Makefile

1,7 → 1,8

10,7 → 11,7

24,8 → 25,8

/trunk/rtl/sys_gen/w11a/s3board/tb/Makefile

1,7 → 1,8

11,7 → 12,7

21,8 → 22,8

/trunk/rtl/sys_gen/w11a/s3board/sys_w11a_s3.mfset

0,0 → 1,133

/trunk/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd

1,6 → 1,6

16,8 → 16,8

32,7 → 32,7

71,6 → 71,8

133,6 → 135,7

253,9 → 256,10

269,7 → 273,7

/trunk/rtl/sys_gen/w11a/s3board/Makefile

1,7 → 1,8

15,7 → 16,7

29,8 → 30,8

/trunk/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vbom

3,6 → 3,7

10,8 → 11,8

/trunk/rtl/bplib/issi/Makefile

1,17 → 1,18

/trunk/rtl/bplib/nexys2/nexys2lib.vhd

1,4 → 1,4

54,7 → 54,7

138,4 → 138,4

/trunk/rtl/bplib/nexys2/tb/Makefile

1,7 → 1,8

10,7 → 11,7

20,9 → 21,9

/trunk/rtl/bplib/nexys2/Makefile

1,7 → 1,8

9,7 → 10,7

17,7 → 18,7

/trunk/rtl/bplib/nexys2/nexys2_pins.ucf

1,9 → 1,9

/trunk/rtl/bplib/bpgen/bp_rs232_2line_iob.vbom

0,0 → 1,8

/trunk/rtl/bplib/bpgen/sn_humanio.vhd

0,0 → 1,118

/trunk/rtl/bplib/bpgen/bp_rs232_4line_iob.vbom

0,0 → 1,8

/trunk/rtl/bplib/bpgen/bpgenlib.vbom

0,0 → 1,4

/trunk/rtl/bplib/bpgen/bp_rs232_2l4l_iob.vbom

0,0 → 1,8

/trunk/rtl/bplib/bpgen/sn_4x7segctl.vbom

0,0 → 1,5

/trunk/rtl/bplib/bpgen/bp_swibtnled.vhd

0,0 → 1,117

/trunk/rtl/bplib/bpgen/sn_humanio_rbus.vbom

0,0 → 1,8

/trunk/rtl/bplib/bpgen/bp_rs232_2line_iob.vhd

0,0 → 1,63

/trunk/rtl/bplib/bpgen/bp_rs232_4line_iob.vhd

0,0 → 1,73

/trunk/rtl/bplib/bpgen/bp_rs232_2l4l_iob.vhd

0,0 → 1,187

/trunk/rtl/bplib/bpgen/sn_humanio.vbom

0,0 → 1,11

/trunk/rtl/bplib/bpgen/bpgenlib.vhd

0,0 → 1,180

/trunk/rtl/bplib/bpgen/sn_4x7segctl.vhd

0,0 → 1,155

/trunk/rtl/bplib/bpgen/sn_humanio_rbus.vhd

0,0 → 1,316

/trunk/rtl/bplib/bpgen/Makefile

0,0 → 1,25

/trunk/rtl/bplib/bpgen/bp_swibtnled.vbom

0,0 → 1,12

/trunk/rtl/bplib/bpgen

trunk/rtl/bplib/bpgen Property changes : Added: svn:ignore ## -0,0 +1,32 ## +*.dep_ghdl +*.dep_isim +*.dep_xst +work-obj93.cf +*.vcd +*.ghw +*.sav +*.tmp +*.exe +ise +xflow.his +*.ngc +*.ncd +*.pcf +*.bit +*.msk +isim +isim.log +isim.wdb +fuse.log +*_[sft]sim.vhd +*_tsim.sdf +*_xst.log +*_tra.log +*_twr.log +*_map.log +*_par.log +*_pad.log +*_bgn.log +*_svn.log +*_sum.log +*_[dsft]sim.log Index: trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vbom (nonexistent) @@ -1,8 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -s3boardlib.vbom -# components -s3_rs232_iob_int.vbom -s3_rs232_iob_ext.vbom -# design -s3_rs232_iob_int_ext.vhd Index: trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vhd (nonexistent) @@ -1,72 +0,0 @@ --- $Id: s3_rs232_iob_ext.vhd 314 2010-07-09 17:38:41Z mueller $ --- --- Copyright 2010- by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_rs232_iob_ext - syn --- Description: iob's for external rs232 (PMod) --- --- Dependencies: xlib/iob_reg_i --- xlib/iob_reg_o --- --- Test bench: - --- --- Target Devices: generic --- Tool versions: xst 11.4; ghdl 0.26 --- --- Revision History: --- Date Rev Version Comment --- 2010-04-17 278 1.0 Initial version ------------------------------------------------------------------------------- --- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; -use work.xlib.all; - --- ---------------------------------------------------------------------------- - -entity s3_rs232_iob_ext is -- iob's for external rs232 (PMod) - port ( - CLK : in slbit; -- clock - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - CTS_N : out slbit; -- clear to send (act. low) - RTS_N : in slbit; -- request to send (act. low) - I_RXD : in slbit; -- pad-i: receive data (board view) - O_TXD : out slbit; -- pad-o: transmit data (board view) - I_CTS_N : in slbit; -- pad-i: clear to send (act. low) - O_RTS_N : out slbit -- pad-o: request to send (act. low) - ); -end s3_rs232_iob_ext; - -architecture syn of s3_rs232_iob_ext is -begin - - IOB_RXD : iob_reg_i -- line idle=1, so init sync flop =1 - generic map (INIT => '1') - port map (CLK => CLK, CE => '1', DI => RXD, PAD => I_RXD); - - IOB_TXD : iob_reg_o -- line idle=1, so init sync flop =1 - generic map (INIT => '1') - port map (CLK => CLK, CE => '1', DO => TXD, PAD => O_TXD); - - IOB_CTS : iob_reg_i - port map (CLK => CLK, CE => '1', DI => CTS_N, PAD => I_CTS_N); - - IOB_RTS : iob_reg_o - port map (CLK => CLK, CE => '1', DO => RTS_N, PAD => O_RTS_N); - -end syn; Index: trunk/rtl/bplib/s3board/s3_humanio.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_humanio.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_humanio.vbom (nonexistent) @@ -1,13 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -../../vlib/genlib/genlib.vhd -../../vlib/xlib/xlib.vhd -s3boardlib.vbom -## sys_conf : sys_conf.vhd -# components -../../vlib/xlib/iob_reg_i_gen.vbom -../../vlib/xlib/iob_reg_o_gen.vbom -../../vlib/genlib/debounce_gen.vbom -s3_dispdrv.vbom -# design -s3_humanio.vhd Index: trunk/rtl/bplib/s3board/s3_rs232_iob_int.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_int.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_int.vbom (nonexistent) @@ -1,8 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -../../vlib/xlib/xlib.vhd -# components -../../vlib/xlib/iob_reg_i.vbom -../../vlib/xlib/iob_reg_o.vbom -# design -s3_rs232_iob_int.vhd Index: trunk/rtl/bplib/s3board/s3_humanio_rbus.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_humanio_rbus.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_humanio_rbus.vbom (nonexistent) @@ -1,8 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -../../vlib/rbus/rblib.vhd -s3boardlib.vbom -# components -s3_humanio.vbom -# design -s3_humanio_rbus.vhd Index: trunk/rtl/bplib/s3board/s3_dispdrv.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_dispdrv.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_dispdrv.vbom (nonexistent) @@ -1,5 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -# components -# design -s3_dispdrv.vhd Index: trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vbom =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vbom (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_ext.vbom (nonexistent) @@ -1,8 +0,0 @@ -# libs -../../vlib/slvtypes.vhd -../../vlib/xlib/xlib.vhd -# components -../../vlib/xlib/iob_reg_i.vbom -../../vlib/xlib/iob_reg_o.vbom -# design -s3_rs232_iob_ext.vhd Index: trunk/rtl/bplib/s3board/s3_humanio.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_humanio.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_humanio.vhd (nonexistent) @@ -1,147 +0,0 @@ --- $Id: s3_humanio.vhd 314 2010-07-09 17:38:41Z mueller $ --- --- Copyright 2010- by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_humanio - syn --- Description: All BTN, SWI, LED and DSP handling for s3board --- --- Dependencies: xlib/iob_reg_i_gen --- xlib/iob_reg_o_gen --- genlib/debounce_gen --- s3board/s3_dispdrv --- --- Test bench: - --- --- Target Devices: generic --- Tool versions: xst 11.4; ghdl 0.26 --- --- Synthesized (xst): --- Date Rev ise Target flop lutl lutm slic t peri --- 2010-04-10 275 11.4 L68 xc3s1000-4 80 87 0 53 s 5.2 ns --- --- Revision History: --- Date Rev Version Comment --- 2010-04-17 278 1.1.1 rename dispdrv -> s3_dispdrv --- 2010-04-11 276 1.1 instantiate BTN/SWI debouncers via DEBOUNCE generic --- 2010-04-10 275 1.0 Initial version ------------------------------------------------------------------------------- --- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; -use work.xlib.all; -use work.genlib.all; -use work.s3boardlib.all; - --- ---------------------------------------------------------------------------- - -entity s3_humanio is -- human i/o handling: swi,btn,led,dsp - generic ( - DEBOUNCE : boolean := true); -- instantiate debouncer for SWI,BTN - port ( - CLK : in slbit; -- clock - RESET : in slbit; -- reset - CE_MSEC : in slbit; -- 1 ms clock enable - SWI : out slv8; -- switch settings, debounced - BTN : out slv4; -- button settings, debounced - LED : in slv8; -- led data - DSP_DAT : in slv16; -- display data - DSP_DP : in slv4; -- display decimal points - I_SWI : in slv8; -- pad-i: switches - I_BTN : in slv4; -- pad-i: buttons - O_LED : out slv8; -- pad-o: leds - O_ANO_N : out slv4; -- pad-o: 7 seg disp: anodes (act.low) - O_SEG_N : out slv8 -- pad-o: 7 seg disp: segments (act.low) - ); -end s3_humanio; - -architecture syn of s3_humanio is - - signal RI_SWI : slv8 := (others=>'0'); - signal RI_BTN : slv4 := (others=>'0'); - - signal N_ANO_N : slv4 := (others=>'0'); - signal N_SEG_N : slv8 := (others=>'0'); - -begin - - IOB_SWI : iob_reg_i_gen - generic map (DWIDTH => 8) - port map (CLK => CLK, CE => '1', DI => RI_SWI, PAD => I_SWI); - - IOB_BTN : iob_reg_i_gen - generic map (DWIDTH => 4) - port map (CLK => CLK, CE => '1', DI => RI_BTN, PAD => I_BTN); - - IOB_LED : iob_reg_o_gen - generic map (DWIDTH => 8) - port map (CLK => CLK, CE => '1', DO => LED, PAD => O_LED); - - IOB_ANO_N : iob_reg_o_gen - generic map (DWIDTH => 4) - port map (CLK => CLK, CE => '1', DO => N_ANO_N, PAD => O_ANO_N); - - IOB_SEG_N : iob_reg_o_gen - generic map (DWIDTH => 8) - port map (CLK => CLK, CE => '1', DO => N_SEG_N, PAD => O_SEG_N); - - DEB: if DEBOUNCE generate - - DEB_SWI : debounce_gen - generic map ( - CWIDTH => 2, - CEDIV => 3, - DWIDTH => 8) - port map ( - CLK => CLK, - RESET => RESET, - CE_INT => CE_MSEC, - DI => RI_SWI, - DO => SWI - ); - - DEB_BTN : debounce_gen - generic map ( - CWIDTH => 2, - CEDIV => 3, - DWIDTH => 4) - port map ( - CLK => CLK, - RESET => RESET, - CE_INT => CE_MSEC, - DI => RI_BTN, - DO => BTN - ); - - end generate DEB; - - NODEB: if not DEBOUNCE generate - SWI <= RI_SWI; - BTN <= RI_BTN; - end generate NODEB; - - DRV : s3_dispdrv - generic map ( - CDWIDTH => 6) - port map ( - CLK => CLK, - DIN => DSP_DAT, - DP => DSP_DP, - ANO_N => N_ANO_N, - SEG_N => N_SEG_N - ); - -end syn; Index: trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_int_ext.vhd (nonexistent) @@ -1,106 +0,0 @@ --- $Id: s3_rs232_iob_int_ext.vhd 314 2010-07-09 17:38:41Z mueller $ --- --- Copyright 2010- by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_rs232_iob_int_ext - syn --- Description: iob's for internal + external rs232, with select --- --- Dependencies: s3_rs232_iob_int --- s3_rs232_iob_ext --- --- Test bench: - --- --- Target Devices: generic --- Tool versions: xst 11.4; ghdl 0.26 --- --- Revision History: --- Date Rev Version Comment --- 2010-04-17 278 1.0 Initial version ------------------------------------------------------------------------------- --- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; -use work.s3boardlib.all; - --- ---------------------------------------------------------------------------- - -entity s3_rs232_iob_int_ext is -- iob's for int+ext rs232, with select - port ( - CLK : in slbit; -- clock - SEL : in slbit; -- select, '0' for port 0 - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - CTS_N : out slbit; -- clear to send (act. low) - RTS_N : in slbit; -- request to send (act. low) - I_RXD0 : in slbit; -- pad-i: p0: receive data (board view) - O_TXD0 : out slbit; -- pad-o: p0: transmit data (board view) - I_RXD1 : in slbit; -- pad-i: p1: receive data (board view) - O_TXD1 : out slbit; -- pad-o: p1: transmit data (board view) - I_CTS1_N : in slbit; -- pad-i: p1: clear to send (act. low) - O_RTS1_N : out slbit -- pad-o: p1: request to send (act. low) - ); -end s3_rs232_iob_int_ext; - -architecture syn of s3_rs232_iob_int_ext is - signal RXD0 : slbit := '0'; - signal TXD0 : slbit := '0'; - signal RXD1 : slbit := '0'; - signal TXD1 : slbit := '0'; - signal CTS1_N : slbit := '0'; - signal RTS1_N : slbit := '0'; -begin - - P0 : s3_rs232_iob_int - port map ( - CLK => CLK, - RXD => RXD0, - TXD => TXD0, - I_RXD => I_RXD0, - O_TXD => O_TXD0 - ); - - P1 : s3_rs232_iob_ext - port map ( - CLK => CLK, - RXD => RXD1, - TXD => TXD1, - CTS_N => CTS1_N, - RTS_N => RTS1_N, - I_RXD => I_RXD1, - O_TXD => O_TXD1, - I_CTS_N => I_CTS1_N, - O_RTS_N => O_RTS1_N - ); - - proc_port_mux: process (SEL, RXD0, TXD, RXD1, CTS1_N, RTS_N) - begin - if SEL = '0' then -- use main board rs232, no flow cntl - RXD <= RXD0; -- get port 0 inputs - CTS_N <= '0'; - TXD0 <= TXD; -- set port 0 output - TXD1 <= '1'; -- port 1 outputs to idle state - RTS1_N <= '0'; - else -- otherwise use pmod1 rs232 - RXD <= RXD1; -- get port 1 inputs - CTS_N <= CTS1_N; - TXD1 <= TXD; -- set port 1 outputs - RTS1_N <= RTS_N; - TXD0 <= '1'; -- port 0 output to idle state - end if; - end process proc_port_mux; - -end syn; Index: trunk/rtl/bplib/s3board/s3_dispdrv.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_dispdrv.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_dispdrv.vhd (nonexistent) @@ -1,151 +0,0 @@ --- $Id: s3_dispdrv.vhd 314 2010-07-09 17:38:41Z mueller $ --- --- Copyright 2007-2010 by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_dispdrv - syn --- Description: s3board: 7 segment display driver --- --- Dependencies: - --- Test bench: - --- Target Devices: generic --- Tool versions: xst 8.1, 8.2, 9.1, 9.2, 11.4; ghdl 0.18-0.26 --- Revision History: --- Date Rev Version Comment --- 2010-04-17 278 1.1.1 renamed from dispdrv --- 2010-03-29 272 1.1 add all ANO off time to allow to driver turn-off --- delay and to avoid cross talk between digits --- 2007-12-16 101 1.0.1 use _N for active low --- 2007-09-16 83 1.0 Initial version ------------------------------------------------------------------------------- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; - -entity s3_dispdrv is -- 7 segment display driver - generic ( - CDWIDTH : positive := 6); -- clk divider width (must be >= 5) - port ( - CLK : in slbit; -- clock - DIN : in slv16; -- data - DP : in slv4; -- decimal points - ANO_N : out slv4; -- anodes (act.low) - SEG_N : out slv8 -- segements (act.low) - ); -end s3_dispdrv; - -architecture syn of s3_dispdrv is - - type regs_type is record - cdiv : std_logic_vector(CDWIDTH-1 downto 0); -- clock divider counter - dcnt : slv2; -- digit counter - end record regs_type; - - constant regs_init : regs_type := ( - conv_std_logic_vector(0,CDWIDTH), - (others=>'0') - ); - - type hex2segtbl_type is array (0 to 15) of slv7; - - constant hex2segtbl : hex2segtbl_type := - ("0111111", -- 0: "0000" - "0000110", -- 1: "0001" - "1011011", -- 2: "0010" - "1001111", -- 3: "0011" - "1100110", -- 4: "0100" - "1101101", -- 5: "0101" - "1111101", -- 6: "0110" - "0000111", -- 7: "0111" - "1111111", -- 8: "1000" - "1101111", -- 9: "1001" - "1110111", -- a: "1010" - "1111100", -- b: "1011" - "0111001", -- c: "1100" - "1011110", -- d: "1101" - "1111001", -- e: "1110" - "1110001" -- f: "1111" - ); - - signal R_REGS : regs_type := regs_init; -- state registers - signal N_REGS : regs_type := regs_init; -- next value state regs - -begin - - assert CDWIDTH >= 5 - report "assert(CDWIDTH >= 5): CDWIDTH too small" - severity FAILURE; - - proc_regs: process (CLK) - begin - - if CLK'event and CLK='1' then - R_REGS <= N_REGS; - end if; - - end process proc_regs; - - - proc_next: process (R_REGS, DIN, DP) - - variable r : regs_type := regs_init; - variable n : regs_type := regs_init; - variable cano : slv4 := "0000"; - variable chex : slv4 := "0000"; - variable cdp : slbit := '0'; - - begin - - r := R_REGS; - n := R_REGS; - - n.cdiv := unsigned(r.cdiv) - 1; - if unsigned(r.cdiv) = 0 then - n.dcnt := unsigned(r.dcnt) + 1; - end if; - - chex := "0000"; - cdp := '0'; - - case r.dcnt is - when "00" => chex := DIN( 3 downto 0); cdp := DP(0); - when "01" => chex := DIN( 7 downto 4); cdp := DP(1); - when "10" => chex := DIN(11 downto 8); cdp := DP(2); - when "11" => chex := DIN(15 downto 12); cdp := DP(3); - when others => chex := "----"; cdp := '-'; - end case; - - -- the logic below ensures that the anode PNP driver transistor is switched - -- off 16 cycles before the cathode drivers change. This prevents 'cross - -- talk' between digits due to transistor turn off delays. With no or 4 - -- cycles gap one gets well visible cross talk, with 8 cycles still some - -- weak cross talk. With 16 cycles (at 50MHz) none is visible. The - -- turn-off delay of the anode driver PNP's this therefore larger 160 ns - -- and below 320 ns. - -- As consquence CDWIDTH should be at least 5, better 6. - - cano := "1111"; - if unsigned(r.cdiv) >= 16 then - cano(conv_integer(unsigned(r.dcnt))) := '0'; - end if; - - N_REGS <= n; - - ANO_N <= cano; - SEG_N <= not (cdp & hex2segtbl(conv_integer(unsigned(chex)))); - - end process proc_next; - -end syn; Index: trunk/rtl/bplib/s3board/s3_rs232_iob_int.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_rs232_iob_int.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_rs232_iob_int.vhd (nonexistent) @@ -1,62 +0,0 @@ --- $Id: s3_rs232_iob_int.vhd 314 2010-07-09 17:38:41Z mueller $ --- --- Copyright 2010- by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_rs232_iob_int - syn --- Description: iob's for internal rs232 --- --- Dependencies: xlib/iob_reg_i --- xlib/iob_reg_o --- --- Test bench: - --- --- Target Devices: generic --- Tool versions: xst 11.4; ghdl 0.26 --- --- Revision History: --- Date Rev Version Comment --- 2010-04-17 278 1.0 Initial version ------------------------------------------------------------------------------- --- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; -use work.xlib.all; - --- ---------------------------------------------------------------------------- - -entity s3_rs232_iob_int is -- iob's for internal rs232 - port ( - CLK : in slbit; -- clock - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - I_RXD : in slbit; -- pad-i: receive data (board view) - O_TXD : out slbit -- pad-o: transmit data (board view) - ); -end s3_rs232_iob_int; - -architecture syn of s3_rs232_iob_int is -begin - - IOB_RXD : iob_reg_i -- line idle=1, so init sync flop =1 - generic map (INIT => '1') - port map (CLK => CLK, CE => '1', DI => RXD, PAD => I_RXD); - - IOB_TXD : iob_reg_o -- line idle=1, so init sync flop =1 - generic map (INIT => '1') - port map (CLK => CLK, CE => '1', DO => TXD, PAD => O_TXD); - -end syn; Index: trunk/rtl/bplib/s3board/s3_humanio_rbus.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3_humanio_rbus.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3_humanio_rbus.vhd (nonexistent) @@ -1,286 +0,0 @@ --- $Id: s3_humanio_rbus.vhd 352 2011-01-02 13:01:37Z mueller $ --- --- Copyright 2010- by Walter F.J. Mueller --- --- 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 --- Software Foundation, either version 2, or at your option any later version. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY --- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --- for complete details. --- ------------------------------------------------------------------------------- --- Module Name: s3_humanio_rbus - syn --- Description: s3_humanio with rbus interceptor --- --- Dependencies: s3board/s3_humanio --- --- Test bench: - --- --- Target Devices: generic --- Tool versions: xst 11.4, 12.1; ghdl 0.26-0.29 --- --- Synthesized (xst): --- Date Rev ise Target flop lutl lutm slic t peri --- 2010-12-29 300 12.1 M53d xc3s1000-4 93 138 0 111 s 6.8 ns --- 2010-06-03 300 11.4 L68 xc3s1000-4 92 137 0 111 s 6.7 ns --- --- Revision History: --- Date Rev Version Comment --- 2010-12-29 351 1.1 renamed from s3_humanio_rri; ported to rbv3 --- 2010-06-18 306 1.0.1 rename rbus data fields to _rbf_ --- 2010-06-03 300 1.0 Initial version ------------------------------------------------------------------------------- --- --- rbus registers: --- --- Address Bits Name r/w/f Function --- bbbbbb00 cntl r/w/- Control register and BTN access --- 11 dat_en r/w/- if 1 display data will be driven by rri --- 10 dp_en r/w/- if 1 display dp's will be driven by rri --- 9 led_en r/w/- if 1 LED will be driven by rri --- 8 swi_en r/w/- if 1 SWI will be driven by rri --- 3:00 btn r/w/- r: return hio BTN status --- w: BTN is hio BTN ored with this fields --- --- bbbbbb01 7:00 swi r/w/- r: return hio SWI status --- w: will drive SWI when swi_en=1 --- --- bbbbbb10 leddp r/w/- Interface to LED and DSP_DP --- 11:09 dsp_dp r/w/- r: returns DSP_DP status --- w: will drive display dp's when dp_en=1 --- 7:00 led r/w/- r: returns LED status --- w: will drive led's when led_en=1 --- --- bbbbbb11 15:00 dsp_dat r/w/- r: return hio DSP_DAT status --- w: will drive DSP_DAT when dat_en=1 --- - -library ieee; -use ieee.std_logic_1164.all; -use ieee.std_logic_arith.all; - -use work.slvtypes.all; -use work.rblib.all; -use work.s3boardlib.all; - --- ---------------------------------------------------------------------------- - -entity s3_humanio_rbus is -- human i/o handling /w rbus intercept - generic ( - DEBOUNCE : boolean := true; -- instantiate debouncer for SWI,BTN - RB_ADDR : slv8 := conv_std_logic_vector(2#10000000#,8)); - port ( - CLK : in slbit; -- clock - RESET : in slbit; -- reset - CE_MSEC : in slbit; -- 1 ms clock enable - RB_MREQ : in rb_mreq_type; -- rbus: request - RB_SRES : out rb_sres_type; -- rbus: response - SWI : out slv8; -- switch settings, debounced - BTN : out slv4; -- button settings, debounced - LED : in slv8; -- led data - DSP_DAT : in slv16; -- display data - DSP_DP : in slv4; -- display decimal points - I_SWI : in slv8; -- pad-i: switches - I_BTN : in slv4; -- pad-i: buttons - O_LED : out slv8; -- pad-o: leds - O_ANO_N : out slv4; -- pad-o: 7 seg disp: anodes (act.low) - O_SEG_N : out slv8 -- pad-o: 7 seg disp: segments (act.low) - ); -end s3_humanio_rbus; - -architecture syn of s3_humanio_rbus is - - type regs_type is record - rbsel : slbit; -- rbus select - swi : slv8; -- rbus swi - btn : slv4; -- rbus btn - led : slv8; -- rbus led - dsp_dat : slv16; -- rbus dsp_dat - dsp_dp : slv4; -- rbus dsp_dp - swi_en : slbit; -- enable: swi from rri - led_en : slbit; -- enable: led from rri - dat_en : slbit; -- enable: dsp_dat from rri - dp_en : slbit; -- enable: dsp_dp from rri - end record regs_type; - - constant regs_init : regs_type := ( - '0', -- rbsel - (others=>'0'), -- swi - (others=>'0'), -- btn - (others=>'0'), -- led - (others=>'0'), -- dsp_dat - (others=>'0'), -- dsp_dp - '0','0','0','0' -- (swi|led|dat|dp)_en - ); - - signal R_REGS : regs_type := regs_init; -- state registers - signal N_REGS : regs_type := regs_init; -- next value state regs - - constant cntl_rbf_dat_en: integer := 11; - constant cntl_rbf_dp_en: integer := 10; - constant cntl_rbf_led_en: integer := 9; - constant cntl_rbf_swi_en: integer := 8; - subtype cntl_rbf_btn is integer range 3 downto 0; - subtype leddp_rbf_dsp_dp is integer range 11 downto 8; - subtype leddp_rbf_led is integer range 7 downto 0; - - constant rbaddr_cntl: slv2 := "00"; -- 0 -/r/w - constant rbaddr_swi: slv2 := "01"; -- 1 -/r/w - constant rbaddr_leddp: slv2 := "10"; -- 2 -/r/w - constant rbaddr_dsp: slv2 := "11"; -- 3 -/r/w - - signal HIO_SWI : slv8 := (others=>'0'); - signal HIO_BTN : slv4 := (others=>'0'); - signal HIO_LED : slv8 := (others=>'0'); - signal HIO_DSP_DAT : slv16 := (others=>'0'); - signal HIO_DSP_DP : slv4 := (others=>'0'); - -begin - - HIO : s3_humanio - generic map ( - DEBOUNCE => DEBOUNCE) - port map ( - CLK => CLK, - RESET => RESET, - CE_MSEC => CE_MSEC, - SWI => HIO_SWI, - BTN => HIO_BTN, - LED => HIO_LED, - DSP_DAT => HIO_DSP_DAT, - DSP_DP => HIO_DSP_DP, - I_SWI => I_SWI, - I_BTN => I_BTN, - O_LED => O_LED, - O_ANO_N => O_ANO_N, - O_SEG_N => O_SEG_N - ); - - proc_regs: process (CLK) - begin - - if CLK'event and CLK='1' then - if RESET = '1' then - R_REGS <= regs_init; - else - R_REGS <= N_REGS; - end if; - end if; - - end process proc_regs; - - proc_next: process (R_REGS, RB_MREQ, LED, DSP_DAT, DSP_DP, - HIO_SWI, HIO_BTN, HIO_LED, HIO_DSP_DAT, HIO_DSP_DP) - - variable r : regs_type := regs_init; - variable n : regs_type := regs_init; - - variable irb_ack : slbit := '0'; - variable irb_busy : slbit := '0'; - variable irb_err : slbit := '0'; - variable irb_dout : slv16 := (others=>'0'); - variable irbena : slbit := '0'; - - begin - - r := R_REGS; - n := R_REGS; - - irb_ack := '0'; - irb_busy := '0'; - irb_err := '0'; - irb_dout := (others=>'0'); - - irbena := RB_MREQ.re or RB_MREQ.we; - - -- rbus address decoder - n.rbsel := '0'; - if RB_MREQ.aval='1' and RB_MREQ.addr(7 downto 2)=RB_ADDR(7 downto 2) then - n.rbsel := '1'; - end if; - - -- rbus transactions - if r.rbsel = '1' then - irb_ack := irbena; -- ack all accesses - - case RB_MREQ.addr(1 downto 0) is - - when rbaddr_cntl => - irb_dout(cntl_rbf_dat_en) := r.dat_en; - irb_dout(cntl_rbf_dp_en) := r.dp_en; - irb_dout(cntl_rbf_led_en) := r.led_en; - irb_dout(cntl_rbf_swi_en) := r.swi_en; - irb_dout(cntl_rbf_btn) := HIO_BTN; - if RB_MREQ.we = '1' then - n.dat_en := RB_MREQ.din(cntl_rbf_dat_en); - n.dp_en := RB_MREQ.din(cntl_rbf_dp_en); - n.led_en := RB_MREQ.din(cntl_rbf_led_en); - n.swi_en := RB_MREQ.din(cntl_rbf_swi_en); - n.btn := RB_MREQ.din(cntl_rbf_btn); - end if; - - when rbaddr_swi => - irb_dout(HIO_SWI'range) := HIO_SWI; - if RB_MREQ.we = '1' then - n.swi := RB_MREQ.din(n.swi'range); - end if; - - when rbaddr_leddp => - irb_dout(leddp_rbf_dsp_dp) := HIO_DSP_DP; - irb_dout(leddp_rbf_led) := HIO_LED; - if RB_MREQ.we = '1' then - n.dsp_dp := RB_MREQ.din(leddp_rbf_dsp_dp); - n.led := RB_MREQ.din(leddp_rbf_led); - end if; - - when rbaddr_dsp => - irb_dout := HIO_DSP_DAT; - if RB_MREQ.we = '1' then - n.dsp_dat := RB_MREQ.din; - end if; - - when others => null; - end case; - - end if; - - BTN <= HIO_BTN or r.btn; - - if r.swi_en = '0' then - SWI <= HIO_SWI; - else - SWI <= r.swi; - end if; - - if r.led_en = '0' then - HIO_LED <= LED; - else - HIO_LED <= r.led; - end if; - - if r.dp_en = '0' then - HIO_DSP_DP <= DSP_DP; - else - HIO_DSP_DP <= r.dsp_dp; - end if; - - if r.dat_en = '0' then - HIO_DSP_DAT <= DSP_DAT; - else - HIO_DSP_DAT <= r.dsp_dat; - end if; - - N_REGS <= n; - - RB_SRES <= rb_sres_init; - RB_SRES.ack <= irb_ack; - RB_SRES.busy <= irb_busy; - RB_SRES.err <= irb_err; - RB_SRES.dout <= irb_dout; - - end process proc_next; - -end syn; Index: trunk/rtl/bplib/s3board/s3board_pins.ucf =================================================================== --- trunk/rtl/bplib/s3board/s3board_pins.ucf (revision 11) +++ trunk/rtl/bplib/s3board/s3board_pins.ucf (revision 12) @@ -1,9 +1,9 @@ -## $Id: s3board_pins.ucf 336 2010-11-06 18:28:27Z mueller $ +## $Id: s3board_pins.ucf 402 2011-08-05 18:56:44Z mueller $ ## ## Pin locks for S3BOARD core functionality: -## internal RS232 -## human I/O (switches, buttons, leds, display) -## sram +## - internal RS232 +## - human I/O (switches, buttons, leds, display) +## - sram ## ## Revision History: ## Date Rev Version Comment Index: trunk/rtl/bplib/s3board/s3boardlib.vhd =================================================================== --- trunk/rtl/bplib/s3board/s3boardlib.vhd (revision 11) +++ trunk/rtl/bplib/s3board/s3boardlib.vhd (revision 12) @@ -1,6 +1,6 @@ --- $Id: s3boardlib.vhd 351 2010-12-30 21:50:54Z mueller $ +-- $Id: s3boardlib.vhd 391 2011-07-09 17:25:02Z mueller $ -- --- Copyright 2007-2010 by Walter F.J. Mueller +-- Copyright 2007-2011 by Walter F.J. Mueller -- -- 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 @@ -19,6 +19,9 @@ -- 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-09 391 1.3.5 move s3_rs232_iob_int_ext to bpgenlib +-- 2011-07-08 390 1.3.4 move s3_(dispdrv|humanio*) to bpgenlib +-- 2011-07-03 387 1.3.3 move s3_rs232_iob_(int|ext) to bpgenlib -- 2010-12-30 351 1.3.2 use rblib; rename human s3_humanio_rri -> _rbus -- 2010-11-06 336 1.3.1 rename input pin CLK -> I_CLK50 -- 2010-06-03 300 1.3 add s3_humanio_rri (now needs rrilib) @@ -41,7 +44,6 @@ use ieee.std_logic_arith.all; use work.slvtypes.all; -use work.rblib.all; package s3boardlib is @@ -87,102 +89,6 @@ ); end component; -component s3_dispdrv is -- 7 segment display driver - generic ( - CDWIDTH : positive := 6); -- clk divider width (must be >= 5) - port ( - CLK : in slbit; -- clock - DIN : in slv16; -- data - DP : in slv4; -- decimal points - ANO_N : out slv4; -- anodes (act.low) - SEG_N : out slv8 -- segements (act.low) - ); -end component; - -component s3_humanio is -- human i/o handling: swi,btn,led,dsp - generic ( - DEBOUNCE : boolean := true); -- instantiate debouncer for SWI,BTN - port ( - CLK : in slbit; -- clock - RESET : in slbit; -- reset - CE_MSEC : in slbit; -- 1 ms clock enable - SWI : out slv8; -- switch settings, debounced - BTN : out slv4; -- button settings, debounced - LED : in slv8; -- led data - DSP_DAT : in slv16; -- display data - DSP_DP : in slv4; -- display decimal points - I_SWI : in slv8; -- pad-i: switches - I_BTN : in slv4; -- pad-i: buttons - O_LED : out slv8; -- pad-o: leds - O_ANO_N : out slv4; -- pad-o: 7 seg disp: anodes (act.low) - O_SEG_N : out slv8 -- pad-o: 7 seg disp: segments (act.low) - ); -end component; - -component s3_humanio_rbus is -- human i/o handling /w rbus intercept - generic ( - DEBOUNCE : boolean := true; -- instantiate debouncer for SWI,BTN - RB_ADDR : slv8 := conv_std_logic_vector(2#10000000#,8)); - port ( - CLK : in slbit; -- clock - RESET : in slbit; -- reset - CE_MSEC : in slbit; -- 1 ms clock enable - RB_MREQ : in rb_mreq_type; -- rbus: request - RB_SRES : out rb_sres_type; -- rbus: response - SWI : out slv8; -- switch settings, debounced - BTN : out slv4; -- button settings, debounced - LED : in slv8; -- led data - DSP_DAT : in slv16; -- display data - DSP_DP : in slv4; -- display decimal points - I_SWI : in slv8; -- pad-i: switches - I_BTN : in slv4; -- pad-i: buttons - O_LED : out slv8; -- pad-o: leds - O_ANO_N : out slv4; -- pad-o: 7 seg disp: anodes (act.low) - O_SEG_N : out slv8 -- pad-o: 7 seg disp: segments (act.low) - ); -end component; - -component s3_rs232_iob_int is -- iob's for internal rs232 - port ( - CLK : in slbit; -- clock - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - I_RXD : in slbit; -- pad-i: receive data (board view) - O_TXD : out slbit -- pad-o: transmit data (board view) - ); -end component; - -component s3_rs232_iob_ext is -- iob's for external rs232 (Pmod) - port ( - CLK : in slbit; -- clock - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - CTS_N : out slbit; -- clear to send (act. low) - RTS_N : in slbit; -- request to send (act. low) - I_RXD : in slbit; -- pad-i: receive data (board view) - O_TXD : out slbit; -- pad-o: transmit data (board view) - I_CTS_N : in slbit; -- pad-i: clear to send (act. low) - O_RTS_N : out slbit -- pad-o: request to send (act. low) - ); -end component; - -component s3_rs232_iob_int_ext is -- iob's for int+ext rs232, with select - port ( - CLK : in slbit; -- clock - SEL : in slbit; -- select, '0' for port 0 - RXD : out slbit; -- receive data (board view) - TXD : in slbit; -- transmit data (board view) - CTS_N : out slbit; -- clear to send (act. low) - RTS_N : in slbit; -- request to send (act. low) - I_RXD0 : in slbit; -- pad-i: p0: receive data (board view) - O_TXD0 : out slbit; -- pad-o: p0: transmit data (board view) - I_RXD1 : in slbit; -- pad-i: p1: receive data (board view) - O_TXD1 : out slbit; -- pad-o: p1: transmit data (board view) - I_CTS1_N : in slbit; -- pad-i: p1: clear to send (act. low) - O_RTS1_N : out slbit -- pad-o: p1: request to send (act. low) - ); -end component; - component s3_sram_dummy is -- SRAM protection dummy port ( O_MEM_CE_N : out slv2; -- sram: chip enables (act.low) @@ -218,4 +124,4 @@ ); end component; -end s3boardlib; +end package s3boardlib;

/trunk/rtl/bplib/s3board/tb/Makefile

1,7 → 1,8

12,7 → 13,7

22,9 → 23,9

/trunk/rtl/bplib/s3board/s3boardlib.vbom

1,4 → 1,3

/trunk/rtl/bplib/s3board/Makefile

1,7 → 1,8

10,7 → 11,7

18,7 → 19,7

/trunk/rtl/w11a/tb/Makefile

1,7 → 1,8

11,7 → 12,7

21,9 → 22,9

/trunk/rtl/w11a/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/xst_vhdl.opt File deleted

/trunk/rtl/vlib/Makefile.xflow File deleted

/trunk/rtl/vlib/Makefile.ghdl File deleted

/trunk/rtl/vlib/Makefile.isim File deleted

/trunk/rtl/vlib/Makefile.xflow_cpld File deleted

/trunk/rtl/vlib/balanced.opt File deleted

/trunk/rtl/vlib/rlink/rlinklib.vhd

1,4 → 1,4

305,4 → 305,4

/trunk/rtl/vlib/rlink/tb/rlink_cext_vhpi.vhd

1,4 → 1,4

37,7 → 37,7

55,4 → 55,4

/trunk/rtl/vlib/rlink/tb/rlinktblib.vhd

1,4 → 1,4

174,4 → 174,4

/trunk/rtl/vlib/rlink/tb/Makefile

1,7 → 1,8

14,7 → 15,7

24,9 → 25,9

/trunk/rtl/vlib/rlink/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/rlink/rlink_serport.vhd

1,6 → 1,6

20,7 → 20,7

28,6 → 28,7

110,7 → 111,7

230,6 → 231,11

/trunk/rtl/vlib/genlib/genlib.vhd

1,4 → 1,4

153,4 → 153,4

/trunk/rtl/vlib/genlib/Makefile

1,7 → 1,8

9,7 → 10,7

17,7 → 18,7

/trunk/rtl/vlib/memlib/memlib.vhd

1,4 → 1,4

235,4 → 235,4

/trunk/rtl/vlib/memlib/ram_1swsr_xfirst_gen_unisim.vhd

1,6 → 1,6

19,9 → 19,10

71,6 → 72,9

122,7 → 126,10

175,6 → 182,9

227,6 → 237,9

256,6 → 269,9

/trunk/rtl/vlib/memlib/ram_2swsr_xfirst_gen_unisim.vhd

1,6 → 1,6

19,9 → 19,10

79,6 → 80,10

159,6 → 164,10

239,6 → 248,10

319,6 → 332,10

362,6 → 379,10

/trunk/rtl/vlib/memlib/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/comlib/crc8.vhd

1,6 → 1,6

31,9 → 31,10

78,13 → 79,9

/trunk/rtl/vlib/comlib/comlib.vhd

1,6 → 1,6

16,9 → 16,10

34,6 → 35,34

83,7 → 112,7

/trunk/rtl/vlib/comlib/misc/Makefile

1,13 → 1,14

15,7 → 16,7

/trunk/rtl/vlib/comlib/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/rbus/rbd_rbmon.vhd

1,4 → 1,4

33,17 → 33,17

/trunk/rtl/vlib/rbus/rbd_eyemon.vhd

1,4 → 1,4

137,6 → 137,8

/trunk/rtl/vlib/rbus/rblib.vhd

1,6 → 1,6

20,6 → 20,7

113,8 → 114,8

127,8 → 128,8

139,8 → 140,8

189,5 → 190,4

/trunk/rtl/vlib/rbus/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/xlib/Makefile

1,13 → 1,14

15,7 → 16,7

/trunk/rtl/vlib/xlib/xlib.vhd

1,4 → 1,4

164,4 → 164,4

/trunk/rtl/vlib/serport/tb/Makefile

1,7 → 1,8

8,7 → 9,7

18,9 → 19,9

/trunk/rtl/vlib/serport/Makefile

1,7 → 1,8

8,7 → 9,7

16,7 → 17,7

/trunk/rtl/vlib/serport/serport.vhd

1,4 → 1,4

134,4 → 134,4

/trunk/rtl/make/syn_s3_speed.opt

0,0 → 1,40

/trunk/rtl/make/generic_ghdl.mk

0,0 → 1,48

/trunk/rtl/make/imp_s3_speed_maptd.opt

0,0 → 1,92

/trunk/rtl/make/generic_xflow.mk

0,0 → 1,287

/trunk/rtl/make/syn_s6_speed.opt

0,0 → 1,40

/trunk/rtl/make/generic_isim.mk

0,0 → 1,50

/trunk/rtl/make/generic_xflow_cpld.mk

0,0 → 1,130

/trunk/rtl/make/imp_s3_speed.opt

0,0 → 1,86

/trunk/rtl/make/imp_s6_speed.opt

0,0 → 1,92

/trunk/rtl/make

trunk/rtl/make Property changes : Added: svn:ignore ## -0,0 +1,32 ## +*.dep_ghdl +*.dep_isim +*.dep_xst +work-obj93.cf +*.vcd +*.ghw +*.sav +*.tmp +*.exe +ise +xflow.his +*.ngc +*.ncd +*.pcf +*.bit +*.msk +isim +isim.log +isim.wdb +fuse.log +*_[sft]sim.vhd +*_tsim.sdf +*_xst.log +*_tra.log +*_twr.log +*_map.log +*_par.log +*_pad.log +*_bgn.log +*_svn.log +*_sum.log +*_[dsft]sim.log Index: trunk/doc/INSTALL.txt =================================================================== --- trunk/doc/INSTALL.txt (revision 11) +++ trunk/doc/INSTALL.txt (revision 12) @@ -1,4 +1,4 @@ -# $Id: INSTALL.txt 376 2011-04-17 12:24:07Z mueller $ +# $Id: INSTALL.txt 408 2011-09-12 19:48:36Z mueller $ Guide to install and build w11a systems, test benches and support software @@ -40,9 +40,12 @@ (Xilinx xst based) as well as the support software (mainly the rlink backend server) requires - - the definition of the environment variable RETROBASE + - the definition of the environment variables: + - RETROBASE: must refer to the installation root directory + - BOOSTINC: pathname for includes of boost library - that the tools binary directory is in the path - that the tools library directory is in the library path + For bash and alike use @@ -50,6 +53,11 @@ export PATH=$PATH:$RETROBASE/tools/bin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RETROBASE/tools/lib + In most cases the boost library version coming with the distribution will + work, in those cases simply use + + export BOOSTINC=/usr/include + After that building functional model based test benches will work. If you want to also build post-xst or post-par test benches read next section. @@ -79,6 +87,14 @@ 4a. Compile sharable libraries --------------------------------------- + Required tools and libraries: + g++ >= 4.3 (decltype support assumed in usage of boost::bind) + boost >= 1.35 (boost::thread api changed, new one is used) + + Build was tested under: + ubuntu lucid (10.04 LTS): gcc 4.4.3 boost 1.40.0 + debian lenny (5.0.8): gcc 4.3.2 boost 1.xx.x (t.b.c.) + To build all sharable libraries cd $RETROBASE/tools/src @@ -191,7 +207,7 @@ To load the bitfile with WebPack impact into the target board use - make .impact + make .iconfig If only the xst or par output is wanted just use

/trunk/doc/README.txt

1,4 → 1,4

60,6 → 60,34

Browse

Tools

Subversion Repositories w11

Compare Revisions

Rev 11 → Rev 12