cvs diff: cannot find src/atmega48.cpp
cvs diff: cannot find src/hwmega48extirq.cpp
cvs diff: cannot find src/hwmega48extirq.h
? src/hwmega668extirq.cpp
? src/hwmega668extirq.h
cvs diff: Diffing .
cvs diff: Diffing autom4te.cache
cvs diff: Diffing config
cvs diff: Diffing doc
cvs diff: Diffing examples
cvs diff: Diffing examples/anacomp
cvs diff: Diffing examples/atmega128_timer
cvs diff: Diffing examples/atmega48
cvs diff: Diffing examples/atmel_key
cvs diff: Diffing examples/feedback
cvs diff: Diffing examples/simple_ex1
cvs diff: Diffing examples/spi
cvs diff: Diffing examples/stdiodemo
cvs diff: Diffing m4
cvs diff: Diffing regress
cvs diff: Diffing regress/avrtest
cvs diff: Diffing regress/modules
cvs diff: Diffing regress/test_opcodes
cvs diff: Diffing src
Index: src/Makefile.am
===================================================================
RCS file: /sources/simulavr/simulavrxx/src/Makefile.am,v
retrieving revision 1.39
diff -c -r1.39 Makefile.am
*** src/Makefile.am	10 Jul 2009 15:21:05 -0000	1.39
--- src/Makefile.am	12 Jul 2009 01:07:44 -0000
***************
*** 28,38 ****
  noinst_LTLIBRARIES=libsim.la
  
  libsim_la_SOURCES = \
!   adcpin.cpp application.cpp at4433.cpp at8515.cpp atmega48.cpp atmega128.cpp \
    atmega668base.cpp \
    avrdevice.cpp avrerror.cpp avrfactory.cpp avrmalloc.cpp decoder.cpp \
    decoder_trace.cpp flash.cpp gdbserver.cpp hardware.cpp helper.cpp \
!   hwacomp.cpp hwad.cpp hweeprom.cpp hwextirq.cpp hwmega48extirq.cpp \
    hwmegaextirq.cpp hwmegatimer0123irq.cpp hwmegatimer.cpp hwmegax8timer.cpp \
    hwmegax8timerirq.cpp hwpinchange.cpp hwport.cpp hwspi.cpp hwsreg.cpp \
    hwstack.cpp hwtimer01irq.cpp hwtimer.cpp hwuart.cpp hwwado.cpp \
--- 28,38 ----
  noinst_LTLIBRARIES=libsim.la
  
  libsim_la_SOURCES = \
!   adcpin.cpp application.cpp at4433.cpp at8515.cpp atmega128.cpp \
    atmega668base.cpp \
    avrdevice.cpp avrerror.cpp avrfactory.cpp avrmalloc.cpp decoder.cpp \
    decoder_trace.cpp flash.cpp gdbserver.cpp hardware.cpp helper.cpp \
!   hwacomp.cpp hwad.cpp hweeprom.cpp hwextirq.cpp hwmega668extirq.cpp \
    hwmegaextirq.cpp hwmegatimer0123irq.cpp hwmegatimer.cpp hwmegax8timer.cpp \
    hwmegax8timerirq.cpp hwpinchange.cpp hwport.cpp hwspi.cpp hwsreg.cpp \
    hwstack.cpp hwtimer01irq.cpp hwtimer.cpp hwuart.cpp hwwado.cpp \
***************
*** 51,57 ****
    atmega668base.h atmega88.h atmega168.h \
    avrdevice_impl.h avrerror.h avrfactory.h avrmalloc.h breakpoint.h \
    config_deprecated.h decoder.h externaltype.h flash.h \
!   funktor.h hwacomp.h hwad.h hweeprom.h hwextirq.h hwmega48extirq.h \
    hwmegaextirq.h hwmegatimer0123irq.h hwmegatimer.h hwmegax8timer.h \
    hwmegax8timerirq.h hwpinchange.h hwport.h hwspi.h hwsreg.h hwstack.h \
    hwtimer01irq.h hwtimer.h hwuart.h hwwado.h ioregs.h \
