LOGIN   :::   RECOVER PASS   :::   GET ACCOUNT    
Browse
  • Projects
  • Code (CVS)
  • Forums
  • News
  • Articles
  • Polls
    •  
    OpenCores
  • FAQ
  • CVS HowTo
  • Mission
  • Media
  • Tools
  • Advertise
  • Mirrors
  • Logos
  • Contact us
  • Job Opportunity

    •  
    Tools
  • Search
      
  • Download Cores (CVSGet)
    •  
    More
  • Wishbone
  • Perlilog
  • EDA tools
  • OpenTech CD
    •  
    Navigation: All forums > Cvs-checkins > Message List > Message Post

    Message

    Reply | Reply all
    Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

    From: cvs at opencores.org<cvs@o...>
    Date: Tue Jun 5 15:03:55 CEST 2007
    Subject: [cvs-checkins] MODIFIED: jop ...
    Top
    Date: 00/07/06 05:15:03

    Modified: jop/vhdl/scio scio_baseio.vhd scio_bg.vhd scio_dspiomin.vhd
    scio_lego.vhd scio_mikjen.vhd scio_min.vhd
    scio_min_fpu.vhd scio_rasmus.vhd
    Log:
    use rdy_cnt in scio devices, return "00" for USB device at address 2


    Revision Changes Path
    1.8 jop/vhdl/scio/scio_baseio.vhd

    http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_baseio.vhd.diff?r1=1.7&r2=1.8

    (In the diff below, changes in quantity of whitespace are not shown.)

    Index: scio_baseio.vhd
    ===================================================================
    RCS file: /cvsroot/martin/jop/vhdl/scio/scio_baseio.vhd,v
    retrieving revision 1.7
    retrieving revision 1.8
    diff -u -b -r1.7 -r1.8
    --- scio_baseio.vhd 1 Jun 2007 16:29:27 -0000 1.7
    +++ scio_baseio.vhd 5 Jun 2007 13:03:55 -0000 1.8
    @@ -13,13 +13,13 @@
    --
    -- 0x20 reserved for USB port -- System.out.print() writes to it!
    -- TAL
    --- 0x30 0 in pins, led outs
    --- 0x30 1 out pins
    --- 0x30 1 ADC1 input
    --- 0x30 2 ADC2 input
    --- 0x30 3 ADC3 input (battery watch)
    --- 0x40 0 isa control and addr write
    --- 0x40 1 isa data
    +-- 0x40 0 in pins, led outs
    +-- 0x40 1 out pins
    +-- 0x40 1 ADC1 input
    +-- 0x40 2 ADC2 input
    +-- 0x40 3 ADC3 input (battery watch)
    +-- 0x50 0 isa control and addr write
    +-- 0x50 1 isa data
    --
    -- status word in uarts:
    -- 0 uart transmit data register empty
    @@ -277,10 +277,20 @@

    sel <= to_integer(unsigned(sc_io_out.address(SLAVE_ADDR_BITS+DECODE_BITS-1 downto SLAVE_ADDR_BITS)));

    - -- What happens when sel_reg > SLAVE_CNT-1??
    sc_io_in.rd_data <= sc_dout(sel_reg);
    --- sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg);
    -sc_io_in.rdy_cnt <= "00";
    + sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg);
    +
    + -- defaults for unused slave addresses
    +-- gnl: for i in SLAVE_CNT to 2**DECODE_BITS-1 generate
    +-- sc_dout(i) <= (others => '0');
    +-- sc_rdy_cnt(i) <= (others => '0');
    +-- end generate;
    + -- default for unused USB device
    + sc_dout(2) <= (others => '0');
    + sc_rdy_cnt(2) <= (others => '0');
    + -- default for other unused devices
    + sc_dout(3) <= (others => '0');
    + sc_rdy_cnt(3) <= (others => '0');

    --
    -- Connect SLAVE_CNT slaves



    1.6 jop/vhdl/scio/scio_bg.vhd

    http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_bg.vhd.diff?r1=1.5&r2=1.6

    (In the diff below, changes in quantity of whitespace are not shown.)

    Index: scio_bg.vhd
    ===================================================================
    RCS file: /cvsroot/martin/jop/vhdl/scio/scio_bg.vhd,v
    retrieving revision 1.5
    retrieving revision 1.6
    diff -u -b -r1.5 -r1.6
    --- scio_bg.vhd 1 Jun 2007 16:45:39 -0000 1.5
    +++ scio_bg.vhd 5 Jun 2007 13:03:55 -0000 1.6
    @@ -486,6 +486,10 @@
    -- What happens when sel_reg > SLAVE_CNT-1??
    sc_io_in.rd_data <= sc_dout(sel_reg);
    sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg);
    + -- slave 2 is reserved for USB and System.out writes to it!!!
    + sc_rdy_cnt(2) <= (others => '0');
    + sc_dout(2) <= (others => '0');
    +

    --
    -- Connect SLAVE_CNT slaves
    @@ -563,10 +567,6 @@
    nrts => nrts
    );

    - -- slave 2 is reserved for USB and System.out writes to it!!!
    - sc_rdy_cnt(2) <= (others => '0'); - sc_dout(2) <= (others => '0'); - -- Siemens TC35 sends up to 32!!! characters after cts deasert -- WW does not like the 115200 baud :-( cmp_ua2: entity work.sc_uart generic map ( 1.5 jop/vhdl/scio/scio_dspiomin.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_dspiomin.vhd.diff?r1=1.4&r2=1.5 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_dspiomin.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_dspiomin.vhd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- scio_dspiomin.vhd 4 Jun 2007 19:37:53 -0000 1.4 +++ scio_dspiomin.vhd 5 Jun 2007 13:03:55 -0000 1.5 @@ -82,7 +82,7 @@ architecture rtl of scio is - constant SLAVE_CNT : integer := 4; + constant SLAVE_CNT : integer := 3; -- SLAVE_CNT <= 2**DECODE_BITS -- take care of USB address 0x20! constant DECODE_BITS : integer := 2; 1.8 jop/vhdl/scio/scio_lego.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_lego.vhd.diff?r1=1.7&r2=1.8 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_lego.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_lego.vhd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- scio_lego.vhd 4 Jun 2007 19:37:53 -0000 1.7 +++ scio_lego.vhd 5 Jun 2007 13:03:55 -0000 1.8 @@ -140,8 +140,10 @@ -- What happens when sel_reg > SLAVE_CNT-1?? sc_io_in.rd_data <= sc_dout(sel_reg); --- sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg); -sc_io_in.rdy_cnt <= "00"; + sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg); + -- default for unused USB device + sc_dout(2) <= (others => '0'); + sc_rdy_cnt(2) <= (others => '0'); -- -- Connect SLAVE_CNT slaves 1.4 jop/vhdl/scio/scio_mikjen.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_mikjen.vhd.diff?r1=1.3&r2=1.4 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_mikjen.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_mikjen.vhd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- scio_mikjen.vhd 4 Jun 2007 19:37:53 -0000 1.3 +++ scio_mikjen.vhd 5 Jun 2007 13:03:55 -0000 1.4 @@ -21,6 +21,7 @@ -- 0x40 3 ADC3 input (battery watch) -- 0x50 0 isa control and addr write -- 0x50 1 isa data +-- 0x60 sigdel for microphone -- -- status word in uarts: -- 0 uart transmit data register empty @@ -281,8 +282,14 @@ -- What happens when sel_reg > SLAVE_CNT-1?? sc_io_in.rd_data <= sc_dout(sel_reg); --- rdy_cnt <= sc_rdy_cnt(sel_reg); - sc_io_in.rdy_cnt <= "00"; + rdy_cnt <= sc_rdy_cnt(sel_reg); + + -- default for unused USB device + sc_dout(2) <= (others => '0'); + sc_rdy_cnt(2) <= (others => '0'); + -- default for other unused devices + sc_dout(3) <= (others => '0'); + sc_rdy_cnt(3) <= (others => '0'); -- -- Connect SLAVE_CNT slaves 1.8 jop/vhdl/scio/scio_min.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_min.vhd.diff?r1=1.7&r2=1.8 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_min.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_min.vhd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- scio_min.vhd 4 Jun 2007 19:37:53 -0000 1.7 +++ scio_min.vhd 5 Jun 2007 13:03:55 -0000 1.8 @@ -81,7 +81,7 @@ architecture rtl of scio is - constant SLAVE_CNT : integer := 2; + constant SLAVE_CNT : integer := 3; -- SLAVE_CNT <= 2**DECODE_BITS -- take care of USB address 0x20! constant DECODE_BITS : integer := 2; @@ -117,6 +117,10 @@ sc_io_in.rd_data <= sc_dout(sel_reg); sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg); + -- default for unused USB device + sc_dout(2) <= (others => '0'); + sc_rdy_cnt(2) <= (others => '0'); + -- -- Connect SLAVE_CNT simple test slaves -- 1.5 jop/vhdl/scio/scio_min_fpu.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_min_fpu.vhd.diff?r1=1.4&r2=1.5 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_min_fpu.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_min_fpu.vhd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- scio_min_fpu.vhd 4 Jun 2007 19:37:53 -0000 1.4 +++ scio_min_fpu.vhd 5 Jun 2007 13:03:55 -0000 1.5 @@ -118,6 +118,19 @@ sc_io_in.rd_data <= sc_dout(sel_reg); sc_io_in.rdy_cnt <= sc_rdy_cnt(sel_reg); + -- default for unused USB device + sc_dout(2) <= (others => '0'); + sc_rdy_cnt(2) <= (others => '0'); + -- default for other unused devices + sc_dout(3) <= (others => '0'); + sc_rdy_cnt(3) <= (others => '0'); + sc_dout(4) <= (others => '0'); + sc_rdy_cnt(4) <= (others => '0'); + sc_dout(5) <= (others => '0'); + sc_rdy_cnt(5) <= (others => '0'); + sc_dout(6) <= (others => '0'); + sc_rdy_cnt(6) <= (others => '0'); + -- -- Connect SLAVE_CNT simple test slaves -- 1.5 jop/vhdl/scio/scio_rasmus.vhd http://www.opencores.org/cvsweb.shtml/jop/vhdl/scio/scio_rasmus.vhd.diff?r1=1.4&r2=1.5 (In the diff below, changes in quantity of whitespace are not shown.) Index: scio_rasmus.vhd =================================================================== RCS file: /cvsroot/martin/jop/vhdl/scio/scio_rasmus.vhd,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- scio_rasmus.vhd 4 Jun 2007 19:37:53 -0000 1.4 +++ scio_rasmus.vhd 5 Jun 2007 13:03:55 -0000 1.5 @@ -20,6 +20,7 @@ -- 0x40 3 ADC3 input (battery watch) -- 0x50 0 isa control and addr write -- 0x50 1 isa data +-- 0x60 MAC -- -- status word in uarts: -- 0 uart transmit data register empty @@ -279,8 +280,14 @@ -- What happens when sel_reg > SLAVE_CNT-1?? sc_io_in.rd_data <= sc_dout(sel_reg); --- rdy_cnt <= sc_rdy_cnt(sel_reg); -sc_io_in.rdy_cnt <= "00"; + rdy_cnt <= sc_rdy_cnt(sel_reg); + + -- default for unused USB device + sc_dout(2) <= (others => '0'); + sc_rdy_cnt(2) <= (others => '0'); + -- default for other unused devices + sc_dout(3) <= (others => '0'); + sc_rdy_cnt(3) <= (others => '0'); -- -- Connect SLAVE_CNT slaves

     
    Copyright (c) 1999 OPENCORES.ORG. All rights reserved.