diff --git a/cpu/stm32w108/Makefile.stm32w108 b/cpu/stm32w108/Makefile.stm32w108 index 56fd72891..247b00595 100644 --- a/cpu/stm32w108/Makefile.stm32w108 +++ b/cpu/stm32w108/Makefile.stm32w108 @@ -45,9 +45,9 @@ ifdef IAR TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a else ifdef PRINTF_FLOAT - TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_thumb2.a + TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library-gnu.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_thumb2.a else - TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library.a $(CONTIKI_CPU)/hal/micro/cortexm3/e_stdio_intonly_thumb2.a + TARGET_LIBFILES = $(CONTIKI_CPU)/simplemac/library/simplemac-library-gnu.a $(CONTIKI_CPU)/lib/e_stdio_intonly_thumb2.a endif endif # `$(CC) -print-file-name=thumb2/libc.a` `$(CC) -print-file-name=thumb2/libgcc.a` @@ -74,7 +74,7 @@ AROPTS = --create ASFLAGS = -s+ -w+ --cpu Cortex-M3 -L$(OBJECTDIR) LDFLAGS += --redirect _Printf=_PrintfSmall --redirect _Scanf=_ScanfSmall --map=contiki-$(TARGET).map ifndef COFFEE - LDFLAGS+= --config $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/iar-cfg.icf + LDFLAGS+= --config $(CONTIKI_CPU)/iar-cfg.icf endif OBJOPTS = --bin @@ -101,7 +101,7 @@ ASFLAGS = -mthumb -mcpu=cortex-m3 -fsigned-char -c -g -Wall -Os -ffunction-secti -mlittle-endian -fshort-enums -x assembler-with-cpp -Wa,-EL LDFLAGS += -mcpu=cortex-m3 \ -mthumb \ - -Wl,-T -Xlinker $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/gnu.ld \ + -Wl,-T -Xlinker $(CONTIKI_CPU)/gnu.ld \ -Wl,-static \ -u Default_Handler \ -nostartfiles \ @@ -118,8 +118,6 @@ OBJOPTS = -O binary endif -ifndef IAR - ifdef COFFEE_ADDRESS COFFEE = 1 endif @@ -147,15 +145,18 @@ ifeq ($(COFFEE),1) else # Coffee starts at the end of the flash, before NVM section. - COFFEE_ADDRESS = 0x801F400 + COFFEE_ADDRESS = 0x801F800 endif + +ifndef IAR + LDFLAGS+= -Wl,--section-start=.coffee=$(COFFEE_ADDRESS) else #IAR ifeq ($(COFFEE),1) - LDFLAGS+= --config $(CONTIKI_CPU)/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf + LDFLAGS+= --config $(CONTIKI_CPU)/iar-cfg-coffee.icf endif endif diff --git a/cpu/stm32w108/cfs-coffee-arch.h b/cpu/stm32w108/cfs-coffee-arch.h index 51cba54cd..e529b0123 100644 --- a/cpu/stm32w108/cfs-coffee-arch.h +++ b/cpu/stm32w108/cfs-coffee-arch.h @@ -67,7 +67,7 @@ /* If using IAR, COFFEE_ADDRESS reflects the static value in the linker script iar-cfg-coffee.icf, so it can't be passed as a parameter for Make.*/ #ifdef __ICCARM__ -#define COFFEE_ADDRESS 0x8010000 +#define COFFEE_ADDRESS 0x8010c00 #endif #if (COFFEE_ADDRESS & 0x3FF) !=0 #error "COFFEE_ADDRESS not aligned to a 1024-bytes page boundary." @@ -96,9 +96,10 @@ #define COFFEE_LOG_SIZE 128 // COFFEE_MICRO_LOGS is 0. -#if COFFEE_PAGES <= 0x100 -#define coffee_page_t uint8_t -#elif COFFEE_PAGES <= 0x10000 +#if COFFEE_PAGES <= 127 +#define coffee_page_t int8_t +#elif COFFEE_PAGES <= 0x7FFF +#define coffee_page_t int16_t #endif diff --git a/cpu/stm32w108/dev/stm32w_conf.h b/cpu/stm32w108/dev/stm32w_conf.h index c7b64e64c..84aa3d6ec 100644 --- a/cpu/stm32w108/dev/stm32w_conf.h +++ b/cpu/stm32w108/dev/stm32w_conf.h @@ -1,5 +1,5 @@ /******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_conf.h +* File Name : stm32w_conf.h * Author : MCD Application Team * Version : V2.0.3 * Date : 09/22/2008 @@ -18,7 +18,7 @@ #define __STM32F10x_CONF_H /* Includes ------------------------------------------------------------------*/ -#include "stm32w_type.h" +#include "stm32w108_type.h" /* Exported types ------------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/ diff --git a/cpu/stm32w108/dev/stm32w_systick.c b/cpu/stm32w108/dev/stm32w_systick.c index 11c3a2f6a..de34f8c44 100644 --- a/cpu/stm32w108/dev/stm32w_systick.c +++ b/cpu/stm32w108/dev/stm32w_systick.c @@ -1,5 +1,5 @@ /******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_systick.c +* File Name : stm32w108_systick.c * Author : MCD Application Team * Version : V2.0.3 * Date : 09/22/2008 diff --git a/cpu/stm32w108/dev/stm32w_systick.h b/cpu/stm32w108/dev/stm32w_systick.h index c9ca99176..415be6429 100644 --- a/cpu/stm32w108/dev/stm32w_systick.h +++ b/cpu/stm32w108/dev/stm32w_systick.h @@ -18,7 +18,7 @@ #ifndef __STM32W_SYSTICK_H #define __STM32W_SYSTICK_H -#include "stm32w_type.h" +#include "stm32w108_type.h" #include "stm32w_conf.h" #ifndef EXT diff --git a/cpu/stm32w108/dev/stm32w_type.h b/cpu/stm32w108/dev/stm32w_type.h deleted file mode 100644 index e3a5fda06..000000000 --- a/cpu/stm32w108/dev/stm32w_type.h +++ /dev/null @@ -1,80 +0,0 @@ -/******************** (C) COPYRIGHT 2008 STMicroelectronics ******************** -* File Name : stm32f10x_type.h -* Author : MCD Application Team -* Version : V2.0.3 -* Date : 09/22/2008 -* Description : This file contains all the common data types used for the -* STM32F10x firmware library. -******************************************************************************** -* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS -* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME. -* AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT, -* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE -* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING -* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS. -*******************************************************************************/ - -/* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __STM32F10x_TYPE_H -#define __STM32F10x_TYPE_H - -/* Includes ------------------------------------------------------------------*/ -/* Exported types ------------------------------------------------------------*/ -typedef signed long s32; -typedef signed short s16; -typedef signed char s8; - -typedef signed long const sc32; /* Read Only */ -typedef signed short const sc16; /* Read Only */ -typedef signed char const sc8; /* Read Only */ - -typedef volatile signed long vs32; -typedef volatile signed short vs16; -typedef volatile signed char vs8; - -typedef volatile signed long const vsc32; /* Read Only */ -typedef volatile signed short const vsc16; /* Read Only */ -typedef volatile signed char const vsc8; /* Read Only */ - -typedef unsigned long u32; -typedef unsigned short u16; -typedef unsigned char u8; - -typedef unsigned long const uc32; /* Read Only */ -typedef unsigned short const uc16; /* Read Only */ -typedef unsigned char const uc8; /* Read Only */ - -typedef volatile unsigned long vu32; -typedef volatile unsigned short vu16; -typedef volatile unsigned char vu8; - -typedef volatile unsigned long const vuc32; /* Read Only */ -typedef volatile unsigned short const vuc16; /* Read Only */ -typedef volatile unsigned char const vuc8; /* Read Only */ - -//typedef enum {FALSE = 0, TRUE = !FALSE} bool; - -typedef enum {RESET = 0, SET = !RESET} FlagStatus, ITStatus; - -typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState; -#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE)) - -typedef enum {ERROR = 0, SUCCESS = !ERROR} ErrorStatus; - -#define U8_MAX ((u8)255) -#define S8_MAX ((s8)127) -#define S8_MIN ((s8)-128) -#define U16_MAX ((u16)65535u) -#define S16_MAX ((s16)32767) -#define S16_MIN ((s16)-32768) -#define U32_MAX ((u32)4294967295uL) -#define S32_MAX ((s32)2147483647) -#define S32_MIN ((s32)-2147483648) - -/* Exported constants --------------------------------------------------------*/ -/* Exported macro ------------------------------------------------------------*/ -/* Exported functions ------------------------------------------------------- */ - -#endif /* __STM32F10x_TYPE_H */ - -/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/ diff --git a/cpu/stm32w108/dev/uart1.h.bak b/cpu/stm32w108/dev/uart1.h.bak new file mode 100644 index 000000000..22f741290 --- /dev/null +++ b/cpu/stm32w108/dev/uart1.h.bak @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2007, Swedish Institute of Computer Science. + * 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 Institute 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 INSTITUTE 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 INSTITUTE 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. + * + * This file is part of the Contiki operating system. + * + * $Id: uart1.h,v 1.1 2010/10/25 09:03:39 salvopitru Exp $ + */ + +/** + * \file + * A brief description of what this file is. + * \author + * Adam Dunkels + */ + +#ifndef __UART1_H__ +#define __UART1_H__ + +//#include "msp430.h" +// +//#define UART1_BAUD2UBR(baud) ((MSP430_CPU_SPEED)/(baud)) + +void uart1_set_input(int (*input)(unsigned char c)); +void uart1_writeb(unsigned char c); +void uart1_init(unsigned long ubr); +//uint8_t uart1_active(void); + +#endif /* __UART1_H__ */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/Makefile b/cpu/stm32w108/e_stdio/Makefile similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/Makefile rename to cpu/stm32w108/e_stdio/Makefile diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_printf.c b/cpu/stm32w108/e_stdio/src/_SP_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_printf.c rename to cpu/stm32w108/e_stdio/src/_SP_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_puts.c b/cpu/stm32w108/e_stdio/src/_SP_puts.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_puts.c rename to cpu/stm32w108/e_stdio/src/_SP_puts.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_snprintf.c b/cpu/stm32w108/e_stdio/src/_SP_snprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_snprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_snprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_sprintf.c b/cpu/stm32w108/e_stdio/src/_SP_sprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_sprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_sprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_vfprintf.c b/cpu/stm32w108/e_stdio/src/_SP_vfprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/_SP_vfprintf.c rename to cpu/stm32w108/e_stdio/src/_SP_vfprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/floatio.h b/cpu/stm32w108/e_stdio/src/floatio.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/floatio.h rename to cpu/stm32w108/e_stdio/src/floatio.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/fvwrite.h b/cpu/stm32w108/e_stdio/src/fvwrite.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/fvwrite.h rename to cpu/stm32w108/e_stdio/src/fvwrite.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/local.h b/cpu/stm32w108/e_stdio/src/local.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/local.h rename to cpu/stm32w108/e_stdio/src/local.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/mbctype.h b/cpu/stm32w108/e_stdio/src/mbctype.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/mbctype.h rename to cpu/stm32w108/e_stdio/src/mbctype.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/scanf.c b/cpu/stm32w108/e_stdio/src/scanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/scanf.c rename to cpu/stm32w108/e_stdio/src/scanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_dtoa.c b/cpu/stm32w108/e_stdio/src/small_dtoa.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_dtoa.c rename to cpu/stm32w108/e_stdio/src/small_dtoa.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.c b/cpu/stm32w108/e_stdio/src/small_mprec.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.c rename to cpu/stm32w108/e_stdio/src/small_mprec.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.h b/cpu/stm32w108/e_stdio/src/small_mprec.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_mprec.h rename to cpu/stm32w108/e_stdio/src/small_mprec.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_strtod.c b/cpu/stm32w108/e_stdio/src/small_strtod.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_strtod.c rename to cpu/stm32w108/e_stdio/src/small_strtod.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_vfsscanf.c b/cpu/stm32w108/e_stdio/src/small_vfsscanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_vfsscanf.c rename to cpu/stm32w108/e_stdio/src/small_vfsscanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcrtomb.c b/cpu/stm32w108/e_stdio/src/small_wcrtomb.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcrtomb.c rename to cpu/stm32w108/e_stdio/src/small_wcrtomb.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcsrtombs.c b/cpu/stm32w108/e_stdio/src/small_wcsrtombs.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wcsrtombs.c rename to cpu/stm32w108/e_stdio/src/small_wcsrtombs.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wctomb_r.c b/cpu/stm32w108/e_stdio/src/small_wctomb_r.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/small_wctomb_r.c rename to cpu/stm32w108/e_stdio/src/small_wctomb_r.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/sscanf.c b/cpu/stm32w108/e_stdio/src/sscanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/sscanf.c rename to cpu/stm32w108/e_stdio/src/sscanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/swi.h b/cpu/stm32w108/e_stdio/src/swi.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/swi.h rename to cpu/stm32w108/e_stdio/src/swi.h diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/syscalls.c b/cpu/stm32w108/e_stdio/src/syscalls.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/syscalls.c rename to cpu/stm32w108/e_stdio/src/syscalls.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test.c b/cpu/stm32w108/e_stdio/src/test.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test.c rename to cpu/stm32w108/e_stdio/src/test.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_mes.c b/cpu/stm32w108/e_stdio/src/test_mes.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_mes.c rename to cpu/stm32w108/e_stdio/src/test_mes.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_printf.c b/cpu/stm32w108/e_stdio/src/test_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_printf.c rename to cpu/stm32w108/e_stdio/src/test_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_scanf.c b/cpu/stm32w108/e_stdio/src/test_scanf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/test_scanf.c rename to cpu/stm32w108/e_stdio/src/test_scanf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/vfieeefp.h b/cpu/stm32w108/e_stdio/src/vfieeefp.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio/src/vfieeefp.h rename to cpu/stm32w108/e_stdio/src/vfieeefp.h diff --git a/cpu/stm32w108/gnu.ld b/cpu/stm32w108/gnu.ld new file mode 100644 index 000000000..58d9df2b8 --- /dev/null +++ b/cpu/stm32w108/gnu.ld @@ -0,0 +1,236 @@ +/*SEARCH_DIR("C:\Program Files\Raisonance\Ride\Lib\ARM") +EXTERN( __io_putchar ) +EXTERN( _write ) +GROUP( +"std_sbrk_thumb.lib" +"smallprintf_thumb.a" +"libc.a" +"libm.a" +) +*/ +/* default stack sizes. + +These are used by the startup in order to allocate stacks for the different modes. +*/ + +__Stack_Size = 0x500 ; + +PROVIDE ( _Stack_Size = __Stack_Size ) ; + +__Stack_Init = 0x20000000; + +_estack = __Stack_Init + __Stack_Size; + + +/*"PROVIDE" allows to easily override these values from an object file or the commmand line.*/ +PROVIDE ( _Stack_Init = __Stack_Init ) ; + +/* +this sends all unreferenced IRQHandlers to a Default_Handler or a reset. +*/ + +PROVIDE(Default_Handler = 0 ); +PROVIDE(NMI_Handler = Default_Handler ); +PROVIDE(HardFault_Handler = Default_Handler ); +PROVIDE(MemManage_Handler = Default_Handler ); +PROVIDE(BusFault_Handler = Default_Handler ); +PROVIDE(UsageFault_Handler = Default_Handler ); +PROVIDE(SVC_Handler = Default_Handler ); +PROVIDE(DebugMonitor_Handler = Default_Handler ); +PROVIDE(PendSV_Handler = Default_Handler ); +PROVIDE(SysTick_Handler = Default_Handler ); +PROVIDE(halTimer1Isr = Default_Handler ); +PROVIDE(halTimer2Isr = Default_Handler ); +PROVIDE(halManagementIsr = Default_Handler ); +PROVIDE(halBaseBandIsr = Default_Handler ); +PROVIDE(halSleepTimerIsr = Default_Handler ); +PROVIDE(halSc1Isr = Default_Handler ); +PROVIDE(halSc2Isr = Default_Handler ); +PROVIDE(halSecurityIsr = Default_Handler ); +PROVIDE(halStackMacTimerIsr = Default_Handler ); +PROVIDE(stmRadioTransmitIsr = Default_Handler ); +PROVIDE(stmRadioReceiveIsr = Default_Handler ); +PROVIDE(halAdcIsr = Default_Handler ); +PROVIDE(halIrqAIsr = Default_Handler ); +PROVIDE(halIrqBIsr = Default_Handler ); +PROVIDE(halIrqCIsr = Default_Handler ); +PROVIDE(halIrqDIsr = Default_Handler ); +PROVIDE(halDebugIsr = Default_Handler ); + +/******************************************************************************/ +/* Peripheral memory map */ +/******************************************************************************/ +/*this allows to compile the ST lib in "non-debug" mode*/ +_BOOTLOADER_SIZE = 0x3000 ; +_ROM_base = DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000 ; +/* include the memory spaces definitions sub-script */ +MEMORY +{ + RAM_region (xrw) : ORIGIN = 0x20000000, LENGTH = 8K + ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-2K + NVM_region (rx) : ORIGIN = 0x0801F800, LENGTH = 2K + FIB_region (ra) : ORIGIN = 0x08040000, LENGTH = 2K +} + + +/* Sections management for FLASH mode */ + +/* Sections Definitions */ + +SECTIONS +{ + + /* for Cortex devices, the beginning of the startup code is stored in the .isr_vector section, which goes to FLASH */ + + .isr_vector (DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000) : + { + . = ALIGN(4); + __ApplicationFlashStart = . ; + /* . = . + _ROM_base ;*/ + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >ROM_region + + /* for some STRx devices, the beginning of the startup code is stored in the .flashtext section, which goes to FLASH */ + .flashtext : + { + . = ALIGN(4); + *(.flashtext) /* Startup code */ + . = ALIGN(4); + } >ROM_region + + /* the program code is stored in the .text section, which goes to Flash */ + .text : + { + . = ALIGN(4); + + *(.text) /* remaining code */ + *(.text.*) /* remaining code */ + *(.rodata) /* read-only data (constants) */ + *(.rodata*) + *(.glue_7) + *(.glue_7t) + . = (DEFINED(ELF_LOADER) ? ALIGN(1024) : .); + *(.elf_text) + . = (DEFINED(ELF_LOADER) ? ALIGN(1024) : .); + + . = ALIGN(4); + _etext = .; + /* This is used by the startup in order to initialize the .data section */ + _sidata = _etext; + } >ROM_region + + /* Section start can be overridden via command line. */ + .coffee 0x08010c0 : + { + _coffee_start = ABSOLUTE(.); + . = ALIGN(1024); + *(.coffeefiles) + . = ORIGIN(NVM_region) - _coffee_start; + } > ROM_region = 0x00 + + + NVM (NOLOAD): + { + . = ALIGN(1024); + KEEP(*(NVM)) + . = ALIGN(4); + } > NVM_region + + + FAT (NOLOAD) : + { + . = ALIGN(4); + KEEP(*(FAT)) + . = ALIGN(4); + } > FIB_region + + /* after that it's only debugging information. */ + + + /* This is the initialized data section + The program executes knowing that the data is in the RAM + but the loader puts the initial values in the FLASH (inidata). + It is one task of the startup to copy the initial values from FLASH to RAM. */ + .data _estack : AT ( _sidata ) + { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .data section */ + _sdata = . ; + + *(.data) + *(.data.*) + + . = ALIGN(4); + /* This is used by the startup in order to initialize the .data secion */ + _edata = . ; + ASSERT(_sidata + SIZEOF(.data) < LOADADDR(.coffee), ".data section overflow in ROM"); + } >RAM_region + + + /* This is the uninitialized data section */ + .bss : + { + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; + + *(.bss) + *(.bss.*) + *(COMMON) + + . = ALIGN(4); + /* This is used by the startup in order to initialize the .bss secion */ + _ebss = . ; + } >RAM_region + + PROVIDE ( end = _ebss ); + PROVIDE ( _end = _ebss ); + + __exidx_start = .; + __exidx_end = .; + + /* remove the debugging information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } +} + +__ApplicationFlashEnd = _sidata + (_edata - _sdata); diff --git a/cpu/stm32w108/hal/doxygen/Doxygen_Release b/cpu/stm32w108/hal/doxygen/Doxygen_Release deleted file mode 100644 index bd72919f3..000000000 --- a/cpu/stm32w108/hal/doxygen/Doxygen_Release +++ /dev/null @@ -1,1557 +0,0 @@ -# Doxyfile 1.6.1 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "Hardware Abstraction Layer" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 1.0.0 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /Users/dimitri/doxygen/mail/1.5.7/doxywizard/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../ - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = */hal_test/* - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = STHeaderHTML.html - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = STFooterHTML.html - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enable doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) -# there is already a search function so this one should typically -# be disabled. - -SEARCHENGINE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/cpu/stm32w108/hal/doxygen/STFooterHTML.html b/cpu/stm32w108/hal/doxygen/STFooterHTML.html deleted file mode 100644 index 4f4cad439..000000000 --- a/cpu/stm32w108/hal/doxygen/STFooterHTML.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - - -
-$projectname.
-$projectnumber. -
-		 -
-Copyright © 2009 by STMicrolectronics. All rights reserved.
-Generated $datetime with Doxygen $doxygenversion. -
-
- - \ No newline at end of file diff --git a/cpu/stm32w108/hal/doxygen/STHeaderHTML.html b/cpu/stm32w108/hal/doxygen/STHeaderHTML.html deleted file mode 100644 index 76acc6ee9..000000000 --- a/cpu/stm32w108/hal/doxygen/STHeaderHTML.html +++ /dev/null @@ -1,16 +0,0 @@ - - -$title - - - - - - -
-Home  - |  Modules  - |  Data Structures  - |  File List  - |  Index
-
diff --git a/cpu/stm32w108/hal/doxygen/ST_Logo.gif b/cpu/stm32w108/hal/doxygen/ST_Logo.gif deleted file mode 100644 index 1b401a59c..000000000 Binary files a/cpu/stm32w108/hal/doxygen/ST_Logo.gif and /dev/null differ diff --git a/cpu/stm32w108/hal/doxygen/makefile b/cpu/stm32w108/hal/doxygen/makefile deleted file mode 100644 index 931ea9071..000000000 --- a/cpu/stm32w108/hal/doxygen/makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: - doxygen Doxygen_Release - cp ST_Logo.gif html -clean: - - rm -fr html diff --git a/cpu/stm32w108/hal/error-def.h b/cpu/stm32w108/hal/error-def.h index 8a995cf9e..15360085c 100644 --- a/cpu/stm32w108/hal/error-def.h +++ b/cpu/stm32w108/hal/error-def.h @@ -1,6 +1,6 @@ /** * @file error-def.h - * @brief Return-code definitions for StZNet stack API functions. + * @brief Return-code definitions for API functions. * * See @ref status_codes for documentation. * diff --git a/cpu/stm32w108/hal/hal.h b/cpu/stm32w108/hal/hal.h index e0fb7bbe7..e0161af3a 100644 --- a/cpu/stm32w108/hal/hal.h +++ b/cpu/stm32w108/hal/hal.h @@ -31,13 +31,12 @@ // Keep micro first for specifics used by other headers #include "micro/micro-common.h" -#include "micro/cortexm3/micro-common.h" - #include "micro/led.h" #include "micro/button.h" #include "micro/system-timer.h" #include "micro/cortexm3/nvm.h" #include "hal/micro/cortexm3/uart.h" +#include "hal/micro/adc.h" #endif //__HAL_H__ diff --git a/cpu/stm32w108/hal/micro/adc.h b/cpu/stm32w108/hal/micro/adc.h index 76fe07de4..9f690c58a 100644 --- a/cpu/stm32w108/hal/micro/adc.h +++ b/cpu/stm32w108/hal/micro/adc.h @@ -15,8 +15,7 @@ * * To use the ADC system, include this file and ensure that * ::halInternalInitAdc() is called whenever the microcontroller is - * started. Call ::halInternalSleepAdc() to sleep the module and - * ::halInternalInitAdc() to wake up the module. + * started. * * A "user" is a separate thread of execution and usage. That is, * internal St code is one user and clients are a different user. @@ -171,13 +170,6 @@ typedef int8u ADCChannelType; */ void halInternalInitAdc(void); - -/** @brief Shuts down the voltage reference and ADC system to - * minimize power consumption in sleep. - */ -void halInternalSleepAdc(void); - - /** @brief Starts an ADC conversion for the user specified by \c id. * * @appusage The application must set \c reference to the voltage diff --git a/cpu/stm32w108/hal/micro/cortexm3/adc.c b/cpu/stm32w108/hal/micro/cortexm3/adc.c index 79e017f6c..9185ecd4f 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/adc.c +++ b/cpu/stm32w108/hal/micro/cortexm3/adc.c @@ -117,6 +117,7 @@ ADCUser startNextConversion() ADC_CFG = adcConfig[i]; // set the configuration to desired INT_ADCFLAG = 0xFFFF; INT_CFGSET = INT_ADC; + break; //see DDTS MBTst38936 } } } else { diff --git a/cpu/stm32w108/hal/micro/cortexm3/board.c b/cpu/stm32w108/hal/micro/cortexm3/board.c new file mode 100644 index 000000000..d127f0370 --- /dev/null +++ b/cpu/stm32w108/hal/micro/cortexm3/board.c @@ -0,0 +1,453 @@ +/** @file board.c + * @brief Board file x STM32W108 Kits boards + * + * This file implements a software layer to support all the ST kits boards + * and deal with the difference in leds, buttons and sensors connected to the board. + * This a bit too complex for customer boards adaptation and customer can simplify it + * to adapt it to their hardware environment as they normally don't need to have the software + * running on several boards. + * The boards supported are: + * - MB851 A + * - MB851 B + * - MB851 C + * - MB954 A + * - MB954 B + * - MB950 A + * - MB951 A + * + */ +#include PLATFORM_HEADER +#include BOARD_HEADER +#ifdef EMBERZNET_HAL +#include "stack/include/ember.h" +#include "stack/include/error.h" +#include "hal/hal.h" +#define PORTA (0 << 3) +#define PORTB (1 << 3) +#define PORTC (2 << 3) +#else +#include "error.h" +#include "hal/hal.h" +#include "hal/micro/cortexm3/mfg-token.h" +#endif +#include + +const LedResourceType LedsMB851A[] = { + { + "D1", /* Green LED */ + PORTB, + 6 + }, + { + "D3", /* Yellow LED */ + PORTB, + 5 + } +}; + +const InfraRedLedResourceType infraRedLedMB851A = { + "D5", /* Infrared LED */ + PORTB, + 4 +}; + + +const LedResourceType LedsMB954A[] = { + { + "D1", /* Green LED */ + PORTA, + 5 + }, + { + "D3", /* Yellow LED */ + PORTA, + 0 + } +}; + +const ButtonResourceType ButtonsMB851A[] = { + { + "S1", + PORTA, + 7 + } +}; + +const ButtonResourceType ButtonsMB954A[] = { + { + "S1", + PORTB, + 3 + } +}; + +const ButtonResourceType ButtonsMB950A[] = { + { + "S1", + PORTB, + 3 + }, + { + "S2", + PORTA, + 7 + }, + { + "S3", + PORTB, + 7 + }, + { + "S4", + PORTB, + 0 + }, + { + "S5", + PORTB, + 6 + } +}; + +const TempSensorResourceType tempSensorMB851A = { + "STLM20", + PORTB, + 7, + FALSE +}; + +const TempSensorResourceType tempSensorMB954A = { + "STLM20", + PORTA, + 4, + TRUE +}; + +const MemsResourceType memsSensor = { + "LIS302", + 0 +}; + +const BoardIOType ioMB851A = { + LedsMB851A, + ButtonsMB851A, +}; + +const BoardIOType ioMB954A = { + LedsMB954A, + ButtonsMB954A, +}; + +const BoardIOType ioMB950A = { + LedsMB954A, + ButtonsMB950A, +}; + +const BoardResourcesType MB851A = { + "MB851 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI), + BUTTONS_MB851A, + LEDS_MB851A, + &ioMB851A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB851A, +}; + +const BoardResourcesType MB851B = { + "MB851 B", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI), + BUTTONS_MB851B, + LEDS_MB851B, + &ioMB851A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB851A, +}; + +const BoardResourcesType MB851C = { + "MB851 C", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F | BOARD_HAS_EEPROM), + BUTTONS_MB851C, + LEDS_MB851C, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB954A = { + "MB954 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_FTDI | BOARD_HAS_PA), + BUTTONS_MB954A, + LEDS_MB954A, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB954B = { + "MB954 B", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F | BOARD_HAS_EEPROM | BOARD_HAS_PA), + BUTTONS_MB954B, + LEDS_MB954B, + &ioMB954A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB950A = { + "MB950 A", + (BOARD_HAS_MEMS | BOARD_HAS_TEMP_SENSOR | BOARD_HAS_STM32F), + BUTTONS_MB950A, + LEDS_MB950A, + &ioMB950A, + &infraRedLedMB851A, + &memsSensor, + &tempSensorMB954A, +}; + +const BoardResourcesType MB951A = { + "MB951 A", + (BOARD_HAS_STM32F), + BUTTONS_MB951A, + LEDS_MB951A, + &ioMB954A, + NULL, + NULL, + NULL, +}; + +static const BoardResourcesType *boardList [] = { + &MB851A, + &MB851B, + &MB851C, + &MB954A, + &MB954B, + &MB950A, + &MB951A +}; + +BoardResourcesType const *boardDescription = NULL; + +#define PORT_NAME(x) ((x == PORTA) ? "A": ((x == PORTB) ? "B" : ((x == PORTC) ? "C": "?"))) + +void halBoardInit(void) +{ + char boardName[16]; + int8s i; + boardDescription = NULL; +#ifdef EMBERZNET_HAL + halCommonGetToken(boardName, TOKEN_MFG_BOARD_NAME); +#else + halCommonGetMfgToken(boardName, TOKEN_MFG_BOARD_NAME); +#endif + + i = 15; + while ((i >= 0) && (boardName[i] == 0xFF)) { + boardName[i] = 0; + i--; + } + + for (i = 0; i < (sizeof(boardList)/4) ; i++) + if (strcmp(boardName, (boardList[i])->name) == 0) { + boardDescription = (BoardResourcesType *) boardList[i]; + break; + } + + if (boardDescription == NULL) { + /* Board type not identified default to MB851A also to support legacy boards */ + boardDescription = (BoardResourcesType *) &MB851A; + } + return; +} +BoardResourcesType const *halBoardGetDescription(void) +{ + return boardDescription; +} + +void halBoardPowerDown(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <io->buttons; + int8u i; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } + } +#endif + /* Configure GPIO for power amplifier */ + if (boardDescription->flags & BOARD_HAS_PA) { + /* SiGe Standby */ + halGpioConfig(PORTB_PIN(6), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(6), 0); + } + +} +void halBoardPowerUp(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <flags & BOARD_HAS_MEMS) || (boardDescription->flags & BOARD_HAS_EEPROM)) { + halGpioConfig(PORTA_PIN(1), GPIOCFG_OUT_ALT_OD); + halGpioConfig(PORTA_PIN(2), GPIOCFG_OUT_ALT_OD); + } + /* Configure GPIO for ADC access (temp sensor) */ + if (boardDescription->flags & BOARD_HAS_TEMP_SENSOR) { + halGpioConfig(PORTx_PIN(boardDescription->temperatureSensor->gpioPort, + boardDescription->temperatureSensor->gpioPin), + GPIOCFG_ANALOG); + } + /* Configure GPIO for LEDs */ + { + LedResourceType *leds = (LedResourceType *) boardDescription->io->leds; + int8u i; + for (i = 0; i < boardDescription->leds; i++) { + /* LED default off */ + halGpioConfig(PORTx_PIN(leds[i].gpioPort, leds[i].gpioPin), GPIOCFG_OUT); + halGpioSet(PORTx_PIN(leds[i].gpioPort, leds[i].gpioPin), 1); + } + } + /* Configure GPIO for BUTTONSs */ + { + ButtonResourceType *buttons = (ButtonResourceType *) boardDescription->io->buttons; + int8u i; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } + } + + /* Configure GPIO for power amplifier */ + if (boardDescription->flags & BOARD_HAS_PA) { + /* SiGe Ant Sel (default ceramic antenna) */ + halGpioConfig(PORTB_PIN(5), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(5), 1); + /* SiGe Standby (default out of standby) */ + halGpioConfig(PORTB_PIN(6), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(6), 1); + /* SiGe LNA (default LNA off )*/ + halGpioConfig(PORTB_PIN(7), GPIOCFG_OUT); + halGpioSet(PORTB_PIN(7), 0); + /* SiGe nTX Active */ + halGpioConfig(PORTC_PIN(5), GPIOCFG_OUT_ALT); + } + +} + +#ifdef TEST_COMMANDS +#include +void printLeds (LedResourceType *leds) +{ + while (leds->name != NULL) { + printf ("Led %s (port:%s, bit:%d)\r\n", leds->name, PORT_NAME(leds->gpioPort), leds->gpioPin); + leds++; + } +} + +void printButtons (ButtonResourceType *buttons) +{ + while (buttons->name != NULL) { + printf ("Button %s (port:%s, bit:%d)\r\n", buttons->name, PORT_NAME(buttons->gpioPort), buttons->gpioPin); + buttons++; + } +} + +void boardPrintStringDescription(void) +{ + int8u i = 0; + + while (boardList[i] != NULL) { + if ((boardDescription == boardList[i]) || (boardDescription == NULL)) { + BoardResourcesType *ptr = boardList[i]; + printf ("*************************************\r\n"); + printf ("Board name = %s\r\n", ptr->name); + printf ("*************************************\r\n"); + printLeds(ptr->leds); + printButtons(ptr->buttons); + if (ptr->mems) { + printf ("MEMS = %s\r\n", ptr->mems->name); + } + if (ptr->temperatureSensor) { + printf ("Temp sensor = %s, port:%s, pin:%d, adcFix:%s\r\n", + ptr->temperatureSensor->name, + PORT_NAME(ptr->temperatureSensor->gpioPort), + ptr->temperatureSensor->gpioPin, + ptr->temperatureSensor->adcFix ? "Yes" : "No" + ); + } + printf ("EEProm:%s\r\n", ptr->EEProm ? "Yes" : "No"); + printf ("PC i/f:%s\r\n", ptr->FTDInotSTM32 ? "FTDI" : "STM32F"); + printf ("Power Amplifier:%s\r\n", ptr->PowerAmplifier ? "Yes" : "No"); + } + i++; + } + return NULL; +} +#endif diff --git a/cpu/stm32w108/hal/micro/cortexm3/button.c b/cpu/stm32w108/hal/micro/cortexm3/button.c index 3b8f2297e..0cbae3aab 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/button.c +++ b/cpu/stm32w108/hal/micro/cortexm3/button.c @@ -12,18 +12,25 @@ void halInitButton(void) { - /* Set GPIO pin to PUD (input pull-up or pull-down) for button S1 */ - halGpioConfig(BUTTON_S1,GPIOCFG_IN_PUD); - /* Set the button S1 gpio pin to pull-up */ - BUTTON_S1_OUTPUT_GPIO |= GPIOOUT_PULLUP << BUTTON_S1_GPIO_PIN; + int8u i; + /* Configure GPIO for BUTTONSs */ + ButtonResourceType *buttons = (ButtonResourceType *) boardDescription->io->buttons; + for (i = 0; i < boardDescription->buttons; i++) { + halGpioConfig(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOCFG_IN_PUD); + halGpioSet(PORTx_PIN(buttons[i].gpioPort, buttons[i].gpioPin), GPIOOUT_PULLUP); + } }/* end halInitButton() */ int8u halGetButtonStatus(HalBoardButton button) { - if (button == BUTTON_S1) - return (BUTTON_S1_INPUT_GPIO & (1<> 3) & 0xf; + int8u pin = button & 0x7; + + if (button != DUMMY_BUTTON) + { + return (BUTTON_INPUT_GPIO(port) & (1 << pin)) ? BUTTON_RELEASED : BUTTON_PRESSED; + } + return BUTTON_UNKNOWN; }/* end halGetButtonStatus()*/ diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h index 3030fdeba..2ed3edbf2 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/gnu.h @@ -22,13 +22,17 @@ #error Improper PLATFORM_HEADER #endif -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -#if GCC_VERSION < 40302 -#error Only GNU C version later than 4.3.2 are supported -#endif +#if (__GNUC__ < 4) + #error Only GNU C versions later than 4.3.2 are supported +#elif (__GNUC__ == 4) + #if (__GNUC_MINOR__ < 3) + #error Only GNU C versions later than 4.3.2 are supported + #elif (__GNUC_MINOR__ == 3) + #if (__GNUC_PATCHLEVEL__ < 2) + #error Only GNU C versions later than 4.3.2 are supported + #endif + #endif +#endif // __GNUC__ #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -36,6 +40,7 @@ #include #if defined (CORTEXM3_STM32W108) #include "micro/cortexm3/stm32w108/regs.h" + #include "micro/cortexm3/stm32w108/stm32w108_type.h" #else #error Unknown CORTEXM3 micro #endif @@ -169,6 +174,16 @@ typedef unsigned int PointerType; #endif #endif +/** + * @brief Set the application start and end address. + * This are useful to detect whether an image is for bootloader mode or not. + * This can be used also to clone image to another node via bootloader. + */ +#define APPLICATION_IMAGE_START ((u32) &__ApplicationFlashStart) +#define APPLICATION_IMAGE_END ((u32) &__ApplicationFlashEnd) +extern char __ApplicationFlashStart; +extern char __ApplicationFlashEnd; + /** * @brief Macro to reset the watchdog timer. Note: be very very * careful when using this as you can easily get into an infinite loop if you @@ -252,6 +267,9 @@ void halInternalResetWatchDog(void); #define VAR_AT_SEGMENT(__variableDeclaration, __segmentName) \ __variableDeclaration __attribute__ ((section (__segmentName))) +#define ALIGN_VAR(__variableDeclaration, alignment) \ + __variableDeclaration __attribute__ ((aligned(alignment))) + //////////////////////////////////////////////////////////////////////////////// //@} // end of Miscellaneous Macros //////////////////////////////////////////////////////////////////////////////// diff --git a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h index 796188544..69e4a05b5 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h +++ b/cpu/stm32w108/hal/micro/cortexm3/compiler/iar.h @@ -33,6 +33,9 @@ #include #if defined (CORTEXM3_STM32W108) #include "micro/cortexm3/stm32w108/regs.h" + #include "micro/cortexm3/stm32w108/stm32w108_type.h" + #elif defined (CORTEXM3_STM32F103) + #include "stm32f10x.h" #else #error Unknown CORTEXM3 micro #endif @@ -163,6 +166,15 @@ typedef unsigned int PointerType; #endif #endif +/** + * @brief Set the application start and end address. + * This are useful to detect whether an image is for bootloader mode or not. + * This can be used also to clone image to another node via bootloader. + */ +#define APPLICATION_IMAGE_START ((u32) __section_begin("FLASH_IMAGE")) +#define APPLICATION_IMAGE_END ((u32) __section_end ("FLASH_IMAGE")) + + /** * @brief Macro to reset the watchdog timer. Note: be very very * careful when using this as you can easily get into an infinite loop if you @@ -247,6 +259,11 @@ void halInternalResetWatchDog(void); #define VAR_AT_SEGMENT(__variableDeclaration, __segmentName) \ __variableDeclaration @ __segmentName +#define _QUOTEME(a) #a +#define QUOTEME(a) _QUOTEME(a) +#define ALIGN_VAR(__variableDeclaration, alignment) _Pragma(QUOTEME(data_alignment=alignment)) \ + __variableDeclaration + //////////////////////////////////////////////////////////////////////////////// //@} // end of Miscellaneous Macros //////////////////////////////////////////////////////////////////////////////// @@ -290,6 +307,8 @@ void halInternalResetWatchDog(void); #pragma segment=__TEXTRW__ #pragma segment=__FAT__ #pragma segment=__NVM__ +// Special pragma to get the application image start and end address +#pragma segment="FLASH_IMAGE" /**@} */ //A utility function for inserting barrier instructions. These diff --git a/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h b/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h new file mode 100644 index 000000000..a119a2357 --- /dev/null +++ b/cpu/stm32w108/hal/micro/cortexm3/iap_bootloader.h @@ -0,0 +1,34 @@ +/** @file iap_bootloader.h + * @brief IAP bootloader specific definitions + * + */ + +/** + * @brief Application start address + */ +#define IAP_BOOTLOADER_APPLICATION_ADDRESS 0x08003000 + +/** + * @brief Radio PAN ID for OTA bootloader + */ +#define IAP_BOOTLOADER_PAN_ID 0xb00b + +/** + * @brief Signature used for switch to application + */ +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d + +/** + * @brief Radio default channel for OTA bootloader + */ +#define IAP_BOOTLOADER_DEFAULT_CHANNEL 0x0F + +/** + * @brief IAP bootloader uart mode + */ +#define IAP_BOOTLOADER_MODE_UART 0 + +/** + * @brief IAP bootloader OTA mode + */ +#define IAP_BOOTLOADER_MODE_OTA 1 diff --git a/cpu/stm32w108/hal/micro/cortexm3/led.c b/cpu/stm32w108/hal/micro/cortexm3/led.c index 9bdb2f0c7..dd0d5f58f 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/led.c +++ b/cpu/stm32w108/hal/micro/cortexm3/led.c @@ -10,12 +10,6 @@ #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" -#define GPIO_PxCLR_BASE (GPIO_PACLR_ADDR) -#define GPIO_PxSET_BASE (GPIO_PASET_ADDR) -#define GPIO_PxOUT_BASE (GPIO_PAOUT_ADDR) -// Each port is offset from the previous port by the same amount -#define GPIO_Px_OFFSET (GPIO_PBCFGL_ADDR-GPIO_PACFGL_ADDR) - void halInitLed(void) { /* Set GPIO pins for Led D1 and Led D3 */ @@ -28,16 +22,12 @@ void halInitLed(void) void halSetLed(HalBoardLed led) { - if(led/8 < 3) { - *((volatile int32u *)(GPIO_PxCLR_BASE+(GPIO_Px_OFFSET*(led/8)))) = BIT(led&7); - } + halGpioSet(led, 0); } void halClearLed(HalBoardLed led) { - if(led/8 < 3) { - *((volatile int32u *)(GPIO_PxSET_BASE+(GPIO_Px_OFFSET*(led/8)))) = BIT(led&7); - } + halGpioSet(led, 1); } void halToggleLed(HalBoardLed led) diff --git a/cpu/stm32w108/hal/micro/cortexm3/memmap.h b/cpu/stm32w108/hal/micro/cortexm3/memmap.h index 801cb1290..8feb1b997 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/memmap.h +++ b/cpu/stm32w108/hal/micro/cortexm3/memmap.h @@ -10,6 +10,8 @@ #ifndef LOADER #if defined (CORTEXM3_STM32W108) #include "hal/micro/cortexm3/stm32w108/memmap.h" + #elif defined (CORTEXM3_STM32F103) + #include "hal/micro/cortexm3/stm32f103ret/memmap.h" #else #error no appropriate micro defined #endif diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c b/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c index a0d0537f4..a7cbc5c76 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common-internal.c @@ -250,7 +250,7 @@ void halInternalSetRegTrim(boolean boostMode) // the accuracy of OSCHF (much lower than XTAL). void halCommonDelayMicroseconds(int16u us) { - int32u beginTime = MAC_TIMER; + int32u beginTime = ReadRegister(MAC_TIMER); //If we're not using the XTAL, the MAC Timer is running off OSCHF, //that means the clock is half speed, 6MHz. We need to halve our delay diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common.c b/cpu/stm32w108/hal/micro/cortexm3/micro-common.c index 1afd82c41..965b25c58 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common.c @@ -9,6 +9,7 @@ #include PLATFORM_HEADER +#include BOARD_HEADER #include "error.h" #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" @@ -59,11 +60,16 @@ void halGpioConfig(int32u io, int32u config) *configRegs[io/4] = portcfg | (config <<((io&3)*4)); } - - - - - +void halGpioSet(int32u gpio, boolean value) +{ + if(gpio/8 < 3) { + if (value) { + *((volatile int32u *)(GPIO_PxSET_BASE+(GPIO_Px_OFFSET*(gpio/8)))) = BIT(gpio&7); + } else { + *((volatile int32u *)(GPIO_PxCLR_BASE+(GPIO_Px_OFFSET*(gpio/8)))) = BIT(gpio&7); + } + } +} int16u halInternalStartSystemTimer(void) { diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h index 1a146df6e..b538e6f08 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro-common.h +++ b/cpu/stm32w108/hal/micro/cortexm3/micro-common.h @@ -24,24 +24,35 @@ #endif //__STSTATUS_TYPE__ #endif // DOXYGEN_SHOULD_SKIP_THIS +#define PORTA (0 << 3) +#define PORTB (1 << 3) +#define PORTC (2 << 3) + /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port A pins into a single number. */ -#define PORTA_PIN(y) ((0<<3)|y) +#define PORTA_PIN(y) (PORTA|y) /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port B pins into a single number. */ -#define PORTB_PIN(y) ((1<<3)|y) +#define PORTB_PIN(y) (PORTB|y) /** * @brief Some registers and variables require indentifying GPIO by * a single number instead of the port and pin. This macro converts * Port C pins into a single number. */ -#define PORTC_PIN(y) ((2<<3)|y) +#define PORTC_PIN(y) (PORTC|y) + +/** + * @brief Some registers and variables require indentifying GPIO by + * a single number instead of the port and pin. This macro converts + * Port C pins into a single number. + */ +#define PORTx_PIN(x, y) (x|y) /** * @brief Resets the watchdog timer. This function is pointed @@ -62,6 +73,16 @@ void halInternalResetWatchDog( void ); */ void halGpioConfig(int32u io, int32u config); +/** + * @brief Set/Clear single GPIO bit + * + * @param io The io pin to use, can be specified with the convenience macros + * PORTA_PIN(), PORTB_PIN(), PORTC_PIN() + * @param value A flag indicating whether to set or clear the io. + * + */ +void halGpioSet(int32u io, boolean value); + /** * @brief Calibrates the internal SlowRC to generate a 1024 Hz (1kHz) clock. diff --git a/cpu/stm32w108/hal/micro/cortexm3/micro.c b/cpu/stm32w108/hal/micro/cortexm3/micro.c index b464ce0ce..34cbf0957 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/micro.c +++ b/cpu/stm32w108/hal/micro/cortexm3/micro.c @@ -6,15 +6,19 @@ */ #include PLATFORM_HEADER +#include BOARD_HEADER #include "error.h" #include "hal/micro/micro-common.h" #include "hal/micro/cortexm3/micro-common.h" #include "micro/system-timer.h" #include "micro/adc.h" +#include "micro/cortexm3/memmap.h" +#include "micro/cortexm3/iap_bootloader.h" #include #include +extern void halBoardInit(void); void halInit(void) { @@ -24,6 +28,7 @@ void halInit(void) //be deleted. GPIO_DBGCFG &= ~GPIO_EXTREGEN; halInternalSetRegTrim(FALSE); + halBoardInit(); halPowerUp(); halInternalCalibrateFastRc(); @@ -54,6 +59,7 @@ void halReboot(void) void halPowerDown(void) { + halBoardPowerDown(); } void halPowerUp(void) @@ -61,6 +67,7 @@ void halPowerUp(void) halInternalInitAdc(); halCommonCalibratePads(); halInternalSwitchToXtal(); + halBoardPowerUp(); } static int16u seed0 = 0xbeef; @@ -106,3 +113,43 @@ void halCommonMemSet(void *dest, int8u val, int16u bytes) { memset(dest, val, bytes); } + +#pragma pack(1) +typedef struct appSwitchStruct { + int32u signature; + int8u mode; + int8u channel; + union { + int16u panID; + int16u offset; + } param; +} appSwitchStructType; +#pragma pack() +static appSwitchStructType *appSwitch = (appSwitchStructType *) RAM_BOTTOM; + +StStatus halBootloaderStart(int8u mode, int8u channel, int16u panID) +{ + if (mode == IAP_BOOTLOADER_MODE_UART) { + int8u cut = *(volatile int8u *) 0x08040798; + if (!( (halFixedAddressTable.baseTable.type == FIXED_ADDRESS_TABLE_TYPE) && + ( ( (halFixedAddressTable.baseTable.version & FAT_MAJOR_VERSION_MASK) + == 0x0000 ) && + (halFixedAddressTable.baseTable.version == 0x0003) //checking presence of valid version + ) && (cut >= 2) && (cut <= 3))) + /* Cut not supported */ + return ST_ERR_FATAL; + } else { + /* Check that OTA bootloader is at the base of the flash */ + if (*((int32u *) (MFB_BOTTOM + 28)) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) { + appSwitch->channel = ((channel >= 11) && (channel <= 26)) ? channel :IAP_BOOTLOADER_DEFAULT_CHANNEL; + appSwitch->param.panID = panID; + } else { + return ST_ERR_FATAL; + } + } + appSwitch->signature = IAP_BOOTLOADER_APP_SWITCH_SIGNATURE; + appSwitch->mode = mode; + halReboot(); + + return (mode <= IAP_BOOTLOADER_MODE_OTA) ? ST_ERR_FATAL: ST_BAD_ARGUMENT; +} diff --git a/cpu/stm32w108/hal/micro/cortexm3/nvm.c b/cpu/stm32w108/hal/micro/cortexm3/nvm.c index 0b14257a5..2aff89c99 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/nvm.c +++ b/cpu/stm32w108/hal/micro/cortexm3/nvm.c @@ -10,6 +10,30 @@ #include PLATFORM_HEADER #include "error.h" + +#ifdef NVM_RAM_EMULATION + +static int16u calibrationData[32+2]={ + 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, +}; + +int8u halCommonReadFromNvm(void *data, int32u offset, int16u length) +{ + halCommonMemCopy(data, ((int8u *) calibrationData) + offset, length); + return ST_SUCCESS; +} +int8u halCommonWriteToNvm(const void *data, int32u offset, int16u length) +{ + halCommonMemCopy(((int8u *) calibrationData) + offset, data, length); + return ST_SUCCESS; +} + +#else + //flash.h gives access to halInternalFlashErase and halInternalFlashWrite. #include "hal/micro/cortexm3/flash.h" //nvm.h includes memmap.h. These two headers define the key parameters: @@ -375,3 +399,4 @@ int8u halCommonWriteToNvm(const void *data, int32u offset, int16u length) } } +#endif // NVM_RAM_EMULATION diff --git a/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 b/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 index 804282d6d..76360196c 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 +++ b/cpu/stm32w108/hal/micro/cortexm3/spmr.s79 @@ -99,9 +99,9 @@ _disableBasePri: _basePriIsDisabled: MRS R0, BASEPRI // read current BASEPRI CMP R0, #INTERRUPTS_DISABLED_PRIORITY - ITE le - LDRLE R0, =1 - LDRGT R0, =0 + ITE lt + LDRLT R0, =0 + LDRGE R0, =1 BX LR __CFI__(EndBlock cfiBlock3) diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h index 003cd1ca4..dd9f5d338 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/board.h @@ -1,24 +1,221 @@ /** @file board.h - * @brief Header file x STM32W108 Kits boards + * @brief Header file x STM32W108 Kits boards abstraction. + * See @ref board for documentation. + * + * + * See hal/micro/cortexm3/stm32w108/board.h for source code. * * */ #ifndef _BOARD_H_ #define _BOARD_H_ -#ifdef BOARD_MB851 +/** @addtogroup board + * @brief ST board abstraction layer + * + * This header defines API and data structures to handle ST boards with thei associated resources + * on algorithm behavior. + * See hal/micro/cortexm3/stm32w108/board.h for source code. + *@{ + */ + +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851B 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB851C 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB954A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB954B 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB950A 2 +/** + * @brief Define the number of LEDs in the specific board revision + */ +#define LEDS_MB951A 2 + +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851A 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851B 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB851C 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB954A 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB954B 1 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB950A 5 +/** + * @brief Define the number of user buttons in the specific board revision + */ +#define BUTTONS_MB951A 0 + +/** + * @brief Data structure for led description + */ +typedef struct LedResourceStruct { + /** Name of the LED as printed in the board */ + char *name; + /** GPIO port associated with the LED */ + int8u gpioPort; + /** GPIO pin associated with the LED */ + int8u gpioPin; +} LedResourceType; + +typedef LedResourceType InfraRedLedResourceType; + +/** + * @brief Data structure for button description + */ +typedef struct ButtonResourceStruct { + /** Name of the button as printed in the board */ + char *name; + /** GPIO port associated with the button */ + int8u gpioPort; + /** GPIO pin associated with the button */ + int8u gpioPin; +} ButtonResourceType; + +/** + * @brief Data structure for MEMS description + */ +typedef struct MemsResourceStruct { + /** Name of the MEMS device */ + char *name; + /** Serial communication port associated with the MEMS */ + int8u scPort; +} MemsResourceType; + +/** + * @brief Data structure for temperature sensor description + */ +typedef struct TempSensorResourceStruct { + /** Name of the temperature sensor device */ + char *name; + /** GPIO port associated with the sensor */ + int8u gpioPort; + /** GPIO pin associated with the sensor */ + int8u gpioPin; + /** Flag to indicate whether the ADC range extension bug fix is implemented */ + boolean adcFix; +} TempSensorResourceType; + +/** + * @brief Data structure for board user I/O + */ +typedef struct BoardIOStruct { + /** Pointer to LED resources */ + const LedResourceType *leds; + /** Pointer to button resources */ + const ButtonResourceType *buttons; +} BoardIOType; + +/** + * @brief Flag to indicate if MEMS is present + */ +#define BOARD_HAS_MEMS (1 << 0) +/** + * @brief Flag to indicate if temeprature sensor is present + */ +#define BOARD_HAS_TEMP_SENSOR (1 << 1) +/** + * @brief Flag to indicate if external power amplifier is present + */ +#define BOARD_HAS_PA (1 << 2) +/** + * @brief Flag to indicate if EEPROM is present + */ +#define BOARD_HAS_EEPROM (1 << 3) +/** + * @brief Flag to indicate if FTDI is used as PC interface + */ +#define BOARD_HAS_FTDI (1 << 4) +/** + * @brief Flag to indicate if STM32F is used as PC interface + */ +#define BOARD_HAS_STM32F (1 << 5) + +/** + * @brief Data structure describing board features + */ +typedef struct BoardResourcesStruct { + const char *name; + const int32u flags; + /** Number of buttons */ + int8u buttons; + /** Number of leds */ + int8u leds; + /** Board I/O description */ + const BoardIOType *io; + /** Board infrared led description */ + const InfraRedLedResourceType* infraredLed; + /** Board infrared MEMS description */ + const MemsResourceType *mems; + /** Board infrared temeprature sensor description */ + const TempSensorResourceType *temperatureSensor; +} BoardResourcesType; + +extern BoardResourcesType const *boardDescription; + +// Generic definitions +#define GPIO_PxCLR_BASE (GPIO_PACLR_ADDR) +#define GPIO_PxSET_BASE (GPIO_PASET_ADDR) +#define GPIO_PxOUT_BASE (GPIO_PAOUT_ADDR) +#define GPIO_PxIN_BASE (GPIO_PAIN_ADDR) +// Each port is offset from the previous port by the same amount +#define GPIO_Px_OFFSET (GPIO_PBCFGL_ADDR-GPIO_PACFGL_ADDR) + /* leds definitions */ -#define LED_D1 PORTB_PIN(6) -#define LED_D3 PORTB_PIN(5) +#define LED_D1 PORTx_PIN(boardDescription->io->leds[0].gpioPort, boardDescription->io->leds[0].gpioPin) //PORTB_PIN(6) +#define LED_D3 PORTx_PIN(boardDescription->io->leds[1].gpioPort, boardDescription->io->leds[1].gpioPin) // PORTB_PIN(5) +#define DUMMY_LED 0xff /** Description buttons definition */ -#define BUTTON_S1 PORTA_PIN(7) -#define BUTTON_S1_INPUT_GPIO GPIO_PAIN -#define BUTTON_S1_OUTPUT_GPIO GPIO_PAOUT -#define BUTTON_S1_GPIO_PIN PA7_BIT -#define BUTTON_S1_WAKE_SOURCE 0x00000080 +#define BUTTON_Sn(n) (PORTx_PIN(boardDescription->io->buttons[n].gpioPort, boardDescription->io->buttons[n].gpioPin)) +#define BUTTON_Sn_WAKE_SOURCE(n) (1 << ((boardDescription->io->buttons[n].gpioPin) + (8 * (boardDescription->io->buttons[n].gpioPort >> 3)))) +#define BUTTON_INPUT_GPIO(port) *((volatile int32u *) (GPIO_PxIN_BASE + GPIO_Px_OFFSET * port)) +#define DUMMY_BUTTON 0xff + +#define BUTTON_S1 (boardDescription->buttons>0 ? BUTTON_Sn(0): DUMMY_BUTTON) +#define BUTTON_S2 (boardDescription->buttons>1 ? BUTTON_Sn(1): DUMMY_BUTTON) +#define BUTTON_S3 (boardDescription->buttons>2 ? BUTTON_Sn(2): DUMMY_BUTTON) +#define BUTTON_S4 (boardDescription->buttons>3 ? BUTTON_Sn(3): DUMMY_BUTTON) +#define BUTTON_S5 (boardDescription->buttons>4 ? BUTTON_Sn(4): DUMMY_BUTTON) + +#define BUTTON_S1_WAKE_SOURCE (boardDescription->buttons>0 ? BUTTON_Sn_WAKE_SOURCE(0): 0) +#define BUTTON_S2_WAKE_SOURCE (boardDescription->buttons>1 ? BUTTON_Sn_WAKE_SOURCE(1): 0) +#define BUTTON_S3_WAKE_SOURCE (boardDescription->buttons>2 ? BUTTON_Sn_WAKE_SOURCE(2): 0) +#define BUTTON_S4_WAKE_SOURCE (boardDescription->buttons>3 ? BUTTON_Sn_WAKE_SOURCE(3): 0) +#define BUTTON_S5_WAKE_SOURCE (boardDescription->buttons>4 ? BUTTON_Sn_WAKE_SOURCE(4): 0) /** Description uart definition */ #define UART_TX PORTB_PIN(1) @@ -26,8 +223,37 @@ #define UART_RX_WAKE_SOURCE 0x00000400 /** Description temperature sensor GPIO */ -#define TEMPERATURE_SENSOR_GPIO PORTB_PIN(7) -#endif /* BOARD_MB851 */ +#define TEMPERATURE_SENSOR_GPIO PORTx_PIN(boardDescription->temperatureSensor->gpioPort, boardDescription->temperatureSensor->gpioPin) // PORTB_PIN(7) + +/** @brief Return pointer to board description structure + * + * + * @return Pointer to board description structure + */ +BoardResourcesType const *halBoardGetDescription(void); +/** + * @brief Initialize the board description data structure after + * autodetect of the boards based on the CIB Board name field + * content. In case of invalid CIB data it will default to MB851A. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardInit(void); +/** + * @brief Perform board specific action to power up the system. + * This code depends on the actual board features and configure + * the stm32w and on board devices for proper operation. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardPowerUp(void); +/** + * @brief Perform board specific action to power down the system, usually before going to deep sleep. + * This code depends on the actual board features and configure + * the stm32w and on board devices for minimal power consumption. + * Customer normally needs to modify this file to adapt it to their specific board. + */ +void halBoardPowerDown(void); #endif /* _BOARD_H_ */ +/** @} // END addtogroup + */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c index 6be646583..4807c28ec 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/crt_stm32w108.c @@ -20,8 +20,8 @@ #include #include #define RESERVED 0 -//#define DUMMY_MALLOC - +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d +#define IAP_BOOTLOADER_MODE_UART 0 /* Includes ----------------------------------------------------------------------*/ #include PLATFORM_HEADER void NMI_Handler(void); @@ -72,7 +72,7 @@ VAR_AT_SEGMENT(const HalFixedAddressTableType halFixedAddressTable, __FAT__); /* function prototypes ------------------------------------------------------*/ void Reset_Handler(void) __attribute__((__interrupt__)); extern int main(void); - +extern void halInternalSwitchToXtal(void); /****************************************************************************** * @@ -121,6 +121,20 @@ void (* const g_pfnVectors[])(void) = halDebugIsr, // 32 }; +static void setStackPointer(int32u address) __attribute__((noinline)); +static void setStackPointer(int32u address) +{ + // This code is needed to generate the instruction below + // that GNU ASM is refusing to add + // asm("MOVS SP, r0"); + asm(".short 0x4685"); +} + +static const int16u blOffset[] = { + 0x0715 - 0x03ad - 0x68, + 0x0719 - 0x03ad - 0x6C +}; + /******************************************************************************* * Function Name : Reset_Handler * Description : This is the code that gets called when the processor first starts execution @@ -244,6 +258,21 @@ void Reset_Handler(void) while(1) { ; } } + //USART bootloader software activation check + if ((*((int32u *)RAM_BOTTOM) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) && (*((int8u *)(RAM_BOTTOM+4)) == IAP_BOOTLOADER_MODE_UART)){ + int8u cut = *(volatile int8u *) 0x08040798; + int16u offset = 0; + typedef void (*EntryPoint)(void); + offset = (halFixedAddressTable.baseTable.version == 3) ? blOffset[cut - 2] : 0; + *((int32u *)RAM_BOTTOM) = 0; + if (offset) { + halInternalSwitchToXtal(); + } + EntryPoint entryPoint = (EntryPoint)(*(int32u *)(FIB_BOTTOM+4) - offset); + setStackPointer(*(int32u *)FIB_BOTTOM); + entryPoint(); + } + INTERRUPTS_OFF(); asm("CPSIE i"); @@ -302,12 +331,10 @@ caddr_t _sbrk ( int incr ) return (caddr_t) prev_heap; } #else -# ifdef DUMMY_MALLOC caddr_t _sbrk ( int incr ) { return NULL; } -# endif #endif int _lseek (int file, int ptr, diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld index ad7042027..ed63358a9 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/gnu.ld @@ -13,71 +13,65 @@ GROUP( These are used by the startup in order to allocate stacks for the different modes. */ -__Stack_Size = 0x500 ; +__Stack_Size = 0x400 ; PROVIDE ( _Stack_Size = __Stack_Size ) ; -__Stack_Init = _estack - __Stack_Size ; +__Stack_Init = 0x20000000; + +_estack = __Stack_Init + __Stack_Size; + /*"PROVIDE" allows to easily override these values from an object file or the commmand line.*/ PROVIDE ( _Stack_Init = __Stack_Init ) ; -/* -There will be a link error if there is not this amount of RAM free at the end. -*/ -_Minimum_Stack_Size = 0x500 ; - /* this sends all unreferenced IRQHandlers to reset */ -PROVIDE(Default_Handler = 0 ); -PROVIDE(NMI_Handler = Default_Handler ); -PROVIDE(HardFault_Handler = Default_Handler ); -PROVIDE(MemManage_Handler = Default_Handler ); -PROVIDE(BusFault_Handler = Default_Handler ); -PROVIDE(UsageFault_Handler = Default_Handler ); -PROVIDE(SVC_Handler = Default_Handler ); -PROVIDE(DebugMonitor_Handler = Default_Handler ); -PROVIDE(PendSV_Handler = Default_Handler ); -PROVIDE(SysTick_Handler = Default_Handler ); -PROVIDE(halTimer1Isr = Default_Handler ); -PROVIDE(halTimer2Isr = Default_Handler ); -PROVIDE(halManagementIsr = Default_Handler ); -PROVIDE(halBaseBandIsr = Default_Handler ); -PROVIDE(halSleepTimerIsr = Default_Handler ); -PROVIDE(halSc1Isr = Default_Handler ); -PROVIDE(halSc2Isr = Default_Handler ); -PROVIDE(halSecurityIsr = Default_Handler ); -PROVIDE(halStackMacTimerIsr = Default_Handler ); -PROVIDE(stmRadioTransmitIsr = Default_Handler ); -PROVIDE(stmRadioReceiveIsr = Default_Handler ); -PROVIDE(halAdcIsr = Default_Handler ); -PROVIDE(halIrqAIsr = Default_Handler ); -PROVIDE(halIrqBIsr = Default_Handler ); -PROVIDE(halIrqCIsr = Default_Handler ); -PROVIDE(halIrqDIsr = Default_Handler ); -PROVIDE(halDebugIsr = Default_Handler ); -/*PROVIDE(stSerialPrintf = printf );*/ +PROVIDE(NMI_Handler = 0 ); +PROVIDE(HardFault_Handler = 0 ); +PROVIDE(MemManage_Handler = 0 ); +PROVIDE(BusFault_Handler = 0 ); +PROVIDE(UsageFault_Handler = 0 ); +PROVIDE(SVC_Handler = 0 ); +PROVIDE(DebugMonitor_Handler = 0 ); +PROVIDE(PendSV_Handler = 0 ); +PROVIDE(SysTick_Handler = 0 ); +PROVIDE(halTimer1Isr = 0 ); +PROVIDE(halTimer2Isr = 0 ); +PROVIDE(halManagementIsr = 0 ); +PROVIDE(halBaseBandIsr = 0 ); +PROVIDE(halSleepTimerIsr = 0 ); +PROVIDE(halSc1Isr = 0 ); +PROVIDE(halSc2Isr = 0 ); +PROVIDE(halSecurityIsr = 0 ); +PROVIDE(halStackMacTimerIsr = 0 ); +PROVIDE(stmRadioTransmitIsr = 0 ); +PROVIDE(stmRadioReceiveIsr = 0 ); +PROVIDE(halAdcIsr = 0 ); +PROVIDE(halIrqAIsr = 0 ); +PROVIDE(halIrqBIsr = 0 ); +PROVIDE(halIrqCIsr = 0 ); +PROVIDE(halIrqDIsr = 0 ); +PROVIDE(halDebugIsr = 0 ); /******************************************************************************/ /* Peripheral memory map */ /******************************************************************************/ /*this allows to compile the ST lib in "non-debug" mode*/ - - +_BOOTLOADER_SIZE = 0x3000 ; +_ROM_base = DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000 ; /* include the memory spaces definitions sub-script */ MEMORY { RAM_region (xrw) : ORIGIN = 0x20000000, LENGTH = 8K - ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-3K - NVM_region (rx) : ORIGIN = 0x0801F400, LENGTH = 3K + ROM_region (rx) : ORIGIN = 0x08000000, LENGTH = 128K-2K + NVM_region (rx) : ORIGIN = 0x0801F800, LENGTH = 2K FIB_region (ra) : ORIGIN = 0x08040000, LENGTH = 2K } -/* higher address of the user mode stack */ -_estack = 0x20002000; /* Sections management for FLASH mode */ @@ -87,9 +81,12 @@ SECTIONS { /* for Cortex devices, the beginning of the startup code is stored in the .isr_vector section, which goes to FLASH */ - .isr_vector : + + .isr_vector (DEFINED(ST_BTL) ? (0x08000000 + _BOOTLOADER_SIZE) : 0x08000000) : { . = ALIGN(4); + __ApplicationFlashStart = . ; + /* . = . + _ROM_base ;*/ KEEP(*(.isr_vector)) /* Startup code */ . = ALIGN(4); } >ROM_region @@ -113,24 +110,12 @@ SECTIONS *(.rodata*) *(.glue_7) *(.glue_7t) - . = ALIGN(1024); - *(.elf_text) - . = ALIGN(1024); - /*. = ALIGN(4);*/ + + . = ALIGN(4); _etext = .; - /* This is used by the startup in order to initialize the .data section */ + /* This is used by the startup in order to initialize the .data secion */ _sidata = _etext; } >ROM_region - - .coffee 0x08010000 : - { - _coffee_start = ABSOLUTE(.); - . = ALIGN(1024); - *(.coffeefiles) - . = ORIGIN(NVM_region) - _coffee_start; - } > ROM_region = 0x00 - - NVM (NOLOAD): { . = ALIGN(1024); @@ -146,6 +131,12 @@ SECTIONS . = ALIGN(4); } > FIB_region +/* + .FAT (NOLOAD): + { + KEEP(*(.FAT)) + } > FIB_region +*/ /* after that it's only debugging information. */ @@ -153,10 +144,10 @@ SECTIONS The program executes knowing that the data is in the RAM but the loader puts the initial values in the FLASH (inidata). It is one task of the startup to copy the initial values from FLASH to RAM. */ - .data : AT ( _sidata ) + .data _estack : AT ( _sidata ) { . = ALIGN(4); - /* This is used by the startup in order to initialize the .data section */ + /* This is used by the startup in order to initialize the .data secion */ _sdata = . ; *(.data) @@ -165,9 +156,9 @@ SECTIONS . = ALIGN(4); /* This is used by the startup in order to initialize the .data secion */ _edata = . ; - ASSERT(_sidata + SIZEOF(.data) < LOADADDR(.coffee), ".data section overflow in ROM"); } >RAM_region + /* This is the uninitialized data section */ .bss : @@ -177,6 +168,7 @@ SECTIONS _sbss = .; *(.bss) + *(.bss.*) *(COMMON) . = ALIGN(4); @@ -186,21 +178,6 @@ SECTIONS PROVIDE ( end = _ebss ); PROVIDE ( _end = _ebss ); - - /* This is the user stack section - This is just to check that there is enough RAM left for the User mode stack - It should generate an error if it's full. - */ - ._usrstack : - { - . = ALIGN(4); - _susrstack = . ; - - . = . + _Minimum_Stack_Size ; - - . = ALIGN(4); - _eusrstack = . ; - } >RAM_region __exidx_start = .; __exidx_end = .; @@ -247,3 +224,5 @@ SECTIONS .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) } } + +__ApplicationFlashEnd = _sidata + (_edata - _sdata); diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf index 74124aac2..d8ed9ee43 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg.icf @@ -1,13 +1,21 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { define symbol __ICFEDIT_intvec_start__ = 0x08000000; -/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +} + +/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; /*-Sizes-*/ -define symbol __ICFEDIT_size_cstack__ = 0x500; +define symbol __ICFEDIT_size_cstack__ = 0x400; + define memory mem with size = 4G; @@ -15,16 +23,17 @@ define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFED define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; initialize by copy { readwrite }; do not initialize { section .noinit, section FAT, section NVM }; -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; -place in ROM_region { readonly }; +place in ROM_region { block FLASH_IMAGE }; + place at end of ROM_region { section NVM }; place in RAM_region { readwrite, block CSTACK }; + diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c index 1ab3d3324..790ef608e 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/low_level_init.c @@ -31,10 +31,24 @@ extern "C" { __root __no_init const HalFixedAddressTableType halFixedAddressTable @ __FAT__; extern const HalVectorTableType __vector_table[]; +extern void halInternalSwitchToXtal(void); +#define IAP_BOOTLOADER_APP_SWITCH_SIGNATURE 0xb001204d +#define IAP_BOOTLOADER_MODE_UART 0 __interwork int __low_level_init(void); +static void setStackPointer(int32u address) +{ + asm("MOVS SP, r0"); +} + +static const int16u blOffset[] = { + 0x0715 - 0x03ad - 0x68, + 0x0719 - 0x03ad - 0x6C +}; + + __interwork int __low_level_init(void) { //Ensure there is enough margin on VREG_1V8 for stable RAM reads by @@ -154,6 +168,21 @@ __interwork int __low_level_init(void) while(1) { ; } } + //USART bootloader software activation check + if ((*((int32u *)RAM_BOTTOM) == IAP_BOOTLOADER_APP_SWITCH_SIGNATURE) && (*((int8u *)(RAM_BOTTOM+4)) == IAP_BOOTLOADER_MODE_UART)){ + int8u cut = *(volatile int8u *) 0x08040798; + int16u offset = 0; + typedef void (*EntryPoint)(void); + offset = (halFixedAddressTable.baseTable.version == 3) ? blOffset[cut - 2] : 0; + *((int32u *)RAM_BOTTOM) = 0; + if (offset) { + halInternalSwitchToXtal(); + } + EntryPoint entryPoint = (EntryPoint)(*(int32u *)(FIB_BOTTOM+4) - offset); + setStackPointer(*(int32u *)FIB_BOTTOM); + entryPoint(); + } + INTERRUPTS_OFF(); asm("CPSIE i"); diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h index 31ab3b216..aa0572be2 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h +++ b/cpu/stm32w108/hal/micro/cortexm3/stm32w108/regs.h @@ -2,6 +2,9 @@ #define __REGS_H__ 1 +#define ReadRegister(a) a +#define WriteRegister(a, b) a = b + /* FLASH_BASE block */ #define DATA_FLASH_BASE_BASE (0x00000000u) #define DATA_FLASH_BASE_END (0x0001FFFFu) diff --git a/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c b/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c index d8958abe8..dfc212ac4 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c +++ b/cpu/stm32w108/hal/micro/cortexm3/temperature_sensor.c @@ -29,18 +29,17 @@ void temperatureSensor_Init(void) #endif /* ENABLE_ADC_EXTENDED_RANGE_BROKEN */ }/* end temperatureSensor_Init() */ -int32u temperatureSensor_GetValue(int8u type) +int32u temperatureSensor_GetValue(void) { static int16u ADCvalue; static int16s volts; - /* - NOTE: - The ADC extended range is inaccurate due to the high voltage mode bug of the general purpose ADC - (see STM32W108 errata). As consequence, it is not reccomended to use this ADC driver for getting - the temperature values. - */ -#ifdef ENABLE_ADC_EXTENDED_RANGE_BROKEN + /* + NOTE: + The ADC extended range is inaccurate due to the high voltage mode bug of the general purpose ADC + (see STM32W108 errata). As consequence, it is not reccomended to use this ADC driver for getting + the temperature values. + */ halStartAdcConversion(ADC_USER_APP, ADC_REF_INT, ADC_SOURCE_ADC2_VREF2, ADC_CONVERSION_TIME_US_4096); halReadAdcBlocking(ADC_USER_APP, &ADCvalue); // This blocks for a while, about 4ms. @@ -49,6 +48,5 @@ int32u temperatureSensor_GetValue(int8u type) volts = halConvertValueToVolts(ADCvalue); return ((18641 - (int32s)volts)*100)/1171; -#endif /* ENABLE_ADC_EXTENDED_RANGE_BROKEN */ }/* end temperatureSensor_GetValue() */ diff --git a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h index c823c2d86..3e939cf0f 100644 --- a/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h +++ b/cpu/stm32w108/hal/micro/generic/compiler/platform-common.h @@ -135,18 +135,6 @@ int8s halCommonMemCompare(const void *source0, const void *source1, int8u bytes); - /** - * @brief Works like C stdlib memcmp(), but takes a flash space source - * parameter. - */ - int8s halCommonMemPGMCompare(const void *source0, void PGM *source1, int8u bytes); - - /** - * @brief Same as the C stdlib memcpy(), but handles copying from const - * program space. - */ - void halCommonMemPGMCopy(void* dest, void PGM *source, int8u bytes); - /** * @brief Friendly convenience macro pointing to the full HAL function. */ diff --git a/cpu/stm32w108/hal/micro/led.h b/cpu/stm32w108/hal/micro/led.h index b0bd24a0d..f6dcd0cc9 100644 --- a/cpu/stm32w108/hal/micro/led.h +++ b/cpu/stm32w108/hal/micro/led.h @@ -49,16 +49,9 @@ void halSetLed(HalBoardLed led); */ void halClearLed(HalBoardLed led); -/** @brief Called by the stack to indicate activity over the radio (for - * both transmission and reception). It is called once with \c turnOn TRUE and - * shortly thereafter with \c turnOn FALSE. - * - * Typically does something interesting, such as change the state of - * an LED. - * - * @param turnOn See Usage. - */ -void halStackIndicateActivity(boolean turnOn); +#ifdef CORTEXM3_STM32F103 +#include "micro/cortexm3/stm32f103ret/led-specific.h" +#endif /** @} // END addtogroup */ diff --git a/cpu/stm32w108/hal/micro/micro-common.h b/cpu/stm32w108/hal/micro/micro-common.h index d187f4fd1..db4895361 100644 --- a/cpu/stm32w108/hal/micro/micro-common.h +++ b/cpu/stm32w108/hal/micro/micro-common.h @@ -15,6 +15,15 @@ #ifndef __MICRO_COMMON_H__ #define __MICRO_COMMON_H__ +#ifndef DOXYGEN_SHOULD_SKIP_THIS +#ifndef __STSTATUS_TYPE__ +#define __STSTATUS_TYPE__ + //This is necessary here because halSleepForQsWithOptions returns an + //StStatus and not adding this typedef to this file breaks a + //whole lot of builds. + typedef int8u StStatus; +#endif //__STSTATUS_TYPE__ +#endif // DOXYGEN_SHOULD_SKIP_THIS /** @brief Initializes microcontroller-specific peripherals. */ @@ -109,6 +118,28 @@ enum */ void halCommonDelayMicroseconds(int16u us); +/** @brief Request the appplication to enter in bootloader mode + * + * This function will check whwther the user flash contains the bootloader + * and if yes it will jump into it according to the user parameters. + * + * + * @param mode The bootloader mode, 0 UART mode, 1 RF mode. All other + * values are reserved + * @param channel The channel where the booloader will operate. 0 means + * default channel (only vaild for RF mode). + * @param panID The panID where the booloader will operate. 0xFFFF means + * default panID (only vaild for RF mode). + * @return An error code or it will never return. + */ +StStatus halBootloaderStart(int8u mode, int8u channel, int16u panId); + +#ifdef CORTEXM3_STM32F103 +#include "micro/cortexm3/stm32f103ret/micro-specific.h" +#endif +#ifdef CORTEXM3_STM32W108 +#include "micro/cortexm3/micro-common.h" +#endif #endif //__MICRO_COMMON_H__ diff --git a/cpu/stm32w108/hal/micro/system-timer.h b/cpu/stm32w108/hal/micro/system-timer.h index 0d4ba9591..3b18651ac 100644 --- a/cpu/stm32w108/hal/micro/system-timer.h +++ b/cpu/stm32w108/hal/micro/system-timer.h @@ -48,9 +48,9 @@ int16u halInternalStartSystemTimer(void); * @return The least significant 16 bits of the current system time, in system * ticks. */ -//#pragma pagezero_on // place this function in zero-page memory for xap +#pragma pagezero_on // place this function in zero-page memory for xap int16u halCommonGetInt16uMillisecondTick(void); -//#pragma pagezero_off +#pragma pagezero_off /** * @brief Returns the current system time in system ticks, as a 32-bit diff --git a/cpu/stm32w108/hal/micro/temperature_sensor.h b/cpu/stm32w108/hal/micro/temperature_sensor.h index 073bfc0ce..49aec4d86 100644 --- a/cpu/stm32w108/hal/micro/temperature_sensor.h +++ b/cpu/stm32w108/hal/micro/temperature_sensor.h @@ -21,7 +21,7 @@ void temperatureSensor_Init(void); /** @brief Get temperature sensor value */ -int32u temperatureSensor_GetValue(int8u type); +int32u temperatureSensor_GetValue(void); #endif /* _TEMP_SENSOR_H_ */ diff --git a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf b/cpu/stm32w108/iar-cfg-coffee.icf similarity index 76% rename from cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf rename to cpu/stm32w108/iar-cfg-coffee.icf index 02531fe92..60f739572 100644 --- a/cpu/stm32w108/hal/micro/cortexm3/stm32w108/iar-cfg-coffee.icf +++ b/cpu/stm32w108/iar-cfg-coffee.icf @@ -1,10 +1,17 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { define symbol __ICFEDIT_intvec_start__ = 0x08000000; -/*-Memory Regions-*/ define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; -define symbol __ICFEDIT_region_ROM_end__ = 0x0800FFFF; -define symbol __ICFEDIT_region_CFS_start__ = 0x08010000; /* Reserved for contiki flash file system. COFFEE_ADDRESS must be changed also in cfs-coffee-arch.h */ +} + +/*-Memory Regions-*/ +define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; +define symbol __ICFEDIT_region_CFS_start__ = 0x08010c00; /* Reserved for contiki flash file system. COFFEE_ADDRESS must be changed also in cfs-coffee-arch.h */ define symbol __ICFEDIT_region_CFS_end__ = 0x0801F3FF; -define symbol __ICFEDIT_region_NVM_start__ = 0x0801F400; +define symbol __ICFEDIT_region_NVM_start__ = 0x0801F800; define symbol __ICFEDIT_region_NVM_end__ = 0x0801FFFF; define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; @@ -14,6 +21,7 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; define symbol __ICFEDIT_size_cstack__ = 0x500; + define memory mem with size = 4G; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; define region CFS_region = mem:[from __ICFEDIT_region_CFS_start__ to __ICFEDIT_region_CFS_end__]; @@ -21,17 +29,17 @@ define region NVM_region = mem:[from __ICFEDIT_region_NVM_start__ to __ICFED define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; initialize by copy { readwrite }; do not initialize { section .noinit, section FAT, section NVM }; -place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; - place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; -place in ROM_region { readonly }; +place in ROM_region { block FLASH_IMAGE }; place in CFS_region { section .coffeefiles }; place in NVM_region { section NVM }; place in RAM_region { readwrite, block CSTACK }; + diff --git a/cpu/stm32w108/iar-cfg.icf b/cpu/stm32w108/iar-cfg.icf new file mode 100644 index 000000000..46e67a7a3 --- /dev/null +++ b/cpu/stm32w108/iar-cfg.icf @@ -0,0 +1,39 @@ + +if( isdefinedsymbol(ST_BTL) ) { +define symbol __ICFEDIT_intvec_start__ = 0x08003000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08003000; +} else { +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +} + +/*-Memory Regions-*/ +define symbol __ICFEDIT_region_ROM_end__ = 0x0801FFFF; +define symbol __ICFEDIT_region_FIB_start__ = 0x08040000; +define symbol __ICFEDIT_region_FIB_end__ = 0x080407FF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; +define symbol __ICFEDIT_region_RAM_end__ = 0x20001FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x500; + + + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { }; +define block FLASH_IMAGE with fixed order { readonly section .intvec, readonly } ; + +initialize by copy { readwrite }; +do not initialize { section .noinit, + section FAT, + section NVM }; + +place at address mem:__ICFEDIT_region_FIB_start__ { section FAT }; +place in ROM_region { block FLASH_IMAGE }; + +place at end of ROM_region { section NVM }; +place in RAM_region { readwrite, + block CSTACK }; + diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio_intonly_thumb2.a b/cpu/stm32w108/lib/e_stdio_intonly_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio_intonly_thumb2.a rename to cpu/stm32w108/lib/e_stdio_intonly_thumb2.a diff --git a/cpu/stm32w108/hal/micro/cortexm3/e_stdio_thumb2.a b/cpu/stm32w108/lib/e_stdio_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/e_stdio_thumb2.a rename to cpu/stm32w108/lib/e_stdio_thumb2.a diff --git a/cpu/stm32w108/hal/micro/cortexm3/smallprintf_thumb2.a b/cpu/stm32w108/lib/smallprintf_thumb2.a similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/smallprintf_thumb2.a rename to cpu/stm32w108/lib/smallprintf_thumb2.a diff --git a/cpu/stm32w108/simplemac/include/phy-library.h b/cpu/stm32w108/simplemac/include/phy-library.h index 7739811b7..ca21a83e6 100644 --- a/cpu/stm32w108/simplemac/include/phy-library.h +++ b/cpu/stm32w108/simplemac/include/phy-library.h @@ -5,7 +5,6 @@ * */ -#include "stm32w108_type.h" //--------------------------------------------------------------------------- // Definitions @@ -30,7 +29,7 @@ /** * @brief Version patch number */ -#define SIMPLEMAC_VERSION_PATCH 0 +#define SIMPLEMAC_VERSION_PATCH 2 /** * @brief Version qualifier diff --git a/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a b/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a new file mode 100644 index 000000000..0c18ab6c3 Binary files /dev/null and b/cpu/stm32w108/simplemac/library/simplemac-library-gnu.a differ diff --git a/cpu/stm32w108/simplemac/library/simplemac-library-iar.a b/cpu/stm32w108/simplemac/library/simplemac-library-iar.a deleted file mode 100644 index 0d53c5e41..000000000 Binary files a/cpu/stm32w108/simplemac/library/simplemac-library-iar.a and /dev/null differ diff --git a/cpu/stm32w108/simplemac/library/simplemac-library.a b/cpu/stm32w108/simplemac/library/simplemac-library.a index c7e2de988..b79d83a15 100644 Binary files a/cpu/stm32w108/simplemac/library/simplemac-library.a and b/cpu/stm32w108/simplemac/library/simplemac-library.a differ diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/Makefile b/cpu/stm32w108/small_printf/Makefile similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/Makefile rename to cpu/stm32w108/small_printf/Makefile diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_printf.c b/cpu/stm32w108/small_printf/_SP_printf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_printf.c rename to cpu/stm32w108/small_printf/_SP_printf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_puts.c b/cpu/stm32w108/small_printf/_SP_puts.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_puts.c rename to cpu/stm32w108/small_printf/_SP_puts.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_snprintf.c b/cpu/stm32w108/small_printf/_SP_snprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_snprintf.c rename to cpu/stm32w108/small_printf/_SP_snprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_sprintf.c b/cpu/stm32w108/small_printf/_SP_sprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_sprintf.c rename to cpu/stm32w108/small_printf/_SP_sprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_vfprintf.c b/cpu/stm32w108/small_printf/_SP_vfprintf.c similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/_SP_vfprintf.c rename to cpu/stm32w108/small_printf/_SP_vfprintf.c diff --git a/cpu/stm32w108/hal/micro/cortexm3/small_printf/vfieeefp.h b/cpu/stm32w108/small_printf/vfieeefp.h similarity index 100% rename from cpu/stm32w108/hal/micro/cortexm3/small_printf/vfieeefp.h rename to cpu/stm32w108/small_printf/vfieeefp.h diff --git a/platform/mb851/Makefile.mb851 b/platform/mb851/Makefile.mb851 index 71b3ba8bd..1fd2b3a56 100644 --- a/platform/mb851/Makefile.mb851 +++ b/platform/mb851/Makefile.mb851 @@ -5,7 +5,7 @@ ARCH= irq.c sensors.c acc-sensor.c button-sensor.c temperature-sensor.c mems.c CONTIKI_TARGET_DIRS = . dev ifndef CONTIKI_TARGET_MAIN -CONTIKI_TARGET_MAIN = contiki-main.c #contiki-init-net.c +CONTIKI_TARGET_MAIN = contiki-main.c board-mb851.c endif ifdef UIP_CONF_IPV6 diff --git a/platform/mb851/board-mb851.c b/platform/mb851/board-mb851.c new file mode 100644 index 000000000..c66e811bd --- /dev/null +++ b/platform/mb851/board-mb851.c @@ -0,0 +1,47 @@ +#include PLATFORM_HEADER +#include BOARD_HEADER + +void halBoardInit(void) +{ + + return; +} + + +void halBoardPowerDown(void) +{ +} +void halBoardPowerUp(void) +{ + /* Set everything to input value */ + GPIO_PACFGL = (GPIOCFG_IN <