--- 51,57 ----
    atmega668base.h atmega88.h atmega168.h \
    avrdevice_impl.h avrerror.h avrfactory.h avrmalloc.h breakpoint.h \
    config_deprecated.h decoder.h externaltype.h flash.h \
!   funktor.h hwacomp.h hwad.h hweeprom.h hwextirq.h hwmega668extirq.h \
    hwmegaextirq.h hwmegatimer0123irq.h hwmegatimer.h hwmegax8timer.h \
    hwmegax8timerirq.h hwpinchange.h hwport.h hwspi.h hwsreg.h hwstack.h \
    hwtimer01irq.h hwtimer.h hwuart.h hwwado.h ioregs.h \
cvs diff: cannot find src/atmega48.cpp
Index: src/atmega48.h
===================================================================
RCS file: /sources/simulavr/simulavrxx/src/atmega48.h,v
retrieving revision 1.1
diff -c -r1.1 atmega48.h
*** src/atmega48.h	26 Mar 2009 19:03:48 -0000	1.1
--- src/atmega48.h	12 Jul 2009 01:07:44 -0000
***************
*** 1,60 ****
!  /*
!  ****************************************************************************
!  *
!  * simulavr - A simulator for the Atmel AVR family of microcontrollers.
!  * Copyright (C) 2001, 2002, 2003   Klaus Rudolph		
!  * 
!  * This program is free software; you can redistribute it and/or modify
!  * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, 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 more details.
!  *
!  * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  ****************************************************************************
!  */
! #ifndef ATMEGA48
! #define ATMEGA48
  
  
! #include "avrdevice.h"
! #include "hardware.h"
! #include "hwmega48extirq.h"
! #include "hwuart.h"
! #include "hwad.h"
! #include "hwport.h"
! #include "hwspi.h"
! #include "hwtimer.h"
! #include "hwmegax8timer.h"
! #include "hwmegax8timerirq.h"
! 
! class AvrDevice_atmega48:public AvrDevice {
! 	protected:
! 		Pin					aref;
! 		Pin					adc6;
! 		Pin					adc7;
! 	   	HWPort				portb;
! 	   	HWPort				portc;
! 	   	HWPort				portd;
! 		HWPrescaler			prescaler;
!         HWMega48ExtIrq*		extirq;
!         HWAdmux				admux;
!         HWAd*				ad;
!         HWMegaSpi*			spi;
!         HWUsart*			usart0;
! 		HWMegaX8TimerIrq*	timerIrq0;
! 		HWMegaX8Timer0*		timer0;
! 	public:
! 		AvrDevice_atmega48();
! 		~AvrDevice_atmega48(); 
! 		unsigned char GetRampz();
! 		void SetRampz(unsigned char);
! };
! #endif
--- 1,12 ----
! #ifndef __ATMEGA48__H
! #define __ATMEGA48__H 1
  
+ #include "atmega668base.h"
  
! class AvrDevice_atmega48:public AvrDevice_atmega668base {
! public:
!     AvrDevice_atmega48() : AvrDevice_atmega668base(512, 8*1024, 256) {}
!     ~AvrDevice_atmega48() {} 
! } ;
! // AvrDevice_atmega48
! #endif  // __ATMEGA48__H
Index: src/atmega668base.cpp
===================================================================
RCS file: /sources/simulavr/simulavrxx/src/atmega668base.cpp,v
retrieving revision 1.1
diff -c -r1.1 atmega668base.cpp
*** src/atmega668base.cpp	10 Jul 2009 15:21:05 -0000	1.1
--- src/atmega668base.cpp	12 Jul 2009 01:07:45 -0000
***************
*** 29,35 ****
  #include "hwspi.h"
  #include "hweeprom.h"
  #include "hwwado.h"
