From dc4572883192c8d22b54c57ef03a8ba2f6e13ee0 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 21 Nov 2011 18:55:54 +0000 Subject: [PATCH] Add STM3240 RTC header file git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4111 42af7a65-404d-4744-a932-0658087f49c3 --- .../stm32/chip/{stm32_rtc.h => stm32f10xxx_rtc.h} | 12 ++++++------ .../chip/{stm32f40xx_rcc.h => stm32f40xxx_rcc.h} | 0 arch/arm/src/stm32/stm32_rtc.h | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) rename arch/arm/src/stm32/chip/{stm32_rtc.h => stm32f10xxx_rtc.h} (93%) rename arch/arm/src/stm32/chip/{stm32f40xx_rcc.h => stm32f40xxx_rcc.h} (100%) diff --git a/arch/arm/src/stm32/chip/stm32_rtc.h b/arch/arm/src/stm32/chip/stm32f10xxx_rtc.h similarity index 93% rename from arch/arm/src/stm32/chip/stm32_rtc.h rename to arch/arm/src/stm32/chip/stm32f10xxx_rtc.h index b9fe3d8f33b..a0778f4e6ae 100644 --- a/arch/arm/src/stm32/chip/stm32_rtc.h +++ b/arch/arm/src/stm32/chip/stm32f10xxx_rtc.h @@ -1,8 +1,8 @@ /************************************************************************************ - * arch/arm/src/stm32/chip/stm32_rtc.h + * arch/arm/src/stm32/chip/stm32f10xxx_rtc.h * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32_RTC_H -#define __ARCH_ARM_SRC_STM32_CHIP_STM32_RTC_H +#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F10XXX_RTC_H +#define __ARCH_ARM_SRC_STM32_CHIP_STM32F10XXX_RTC_H /************************************************************************************ * Pre-processor Definitions @@ -93,4 +93,4 @@ #define RTC_DIVH_RTC_DIV_SHIFT (0) /* Bits 3-0: RTC Clock Divider High */ #define RTC_DIVH_RTC_DIV_MASK (0x0f << RTC_DIVH_RTC_DIV_SHIFT) -#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_RTC_H */ +#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F10XXX_RTC_H */ diff --git a/arch/arm/src/stm32/chip/stm32f40xx_rcc.h b/arch/arm/src/stm32/chip/stm32f40xxx_rcc.h similarity index 100% rename from arch/arm/src/stm32/chip/stm32f40xx_rcc.h rename to arch/arm/src/stm32/chip/stm32f40xxx_rcc.h diff --git a/arch/arm/src/stm32/stm32_rtc.h b/arch/arm/src/stm32/stm32_rtc.h index 28bfc339d3a..d2d66c95dad 100644 --- a/arch/arm/src/stm32/stm32_rtc.h +++ b/arch/arm/src/stm32/stm32_rtc.h @@ -43,8 +43,12 @@ #include #include "chip.h" -#include "chip/stm32_rtc.h" -#include "chip/stm32_bkp.h" +#if defined(CONFIG_STM32_STM32F10XX) +# include "chip/stm32f10xxx_rtc.h" +# include "chip/stm32_bkp.h" +#elif defined(CONFIG_STM32_STM32F40XX) +# include "chip/stm32f40xxx_rtc.h" +#endif /************************************************************************************ * Pre-processor Definitions