# HG changeset patch # User jlarmour # Date 1056444146 0 # Node ID 7156cfbcb113c3a83bad3fdb9772a8d020b14a62 # Parent c27fc1b75136ea18dcb856545c5a4ae120db2c3c * include/var_io.h: Remove not seemingly useful AT91_PMC_SCER_CPU. * cdl/hal_arm_at91.cdl: We have a var_arch.h so define CYGBLD_HAL_ARM_VAR_ARCH_H. * include/var_arch.h: New file containing overrides for hal_arch.h. (HAL_IDLE_THREAD_ACTION): override here by defining power saving modes for idle actions. diff --git a/packages/hal/arm/at91/var/current/ChangeLog b/packages/hal/arm/at91/var/current/ChangeLog --- a/packages/hal/arm/at91/var/current/ChangeLog +++ b/packages/hal/arm/at91/var/current/ChangeLog @@ -1,3 +1,15 @@ +2003-06-24 Jonathan Larmour + + * include/var_io.h: Remove not seemingly useful AT91_PMC_SCER_CPU. + + * cdl/hal_arm_at91.cdl: We have a var_arch.h so define + CYGBLD_HAL_ARM_VAR_ARCH_H. + + * include/var_arch.h: New file containing + overrides for hal_arch.h. + (HAL_IDLE_THREAD_ACTION): override here by defining power saving modes + for idle actions. + 2003-06-04 Daniel Néri * src/at91_misc.c (hal_hardware_init): Make sure the AIC internal diff --git a/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl b/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl --- a/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl +++ b/packages/hal/arm/at91/var/current/cdl/hal_arm_at91.cdl @@ -70,6 +70,7 @@ cdl_package CYGPKG_HAL_ARM_AT91 { # Let the architectural HAL see this variant's files define_proc { puts $::cdl_system_header "#define CYGBLD_HAL_ARM_VAR_IO_H" + puts $::cdl_system_header "#define CYGBLD_HAL_ARM_VAR_ARCH_H" } cdl_option CYGHWR_HAL_ARM_AT91 { diff --git a/packages/hal/arm/at91/var/current/include/var_arch.h b/packages/hal/arm/at91/var/current/include/var_arch.h new file mode 100644 --- /dev/null +++ b/packages/hal/arm/at91/var/current/include/var_arch.h @@ -0,0 +1,94 @@ +#ifndef CYGONCE_HAL_VAR_ARCH_H +#define CYGONCE_HAL_VAR_ARCH_H +//============================================================================= +// +// var_arch.h +// +// AT91 variant architecture overrides +// +//============================================================================= +//####ECOSGPLCOPYRIGHTBEGIN#### +// ------------------------------------------- +// This file is part of eCos, the Embedded Configurable Operating System. +// Copyright (C) 2003 Jonathan Larmour +// +// 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 the copyright +// holders. +// ------------------------------------------- +//####ECOSGPLCOPYRIGHTEND#### +//============================================================================= +//#####DESCRIPTIONBEGIN#### +// +// Author(s): jlarmour +// Contributors: Daniel Neri +// Date: 2003-06-24 +// Purpose: AT91 variant architecture overrides +// Description: +// Usage: #include +// +//####DESCRIPTIONEND#### +// +//============================================================================= + +#include +#include + +//-------------------------------------------------------------------------- +// Idle thread code. +// This macro is called in the idle thread loop, and gives the HAL the +// chance to insert code. Typical idle thread behaviour might be to halt the +// processor. These implementations halt the system core clock. + +#ifndef HAL_IDLE_THREAD_ACTION + + +#if defined(CYGHWR_HAL_ARM_AT91_R40807) || \ + defined(CYGHWR_HAL_ARM_AT91_R40008) + +#define HAL_IDLE_THREAD_ACTION(_count_) \ +CYG_MACRO_START \ + HAL_WRITE_UINT32(AT91_PS+AT91_PS_CR, AT91_PS_CR_CPU); \ +CYG_MACRO_END + +#elif defined(CYGHWR_HAL_ARM_AT91_M42800A) || \ + defined(CYGHWR_HAL_ARM_AT91_M55800A) + +#define HAL_IDLE_THREAD_ACTION(_count_) \ +CYG_MACRO_START \ + HAL_WRITE_UINT32(AT91_PMC+AT91_PMC_SCDR, 1); \ +CYG_MACRO_END + +#else + +#error Unknown AT91 variant + +#endif + +#endif + +//----------------------------------------------------------------------------- +// end of var_arch.h +#endif // CYGONCE_HAL_VAR_ARCH_H diff --git a/packages/hal/arm/at91/var/current/include/var_io.h b/packages/hal/arm/at91/var/current/include/var_io.h --- a/packages/hal/arm/at91/var/current/include/var_io.h +++ b/packages/hal/arm/at91/var/current/include/var_io.h @@ -395,7 +395,7 @@ #endif #define AT91_PS_CR 0x000 // Control -#define AT91_PS_CR_CPU (1<<0) // Disable CPU clock +#define AT91_PS_CR_CPU (1<<0) // Disable CPU clock (idle mode) #define AT91_PS_PCER 0x004 // Peripheral clock enable #define AT91_PS_PCDR 0x008 // Peripheral clock disable #define AT91_PS_PCSR 0x00c // Peripheral clock status @@ -412,7 +412,6 @@ #define AT91_PMC_SCER 0x00 #define AT91_PMC_SCDR 0x04 #define AT91_PMC_SCSR 0x08 -#define AT91_PMC_SCER_CPU 0x01 #define AT91_PMC_PCER 0x10 #define AT91_PMC_PCDR 0x14