! #include "hwmega48extirq.h"
  
  AvrDevice_atmega668base::~AvrDevice_atmega668base() {}
  AvrDevice_atmega668base::AvrDevice_atmega668base(
--- 29,35 ----
  #include "hwspi.h"
  #include "hweeprom.h"
  #include "hwwado.h"
! #include "hwmega668extirq.h"
  
  AvrDevice_atmega668base::~AvrDevice_atmega668base() {}
  AvrDevice_atmega668base::AvrDevice_atmega668base(
***************
*** 66,72 ****
  	RegisterPin("ADC6", &adc6);
  	RegisterPin("ADC7", &adc7);
  
! 	extirq	= new HWMega48ExtIrq(	this,
  								irqSystem, 
  								PinAtPort(&portd, 0),
  								PinAtPort(&portd, 1),
--- 66,72 ----
  	RegisterPin("ADC6", &adc6);
  	RegisterPin("ADC7", &adc7);
  
! 	extirq	= new HWMega668ExtIrq(	this,
  								irqSystem, 
  								PinAtPort(&portd, 0),
  								PinAtPort(&portd, 1),
***************
*** 132,138 ****
  
  	for (int ii=0x6A; ii<=0x6D; ii++) { rw[ii]=new RWReserved(this, ii); }
  
! 	rw[0x69]= new RWEicra48(this,  extirq); //RWEicra;
  
  	for (int ii=0x60; ii<=0x68; ii++) { rw[ii]=new RWReserved(this, ii); }
  
--- 132,138 ----
  
  	for (int ii=0x6A; ii<=0x6D; ii++) { rw[ii]=new RWReserved(this, ii); }
  
! 	rw[0x69]= new RWEicra668(this,  extirq); //RWEicra;
  
  	for (int ii=0x60; ii<=0x68; ii++) { rw[ii]=new RWReserved(this, ii); }
  
***************
*** 163,170 ****
  	rw[0x40]= new RWEedr(this, eeprom);
  	rw[0x3F]= new RWEecr(this, eeprom);
  	rw[0x3E]= new RWReserved(this, 0x3E);
! 	rw[0x3D]= new RWEimsk48(this,  extirq);
! 	rw[0x3C]= new RWEifr48(this,  extirq);
  
  	for (int ii=0x36; ii<=0x3B; ii++) { rw[ii]=new RWReserved(this, ii); }
  
--- 163,170 ----
  	rw[0x40]= new RWEedr(this, eeprom);
  	rw[0x3F]= new RWEecr(this, eeprom);
  	rw[0x3E]= new RWReserved(this, 0x3E);
! 	rw[0x3D]= new RWEimsk668(this,  extirq);
! 	rw[0x3C]= new RWEifr668(this,  extirq);
  
  	for (int ii=0x36; ii<=0x3B; ii++) { rw[ii]=new RWReserved(this, ii); }
  
Index: src/atmega668base.h
===================================================================
RCS file: /sources/simulavr/simulavrxx/src/atmega668base.h,v
retrieving revision 1.1
diff -c -r1.1 atmega668base.h
*** src/atmega668base.h	10 Jul 2009 15:21:05 -0000	1.1
--- src/atmega668base.h	12 Jul 2009 01:07:45 -0000
***************
*** 26,32 ****
  
  #include "avrdevice.h"
  #include "hardware.h"
! #include "hwmega48extirq.h"
  #include "hwuart.h"
  #include "hwad.h"
  #include "hwport.h"
--- 26,32 ----
  
  #include "avrdevice.h"
  #include "hardware.h"
! #include "hwmega668extirq.h"
  #include "hwuart.h"
  #include "hwad.h"
  #include "hwport.h"
***************
*** 44,50 ****
  	   	HWPort				portc;
  	   	HWPort				portd;
  		HWPrescaler			prescaler;
!         HWMega48ExtIrq*		extirq;
          HWAdmux				admux;
          HWAd*				ad;
          HWMegaSpi*			spi;
--- 44,50 ----
  	   	HWPort				portc;
  	   	HWPort				portd;
  		HWPrescaler			prescaler;
!         HWMega668ExtIrq*		extirq;
          HWAdmux				admux;
          HWAd*				ad;
          HWMegaSpi*			spi;
cvs diff: cannot find src/hwmega48extirq.cpp
cvs diff: cannot find src/hwmega48extirq.h
cvs diff: Diffing src/python
cvs diff: Diffing tests