OpenCores
URL https://opencores.org/ocsvn/openmsp430/openmsp430/trunk

Subversion Repositories openmsp430

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /openmsp430/trunk/fpga/xilinx_diligent_s3board/rtl/verilog/openmsp430/periph
    from Rev 104 to Rev 109
    ↔ Reverse comparison
  •

Rev 104 → Rev 109

/template_periph_8b.v
40,10 → 40,6
// $LastChangedBy$
// $LastChangedDate$
//----------------------------------------------------------------------------
`ifdef OMSP_NO_INCLUDE
`else
`include "openMSP430_defines.v"
`endif
 
module template_periph_8b (
 
55,7 → 51,7
per_addr, // Peripheral address
per_din, // Peripheral data input
per_en, // Peripheral enable (high active)
per_wen, // Peripheral write enable (high active)
per_we, // Peripheral write enable (high active)
puc // Main system reset
);
 
69,7 → 65,7
input [7:0] per_addr; // Peripheral address
input [15:0] per_din; // Peripheral data input
input per_en; // Peripheral enable (high active)
input [1:0] per_wen; // Peripheral write enable (high active)
input [1:0] per_we; // Peripheral write enable (high active)
input puc; // Main system reset
 
 
107,9 → 103,9
endcase
 
// Read/Write probes
wire reg_lo_write = per_wen[0] & per_en;
wire reg_hi_write = per_wen[1] & per_en;
wire reg_read = ~|per_wen & per_en;
wire reg_lo_write = per_we[0] & per_en;
wire reg_hi_write = per_we[1] & per_en;
wire reg_read = ~|per_we & per_en;
 
// Read/Write vectors
wire [255:0] reg_hi_wr = reg_dec & {256{reg_hi_write}};
187,8 → 183,3
 
endmodule // template_periph_8b
 
`ifdef OMSP_NO_INCLUDE
`else
`include "openMSP430_undefines.v"
`endif
/omsp_gpio.v
35,10 → 35,6
// $LastChangedBy$
// $LastChangedDate$
//----------------------------------------------------------------------------
`ifdef OMSP_NO_INCLUDE
`else
`include "openMSP430_defines.v"
`endif
 
module omsp_gpio (
 
76,7 → 72,7
per_addr, // Peripheral address
per_din, // Peripheral data input
per_en, // Peripheral enable (high active)
per_wen, // Peripheral write enable (high active)
per_we, // Peripheral write enable (high active)
puc // Main system reset
);
 
126,7 → 122,7
input [7:0] per_addr; // Peripheral address
input [15:0] per_din; // Peripheral data input
input per_en; // Peripheral enable (high active)
input [1:0] per_wen; // Peripheral write enable (high active)
input [1:0] per_we; // Peripheral write enable (high active)
input puc; // Main system reset
 
 
250,9 → 246,9
endcase
 
// Read/Write probes
wire reg_lo_write = per_wen[0] & per_en;
wire reg_hi_write = per_wen[1] & per_en;
wire reg_read = ~|per_wen & per_en;
wire reg_lo_write = per_we[0] & per_en;
wire reg_hi_write = per_we[1] & per_en;
wire reg_read = ~|per_we & per_en;
 
// Read/Write vectors
wire [255:0] reg_hi_wr = reg_dec & {256{reg_hi_write}};
826,8 → 822,3
p6sel_rd;
 
endmodule // omsp_gpio
 
`ifdef OMSP_NO_INCLUDE
`else
`include "openMSP430_undefines.v"
`endif
/omsp_timerA_defines.v
0,0 → 1,79
//----------------------------------------------------------------------------
// Copyright (C) 2001 Authors
//
// This source file may be used and distributed without restriction provided
// that this copyright statement is not removed from the file and that any
// derivative work contains the original copyright notice and the associated
// disclaimer.
//
// This source file is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This source 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 Lesser General Public
// License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this source; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
//----------------------------------------------------------------------------
//
// *File Name: omsp_timerA_defines.v
//
// *Module Description:
// omsp_timerA Configuration file
//
// *Author(s):
// - Olivier Girard, olgirard@gmail.com
//
//----------------------------------------------------------------------------
// $Rev: 103 $
// $LastChangedBy: olivier.girard $
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $
//----------------------------------------------------------------------------
//`define OMSP_TA_NO_INCLUDE
`ifdef OMSP_TA_NO_INCLUDE
`else
`include "omsp_timerA_undefines.v"
`endif
 
//----------------------------------------------------------------------------
// TIMER A CONFIGURATION
//----------------------------------------------------------------------------
 
 
 
//==========================================================================//
//==========================================================================//
//==========================================================================//
//==========================================================================//
//===== SYSTEM CONSTANTS --- !!!!!!!! DO NOT EDIT !!!!!!!! =====//
//==========================================================================//
//==========================================================================//
//==========================================================================//
//==========================================================================//
 
// Timer A: TACTL Control Register
`define TASSELx 9:8
`define TAIDx 7:6
`define TAMCx 5:4
`define TACLR 2
`define TAIE 1
`define TAIFG 0
 
