This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Re: H8/300 WatchDog Timer Driver
- From: Jonathan Larmour <jifl at eCosCentric dot com>
- To: Yoshinori Sato <qzb04471 at nifty dot ne dot jp>
- Cc: ecos-patches at sources dot redhat dot com
- Date: Wed, 14 Aug 2002 19:59:43 +0100
- Subject: Re: H8/300 WatchDog Timer Driver
- References: <m2k7pcsfz2.wl@np70.localdomain.ysato.2y.net>
I've belatedly checked in this patch. I made a few minor tweaks. Again
please remember to supply ChangeLog files in new packages.
Thanks for the contribution!
Jifl
--
--[ "You can complain because roses have thorns, or you ]--
--[ can rejoice because thorns have roses." -Lincoln ]-- Opinions==mine
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/ChangeLog,v
retrieving revision 1.73
diff -u -5 -p -r1.73 ChangeLog
--- ChangeLog 9 Aug 2002 10:29:33 -0000 1.73
+++ ChangeLog 14 Aug 2002 18:59:33 -0000
@@ -1,5 +1,9 @@
+2002-08-14 Yoshinori Sato <qzb04471@nifty.ne.jp>
+
+ * ecos.db: Add H8/300H watchdog driver package.
+
2002-08-07 Andrew Lunn <andrew.lunn@ascom.ch>
* ecos.db: Added CRC package.
2002-08-07 Gary Thomas <gthomas@ecoscentric.com>
@@ -22,10 +26,11 @@
2002-05-08 Jesper Skov <jskov@redhat.com>
* ecos.db: Removed special SH2 SCIF driver. The changes have been
merged into the SH3 (now generic SH) driver.
+
2002-04-24 Yoshinori Sato <qzb04471@nifty.ne.jp>
* ecos.db: Add H8/300 serial driver.
2002-04-25 Bob Koninckx <bob.koninckx@mech.kuleuven.ac.be>
Index: ecos.db
===================================================================
RCS file: /cvs/ecos/ecos/packages/ecos.db,v
retrieving revision 1.66
diff -u -5 -p -r1.66 ecos.db
--- ecos.db 9 Aug 2002 10:27:41 -0000 1.66
+++ ecos.db 14 Aug 2002 18:59:35 -0000
@@ -1459,10 +1459,20 @@ package CYGPKG_DEVICES_WATCHDOG_SH_SH3 {
description "
This package provides a watchdog driver implementation for the
Hitachi SH3 chip."
}
+package CYGPKG_DEVICES_WATCHDOG_H8300_H8300H {
+ alias { "Watchdog driver for the Hitachi H8/300H chip" devices_watchdog_h8300h device_watchdog_h8300h }
+ directory devs/watchdog/h8300/h8300h
+ script watchdog_h8300h.cdl
+ hardware
+ description "
+ This package provides a watchdog driver implementation for the
+ Hitachi H8/300H chip."
+}
+
package CYGPKG_IO_WATCHDOG {
alias { "Watchdog IO device" watchdog io_watchdog }
directory io/watchdog
script watchdog.cdl
description "
Index: NEWS
===================================================================
RCS file: /cvs/ecos/ecos/packages/NEWS,v
retrieving revision 1.52
diff -u -5 -p -r1.52 NEWS
--- NEWS 6 Aug 2002 15:33:29 -0000 1.52
+++ NEWS 14 Aug 2002 18:59:35 -0000
@@ -1,5 +1,6 @@
+* Yoshinori Sato has contributed a watchdog driver for the Hitachi H8/300H.
* Add AT91 watchdog driver. Contributed by Thomas Koeller of Basler Vision
Technologies.
* SMP support added for x86.
* Ported new networking stack from FreeBSD to eCos. Includes IPv6 support.
* Added generic power management support, plus platform support for the iPAQ.
Index: hal/h8300/h8300h/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/h8300/h8300h/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- hal/h8300/h8300h/current/ChangeLog 23 May 2002 23:02:58 -0000 1.2
+++ hal/h8300/h8300h/current/ChangeLog 14 Aug 2002 18:59:36 -0000
@@ -1,5 +1,9 @@
+2002-08-14 Yoshinori Sato <qzb04471@nifty.ne.jp>
+
+ * include/mod_regs_wdt.h: New file. Providing watchdog hardware data.
+
2002-04-24 Yoshinori Sato <qzb04471@nifty.ne.jp>
* New package.
//===========================================================================
Index: hal/h8300/h8300h/current/include/mod_regs_wdt.h
===================================================================
RCS file: hal/h8300/h8300h/current/include/mod_regs_wdt.h
diff -N hal/h8300/h8300h/current/include/mod_regs_wdt.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hal/h8300/h8300h/current/include/mod_regs_wdt.h 14 Aug 2002 18:59:36 -0000
@@ -0,0 +1,75 @@
+#ifndef CYGONCE_MOD_REGS_WDT_H
+#define CYGONCE_MOD_REGS_WDT_H
+
+//==========================================================================
+//
+// mod_regs_wdt.h
+//
+// Watchdog Timer Register
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos 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 or (at your option) any later version.
+//
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s): yoshinori sato
+// Contributors: yoshinori sato
+// Date: 2002-02-19
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+
+#define CYGARC_TCSR 0xFFFF8C
+#define CYGARC_TCNT 0xFFFF8D
+#define CYGARC_RSTCSRW 0xFFFF8E
+#define CYGARC_RSTCSRR 0xFFFF8F
+
+#define CYGARC_TCNT_MAGIC 0x5A00
+#define CYGARC_TCSR_MAGIC 0xA500
+
+#define CYGARC_WDT_OVF 0x80
+#define CYGARC_WDT_WT 0x40
+#define CYGARC_WDT_TME 0x20
+#define CYGARC_WDT_CKS2 0x04
+#define CYGARC_WDT_CKS1 0x02
+#define CYGARC_WDT_CKS0 0x01
+
+#define CYGARC_WDT_CKS 0x07 //Max Delay
+
+#define CYGARC_WDT_PERIOD ((1000000000/(CYGHWR_HAL_H8300_PROCESSOR_SPEED/4096))*256)
+
+#endif
+
+// EOF mod_regs_wdt.h
Index: devs/watchdog/h8300/h8300h/current/ChangeLog
===================================================================
RCS file: devs/watchdog/h8300/h8300h/current/ChangeLog
diff -N devs/watchdog/h8300/h8300h/current/ChangeLog
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devs/watchdog/h8300/h8300h/current/ChangeLog 14 Aug 2002 18:59:36 -0000
@@ -0,0 +1,36 @@
+2002-08-14 Yoshinori Sato <qzb04471@nifty.ne.jp>
+
+ * New package.
+
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos 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 or (at your option) any later version.
+//
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
Index: devs/watchdog/h8300/h8300h/current/cdl/watchdog_h8300h.cdl
===================================================================
RCS file: devs/watchdog/h8300/h8300h/current/cdl/watchdog_h8300h.cdl
diff -N devs/watchdog/h8300/h8300h/current/cdl/watchdog_h8300h.cdl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devs/watchdog/h8300/h8300h/current/cdl/watchdog_h8300h.cdl 14 Aug 2002 18:59:36 -0000
@@ -0,0 +1,103 @@
+# ====================================================================
+#
+# watchdog_h8300h.cdl
+#
+# eCos watchdog for the Hitachi H8/300H driver configuration data
+#
+# ====================================================================
+#####ECOSGPLCOPYRIGHTBEGIN####
+## -------------------------------------------
+## This file is part of eCos, the Embedded Configurable Operating System.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+##
+## eCos 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 or (at your option) any later version.
+##
+## eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+##
+## As a special exception, if other files instantiate templates or use macros
+## or inline functions from this file, or you compile this file and link it
+## with other works to produce a work based on this file, this file does not
+## by itself cause the resulting work to be covered by the GNU General Public
+## License. However the source code for this file must still be made available
+## in accordance with section (3) of the GNU General Public License.
+##
+## This exception does not invalidate any other reasons why a work based on
+## this file might be covered by the GNU General Public License.
+##
+## Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+## at http://sources.redhat.com/ecos/ecos-license/
+## -------------------------------------------
+#####ECOSGPLCOPYRIGHTEND####
+# ====================================================================
+######DESCRIPTIONBEGIN####
+#
+# Author(s): ysato
+# Contributors: ysato
+# Date: 2002-04-29
+#
+#####DESCRIPTIONEND####
+#
+# ====================================================================
+
+cdl_package CYGPKG_DEVICES_WATCHDOG_H8300_H8300H {
+ parent CYGPKG_IO_WATCHDOG
+ active_if CYGPKG_IO_WATCHDOG
+ display "H8/300H watchdog driver"
+ requires CYGPKG_HAL_H8300_H8300H
+ hardware
+ compile watchdog_h8300h.cxx
+ implements CYGINT_WATCHDOG_HW_IMPLEMENTATIONS
+ implements CYGINT_WATCHDOG_RESETS_ON_TIMEOUT
+ active_if CYGIMP_WATCHDOG_HARDWARE
+
+ cdl_option CYGIMP_WATCHDOG_HARDWARE {
+ parent CYGPKG_IO_WATCHDOG_IMPLEMENTATION
+ display "Hardware watchdog"
+ default_value 1
+ implements CYGINT_WATCHDOG_IMPLEMENTATIONS
+ }
+
+ cdl_component CYGPKG_DEVICES_WATCHDOG_H8300_H8300H_OPTIONS {
+ display "H8/300H watchdog build options"
+ flavor none
+ description "
+ Package specific build options including control over
+ compiler flags used only in building this package,
+ and details of which tests are built."
+
+
+ cdl_option CYGPKG_DEVICES_WATCHDOG_H8300_H8300H_CFLAGS_ADD {
+ display "Additional compiler flags"
+ flavor data
+ no_define
+ default_value { "" }
+ description "
+ This option modifies the set of compiler flags for
+ building the watchdog device. These flags are used in addition
+ to the set of global flags."
+ }
+
+ cdl_option CYGPKG_DEVICES_WATCHDOG_H8300_H8300H_CFLAGS_REMOVE {
+ display "Suppressed compiler flags"
+ flavor data
+ no_define
+ default_value { "" }
+ description "
+ This option modifies the set of compiler flags for
+ building the watchdog device. These flags are removed from
+ the set of global flags if present."
+ }
+
+ }
+}
+
+# EOF watchdog_h8300h.cdl
Index: devs/watchdog/h8300/h8300h/current/src/watchdog_h8300h.cxx
===================================================================
RCS file: devs/watchdog/h8300/h8300h/current/src/watchdog_h8300h.cxx
diff -N devs/watchdog/h8300/h8300h/current/src/watchdog_h8300h.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devs/watchdog/h8300/h8300h/current/src/watchdog_h8300h.cxx 14 Aug 2002 18:59:36 -0000
@@ -0,0 +1,113 @@
+//==========================================================================
+//
+// devs/watchdog/h8300/h83000/watchdog_h8300.cxx
+//
+// Watchdog implementation for Hitachi H8/300H CPUs
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos 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 or (at your option) any later version.
+//
+// eCos 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 eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s): yoshinori sato
+// Contributors: yoshinori sato
+// Date: 2002-04-29
+// Purpose: Watchdog class implementation
+// Description: Contains an implementation of the Watchdog class for use
+// with the Hitachi H8/300H watchdog timer.
+//
+//####DESCRIPTIONEND####
+//
+//==========================================================================
+
+#include <pkgconf/system.h> // system configuration file
+#include <pkgconf/watchdog.h> // configuration for this package
+
+#include <cyg/infra/cyg_trac.h> // tracing macros
+
+#include <cyg/hal/hal_io.h> // IO register access
+#include <cyg/hal/mod_regs_wdt.h> // watchdog register definitions
+
+#include <cyg/io/watchdog.hxx> // watchdog API
+
+// -------------------------------------------------------------------------
+// Constructor
+
+void
+Cyg_Watchdog::init_hw(void)
+{
+ CYG_REPORT_FUNCTION();
+
+ // No hardware init needed.
+
+ resolution = CYGARC_WDT_PERIOD;
+
+ CYG_REPORT_RETURN();
+}
+
+// -------------------------------------------------------------------------
+// Start the watchdog running.
+
+void
+Cyg_Watchdog::start()
+{
+ CYG_REPORT_FUNCTION();
+
+ //Stop WDT
+ HAL_WRITE_UINT16(CYGARC_TCSR,CYGARC_TCSR_MAGIC);
+ //Clear WDT Count
+ HAL_WRITE_UINT16(CYGARC_TCSR,CYGARC_TCNT_MAGIC);
+ //Start WDT
+ HAL_WRITE_UINT16(CYGARC_TCSR,CYGARC_TCSR_MAGIC|
+ CYGARC_WDT_WT|CYGARC_WDT_TME|CYGARC_WDT_CKS);
+
+ CYG_REPORT_RETURN();
+}
+
+// -------------------------------------------------------------------------
+// Reset watchdog timer. This needs to be called regularly to prevent
+// the watchdog firing.
+
+void
+Cyg_Watchdog::reset()
+{
+ CYG_REPORT_FUNCTION();
+
+ HAL_WRITE_UINT16(CYGARC_TCSR,CYGARC_TCNT_MAGIC);
+
+ CYG_REPORT_RETURN();
+}
+
+// -------------------------------------------------------------------------
+// EOF watchdog_h8300.cxx