trion-cvs — Readonly notifications of CVS modifications.

[Trion-cvs] trion/kernel/arch/i386 Makefile.am,1.7,1.8

[<da...@us...>]

Update of /cvsroot/trion/trion/kernel/arch/i386
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26007

Modified Files:
	Makefile.am 
Log Message:
Added Timer class

Index: Makefile.am
===================================================================
RCS file: /cvsroot/trion/trion/kernel/arch/i386/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	16 Feb 2004 19:57:25 -0000	1.7
--- Makefile.am	25 Feb 2004 18:42:42 -0000	1.8
***************
*** 53,57 ****
  	$(top_srcdir)/include/arch/i386/Port.h Port.cpp \
  	$(top_srcdir)/include/arch/i386/Smp.h Smp.cpp \
! 	$(top_srcdir)/include/arch/i386/VGAConsole.h VGAConsole.cpp
  
  libi386_a_CXXFLAGS = \
--- 53,58 ----
  	$(top_srcdir)/include/arch/i386/Port.h Port.cpp \
  	$(top_srcdir)/include/arch/i386/Smp.h Smp.cpp \
! 	$(top_srcdir)/include/arch/i386/VGAConsole.h VGAConsole.cpp \
! 	$(top_srcdir)/include/arch/i386/Timer.h Timer.cpp
  
  libi386_a_CXXFLAGS = \

[Trion-cvs] trion/include/arch/i386 Timer.h,NONE,1.1

[<da...@us...>]

Update of /cvsroot/trion/trion/include/arch/i386
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25299

Added Files:
	Timer.h 
Log Message:


--- NEW FILE: Timer.h ---
// -----------------------------------------------------------------------
// Timer.cpp - A timer class (8253/54 chip)
//
// Author(s) : Daniel Noll
// Date      : 02/25/2004
// Version   : 1.0
// Home Page : http://trion.sourceforge.net
// -----------------------------------------------------------------------

// -----------------------------------------------------------------------
// Copyright (C) 2003, Trion Development Group Members
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// 1. Redistributions of source code must retain the above copyright
//    notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
//    notice, this list of conditions and the following disclaimer in the
//    documentation and/or other materials provided with the distribution.
// 3. Neither the name of the Trion Development Group nor the names of its
//    contributors may be used to endorse or promote products derived from
//    this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// -----------------------------------------------------------------------

#include <arch/i386/Interrupt.h>
#include <arch/i386/InterruptManager.h>

#define COUNTER0 0x40
#define COUNTER1 0x41
#define COUNTER2 0x42
#define MODECTRL 0x43

#define EOI			0x20

class Timer : public Interrupt
{
	private:
		unsigned int ticks;

	public:
		void Execute();

		Timer();
		Timer(int freq);

		void InstallTimer(InterruptManager *im);

		int AddHandler(void (*handler)());
		int AddHandler(void (*handler)(), int freq);
		void RemoveHandler(int index);
};

[Trion-cvs] trion/kernel/arch/i386 Timer.cpp,NONE,1.1

[<da...@us...>]

Update of /cvsroot/trion/trion/kernel/arch/i386
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21502/arch/i386

Added Files:
	Timer.cpp 
Log Message:
Timer-Class (not working)

--- NEW FILE: Timer.cpp ---
// -----------------------------------------------------------------------
// Timer.h - A timer class (8253/54 chip)
//
// Author(s) : Daniel Noll
// Date      : 02/25/2004
// Version   : 1.0
// Home Page : http://trion.sourceforge.net
// -----------------------------------------------------------------------

// -----------------------------------------------------------------------
// Copyright (C) 2003, Trion Development Group Members
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// 1. Redistributions of source code must retain the above copyright
//    notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
//    notice, this list of conditions and the following disclaimer in the
//    documentation and/or other materials provided with the distribution.
// 3. Neither the name of the Trion Development Group nor the names of its
//    contributors may be used to endorse or promote products derived from
//    this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// -----------------------------------------------------------------------

#include <arch/i386/Timer.h>
#include <Console.h>

Timer::Timer() : Interrupt()
{
	Timer(100);
}

Timer::Timer(int freq) : Interrupt()
{
	type=D_INT;

	// Initialize the timer-chip
	Port cntr0(0x40);
	int t = 1193180 / freq;

	cntr0.WriteByte(t & 0xFF);
	cntr0.WriteByte(t >> 8);

	ticks=0;
}

void Timer::Execute()
{
	Port(0x20).WriteByte(EOI);
	Port(0xA0).WriteByte(EOI);
}

void Timer::InstallTimer(InterruptManager *im)
{
	im->InstallInterrupt(this, 0x20);
	im->EnableIRQ(1);

	console().WriteMessage(Console::MSG_OK, "Timer: ", "setup");
}