// Timer A: TACCTLx Capture/Compare Control Register
`define TACMx 15:14
`define TACCISx 13:12
`define TASCS 11
`define TASCCI 10
`define TACAP 8
`define TAOUTMODx 7:5
`define TACCIE 4
`define TACCI 3
`define TAOUT 2
`define TACOV 1
`define TACCIFG 0
omsp_timerA_defines.v Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: omsp_timerA.v =================================================================== --- omsp_timerA.v (revision 104) +++ omsp_timerA.v (revision 109) @@ -35,9 +35,9 @@ // $LastChangedBy$ // $LastChangedDate$ //---------------------------------------------------------------------------- -`ifdef OMSP_NO_INCLUDE +`ifdef OMSP_TA_NO_INCLUDE `else -`include "openMSP430_defines.v" +`include "omsp_timerA_defines.v" `endif module omsp_timerA ( @@ -62,7 +62,7 @@ per_addr, // Peripheral address per_din, // Peripheral data input per_en, // Peripheral enable (high active) - per_wen, // Peripheral write enable (high active) + per_we, // Peripheral write enable (high active) puc, // Main system reset smclk_en, // SMCLK enable (from CPU) ta_cci0a, // Timer A capture 0 input A @@ -96,7 +96,7 @@ input [7:0] per_addr; // Peripheral address input [15:0] per_din; // Peripheral data input input per_en; // Peripheral enable (high active) -input [1:0] per_wen; // Peripheral write enable (high active) +input [1:0] per_we; // Peripheral write enable (high active) input puc; // Main system reset input smclk_en; // SMCLK enable (from CPU) input ta_cci0a; // Timer A capture 0 input A @@ -157,8 +157,8 @@ endcase // Read/Write probes -wire reg_write = |per_wen & per_en; -wire reg_read = ~|per_wen & per_en; +wire reg_write = |per_we & per_en; +wire reg_read = ~|per_we & per_en; // Read/Write vectors wire [511:0] reg_wr = reg_dec & {512{reg_write}}; @@ -688,7 +688,7 @@ endmodule // omsp_timerA -`ifdef OMSP_NO_INCLUDE +`ifdef OMSP_TA_NO_INCLUDE `else -`include "openMSP430_undefines.v" +`include "omsp_timerA_undefines.v" `endif
/omsp_timerA_undefines.v
0,0 → 1,108
//----------------------------------------------------------------------------
// Copyright (C) 2001 Authors
//
// This source file may be used and distributed without restriction provided
// that this copyright statement is not removed from the file and that any
// derivative work contains the original copyright notice and the associated
// disclaimer.
//
// This source file is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published
// by the Free Software Foundation; either version 2.1 of the License, or
// (at your option) any later version.
//
// This source 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 Lesser General Public
// License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this source; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
//----------------------------------------------------------------------------
//
// *File Name: omsp_timerA_undefines.v
//
// *Module Description:
// omsp_timerA Verilog `undef file
//
// *Author(s):
// - Olivier Girard, olgirard@gmail.com
//
//----------------------------------------------------------------------------
// $Rev: 23 $
// $LastChangedBy: olivier.girard $
// $LastChangedDate: 2009-08-30 18:39:26 +0200 (Sun, 30 Aug 2009) $
//----------------------------------------------------------------------------
 
//----------------------------------------------------------------------------
// SYSTEM CONFIGURATION
//----------------------------------------------------------------------------
 
 
 
//==========================================================================//
//==========================================================================//
//==========================================================================//
//==========================================================================//
//===== SYSTEM CONSTANTS --- !!!!!!!! DO NOT EDIT !!!!!!!! =====//
//==========================================================================//
//==========================================================================//
//==========================================================================//
//==========================================================================//
 
// Timer A: TACTL Control Register
`ifdef TASSELx
`undef TASSELx
`endif
`ifdef TAIDx
`undef TAIDx
`endif
`ifdef TAMCx
`undef TAMCx
`endif
`ifdef TACLR
`undef TACLR
`endif
`ifdef TAIE
`undef TAIE
`endif
`ifdef TAIFG
`undef TAIFG
`endif
 
// Timer A: TACCTLx Capture/Compare Control Register
`ifdef TACMx
`undef TACMx
`endif
`ifdef TACCISx
`undef TACCISx
`endif
`ifdef TASCS
`undef TASCS
`endif
`ifdef TASCCI
`undef TASCCI
`endif
`ifdef TACAP
`undef TACAP
`endif
`ifdef TAOUTMODx
`undef TAOUTMODx
`endif
`ifdef TACCIE
`undef TACCIE
`endif
`ifdef TACCI
`undef TACCI
`endif
`ifdef TAOUT
`undef TAOUT
`endif
`ifdef TACOV
`undef TACOV
`endif
`ifdef TACCIFG
`undef TACCIFG
`endif
omsp_timerA_undefines.v Property changes : Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: template_periph_16b.v =================================================================== --- template_periph_16b.v (revision 104) +++ template_periph_16b.v (revision 109) @@ -40,10 +40,6 @@ // $LastChangedBy$ // $LastChangedDate$ //---------------------------------------------------------------------------- -`ifdef OMSP_NO_INCLUDE -`else -`include "openMSP430_defines.v" -`endif module template_periph_16b ( @@ -55,7 +51,7 @@ per_addr, // Peripheral address per_din, // Peripheral data input per_en, // Peripheral enable (high active) - per_wen, // Peripheral write enable (high active) + per_we, // Peripheral write enable (high active) puc // Main system reset ); @@ -69,7 +65,7 @@ input [7:0] per_addr; // Peripheral address input [15:0] per_din; // Peripheral data input input per_en; // Peripheral enable (high active) -input [1:0] per_wen; // Peripheral write enable (high active) +input [1:0] per_we; // Peripheral write enable (high active) input puc; // Main system reset @@ -107,8 +103,8 @@ endcase // Read/Write probes -wire reg_write = |per_wen & per_en; -wire reg_read = ~|per_wen & per_en; +wire reg_write = |per_we & per_en; +wire reg_read = ~|per_we & per_en; // Read/Write vectors wire [511:0] reg_wr = reg_dec & {512{reg_write}}; @@ -180,8 +176,3 @@ endmodule // template_periph_16b - -`ifdef OMSP_NO_INCLUDE -`else -`include "openMSP430_undefines.v" -`endif

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.