From 2180a02e2f79b8ee77780ea11be188c0faaa8866 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 25 Feb 2012 18:57:11 +0100 Subject: [PATCH 01/56] first attempt at porting libopencm3 to energymicro unless sources are explicitly given, the linker scripts and make files were copied over from the stm32/f1 port. --- examples/efm32/tinygecko/Makefile.include | 96 +++++++++++++++++++ .../efm32-tg-stk3300/Makefile.include | 25 +++++ .../efm32/tinygecko/efm32-tg-stk3300/README | 9 ++ .../efm32-tg-stk3300/miniblink/Makefile | 23 +++++ .../efm32-tg-stk3300/miniblink/README | 9 ++ .../efm32-tg-stk3300/miniblink/miniblink.c | 72 ++++++++++++++ .../efm32/tinygecko/devicerevision.h | 26 +++++ include/libopencm3/efm32/tinygecko/vector.h | 11 +++ include/libopencm3/efm32/vector.h | 34 +++++++ lib/efm32/tinygecko/EFM32TG840F32.ld | 15 +++ lib/efm32/tinygecko/Makefile | 59 ++++++++++++ lib/efm32/tinygecko/devicerevision.c | 10 ++ lib/efm32/tinygecko/tinygecko.ld | 78 +++++++++++++++ lib/efm32/tinygecko/vector.c | 92 ++++++++++++++++++ 14 files changed, 559 insertions(+) create mode 100644 examples/efm32/tinygecko/Makefile.include create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/README create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c create mode 100644 include/libopencm3/efm32/tinygecko/devicerevision.h create mode 100644 include/libopencm3/efm32/tinygecko/vector.h create mode 100644 include/libopencm3/efm32/vector.h create mode 100644 lib/efm32/tinygecko/EFM32TG840F32.ld create mode 100644 lib/efm32/tinygecko/Makefile create mode 100644 lib/efm32/tinygecko/devicerevision.c create mode 100644 lib/efm32/tinygecko/tinygecko.ld create mode 100644 lib/efm32/tinygecko/vector.c diff --git a/examples/efm32/tinygecko/Makefile.include b/examples/efm32/tinygecko/Makefile.include new file mode 100644 index 00000000..1ee8d49a --- /dev/null +++ b/examples/efm32/tinygecko/Makefile.include @@ -0,0 +1,96 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2010 Piotr Esden-Tempski +## Copyright (C) 2012 chrysn +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## + +PREFIX ?= arm-none-eabi +#PREFIX ?= arm-elf +CC = $(PREFIX)-gcc +LD = $(PREFIX)-gcc +OBJCOPY = $(PREFIX)-objcopy +OBJDUMP = $(PREFIX)-objdump +GDB = $(PREFIX)-gdb +# Uncomment this line if you want to use the installed (not local) library. +#TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) +TOOLCHAIN_DIR = ../../../../.. +CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ + -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F1 +LDSCRIPT ?= ${TOOLCHAIN_DIR}/lib/efm32/tinygecko/$(MCU).ld +LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib/efm32/tinygecko \ + -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \ + -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float +OBJS += $(BINARY).o + +# Be silent per default, but 'make V=1' will show all compiler calls. +ifneq ($(V),1) +Q := @ +NULL := 2>/dev/null +else +LDFLAGS += -Wl,--print-gc-sections +endif + +.SUFFIXES: .elf .bin .hex .srec .list .images +.SECONDEXPANSION: +.SECONDARY: + +all: images + +images: $(BINARY).images +flash: $(BINARY).flash + +%.images: %.bin %.hex %.srec %.list + @#echo "*** $* images generated ***" + +%.bin: %.elf + @#printf " OBJCOPY $(*).bin\n" + $(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin + +%.hex: %.elf + @#printf " OBJCOPY $(*).hex\n" + $(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex + +%.srec: %.elf + @#printf " OBJCOPY $(*).srec\n" + $(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec + +%.list: %.elf + @#printf " OBJDUMP $(*).list\n" + $(Q)$(OBJDUMP) -S $(*).elf > $(*).list + +%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/efm32/tinygecko/libopencm3_efm32tinygecko.a + @#printf " LD $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_efm32tinygecko $(LDFLAGS) + +%.o: %.c Makefile + @#printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(CC) $(CFLAGS) -o $@ -c $< + +clean: + $(Q)rm -f *.o + $(Q)rm -f *.d + $(Q)rm -f *.elf + $(Q)rm -f *.bin + $(Q)rm -f *.hex + $(Q)rm -f *.srec + $(Q)rm -f *.list + +.PHONY: images clean + +-include $(OBJS:.o=.d) + diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include new file mode 100644 index 00000000..e707b652 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include @@ -0,0 +1,25 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2012 chrysn +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## + +MCU = EFM32TG840F32 + +# Linker scripts are always relative to the current directory. This file is +# intended for inclusion from example subdirectories, so the Makefile.include +# meant here would be called ../Makefile.include relative to here. +include ../../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/README b/examples/efm32/tinygecko/efm32-tg-stk3300/README new file mode 100644 index 00000000..ffa3b595 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/README @@ -0,0 +1,9 @@ +========================= +EFM32-TG-STK3300 Examples +========================= + +Examples in this directory are designed to be run on the Energy Micro EFM32 +Tiny Gecko Starter Kit, which is based on the EFM32TG840F32 MCU, has an onboard +USB debug and power management interface, and a bunch of peripherials built in +that demonstrate the chip's low power capabilities (LED, LCD display, light +sensor, touch slider, LC sensor, push buttons). diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile new file mode 100644 index 00000000..a2e44dc0 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile @@ -0,0 +1,23 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## 2012 chrysn +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## + +BINARY = miniblink + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README new file mode 100644 index 00000000..d19e4fee --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README @@ -0,0 +1,9 @@ +========================================== +EFM32-TG-STK3300 Examples miniblink README +========================================== + +This is the smallest-possible example program using libopencm3. + +It's intended for the EFM32-TG-STK3300 eval board. It should blink +the user LED on the board. + diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c new file mode 100644 index 00000000..e19ba8fe --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -0,0 +1,72 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +//#include +// +//void gpio_setup(void) +//{ +// /* Enable GPIOC clock. */ +// /* Manually: */ +// // RCC_APB2ENR |= RCC_APB2ENR_IOPCEN; +// /* Using API functions: */ +// rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); +// +// /* Set GPIO8 (in GPIO port C) to 'output push-pull'. */ +// /* Manually: */ +// // GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((8 - 8) * 4) + 2)); +// // GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((8 - 8) * 4)); +// /* Using API functions: */ +// gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, +// GPIO_CNF_OUTPUT_PUSHPULL, GPIO8); +//} + +int main(void) +{ +// int i; +// +// gpio_setup(); +// +// /* Blink the LED (PC8) on the board. */ +// while (1) { +// /* Manually: */ +// // GPIOC_BSRR = GPIO8; /* LED off */ +// // for (i = 0; i < 800000; i++) /* Wait a bit. */ +// // __asm__("nop"); +// // GPIOC_BRR = GPIO8; /* LED on */ +// // for (i = 0; i < 800000; i++) /* Wait a bit. */ +// // __asm__("nop"); +// +// /* Using API functions gpio_set()/gpio_clear(): */ +// // gpio_set(GPIOC, GPIO8); /* LED off */ +// // for (i = 0; i < 800000; i++) /* Wait a bit. */ +// // __asm__("nop"); +// // gpio_clear(GPIOC, GPIO8); /* LED on */ +// // for (i = 0; i < 800000; i++) /* Wait a bit. */ +// // __asm__("nop"); +// +// /* Using API function gpio_toggle(): */ +// gpio_toggle(GPIOC, GPIO8); /* LED on/off */ +// for (i = 0; i < 800000; i++) /* Wait a bit. */ +// __asm__("nop"); +// } +// +// return 0; + for(;;); +} diff --git a/include/libopencm3/efm32/tinygecko/devicerevision.h b/include/libopencm3/efm32/tinygecko/devicerevision.h new file mode 100644 index 00000000..83e0e0dd --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/devicerevision.h @@ -0,0 +1,26 @@ +/* this implements d0034_efm32tg_reference_manual.pdf's 7.3.4 "Device Revision" + * section */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_DEVICEREVISION_H +#define LIBOPENCM3_EFM32_TINYGECKO_DEVICEREVISION_H + +#include + +#define DEVICEREVISION_PID2 MMIO32(0xE00FFFE8) +#define DEVICEREVISION_PID3 MMIO32(0xE00FFFEC) + +/* devicerevision_revision_get has a comment that would make these definitions + * obsolete; i'm not sure how far it is reasonable to parameterize everythin + * g*/ +#define DEVICEREVISION_REVISION_LENGTH 4 +#define DEVICEREVISION_REVISION_SHIFT 4 +#define DEVICEREVISION_REVISION_MASK (~(~0< + +typedef void (*efm32_vector_table_entry_t)(void); + +typedef struct { + unsigned int *initial_sp_value; + efm32_vector_table_entry_t reset; + efm32_vector_table_entry_t nmi; + efm32_vector_table_entry_t hard_fault; + efm32_vector_table_entry_t memory_manage_fault; + efm32_vector_table_entry_t bus_fault; + efm32_vector_table_entry_t usage_fault; + efm32_vector_table_entry_t reserved_x001c[4]; + efm32_vector_table_entry_t sv_call; + efm32_vector_table_entry_t reserved_debug; + efm32_vector_table_entry_t reserved_x0034; + efm32_vector_table_entry_t pend_sv; + efm32_vector_table_entry_t systick; + efm32_vector_table_entry_t irq[EFM32_VECTOR_NIRQ]; +} efm32_vector_table_t; + +#endif diff --git a/lib/efm32/tinygecko/EFM32TG840F32.ld b/lib/efm32/tinygecko/EFM32TG840F32.ld new file mode 100644 index 00000000..f7baa904 --- /dev/null +++ b/lib/efm32/tinygecko/EFM32TG840F32.ld @@ -0,0 +1,15 @@ +/* lengths from d011_efm32tg840_datasheet.pdf table 1.1, offset from + * d0034_efm32tg_reference_manual.pdf figure 5.2. + * + * the origins and memory structure are constant over all tinygeckos, but the + * MEMORY section requires the use of constants, and has thus to be duplicated + * over the chip variants. + * */ + +MEMORY +{ + rom (rx) : ORIGIN = 0, LENGTH = 32k + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4k +} + +INCLUDE tinygecko.ld; diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile new file mode 100644 index 00000000..b785d4df --- /dev/null +++ b/lib/efm32/tinygecko/Makefile @@ -0,0 +1,59 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## + +LIBNAME = libopencm3_efm32tinygecko + +PREFIX ?= arm-none-eabi +#PREFIX ?= arm-elf +CC = $(PREFIX)-gcc +AR = $(PREFIX)-ar +CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ + -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ + -ffunction-sections -fdata-sections -MD -DSTM32F1 +# ARFLAGS = rcsv +ARFLAGS = rcs +OBJS = vector.o devicerevision.o + +VPATH += ../ + +# Be silent per default, but 'make V=1' will show all compiler calls. +ifneq ($(V),1) +Q := @ +endif + +all: $(LIBNAME).a + +$(LIBNAME).a: $(OBJS) + @printf " AR $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(AR) $(ARFLAGS) $@ $^ + +%.o: %.c + @printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(CC) $(CFLAGS) -o $@ -c $< + +clean: + @printf " CLEAN lib/efm32/tinygecko\n" + $(Q)rm -f *.o *.d + $(Q)rm -f $(LIBNAME).a + +.PHONY: clean + +-include $(OBJS:.o=.d) + diff --git a/lib/efm32/tinygecko/devicerevision.c b/lib/efm32/tinygecko/devicerevision.c new file mode 100644 index 00000000..216ab1bd --- /dev/null +++ b/lib/efm32/tinygecko/devicerevision.c @@ -0,0 +1,10 @@ +#include + +u8 devicerevision_revision_get(void) +{ + /* probably this is more elegant, more readable and closer to the spec, + * and i'll just get used to doing things like that: + return (DEVICEREVISION_PID2 & 0xf0) | ((DEVICEREVISION_PID3 & 0xf0) >> 4); + */ + return ((DEVICEREVISION_PID2 & DEVICEREVISION_REVISION_MASK) >> DEVICEREVISION_REVISION_SHIFT << DEVICEREVISION_REVISION_LENGTH) | ((DEVICEREVISION_PID3 & DEVICEREVISION_REVISION_MASK) >> DEVICEREVISION_REVISION_SHIFT); +} diff --git a/lib/efm32/tinygecko/tinygecko.ld b/lib/efm32/tinygecko/tinygecko.ld new file mode 100644 index 00000000..db3b81f5 --- /dev/null +++ b/lib/efm32/tinygecko/tinygecko.ld @@ -0,0 +1,78 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann , + * 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* Generic linker script for EFM32 targets using libopencm3. */ + +/* Memory regions must be defined in the ld script which includes this one. */ + +/* Enforce emmition of the vector table. */ +EXTERN (vector_table) + +/* Define the entry point of the output file. */ +ENTRY(reset_handler) + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(rom); + + .text : { + *(.vectors) /* Vector table */ + *(.text*) /* Program code */ + . = ALIGN(4); + *(.rodata*) /* Read-only data */ + . = ALIGN(4); + _etext = .; + } >rom + + . = ORIGIN(ram); + + .data : AT(_etext) { + _data = .; + *(.data*) /* Read-write initialized data */ + . = ALIGN(4); + _edata = .; + } >ram + + .bss : { + *(.bss*) /* Read-write zero initialized data */ + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >ram AT >rom + + /* + * The .eh_frame section appears to be used for C++ exception handling. + * You may need to fix this if you're using C++. + */ + /DISCARD/ : { *(.eh_frame) } + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ + /DISCARD/ : { *(.ARM.exidx) } + + . = ALIGN(4); + end = .; +} + +PROVIDE(_stack = ORIGIN(ram) + LENGTH(ram)); + diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c new file mode 100644 index 00000000..0a7c09f9 --- /dev/null +++ b/lib/efm32/tinygecko/vector.c @@ -0,0 +1,92 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Piotr Esden-Tempski , + * 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#define WEAK __attribute__ ((weak)) + +/* Symbols exported by the linker script(s). */ +extern unsigned _etext, _data, _edata, _ebss, _stack; + +void main(void); +void reset_handler(void); +void blocking_handler(void); +void null_handler(void); + +void WEAK nmi_handler(void); +void WEAK hard_fault_handler(void); +void WEAK mem_manage_handler(void); +void WEAK bus_fault_handler(void); +void WEAK usage_fault_handler(void); +void WEAK sv_call_handler(void); +void WEAK debug_monitor_handler(void); +void WEAK pend_sv_handler(void); +void WEAK sys_tick_handler(void); + + +__attribute__ ((section(".vectors"))) +efm32_vector_table_t vector_table = { + .initial_sp_value = &_stack, + .reset = reset_handler, + .nmi = nmi_handler, + .hard_fault = hard_fault_handler, + .memory_manage_fault = mem_manage_handler, + .bus_fault = bus_fault_handler, + .usage_fault = usage_fault_handler, + .sv_call = sv_call_handler, + .pend_sv = pend_sv_handler, + .systick = sys_tick_handler, +}; + +void reset_handler(void) +{ + volatile unsigned *src, *dest; + + __asm__("MSR msp, %0" : : "r"(&_stack)); + + for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++) + *dest = *src; + + while (dest < &_ebss) + *dest++ = 0; + + /* Call the application's entry point. */ + main(); +} + +void blocking_handler(void) +{ + while (1) ; +} + +void null_handler(void) +{ + /* Do nothing. */ +} + +#pragma weak nmi_handler = null_handler +#pragma weak hard_fault_handler = blocking_handler +#pragma weak mem_manage_handler = blocking_handler +#pragma weak bus_fault_handler = blocking_handler +#pragma weak usage_fault_handler = blocking_handler +#pragma weak sv_call_handler = null_handler +#pragma weak debug_monitor_handler = null_handler +#pragma weak pend_sv_handler = null_handler +#pragma weak sys_tick_handler = null_handler From 08918902ab8df5211516bc5771cb02b966cf19af Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 25 Feb 2012 22:42:15 +0100 Subject: [PATCH 02/56] made blinking a led on efm32 possible this includes all register definitions for the gpu and mcu modules, but not all their bit definitions --- .../efm32-tg-stk3300/miniblink/miniblink.c | 69 +++----- include/libopencm3/efm32/tinygecko/cmu.h | 66 ++++++++ include/libopencm3/efm32/tinygecko/gpio.h | 152 ++++++++++++++++++ 3 files changed, 239 insertions(+), 48 deletions(-) create mode 100644 include/libopencm3/efm32/tinygecko/cmu.h create mode 100644 include/libopencm3/efm32/tinygecko/gpio.h diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index e19ba8fe..30536261 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -18,55 +18,28 @@ * along with this program. If not, see . */ -//#include -// -//void gpio_setup(void) -//{ -// /* Enable GPIOC clock. */ -// /* Manually: */ -// // RCC_APB2ENR |= RCC_APB2ENR_IOPCEN; -// /* Using API functions: */ -// rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); -// -// /* Set GPIO8 (in GPIO port C) to 'output push-pull'. */ -// /* Manually: */ -// // GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((8 - 8) * 4) + 2)); -// // GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((8 - 8) * 4)); -// /* Using API functions: */ -// gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, -// GPIO_CNF_OUTPUT_PUSHPULL, GPIO8); -//} +#include +#include int main(void) { -// int i; -// -// gpio_setup(); -// -// /* Blink the LED (PC8) on the board. */ -// while (1) { -// /* Manually: */ -// // GPIOC_BSRR = GPIO8; /* LED off */ -// // for (i = 0; i < 800000; i++) /* Wait a bit. */ -// // __asm__("nop"); -// // GPIOC_BRR = GPIO8; /* LED on */ -// // for (i = 0; i < 800000; i++) /* Wait a bit. */ -// // __asm__("nop"); -// -// /* Using API functions gpio_set()/gpio_clear(): */ -// // gpio_set(GPIOC, GPIO8); /* LED off */ -// // for (i = 0; i < 800000; i++) /* Wait a bit. */ -// // __asm__("nop"); -// // gpio_clear(GPIOC, GPIO8); /* LED on */ -// // for (i = 0; i < 800000; i++) /* Wait a bit. */ -// // __asm__("nop"); -// -// /* Using API function gpio_toggle(): */ -// gpio_toggle(GPIOC, GPIO8); /* LED on/off */ -// for (i = 0; i < 800000; i++) /* Wait a bit. */ -// __asm__("nop"); -// } -// -// return 0; - for(;;); + // FIXME: As of now, this doesn't work without x being volatile; an issue with linking? + volatile int x; + + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; + + // The User LED is connected to PD7 to the plus side of the LED + // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 + // and 16.3 (called UIF_LED0) + + GPIO_PD_MODEL = GPIO_MODE_PUSHPULL<<(7*4); + GPIO_PD_DOUTSET = 1<<7; + + while(1) { + for(x = 0; x < 200000; ++x); + GPIO_PD_DOUTTGL = 1<<7; + }; } diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h new file mode 100644 index 00000000..38217ed1 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -0,0 +1,66 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* this interface correspons to the description in + * d0034_efm32tg_reference_manual.pdf section 11. */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_CMU_H +#define LIBOPENCM3_EFM32_TINYGECKO_CMU_H + +#include + +#define CMU_BASE 0x400C8000 /* according to d0034_efm32tg_reference_manual.pdf figure 5.2 */ + +/* this is d0034_efm32tg_reference_manual.pdf section 11.4 */ + +#define CMU_CTRL MMIO32(CMU_BASE + 0x000) +#define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) +#define CMU_HFPERCLKDIV MMIO32(CMU_BASE + 0x008) +#define CMU_HFRCOCTRL MMIO32(CMU_BASE + 0x00C) +#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) +#define CMU_AUXHFRCOCTRL MMIO32(CMU_BASE + 0x014) +#define CMU_CALCTRL MMIO32(CMU_BASE + 0x018) +#define CMU_CALCNT MMIO32(CMU_BASE + 0x01C) +#define CMU_OSCENCMD MMIO32(CMU_BASE + 0x020) +#define CMU_CMD MMIO32(CMU_BASE + 0x024) +#define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) +#define CMU_STATUS MMIO32(CMU_BASE + 0x02C) +#define CMU_IF MMIO32(CMU_BASE + 0x030) +#define CMU_IFS MMIO32(CMU_BASE + 0x034) +#define CMU_IFC MMIO32(CMU_BASE + 0x038) +#define CMU_IEN MMIO32(CMU_BASE + 0x03C) +#define CMU_HFCORECLKEN0 MMIO32(CMU_BASE + 0x040) +#define CMU_HFPERCLKEN0 MMIO32(CMU_BASE + 0x044) +#define CMU_SYNCBUSY MMIO32(CMU_BASE + 0x050) +#define CMU_FREEZE MMIO32(CMU_BASE + 0x054) +#define CMU_LFACLKEN0 MMIO32(CMU_BASE + 0x058) +#define CMU_LFBCLKEN0 MMIO32(CMU_BASE + 0x060) +#define CMU_LFAPRESC0 MMIO32(CMU_BASE + 0x068) +#define CMU_LFBPRESC0 MMIO32(CMU_BASE + 0x070) +#define CMU_PCNTCTRL MMIO32(CMU_BASE + 0x078) +#define CMU_LCDCTRL MMIO32(CMU_BASE + 0x07C) +#define CMU_ROUTE MMIO32(CMU_BASE + 0x080) +#define CMU_LOCK MMIO32(CMU_BASE + 0x084) + +/* this is incomplete because i'm impatient and want a working result + * quickly */ + +#define CMU_HFPERCLKEN0_GPIO (1<<6) + +#endif diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h new file mode 100644 index 00000000..3417eee6 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -0,0 +1,152 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* this interface corresponds to the description in + * d0034_efm32tg_reference_manual.pdf section 28. the interface tries to be + * close to stm32/f1's gpio interface. */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_GPIO_H +#define LIBOPENCM3_EFM32_TINYGECKO_GPIO_H + +#include + +#define GPIO_BASE 0x40006000 /* according to d0034_efm32tg_reference_manual.pdf figure 5.2 */ + +/* this is rather straight forward d0034_efm32tg_reference_manual.pdf section 28.4 */ +#define GPIO_Px_CTRL_OFFSET 0x000 +#define GPIO_Px_MODEL_OFFSET 0x004 +#define GPIO_Px_MODEH_OFFSET 0x008 +#define GPIO_Px_DOUT_OFFSET 0x00C +#define GPIO_Px_DOUTSET_OFFSET 0x010 +#define GPIO_Px_DOUTCLR_OFFSET 0x014 +#define GPIO_Px_DOUTTGL_OFFSET 0x018 +#define GPIO_Px_DIN_OFFSET 0x01C +#define GPIO_Px_PINLOCKN_OFFSET 0x020 + +#define GPIO_PA (GPIO_BASE + 0x000) +#define GPIO_PA_CTRL MMIO32(GPIO_PA + GPIO_Px_CTRL_OFFSET) +#define GPIO_PA_MODEL MMIO32(GPIO_PA + GPIO_Px_MODEL_OFFSET) +#define GPIO_PA_MODEH MMIO32(GPIO_PA + GPIO_Px_MODEH_OFFSET) +#define GPIO_PA_DOUT MMIO32(GPIO_PA + GPIO_Px_DOUT_OFFSET) +#define GPIO_PA_DOUTSET MMIO32(GPIO_PA + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PA_DOUTCLR MMIO32(GPIO_PA + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PA_DOUTTGL MMIO32(GPIO_PA + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PA_DIN MMIO32(GPIO_PA + GPIO_Px_DIN_OFFSET) +#define GPIO_PA_PINLOCKN MMIO32(GPIO_PA + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_PB (GPIO_BASE + 0x024) +#define GPIO_PB_CTRL MMIO32(GPIO_PB + GPIO_Px_CTRL_OFFSET) +#define GPIO_PB_MODEL MMIO32(GPIO_PB + GPIO_Px_MODEL_OFFSET) +#define GPIO_PB_MODEH MMIO32(GPIO_PB + GPIO_Px_MODEH_OFFSET) +#define GPIO_PB_DOUT MMIO32(GPIO_PB + GPIO_Px_DOUT_OFFSET) +#define GPIO_PB_DOUTSET MMIO32(GPIO_PB + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PB_DOUTCLR MMIO32(GPIO_PB + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PB_DOUTTGL MMIO32(GPIO_PB + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PB_DIN MMIO32(GPIO_PB + GPIO_Px_DIN_OFFSET) +#define GPIO_PB_PINLOCKN MMIO32(GPIO_PB + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_PC (GPIO_BASE + 0x048) +#define GPIO_PC_CTRL MMIO32(GPIO_PC + GPIO_Px_CTRL_OFFSET) +#define GPIO_PC_MODEL MMIO32(GPIO_PC + GPIO_Px_MODEL_OFFSET) +#define GPIO_PC_MODEH MMIO32(GPIO_PC + GPIO_Px_MODEH_OFFSET) +#define GPIO_PC_DOUT MMIO32(GPIO_PC + GPIO_Px_DOUT_OFFSET) +#define GPIO_PC_DOUTSET MMIO32(GPIO_PC + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PC_DOUTCLR MMIO32(GPIO_PC + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PC_DOUTTGL MMIO32(GPIO_PC + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PC_DIN MMIO32(GPIO_PC + GPIO_Px_DIN_OFFSET) +#define GPIO_PC_PINLOCKN MMIO32(GPIO_PC + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_PD (GPIO_BASE + 0x06C) +#define GPIO_PD_CTRL MMIO32(GPIO_PD + GPIO_Px_CTRL_OFFSET) +#define GPIO_PD_MODEL MMIO32(GPIO_PD + GPIO_Px_MODEL_OFFSET) +#define GPIO_PD_MODEH MMIO32(GPIO_PD + GPIO_Px_MODEH_OFFSET) +#define GPIO_PD_DOUT MMIO32(GPIO_PD + GPIO_Px_DOUT_OFFSET) +#define GPIO_PD_DOUTSET MMIO32(GPIO_PD + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PD_DOUTCLR MMIO32(GPIO_PD + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PD_DOUTTGL MMIO32(GPIO_PD + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PD_DIN MMIO32(GPIO_PD + GPIO_Px_DIN_OFFSET) +#define GPIO_PD_PINLOCKN MMIO32(GPIO_PD + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_PE (GPIO_BASE + 0x090) +#define GPIO_PE_CTRL MMIO32(GPIO_PE + GPIO_Px_CTRL_OFFSET) +#define GPIO_PE_MODEL MMIO32(GPIO_PE + GPIO_Px_MODEL_OFFSET) +#define GPIO_PE_MODEH MMIO32(GPIO_PE + GPIO_Px_MODEH_OFFSET) +#define GPIO_PE_DOUT MMIO32(GPIO_PE + GPIO_Px_DOUT_OFFSET) +#define GPIO_PE_DOUTSET MMIO32(GPIO_PE + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PE_DOUTCLR MMIO32(GPIO_PE + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PE_DOUTTGL MMIO32(GPIO_PE + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PE_DIN MMIO32(GPIO_PE + GPIO_Px_DIN_OFFSET) +#define GPIO_PE_PINLOCKN MMIO32(GPIO_PE + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_PF (GPIO_BASE + 0x0B4) +#define GPIO_PF_CTRL MMIO32(GPIO_PF + GPIO_Px_CTRL_OFFSET) +#define GPIO_PF_MODEL MMIO32(GPIO_PF + GPIO_Px_MODEL_OFFSET) +#define GPIO_PF_MODEH MMIO32(GPIO_PF + GPIO_Px_MODEH_OFFSET) +#define GPIO_PF_DOUT MMIO32(GPIO_PF + GPIO_Px_DOUT_OFFSET) +#define GPIO_PF_DOUTSET MMIO32(GPIO_PF + GPIO_Px_DOUTSET_OFFSET) +#define GPIO_PF_DOUTCLR MMIO32(GPIO_PF + GPIO_Px_DOUTCLR_OFFSET) +#define GPIO_PF_DOUTTGL MMIO32(GPIO_PF + GPIO_Px_DOUTTGL_OFFSET) +#define GPIO_PF_DIN MMIO32(GPIO_PF + GPIO_Px_DIN_OFFSET) +#define GPIO_PF_PINLOCKN MMIO32(GPIO_PF + GPIO_Px_PINLOCKN_OFFSET) + +#define GPIO_EXTIPSELL MMIO32(GPIO_BASE + 0x100) +#define GPIO_EXTIPSELH MMIO32(GPIO_BASE + 0x104) +#define GPIO_EXTIRISE MMIO32(GPIO_BASE + 0x108) +#define GPIO_EXTIFALL MMIO32(GPIO_BASE + 0x10C) +#define GPIO_IEN MMIO32(GPIO_BASE + 0x110) +#define GPIO_IF MMIO32(GPIO_BASE + 0x114) +#define GPIO_IFS MMIO32(GPIO_BASE + 0x118) +#define GPIO_IFC MMIO32(GPIO_BASE + 0x11C) +#define GPIO_ROUTE MMIO32(GPIO_BASE + 0x120) +#define GPIO_INSENSE MMIO32(GPIO_BASE + 0x124) +#define GPIO_LOCK MMIO32(GPIO_BASE + 0x128) +#define GPIO_CTRL MMIO32(GPIO_BASE + 0x12C) +#define GPIO_CMD MMIO32(GPIO_BASE + 0x130) +#define GPIO_EM4WUEN MMIO32(GPIO_BASE + 0x134) +#define GPIO_EM4WUPOL MMIO32(GPIO_BASE + 0x138) +#define GPIO_EM4WUCAUSE MMIO32(GPIO_BASE + 0x13C) + +/* these are the modes defined for the MODEx fields in the MODEL/MODEH + * registers, named as in d0034_efm32tg_reference_manual.pdf's sections + * 28.5.2/28.5.3. for explanations of what they really do, rather see section + * 28.3.1. */ + +#define GPIO_MODE_DISABLED 0 +#define GPIO_MODE_INPUT 1 +#define GPIO_MODE_INPUTPULL 2 +#define GPIO_MODE_INPUTPULLFILTER 3 +#define GPIO_MODE_PUSHPULL 4 +#define GPIO_MODE_PUSHPULLDRIVE 5 +#define GPIO_MODE_WIREDOR 6 +#define GPIO_MODE_WIREDORPULLDOWN 7 +#define GPIO_MODE_WIREDAND 8 +#define GPIO_MODE_WIREDANDFILTER 9 +#define GPIO_MODE_WIREDANDPULLUP 10 +#define GPIO_MODE_WIREDANDPULLUPFILTER 11 +#define GPIO_MODE_WIREDANDDRIVE 12 +#define GPIO_MODE_WIREDANDDRIVEFILTER 13 +#define GPIO_MODE_WIREDANDDRIVEPULLUP 14 +#define GPIO_MODE_WIREDANDDRIVEPULLUPFILTER 15 + +//void gpio_set(u32 gpioport, u16 gpios); +//void gpio_clear(u32 gpioport, u16 gpios); +//void gpio_toggle(u32 gpioport, u16 gpios); +//u16 gpio_get(u32 gpioport, u16 gpios); + +#endif From 2275ed7b0c355920927be6709a87a0482a749eb2 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 26 Feb 2012 03:40:18 +0100 Subject: [PATCH 03/56] overhauled documentation includes minor refactoring in example code and modification of how the generic and the tinygecko specific vector.h go together (bringing it in line with stm32/f1's memorymap.h) --- Makefile | 2 +- examples/efm32/tinygecko/Makefile.include | 2 +- .../efm32-tg-stk3300/miniblink/miniblink.c | 35 +++++++++++-- include/libopencm3/efm32/tinygecko/cmu.h | 30 ++++++++--- .../efm32/tinygecko/devicerevision.h | 4 ++ include/libopencm3/efm32/tinygecko/gpio.h | 52 +++++++++++++++---- include/libopencm3/efm32/tinygecko/vector.h | 14 +++-- include/libopencm3/efm32/vector.h | 24 ++++++--- lib/efm32/tinygecko/Makefile | 3 +- lib/efm32/tinygecko/vector.c | 2 +- 10 files changed, 131 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 4e410968..07825ec8 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ LIBDIR = $(DESTDIR)/$(PREFIX)/lib SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts INSTALL = install -TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lm3s +TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lm3s efm32/tinygecko # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) diff --git a/examples/efm32/tinygecko/Makefile.include b/examples/efm32/tinygecko/Makefile.include index 1ee8d49a..76691ce4 100644 --- a/examples/efm32/tinygecko/Makefile.include +++ b/examples/efm32/tinygecko/Makefile.include @@ -30,7 +30,7 @@ GDB = $(PREFIX)-gdb #TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR = ../../../../.. CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ - -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F1 + -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD LDSCRIPT ?= ${TOOLCHAIN_DIR}/lib/efm32/tinygecko/$(MCU).ld LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib/efm32/tinygecko \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \ diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index 30536261..0941add7 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -21,11 +21,37 @@ #include #include +void led_setup(void); +void led_toggle(void); + +/** @file + * Minimal example for making the User LED of the EFM32-TG-STK330 eval board blink. + */ + +/** + * Toggle the User LED in an infinite loop, with time between the toggling + * determined by a busy loop stupidly counting up. + */ + int main(void) { // FIXME: As of now, this doesn't work without x being volatile; an issue with linking? volatile int x; + led_setup(); + + while(1) { + for(x = 0; x < 200000; ++x); + led_toggle(); + }; +} + +/** + * Enable GPIO, and set up port D7 as an output pin. + */ + +void led_setup(void) +{ // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 @@ -36,10 +62,9 @@ int main(void) // and 16.3 (called UIF_LED0) GPIO_PD_MODEL = GPIO_MODE_PUSHPULL<<(7*4); - GPIO_PD_DOUTSET = 1<<7; +} - while(1) { - for(x = 0; x < 200000; ++x); - GPIO_PD_DOUTTGL = 1<<7; - }; +void led_toggle(void) +{ + GPIO_PD_DOUTTGL = 1<<7; } diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 38217ed1..e690ebd9 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -17,17 +17,29 @@ * along with this program. If not, see . */ -/* this interface correspons to the description in - * d0034_efm32tg_reference_manual.pdf section 11. */ +/** @file + * + * Definitions for the CMU (Clock Management Unit). + * + * This corresponds to the description in d0034_efm32tg_reference_manual.pdf + * section 11. + * + * @see CMU_registers + */ +/* FIXME: i'd prefer not to @see CMU_registers but have some direct link placed + * automatically from a file to its groups */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_CMU_H #define LIBOPENCM3_EFM32_TINYGECKO_CMU_H #include -#define CMU_BASE 0x400C8000 /* according to d0034_efm32tg_reference_manual.pdf figure 5.2 */ +#define CMU_BASE 0x400C8000 /**< Register base address for the CMU according to d0034_efm32tg_reference_manual.pdf figure 5.2. */ -/* this is d0034_efm32tg_reference_manual.pdf section 11.4 */ +/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4. + * + * @defgroup CMU_registers CMU registers + * @{ */ #define CMU_CTRL MMIO32(CMU_BASE + 0x000) #define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) @@ -58,8 +70,14 @@ #define CMU_ROUTE MMIO32(CMU_BASE + 0x080) #define CMU_LOCK MMIO32(CMU_BASE + 0x084) -/* this is incomplete because i'm impatient and want a working result - * quickly */ +/** @} */ + +/** + * This section is incomplete because i'm impatient and want a working result + * quickly + * + * @todo Include all bits and bit groups from the manual. + */ #define CMU_HFPERCLKEN0_GPIO (1<<6) diff --git a/include/libopencm3/efm32/tinygecko/devicerevision.h b/include/libopencm3/efm32/tinygecko/devicerevision.h index 83e0e0dd..c7c64aa4 100644 --- a/include/libopencm3/efm32/tinygecko/devicerevision.h +++ b/include/libopencm3/efm32/tinygecko/devicerevision.h @@ -1,3 +1,7 @@ +/* FIXME: proper documentation, see where this fits, if we need this at all + * etc. this was just a first attempt at implementing something easy with + * MMIO32. */ + /* this implements d0034_efm32tg_reference_manual.pdf's 7.3.4 "Device Revision" * section */ diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index 3417eee6..710651c5 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -17,18 +17,36 @@ * along with this program. If not, see . */ -/* this interface corresponds to the description in - * d0034_efm32tg_reference_manual.pdf section 28. the interface tries to be - * close to stm32/f1's gpio interface. */ +/** @file + * + * Definitions for the GPIO subsystem (General Purpose Input Output). + * + * This corresponds to the description in d0034_efm32tg_reference_manual.pdf + * section 28. + * + * @see GPIO_registers + * @see GPIO_MODE_values + */ +/* FIXME: i'd prefer not to @see CMU_registers but have some direct link placed + * automatically from a file to its groups */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_GPIO_H #define LIBOPENCM3_EFM32_TINYGECKO_GPIO_H #include -#define GPIO_BASE 0x40006000 /* according to d0034_efm32tg_reference_manual.pdf figure 5.2 */ +#define GPIO_BASE 0x40006000 /**< Register base address for the GPIO according to d0034_efm32tg_reference_manual.pdf figure 5.2. */ -/* this is rather straight forward d0034_efm32tg_reference_manual.pdf section 28.4 */ +/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 28.4 + * + * The bulk of the registers defined here (like GPIO_PA_CTRL) will not be used + * inside the convenience functions, but are provided for direct access. + * + * @todo This section could profit from bit-banding. + * + * @defgroup GPIO_registers GPIO registers + * @{ + */ #define GPIO_Px_CTRL_OFFSET 0x000 #define GPIO_Px_MODEL_OFFSET 0x004 #define GPIO_Px_MODEH_OFFSET 0x008 @@ -122,10 +140,24 @@ #define GPIO_EM4WUPOL MMIO32(GPIO_BASE + 0x138) #define GPIO_EM4WUCAUSE MMIO32(GPIO_BASE + 0x13C) -/* these are the modes defined for the MODEx fields in the MODEL/MODEH - * registers, named as in d0034_efm32tg_reference_manual.pdf's sections - * 28.5.2/28.5.3. for explanations of what they really do, rather see section - * 28.3.1. */ +/** @} */ + +/** These are the modes defined for the MODEx fields in the MODEL/MODEH + * registers. + * + * For example, to set the mode for the 3rd pin of port A to pushpull, set + * `GPIO_PA_MODEL = GPIO_MODE_PUSHPULL << (3*4);`. + * + * @todo Update the example as soon as there are convenience functions to do + * this properly. + * + * They are named as in d0034_efm32tg_reference_manual.pdf's sections + * 28.5.2/28.5.3. For explanations of what they really do, rather see section + * 28.3.1. + * + * @defgroup GPIO_MODE_values GPIO MODE values + * @{ + */ #define GPIO_MODE_DISABLED 0 #define GPIO_MODE_INPUT 1 @@ -144,6 +176,8 @@ #define GPIO_MODE_WIREDANDDRIVEPULLUP 14 #define GPIO_MODE_WIREDANDDRIVEPULLUPFILTER 15 +/** @} */ + //void gpio_set(u32 gpioport, u16 gpios); //void gpio_clear(u32 gpioport, u16 gpios); //void gpio_toggle(u32 gpioport, u16 gpios); diff --git a/include/libopencm3/efm32/tinygecko/vector.h b/include/libopencm3/efm32/tinygecko/vector.h index c609da3b..1f2eeb72 100644 --- a/include/libopencm3/efm32/tinygecko/vector.h +++ b/include/libopencm3/efm32/tinygecko/vector.h @@ -1,11 +1,15 @@ -/* this implements d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line. */ - +/** @file + * + * Definitions for vector tables on Tiny Gecko systems. + * + * @see include/libopencm3/efm32/vector.h + * + * @todo The definitions of the individual IRQs will go here too. + * */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H #define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H -#define EFM32_VECTOR_NIRQ 23 - -#include "../vector.h" +#define EFM32_VECTOR_NIRQ 23 /**< See d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line */ #endif diff --git a/include/libopencm3/efm32/vector.h b/include/libopencm3/efm32/vector.h index 96ca301b..8a385ec3 100644 --- a/include/libopencm3/efm32/vector.h +++ b/include/libopencm3/efm32/vector.h @@ -1,21 +1,29 @@ -/* this implements d0002_efm32_cortex-m3_reference_manual.pdf's figure 2.2. +/** @file * - * the structure of the vector table is implemented independently of the vector - * table, as it can be relocated to other memory locations too. + * Definitions for handling vector tables. * - * don't include this file directly; rather, include the family's vector.h - * file, which defines the number of interrupts (EFM_VECTOR_NIRQ) from table - * 1.1 */ + * This implements d0002_efm32_cortex-m3_reference_manual.pdf's figure 2.2. + * + * The structure of the vector table is implemented independently of the system + * vector table starting at memory position 0x0, as it can be relocated to + * other memory locations too. + */ #ifndef LIBOPENCM3_EFM32_VECTOR_H #define LIBOPENCM3_EFM32_VECTOR_H #include -typedef void (*efm32_vector_table_entry_t)(void); +#ifdef TINYGECKO +# include +#else +# error "efm32 family not defined." +#endif + +typedef void (*efm32_vector_table_entry_t)(void); /**< Type of an interrupt function. Only used to avoid hard-to-read function pointers in the efm32_vector_table_t struct. */ typedef struct { - unsigned int *initial_sp_value; + unsigned int *initial_sp_value; /**< The value the stack pointer is set to initially */ efm32_vector_table_entry_t reset; efm32_vector_table_entry_t nmi; efm32_vector_table_entry_t hard_fault; diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile index b785d4df..afe1e934 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/tinygecko/Makefile @@ -19,6 +19,7 @@ ## LIBNAME = libopencm3_efm32tinygecko +FAMILY = TINYGECKO PREFIX ?= arm-none-eabi #PREFIX ?= arm-elf @@ -26,7 +27,7 @@ CC = $(PREFIX)-gcc AR = $(PREFIX)-ar CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ - -ffunction-sections -fdata-sections -MD -DSTM32F1 + -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs OBJS = vector.o devicerevision.o diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c index 0a7c09f9..624785e4 100644 --- a/lib/efm32/tinygecko/vector.c +++ b/lib/efm32/tinygecko/vector.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include +#include #define WEAK __attribute__ ((weak)) From 91732cbb9ed16aadf1b3fa69a4bf18eb09ae030d Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 26 Feb 2012 03:49:06 +0100 Subject: [PATCH 04/56] make doxygen ignore .d files .d files are created to track Makefile dependencies and don't contain real code --- Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile b/Doxyfile index e5b6a387..70147a73 100644 --- a/Doxyfile +++ b/Doxyfile @@ -654,7 +654,7 @@ EXCLUDE_SYMLINKS = NO # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = *.d # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the From be62115f007cba85db361b4235ec23da446d7803 Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 12:01:41 +0100 Subject: [PATCH 05/56] efm32: created memory map from all base addresses --- include/libopencm3/efm32/memorymap.h | 29 +++++++ include/libopencm3/efm32/tinygecko/cmu.h | 3 +- include/libopencm3/efm32/tinygecko/gpio.h | 3 +- .../libopencm3/efm32/tinygecko/memorymap.h | 76 +++++++++++++++++++ 4 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 include/libopencm3/efm32/memorymap.h create mode 100644 include/libopencm3/efm32/tinygecko/memorymap.h diff --git a/include/libopencm3/efm32/memorymap.h b/include/libopencm3/efm32/memorymap.h new file mode 100644 index 00000000..35bfdd34 --- /dev/null +++ b/include/libopencm3/efm32/memorymap.h @@ -0,0 +1,29 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef LIBOPENCM3_EFM32_MEMORYMAP_H +#define LIBOPENCM3_EFM32_MEMORYMAP_H + +#ifdef TINYGECKO +# include +#else +# error "efm32 family not defined." +#endif + +#endif diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index e690ebd9..b0032892 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -33,8 +33,7 @@ #define LIBOPENCM3_EFM32_TINYGECKO_CMU_H #include - -#define CMU_BASE 0x400C8000 /**< Register base address for the CMU according to d0034_efm32tg_reference_manual.pdf figure 5.2. */ +#include /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4. * diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index 710651c5..7551a41b 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -34,8 +34,7 @@ #define LIBOPENCM3_EFM32_TINYGECKO_GPIO_H #include - -#define GPIO_BASE 0x40006000 /**< Register base address for the GPIO according to d0034_efm32tg_reference_manual.pdf figure 5.2. */ +#include /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 28.4 * diff --git a/include/libopencm3/efm32/tinygecko/memorymap.h b/include/libopencm3/efm32/tinygecko/memorymap.h new file mode 100644 index 00000000..672c0136 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/memorymap.h @@ -0,0 +1,76 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** @file + * + * Layout of the system address space of Tiny Gecko devices. + * + * This reflects d0034_efm32tg_reference_manual.pdf figure 5.2. + */ + +/* The common cortex-m3 definitions were verified from + * d0034_efm32tg_reference_manual.pdf figure 5.2. The CM3 ROM Table seems to be + * missing there. The details (everything based on SCS_BASE) was verified from + * d0002_efm32_cortex-m3_reference_manual.pdf table 4.1, and seems to fit, but + * there are discrepancies. */ +#include + +#define CODE_BASE 0x00000000 + +#define SRAM_BASE 0x20000000 +#define SRAM_BASE_BITBAND 0x22000000 + +#define PERIPH_BASE 0x40000000 +#define PERIPH_BASE_BITBAND 0x42000000 + +/* Details of the "Code" section */ + +#define FLASH_BASE (CODE_BASE + 0x00000000) +#define USERDATA_BASE (CODE_BASE + 0x0fe00000) +#define LOCKBITS_BASE (CODE_BASE + 0x0fe04000) +#define CHIPCONFIG_BASE (CODE_BASE + 0x0fe08000) +#define CODESPACESRAM_BASE (CODE_BASE + 0x10000000) + +/* Tiny Gecko peripherial definitions */ + +#define VCMP_BASE (PERIPH_BASE + 0x00000000) +#define ACMP0_BASE (PERIPH_BASE + 0x00001000) +#define ACMP1_BASE (PERIPH_BASE + 0x00001400) +#define ADC_BASE (PERIPH_BASE + 0x00002000) +#define DAC0_BASE (PERIPH_BASE + 0x00004000) +#define GPIO_BASE (PERIPH_BASE + 0x00006000) +#define I2C0_BASE (PERIPH_BASE + 0x0000a000) +#define USART0_BASE (PERIPH_BASE + 0x0000c000) +#define USART1_BASE (PERIPH_BASE + 0x0000c400) +#define TIMER0_BASE (PERIPH_BASE + 0x00010000) +#define TIMER1_BASE (PERIPH_BASE + 0x00010400) +#define RTC_BASE (PERIPH_BASE + 0x00080000) +#define LETIMER0_BASE (PERIPH_BASE + 0x00082000) +#define LEUART0_BASE (PERIPH_BASE + 0x00084000) +#define PCNT0_BASE (PERIPH_BASE + 0x00086000) +#define WDOG_BASE (PERIPH_BASE + 0x00088000) +#define LCD_BASE (PERIPH_BASE + 0x0008a000) +#define LESENSE_BASE (PERIPH_BASE + 0x0008c000) +#define MSC_BASE (PERIPH_BASE + 0x000c0000) +#define DMA_BASE (PERIPH_BASE + 0x000c2000) +#define EMU_BASE (PERIPH_BASE + 0x000c6000) +#define CMU_BASE (PERIPH_BASE + 0x000c8000) +#define RMU_BASE (PERIPH_BASE + 0x000ca000) +#define PRS_BASE (PERIPH_BASE + 0x000cc000) +#define AES_BASE (PERIPH_BASE + 0x000e0000) From f6025af859b4a2b27a01aaf314c66b531f3dbc21 Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 13:21:40 +0100 Subject: [PATCH 06/56] efm32 tinygecko: defined interrupts there seems not to be anything family specific about the interrupt vectors of m3 based efm32 systems, thus renaming vector.h to irq.h --- include/libopencm3/efm32/tinygecko/irq.h | 36 +++++++++++++++++++++ include/libopencm3/efm32/tinygecko/vector.h | 15 --------- include/libopencm3/efm32/vector.h | 11 +++++-- 3 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 include/libopencm3/efm32/tinygecko/irq.h delete mode 100644 include/libopencm3/efm32/tinygecko/vector.h diff --git a/include/libopencm3/efm32/tinygecko/irq.h b/include/libopencm3/efm32/tinygecko/irq.h new file mode 100644 index 00000000..ee0c631c --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/irq.h @@ -0,0 +1,36 @@ +/** @file + * + * Definitions of interrupt names on EFM32 Tiny Gecko systems + * + * The names and numbers are taken from d0034_efm32tg_reference_manual.pdf table 4.1. + */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H +#define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H + +#define IRQ_DMA 0 +#define IRQ_GPIO_EVEN 1 +#define IRQ_TIMER0 2 +#define IRQ_USART0_RX 3 +#define IRQ_USART0_TX 4 +#define IRQ_ACMP01 5 +#define IRQ_ADC0 6 +#define IRQ_DAC0 7 +#define IRQ_I2C0 8 +#define IRQ_GPIO_ODD 9 +#define IRQ_TIMER1 10 +#define IRQ_USART1_RX 11 +#define IRQ_USART1_TX 12 +#define IRQ_LESENSE 13 +#define IRQ_LEUART0 14 +#define IRQ_LETIMER0 15 +#define IRQ_PCNT0 16 +#define IRQ_RTC 17 +#define IRQ_CMU 18 +#define IRQ_VCMP 19 +#define IRQ_LCD 20 +#define IRQ_MSC 21 +#define IRQ_AES 22 +#define IRQ_COUNT 23 /**< See also d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line, which shows that there are really no more interrupts and it is sufficient to allocate only 23 slots. */ + +#endif diff --git a/include/libopencm3/efm32/tinygecko/vector.h b/include/libopencm3/efm32/tinygecko/vector.h deleted file mode 100644 index 1f2eeb72..00000000 --- a/include/libopencm3/efm32/tinygecko/vector.h +++ /dev/null @@ -1,15 +0,0 @@ -/** @file - * - * Definitions for vector tables on Tiny Gecko systems. - * - * @see include/libopencm3/efm32/vector.h - * - * @todo The definitions of the individual IRQs will go here too. - * */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H -#define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H - -#define EFM32_VECTOR_NIRQ 23 /**< See d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line */ - -#endif diff --git a/include/libopencm3/efm32/vector.h b/include/libopencm3/efm32/vector.h index 8a385ec3..ae6b9ba0 100644 --- a/include/libopencm3/efm32/vector.h +++ b/include/libopencm3/efm32/vector.h @@ -7,6 +7,9 @@ * The structure of the vector table is implemented independently of the system * vector table starting at memory position 0x0, as it can be relocated to * other memory locations too. + * + * The exact size of a vector interrupt table depends on the number of + * interrupts IRQ_COUNT, which is defined per family. */ #ifndef LIBOPENCM3_EFM32_VECTOR_H @@ -15,12 +18,14 @@ #include #ifdef TINYGECKO -# include +# include #else # error "efm32 family not defined." #endif -typedef void (*efm32_vector_table_entry_t)(void); /**< Type of an interrupt function. Only used to avoid hard-to-read function pointers in the efm32_vector_table_t struct. */ +/** Type of an interrupt function. Only used to avoid hard-to-read function + * pointers in the efm32_vector_table_t struct. */ +typedef void (*efm32_vector_table_entry_t)(void); typedef struct { unsigned int *initial_sp_value; /**< The value the stack pointer is set to initially */ @@ -36,7 +41,7 @@ typedef struct { efm32_vector_table_entry_t reserved_x0034; efm32_vector_table_entry_t pend_sv; efm32_vector_table_entry_t systick; - efm32_vector_table_entry_t irq[EFM32_VECTOR_NIRQ]; + efm32_vector_table_entry_t irq[IRQ_COUNT]; } efm32_vector_table_t; #endif From f4376371ec34b34021aa266a95a2a7bdc87b2683 Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 13:24:19 +0100 Subject: [PATCH 07/56] efm32: minor documentation enhancements --- include/libopencm3/efm32/memorymap.h | 8 ++++++++ include/libopencm3/efm32/tinygecko/memorymap.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/libopencm3/efm32/memorymap.h b/include/libopencm3/efm32/memorymap.h index 35bfdd34..481883c1 100644 --- a/include/libopencm3/efm32/memorymap.h +++ b/include/libopencm3/efm32/memorymap.h @@ -17,6 +17,14 @@ * along with this program. If not, see . */ +/** @file + * + * Dispatcher for the base address definitions, depending on the particular + * Gecko family. + * + * @see tinygecko/memorymap.h + */ + #ifndef LIBOPENCM3_EFM32_MEMORYMAP_H #define LIBOPENCM3_EFM32_MEMORYMAP_H diff --git a/include/libopencm3/efm32/tinygecko/memorymap.h b/include/libopencm3/efm32/tinygecko/memorymap.h index 672c0136..87395b5c 100644 --- a/include/libopencm3/efm32/tinygecko/memorymap.h +++ b/include/libopencm3/efm32/tinygecko/memorymap.h @@ -54,7 +54,7 @@ #define ACMP1_BASE (PERIPH_BASE + 0x00001400) #define ADC_BASE (PERIPH_BASE + 0x00002000) #define DAC0_BASE (PERIPH_BASE + 0x00004000) -#define GPIO_BASE (PERIPH_BASE + 0x00006000) +#define GPIO_BASE (PERIPH_BASE + 0x00006000) /**< @see gpio.h */ #define I2C0_BASE (PERIPH_BASE + 0x0000a000) #define USART0_BASE (PERIPH_BASE + 0x0000c000) #define USART1_BASE (PERIPH_BASE + 0x0000c400) @@ -70,7 +70,7 @@ #define MSC_BASE (PERIPH_BASE + 0x000c0000) #define DMA_BASE (PERIPH_BASE + 0x000c2000) #define EMU_BASE (PERIPH_BASE + 0x000c6000) -#define CMU_BASE (PERIPH_BASE + 0x000c8000) +#define CMU_BASE (PERIPH_BASE + 0x000c8000) /**< @see cmu.h */ #define RMU_BASE (PERIPH_BASE + 0x000ca000) #define PRS_BASE (PERIPH_BASE + 0x000cc000) #define AES_BASE (PERIPH_BASE + 0x000e0000) From d6a314bed737d3f4142f814454d5462f842f1e4f Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 14:00:34 +0100 Subject: [PATCH 08/56] efm32: make all interrupts usable in vector table * define weak symbol for ${irq_name}_isr * put them in the rom vector table * declare reset_vector weak in case someone wants to insert code there * remove null_handler (null handlers should be only requested explicitly, and finding out why the chip gets stuck is easier than determining whether or not a no-op interrupt handler was executed) --- lib/efm32/tinygecko/vector.c | 93 +++++++++++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 13 deletions(-) diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c index 624785e4..fb8fbd4b 100644 --- a/lib/efm32/tinygecko/vector.c +++ b/lib/efm32/tinygecko/vector.c @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +#include #include #define WEAK __attribute__ ((weak)) @@ -26,10 +27,9 @@ extern unsigned _etext, _data, _edata, _ebss, _stack; void main(void); -void reset_handler(void); void blocking_handler(void); -void null_handler(void); +void WEAK reset_handler(void); void WEAK nmi_handler(void); void WEAK hard_fault_handler(void); void WEAK mem_manage_handler(void); @@ -40,6 +40,29 @@ void WEAK debug_monitor_handler(void); void WEAK pend_sv_handler(void); void WEAK sys_tick_handler(void); +void WEAK dma_isr(void); +void WEAK gpio_even_isr(void); +void WEAK timer0_isr(void); +void WEAK usart0_rx_isr(void); +void WEAK usart0_tx_isr(void); +void WEAK acmp01_isr(void); +void WEAK adc0_isr(void); +void WEAK dac0_isr(void); +void WEAK i2c0_isr(void); +void WEAK gpio_odd_isr(void); +void WEAK timer1_isr(void); +void WEAK usart1_rx_isr(void); +void WEAK usart1_tx_isr(void); +void WEAK lesense_isr(void); +void WEAK leuart0_isr(void); +void WEAK letimer0_isr(void); +void WEAK pcnt0_isr(void); +void WEAK rtc_isr(void); +void WEAK cmu_isr(void); +void WEAK vcmp_isr(void); +void WEAK lcd_isr(void); +void WEAK msc_isr(void); +void WEAK aes_isr(void); __attribute__ ((section(".vectors"))) efm32_vector_table_t vector_table = { @@ -53,9 +76,34 @@ efm32_vector_table_t vector_table = { .sv_call = sv_call_handler, .pend_sv = pend_sv_handler, .systick = sys_tick_handler, + .irq = { + [IRQ_DMA] = dma_isr, + [IRQ_GPIO_EVEN] = gpio_even_isr, + [IRQ_TIMER0] = timer0_isr, + [IRQ_USART0_RX] = usart0_rx_isr, + [IRQ_USART0_TX] = usart0_tx_isr, + [IRQ_ACMP01] = acmp01_isr, + [IRQ_ADC0] = adc0_isr, + [IRQ_DAC0] = dac0_isr, + [IRQ_I2C0] = i2c0_isr, + [IRQ_GPIO_ODD] = gpio_odd_isr, + [IRQ_TIMER1] = timer1_isr, + [IRQ_USART1_RX] = usart1_rx_isr, + [IRQ_USART1_TX] = usart1_tx_isr, + [IRQ_LESENSE] = lesense_isr, + [IRQ_LEUART0] = leuart0_isr, + [IRQ_LETIMER0] = letimer0_isr, + [IRQ_PCNT0] = pcnt0_isr, + [IRQ_RTC] = rtc_isr, + [IRQ_CMU] = cmu_isr, + [IRQ_VCMP] = vcmp_isr, + [IRQ_LCD] = lcd_isr, + [IRQ_MSC] = msc_isr, + [IRQ_AES] = aes_isr, + } }; -void reset_handler(void) +void WEAK reset_handler(void) { volatile unsigned *src, *dest; @@ -76,17 +124,36 @@ void blocking_handler(void) while (1) ; } -void null_handler(void) -{ - /* Do nothing. */ -} - -#pragma weak nmi_handler = null_handler +#pragma weak nmi_handler = blocking_handler #pragma weak hard_fault_handler = blocking_handler #pragma weak mem_manage_handler = blocking_handler #pragma weak bus_fault_handler = blocking_handler #pragma weak usage_fault_handler = blocking_handler -#pragma weak sv_call_handler = null_handler -#pragma weak debug_monitor_handler = null_handler -#pragma weak pend_sv_handler = null_handler -#pragma weak sys_tick_handler = null_handler +#pragma weak sv_call_handler = blocking_handler +#pragma weak debug_monitor_handler = blocking_handler +#pragma weak pend_sv_handler = blocking_handler +#pragma weak sys_tick_handler = blocking_handler + +#pragma weak dma_isr = blocking_handler +#pragma weak gpio_even_isr = blocking_handler +#pragma weak timer0_isr = blocking_handler +#pragma weak usart0_rx_isr = blocking_handler +#pragma weak usart0_tx_isr = blocking_handler +#pragma weak acmp01_isr = blocking_handler +#pragma weak adc0_isr = blocking_handler +#pragma weak dac0_isr = blocking_handler +#pragma weak i2c0_isr = blocking_handler +#pragma weak gpio_odd_isr = blocking_handler +#pragma weak timer1_isr = blocking_handler +#pragma weak usart1_rx_isr = blocking_handler +#pragma weak usart1_tx_isr = blocking_handler +#pragma weak lesense_isr = blocking_handler +#pragma weak leuart0_isr = blocking_handler +#pragma weak letimer0_isr = blocking_handler +#pragma weak pcnt0_isr = blocking_handler +#pragma weak rtc_isr = blocking_handler +#pragma weak cmu_isr = blocking_handler +#pragma weak vcmp_isr = blocking_handler +#pragma weak lcd_isr = blocking_handler +#pragma weak msc_isr = blocking_handler +#pragma weak aes_isr = blocking_handler From f52b1a56b076853cec95e848260d3ea83bae91ff Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 14:14:22 +0100 Subject: [PATCH 09/56] make doxygen ignore __attribute__ doxygen doesn't understand __attribute__ and constructs bogus call graphs and dependencies from it. according to the doxygen maintainer[1], this is the way to deal with it. [1] http://sourceforge.net/mailarchive/message.php?msg_id=20085215 --- Doxyfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doxyfile b/Doxyfile index 70147a73..beb5dda3 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1413,13 +1413,13 @@ ENABLE_PREPROCESSING = YES # compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. -MACRO_EXPANSION = NO +MACRO_EXPANSION = YES # 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 +EXPAND_ONLY_PREDEF = YES # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # pointed to by INCLUDE_PATH will be searched when a #include is found. @@ -1447,7 +1447,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = __attribute__(x)= # 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. From 09523e854dbb2993d427b9a25ff464bb355d06f1 Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 16:07:24 +0100 Subject: [PATCH 10/56] efm32 example: enhanced makefiles --- examples/efm32/tinygecko/Makefile.include | 3 ++- examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/efm32/tinygecko/Makefile.include b/examples/efm32/tinygecko/Makefile.include index 76691ce4..2426e988 100644 --- a/examples/efm32/tinygecko/Makefile.include +++ b/examples/efm32/tinygecko/Makefile.include @@ -30,7 +30,8 @@ GDB = $(PREFIX)-gdb #TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) TOOLCHAIN_DIR = ../../../../.. CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ - -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD + -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD\ + -D$(FAMILY) LDSCRIPT ?= ${TOOLCHAIN_DIR}/lib/efm32/tinygecko/$(MCU).ld LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib/efm32/tinygecko \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \ diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include index e707b652..32e6cfc3 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include @@ -18,8 +18,6 @@ ## MCU = EFM32TG840F32 +FAMILY = TINYGECKO -# Linker scripts are always relative to the current directory. This file is -# intended for inclusion from example subdirectories, so the Makefile.include -# meant here would be called ../Makefile.include relative to here. -include ../../Makefile.include +include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include From 805119786c348cadcd007fe4cf688dd7d89a7e0d Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 17:59:58 +0100 Subject: [PATCH 11/56] added upload target for segger's JLink tool this is quite a hack, but the only way i know of by which firmware can be uploaded to the efm32tg-stk until OpenOCD supports SWD on jlink --- .../efm32-tg-stk3300/Makefile.include | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include index 32e6cfc3..a2ad07a1 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include @@ -21,3 +21,29 @@ MCU = EFM32TG840F32 FAMILY = TINYGECKO include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include + +# FIXME: i'd much rather have this in a heredoc, but heredocs are not that easy +# in makefiles. furthermore, this isn't caught by the clean target. actually, +# i'd very much prefer using openocd anyway, this would also get rid of the +# Default.ini and JLink.log files jlink.sh drops. + +# just the next hack: jlink, as shipped in energy micro's +# energyAwareToolsBeta_30082011.tgz, needs its LD_LIBRARY_PATH explicitly set. +# it provides a wrapper script, but that fails to pass on arguments. set this +# path to the energymicro folder extracted from the tools, and we'll take care +# of the test +JLINKDIR = ${HOME}/energymicro/energymicro + +$(BINARY)-upload.sh: + rm -f "$@" + echo "exec device = EFM32TG840F32" >> "$@" + echo "exec EnableFlashDL" >> "$@" + echo "h" >> "$@" + echo "loadbin ${BINARY}.bin 0" >> "$@" + echo "r" >> "$@" + echo "go" >> "$@" + echo "q" >> "$@" + chmod +x "$@" + +upload: $(BINARY)-upload.sh $(BINARY).bin + LD_LIBRARY_PATH=$(JLINKDIR)/lib/ $(JLINKDIR)/bin/JLinkExe "$<" || echo "JLink exited with non-zero exit status, but that's normal." From 8e90ffa2ab4efa2cc35943ee2ea2978625c9ecab Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 27 Feb 2012 19:20:19 +0100 Subject: [PATCH 12/56] fixed a bug in efm32 miniblink example actually, it wasn't a bug; the compiler just optimized a statement away until it was declared volatile. inserting a no-op assembler instruction to make it more obvious what's going on --- .../efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index 0941add7..1976080c 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -35,13 +35,12 @@ void led_toggle(void); int main(void) { - // FIXME: As of now, this doesn't work without x being volatile; an issue with linking? - volatile int x; + int x; led_setup(); while(1) { - for(x = 0; x < 200000; ++x); + for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ led_toggle(); }; } From a747e887bd819ad20bca83e8f43c9e81798a59f6 Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 29 Feb 2012 02:32:14 +0100 Subject: [PATCH 13/56] efm32 tinygecko gpio: implemented all the bit values along with the actual implementation comes a first attempt to better structure the doxygen groups. putting all the groups in a bigger one makes it easier to reference them from the file itself, and makes the structure clearer on the module page. --- include/libopencm3/efm32/tinygecko/gpio.h | 199 +++++++++++++++++++++- 1 file changed, 191 insertions(+), 8 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index 7551a41b..ea4eafda 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -24,11 +24,8 @@ * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 28. * - * @see GPIO_registers - * @see GPIO_MODE_values + * @see EFM32TG_GPIO */ -/* FIXME: i'd prefer not to @see CMU_registers but have some direct link placed - * automatically from a file to its groups */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_GPIO_H #define LIBOPENCM3_EFM32_TINYGECKO_GPIO_H @@ -36,6 +33,12 @@ #include #include +/** Register definitions and register value definitions for the GPIO subsystem + * + * @defgroup EFM32TG_GPIO EFM32 Tiny Gecko GPIO registers and values + * @{ + */ + /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 28.4 * * The bulk of the registers defined here (like GPIO_PA_CTRL) will not be used @@ -43,7 +46,7 @@ * * @todo This section could profit from bit-banding. * - * @defgroup GPIO_registers GPIO registers + * @defgroup EFM32TG_GPIO_registers EFM32 Tiny Gecko GPIO registers * @{ */ #define GPIO_Px_CTRL_OFFSET 0x000 @@ -141,8 +144,29 @@ /** @} */ -/** These are the modes defined for the MODEx fields in the MODEL/MODEH - * registers. +/** Bit states for the GPIO_Px_CTRL register + * + * They are named as in d0034_efm32tg_reference_manual.pdf's section + * 28.5.1. + * + * @defgroup EFM32TG_GPIO_Px_CTRL_bits EFM32 Tiny Gecko GPIO Px CTRL bits + * @{ + */ + +#define GPIO_CTRL_DRIVEMODE_STANDARD 0 /**< 6mA drive current */ +#define GPIO_CTRL_DRIVEMODE_LOWEST 1 /**< 0.5mA drive current */ +#define GPIO_CTRL_DRIVEMODE_HIGH 2 /**< 20mA drive current */ +#define GPIO_CTRL_DRIVEMODE_LOW 3 /**< 2mA drive current */ + +/** @} */ + +/** These are the modes defined for the MODEx fields in the GPIO_Px_MODEL and + * GPIO_Px_MODEH registers. + * + * These bit state definitions are not localized, meaning that they have to be + * bitshifted by multiples of 4 to configure other pins than 0; configurations + * for pins 0 to 7 go to GPIO_Px_MODEL (shifted by 4*pin), configurations for + * pins 8 to 15 go to GPIO_Px_MODEH (shifted by 4*(pin-8)). * * For example, to set the mode for the 3rd pin of port A to pushpull, set * `GPIO_PA_MODEL = GPIO_MODE_PUSHPULL << (3*4);`. @@ -154,7 +178,7 @@ * 28.5.2/28.5.3. For explanations of what they really do, rather see section * 28.3.1. * - * @defgroup GPIO_MODE_values GPIO MODE values + * @defgroup EFM32TG_GPIO_MODE_values EFM32 Tiny Gecko GPIO MODE values * @{ */ @@ -177,6 +201,165 @@ /** @} */ +/** These are the modes defined for the EXTIPSELx fields in the GPIO_EXTIPSELL + * and GPIO_EXTIPSELH registers. + * + * These bit state definitions are not localized, meaning that they have to be + * bitshifted by multiples of 4 to configure other pins than 0; configurations + * for pins 0 to 7 go to GPIO_EXTIPSELL (shifted by 4*pin), configurations for + * pins 8 to 15 go to GPIO_EXTIPSELH (shifted by 4*(pin-8)). + * + * They are named as in d0034_efm32tg_reference_manual.pdf's sections + * 28.5.10/28.5.11. For explanations of what they do, rather see section + * 28.3.5. + * + * @defgroup EFM32TG_GPIO_EXTIP_values EFM32 Tiny Gecko GPIO EXTIPSEL values + * @{ + */ + +#define GPIO_EXTIPSEL_PORTA 0 /**< Port A pin x selected for external interrupt x */ +#define GPIO_EXTIPSEL_PORTB 1 /**< Port B pin x selected for external interrupt x */ +#define GPIO_EXTIPSEL_PORTC 2 /**< Port C pin x selected for external interrupt x */ +#define GPIO_EXTIPSEL_PORTD 3 /**< Port D pin x selected for external interrupt x */ +#define GPIO_EXTIPSEL_PORTE 4 /**< Port E pin x selected for external interrupt x */ +#define GPIO_EXTIPSEL_PORTF 5 /**< Port F pin x selected for external interrupt x */ + +/** @} */ + +/** Bit states for the GPIO_ROUTE register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.18 for definitions, and + * 28.3.4.1 for explanations. + * + * @defgroup EFM32TG_GPIO_ROUTE_bits EFM32 Tiny Gecko GPIO ROUTE bits + * @{ + */ + +#define GPIO_ROUTE_SWLOCATION_MASK (0x03<<8) +#define GPIO_ROUTE_SWLOCATION_LOC0 (0<<8) /**< Route SW pins to location 0 (see chip data sheet for exact pins */ +#define GPIO_ROUTE_SWLOCATION_LOC1 (1<<8) /**< Route SW pins to location 1 (see chip data sheet for exact pins */ +#define GPIO_ROUTE_SWLOCATION_LOC2 (2<<8) /**< Route SW pins to location 2 (see chip data sheet for exact pins */ +#define GPIO_ROUTE_SWLOCATION_LOC3 (3<<8) /**< Route SW pins to location 3 (see chip data sheet for exact pins */ + +#define GPIO_ROUTE_SWOPEN (1<<2) /**< Serial Wire Viewer Output pin enabled */ +#define GPIO_ROUTE_SWDIOPEN (1<<1) /**< Serial Wire Data pin enabled */ +#define GPIO_ROUTE_SWCLKPEN (1<<0) /**< Serial Wire Clock pin enabled */ + +/** @} */ + +/** Bit states for the GPIO_INSENSE register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.19 for definitions, and + * 28.3.7 for details. + * + * @defgroup EFM32TG_GPIO_INSENSE_bits EFM32 Tiny Gecko GPIO INSENSE bits + * @{ + */ + +#define GPIO_INSENSE_PRS (1<<1) /**< Input sensing for PRS enabled */ +#define GPIO_INSENSE_INT (1<<0) /**< Input sensing for interrupts enabled */ + +/** @} */ + +/** Values for the GPIO_LOCK register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.20 for definitions, and + * 28.3.1.1 for explanations. + * + * @defgroup EFM32TG_GPIO_LOCK_values EFM32 Tiny Gecko GPIO LOCK bits + * @{ + */ + +#define GPIO_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ +#define GPIO_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ +#define GPIO_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock down GPIO */ +#define GPIO_LOCK_SET_UNLOCKED 0xa543 /**< Write this to the LOCK register to unlock the GPIO */ + +/** @} */ + +/** Bit states for the GPIO_CTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.21 for definitions, and + * 28.3.4 for explanations. + * + * @defgroup EFM32TG_GPIO_CTRL_bits EFM32 Tiny Gecko GPIO CTRL bits + * @{ + */ + +#define GPIO_CTRL_EM4RET (1<<0) /**< Retention of states in EM4 */ + +/** @} */ + +/** Bit states for the GPIO_CMD register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.22 for definitions and + * figure 28.5 in case you wonder if that register is mentioned anywhere else + * at all. + * + * @defgroup EFM32TG_GPIO_CMD_bits EFM32 Tiny Gecko GPIO CMD bits + * @{ + */ + +#define GPIO_CMD_EM4WUCLR (1<<0) /**< Write this flag to clear EM4 wakeup requests */ + +/** @} */ + +/** Bit states for the GPIO_EM4WUEN register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.23 for definitions, and + * 28.3.2 for explanations. + * + * @defgroup EFM32TG_GPIO_EM4WUEN_bits EFM32 Tiny Gecko GPIO EM4WUEN bits + * @{ + */ + +#define GPIO_EM4WUEN_A0 0x01 /**< Wake up from EM4 on A0 activity */ +#define GPIO_EM4WUEN_A6 0x02 /**< Wake up from EM4 on A6 activity */ +#define GPIO_EM4WUEN_C9 0x04 /**< Wake up from EM4 on C9 activity */ +#define GPIO_EM4WUEN_F1 0x08 /**< Wake up from EM4 on F1 activity */ +#define GPIO_EM4WUEN_F3 0x10 /**< Wake up from EM4 on F3 activity */ +#define GPIO_EM4WUEN_E13 0x20 /**< Wake up from EM4 on E13 activity */ + +/** @} */ + +/** Bit states for the GPIO_EM4WUPOL register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.24 for definitions, and + * 28.3.2 for explanations. + * + * @defgroup EFM32TG_GPIO_EM4WUPOL_bits EFM32 Tiny Gecko GPIO EM4WUPOL bits + * @{ + */ + +#define GPIO_EM4WUPOL_A0 0x01 /**< High wake up from EM4 on A0 */ +#define GPIO_EM4WUPOL_A6 0x02 /**< High wake up from EM4 on A6 */ +#define GPIO_EM4WUPOL_C9 0x04 /**< High wake up from EM4 on C9 */ +#define GPIO_EM4WUPOL_F1 0x08 /**< High wake up from EM4 on F1 */ +#define GPIO_EM4WUPOL_F3 0x10 /**< High wake up from EM4 on F3 */ +#define GPIO_EM4WUPOL_E13 0x20 /**< High wake up from EM4 on E13 */ + +/** @} */ + +/** Bit states for the GPIO_EM4WUCAUSE register + * + * See d0034_efm32tg_reference_manual.pdf section 28.5.25 for definitions, and + * 28.3.2 for explanations. + * + * @defgroup EFM32TG_GPIO_EM4WUCAUSE_bits EFM32 Tiny Gecko GPIO EM4WUCAUSE bits + * @{ + */ + +#define GPIO_EM4WUCAUSE_A0 0x01 /**< Woke up from EM4 on A0 */ +#define GPIO_EM4WUCAUSE_A6 0x02 /**< Woke up from EM4 on A6 */ +#define GPIO_EM4WUCAUSE_C9 0x04 /**< Woke up from EM4 on C9 */ +#define GPIO_EM4WUCAUSE_F1 0x08 /**< Woke up from EM4 on F1 */ +#define GPIO_EM4WUCAUSE_F3 0x10 /**< Woke up from EM4 on F3 */ +#define GPIO_EM4WUCAUSE_E13 0x20 /**< Woke up from EM4 on E13 */ + +/** @} */ + +/** @} */ + //void gpio_set(u32 gpioport, u16 gpios); //void gpio_clear(u32 gpioport, u16 gpios); //void gpio_toggle(u32 gpioport, u16 gpios); From 541fded753a27b8670c5b485ecec1794c02de187 Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 1 Mar 2012 02:09:02 +0100 Subject: [PATCH 14/56] convenience functions for efm32 gpio also, the whole gpio header file is now a big doxygen group, structuring the convenience functions and the register/value definitions --- .../efm32-tg-stk3300/miniblink/miniblink.c | 6 +- include/libopencm3/efm32/tinygecko/gpio.h | 310 +++++++++++++----- lib/efm32/tinygecko/Makefile | 2 +- lib/efm32/tinygecko/gpio.c | 23 ++ 4 files changed, 250 insertions(+), 91 deletions(-) create mode 100644 lib/efm32/tinygecko/gpio.c diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index 1976080c..e9907d37 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -60,10 +60,12 @@ void led_setup(void) // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 // and 16.3 (called UIF_LED0) - GPIO_PD_MODEL = GPIO_MODE_PUSHPULL<<(7*4); + gpio_set_mode(GPIO_PD, GPIO_MODE_PUSHPULL, GPIO7); + // GPIO_PD_MODEL = GPIO_MODE_PUSHPULL<<(7*4); } void led_toggle(void) { - GPIO_PD_DOUTTGL = 1<<7; + gpio_toggle(GPIO_PD, GPIO7); + // GPIO_PD_DOUTTGL = 1<<7; } diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index ea4eafda..3e782f3f 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -18,13 +18,16 @@ */ /** @file - * - * Definitions for the GPIO subsystem (General Purpose Input Output). + * @see EFM32TG_GPIO + */ + +/** Definitions for the GPIO subsystem (General Purpose Input Output). * * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 28. * - * @see EFM32TG_GPIO + * @defgroup EFM32TG_GPIO EFM32 Tiny Gecko GPIO + * @{ */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_GPIO_H @@ -35,7 +38,7 @@ /** Register definitions and register value definitions for the GPIO subsystem * - * @defgroup EFM32TG_GPIO EFM32 Tiny Gecko GPIO registers and values + * @defgroup EFM32TG_GPIO_regsandvals EFM32 Tiny Gecko GPIO registers and values * @{ */ @@ -49,98 +52,129 @@ * @defgroup EFM32TG_GPIO_registers EFM32 Tiny Gecko GPIO registers * @{ */ -#define GPIO_Px_CTRL_OFFSET 0x000 -#define GPIO_Px_MODEL_OFFSET 0x004 -#define GPIO_Px_MODEH_OFFSET 0x008 -#define GPIO_Px_DOUT_OFFSET 0x00C -#define GPIO_Px_DOUTSET_OFFSET 0x010 -#define GPIO_Px_DOUTCLR_OFFSET 0x014 -#define GPIO_Px_DOUTTGL_OFFSET 0x018 -#define GPIO_Px_DIN_OFFSET 0x01C -#define GPIO_Px_PINLOCKN_OFFSET 0x020 +#define GPIO_Px_CTRL(port) MMIO32(port + 0x000) /**< @see EFM32TG_GPIO_Px_CTRL_bits */ +#define GPIO_Px_MODEL(port) MMIO32(port + 0x004) /**< @see EFM32TG_GPIO_MODE_values */ +#define GPIO_Px_MODEH(port) MMIO32(port + 0x008) /**< @see EFM32TG_GPIO_MODE_values */ +#define GPIO_Px_DOUT(port) MMIO32(port + 0x00C) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_Px_DOUTSET(port) MMIO32(port + 0x010) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_Px_DOUTCLR(port) MMIO32(port + 0x014) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_Px_DOUTTGL(port) MMIO32(port + 0x018) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_Px_DIN(port) MMIO32(port + 0x01C) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_Px_PINLOCKN(port) MMIO32(port + 0x020) /**< @see EFM32TG_GPIO_pinnumberbits */ #define GPIO_PA (GPIO_BASE + 0x000) -#define GPIO_PA_CTRL MMIO32(GPIO_PA + GPIO_Px_CTRL_OFFSET) -#define GPIO_PA_MODEL MMIO32(GPIO_PA + GPIO_Px_MODEL_OFFSET) -#define GPIO_PA_MODEH MMIO32(GPIO_PA + GPIO_Px_MODEH_OFFSET) -#define GPIO_PA_DOUT MMIO32(GPIO_PA + GPIO_Px_DOUT_OFFSET) -#define GPIO_PA_DOUTSET MMIO32(GPIO_PA + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PA_DOUTCLR MMIO32(GPIO_PA + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PA_DOUTTGL MMIO32(GPIO_PA + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PA_DIN MMIO32(GPIO_PA + GPIO_Px_DIN_OFFSET) -#define GPIO_PA_PINLOCKN MMIO32(GPIO_PA + GPIO_Px_PINLOCKN_OFFSET) +#define GPIO_PA_CTRL GPIO_Px_CTRL(GPIO_PA) +#define GPIO_PA_MODEL GPIO_Px_MODEL(GPIO_PA) +#define GPIO_PA_MODEH GPIO_Px_MODEH(GPIO_PA) +#define GPIO_PA_DOUT GPIO_Px_DOUT(GPIO_PA) +#define GPIO_PA_DOUTSET GPIO_Px_DOUTSET(GPIO_PA) +#define GPIO_PA_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PA) +#define GPIO_PA_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PA) +#define GPIO_PA_DIN GPIO_Px_DIN(GPIO_PA) +#define GPIO_PA_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PA) #define GPIO_PB (GPIO_BASE + 0x024) -#define GPIO_PB_CTRL MMIO32(GPIO_PB + GPIO_Px_CTRL_OFFSET) -#define GPIO_PB_MODEL MMIO32(GPIO_PB + GPIO_Px_MODEL_OFFSET) -#define GPIO_PB_MODEH MMIO32(GPIO_PB + GPIO_Px_MODEH_OFFSET) -#define GPIO_PB_DOUT MMIO32(GPIO_PB + GPIO_Px_DOUT_OFFSET) -#define GPIO_PB_DOUTSET MMIO32(GPIO_PB + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PB_DOUTCLR MMIO32(GPIO_PB + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PB_DOUTTGL MMIO32(GPIO_PB + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PB_DIN MMIO32(GPIO_PB + GPIO_Px_DIN_OFFSET) -#define GPIO_PB_PINLOCKN MMIO32(GPIO_PB + GPIO_Px_PINLOCKN_OFFSET) +#define GPIO_PB_CTRL GPIO_Px_CTRL(GPIO_PB) +#define GPIO_PB_MODEL GPIO_Px_MODEL(GPIO_PB) +#define GPIO_PB_MODEH GPIO_Px_MODEH(GPIO_PB) +#define GPIO_PB_DOUT GPIO_Px_DOUT(GPIO_PB) +#define GPIO_PB_DOUTSET GPIO_Px_DOUTSET(GPIO_PB) +#define GPIO_PB_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PB) +#define GPIO_PB_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PB) +#define GPIO_PB_DIN GPIO_Px_DIN(GPIO_PB) +#define GPIO_PB_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PB) #define GPIO_PC (GPIO_BASE + 0x048) -#define GPIO_PC_CTRL MMIO32(GPIO_PC + GPIO_Px_CTRL_OFFSET) -#define GPIO_PC_MODEL MMIO32(GPIO_PC + GPIO_Px_MODEL_OFFSET) -#define GPIO_PC_MODEH MMIO32(GPIO_PC + GPIO_Px_MODEH_OFFSET) -#define GPIO_PC_DOUT MMIO32(GPIO_PC + GPIO_Px_DOUT_OFFSET) -#define GPIO_PC_DOUTSET MMIO32(GPIO_PC + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PC_DOUTCLR MMIO32(GPIO_PC + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PC_DOUTTGL MMIO32(GPIO_PC + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PC_DIN MMIO32(GPIO_PC + GPIO_Px_DIN_OFFSET) -#define GPIO_PC_PINLOCKN MMIO32(GPIO_PC + GPIO_Px_PINLOCKN_OFFSET) +#define GPIO_PC_CTRL GPIO_Px_CTRL(GPIO_PC) +#define GPIO_PC_MODEL GPIO_Px_MODEL(GPIO_PC) +#define GPIO_PC_MODEH GPIO_Px_MODEH(GPIO_PC) +#define GPIO_PC_DOUT GPIO_Px_DOUT(GPIO_PC) +#define GPIO_PC_DOUTSET GPIO_Px_DOUTSET(GPIO_PC) +#define GPIO_PC_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PC) +#define GPIO_PC_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PC) +#define GPIO_PC_DIN GPIO_Px_DIN(GPIO_PC) +#define GPIO_PC_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PC) #define GPIO_PD (GPIO_BASE + 0x06C) -#define GPIO_PD_CTRL MMIO32(GPIO_PD + GPIO_Px_CTRL_OFFSET) -#define GPIO_PD_MODEL MMIO32(GPIO_PD + GPIO_Px_MODEL_OFFSET) -#define GPIO_PD_MODEH MMIO32(GPIO_PD + GPIO_Px_MODEH_OFFSET) -#define GPIO_PD_DOUT MMIO32(GPIO_PD + GPIO_Px_DOUT_OFFSET) -#define GPIO_PD_DOUTSET MMIO32(GPIO_PD + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PD_DOUTCLR MMIO32(GPIO_PD + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PD_DOUTTGL MMIO32(GPIO_PD + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PD_DIN MMIO32(GPIO_PD + GPIO_Px_DIN_OFFSET) -#define GPIO_PD_PINLOCKN MMIO32(GPIO_PD + GPIO_Px_PINLOCKN_OFFSET) +#define GPIO_PD_CTRL GPIO_Px_CTRL(GPIO_PD) +#define GPIO_PD_MODEL GPIO_Px_MODEL(GPIO_PD) +#define GPIO_PD_MODEH GPIO_Px_MODEH(GPIO_PD) +#define GPIO_PD_DOUT GPIO_Px_DOUT(GPIO_PD) +#define GPIO_PD_DOUTSET GPIO_Px_DOUTSET(GPIO_PD) +#define GPIO_PD_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PD) +#define GPIO_PD_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PD) +#define GPIO_PD_DIN GPIO_Px_DIN(GPIO_PD) +#define GPIO_PD_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PD) #define GPIO_PE (GPIO_BASE + 0x090) -#define GPIO_PE_CTRL MMIO32(GPIO_PE + GPIO_Px_CTRL_OFFSET) -#define GPIO_PE_MODEL MMIO32(GPIO_PE + GPIO_Px_MODEL_OFFSET) -#define GPIO_PE_MODEH MMIO32(GPIO_PE + GPIO_Px_MODEH_OFFSET) -#define GPIO_PE_DOUT MMIO32(GPIO_PE + GPIO_Px_DOUT_OFFSET) -#define GPIO_PE_DOUTSET MMIO32(GPIO_PE + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PE_DOUTCLR MMIO32(GPIO_PE + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PE_DOUTTGL MMIO32(GPIO_PE + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PE_DIN MMIO32(GPIO_PE + GPIO_Px_DIN_OFFSET) -#define GPIO_PE_PINLOCKN MMIO32(GPIO_PE + GPIO_Px_PINLOCKN_OFFSET) +#define GPIO_PE_CTRL GPIO_Px_CTRL(GPIO_PE) +#define GPIO_PE_MODEL GPIO_Px_MODEL(GPIO_PE) +#define GPIO_PE_MODEH GPIO_Px_MODEH(GPIO_PE) +#define GPIO_PE_DOUT GPIO_Px_DOUT(GPIO_PE) +#define GPIO_PE_DOUTSET GPIO_Px_DOUTSET(GPIO_PE) +#define GPIO_PE_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PE) +#define GPIO_PE_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PE) +#define GPIO_PE_DIN GPIO_Px_DIN(GPIO_PE) +#define GPIO_PE_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PE) #define GPIO_PF (GPIO_BASE + 0x0B4) -#define GPIO_PF_CTRL MMIO32(GPIO_PF + GPIO_Px_CTRL_OFFSET) -#define GPIO_PF_MODEL MMIO32(GPIO_PF + GPIO_Px_MODEL_OFFSET) -#define GPIO_PF_MODEH MMIO32(GPIO_PF + GPIO_Px_MODEH_OFFSET) -#define GPIO_PF_DOUT MMIO32(GPIO_PF + GPIO_Px_DOUT_OFFSET) -#define GPIO_PF_DOUTSET MMIO32(GPIO_PF + GPIO_Px_DOUTSET_OFFSET) -#define GPIO_PF_DOUTCLR MMIO32(GPIO_PF + GPIO_Px_DOUTCLR_OFFSET) -#define GPIO_PF_DOUTTGL MMIO32(GPIO_PF + GPIO_Px_DOUTTGL_OFFSET) -#define GPIO_PF_DIN MMIO32(GPIO_PF + GPIO_Px_DIN_OFFSET) -#define GPIO_PF_PINLOCKN MMIO32(GPIO_PF + GPIO_Px_PINLOCKN_OFFSET) - -#define GPIO_EXTIPSELL MMIO32(GPIO_BASE + 0x100) -#define GPIO_EXTIPSELH MMIO32(GPIO_BASE + 0x104) -#define GPIO_EXTIRISE MMIO32(GPIO_BASE + 0x108) -#define GPIO_EXTIFALL MMIO32(GPIO_BASE + 0x10C) -#define GPIO_IEN MMIO32(GPIO_BASE + 0x110) -#define GPIO_IF MMIO32(GPIO_BASE + 0x114) -#define GPIO_IFS MMIO32(GPIO_BASE + 0x118) -#define GPIO_IFC MMIO32(GPIO_BASE + 0x11C) -#define GPIO_ROUTE MMIO32(GPIO_BASE + 0x120) -#define GPIO_INSENSE MMIO32(GPIO_BASE + 0x124) -#define GPIO_LOCK MMIO32(GPIO_BASE + 0x128) -#define GPIO_CTRL MMIO32(GPIO_BASE + 0x12C) -#define GPIO_CMD MMIO32(GPIO_BASE + 0x130) -#define GPIO_EM4WUEN MMIO32(GPIO_BASE + 0x134) -#define GPIO_EM4WUPOL MMIO32(GPIO_BASE + 0x138) -#define GPIO_EM4WUCAUSE MMIO32(GPIO_BASE + 0x13C) +#define GPIO_PF_CTRL GPIO_Px_CTRL(GPIO_PF) +#define GPIO_PF_MODEL GPIO_Px_MODEL(GPIO_PF) +#define GPIO_PF_MODEH GPIO_Px_MODEH(GPIO_PF) +#define GPIO_PF_DOUT GPIO_Px_DOUT(GPIO_PF) +#define GPIO_PF_DOUTSET GPIO_Px_DOUTSET(GPIO_PF) +#define GPIO_PF_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PF) +#define GPIO_PF_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PF) +#define GPIO_PF_DIN GPIO_Px_DIN(GPIO_PF) +#define GPIO_PF_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PF) + +#define GPIO_EXTIPSELL MMIO32(GPIO_BASE + 0x100) /**< @see EFM32TG_GPIO_EXTIP_values */ +#define GPIO_EXTIPSELH MMIO32(GPIO_BASE + 0x104) /**< @see EFM32TG_GPIO_EXTIP_values */ +#define GPIO_EXTIRISE MMIO32(GPIO_BASE + 0x108) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_EXTIFALL MMIO32(GPIO_BASE + 0x10C) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_IEN MMIO32(GPIO_BASE + 0x110) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_IF MMIO32(GPIO_BASE + 0x114) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_IFS MMIO32(GPIO_BASE + 0x118) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_IFC MMIO32(GPIO_BASE + 0x11C) /**< @see EFM32TG_GPIO_pinnumberbits */ +#define GPIO_ROUTE MMIO32(GPIO_BASE + 0x120) /**< @see EFM32TG_GPIO_ROUTE_bits */ +#define GPIO_INSENSE MMIO32(GPIO_BASE + 0x124) /**< @see EFM32TG_GPIO_INSENSE_bits */ +#define GPIO_LOCK MMIO32(GPIO_BASE + 0x128) /**< @see EFM32TG_GPIO_LOCK_values */ +#define GPIO_CTRL MMIO32(GPIO_BASE + 0x12C) /**< @see EFM32TG_GPIO_CTRL_bits */ +#define GPIO_CMD MMIO32(GPIO_BASE + 0x130) /**< @see EFM32TG_GPIO_CMD_bits */ +#define GPIO_EM4WUEN MMIO32(GPIO_BASE + 0x134) /**< @see EFM32TG_GPIO_EM4WUEN_bits */ +#define GPIO_EM4WUPOL MMIO32(GPIO_BASE + 0x138) /**< @see EFM32TG_GPIO_EM4WUPOL_bits */ +#define GPIO_EM4WUCAUSE MMIO32(GPIO_BASE + 0x13C) /**< @see EFM32TG_GPIO_EM4WUCAUSE_bits */ + +/** @} */ + +/** Pin number bits + * + * Provided for convenience. They can be used on the GPIO_Px_DOUT, + * GPIO_Px_DOUTSET, GPIO_Px_DOUTCLR, GPIO_Px_DOUTTGL, GPIO_Px_DIN, + * GPIO_Px_PINLOCKN, GPIO_Px_EXTIRISE, GPIO_Px_EXTIFALL, GPIO_IEN, GPIO_IF, + * GPIO_IFS, and GPIO_IFC registers. + * + * @defgroup EFM32TG_GPIO_pinnumberbits EFM32 Tiny Gecko GPIO pin number bits + * @{ + */ + +#define GPIO0 (1 << 0) +#define GPIO1 (1 << 1) +#define GPIO2 (1 << 2) +#define GPIO3 (1 << 3) +#define GPIO4 (1 << 4) +#define GPIO5 (1 << 5) +#define GPIO6 (1 << 6) +#define GPIO7 (1 << 7) +#define GPIO8 (1 << 8) +#define GPIO9 (1 << 9) +#define GPIO10 (1 << 10) +#define GPIO11 (1 << 11) +#define GPIO12 (1 << 12) +#define GPIO13 (1 << 13) +#define GPIO14 (1 << 14) +#define GPIO15 (1 << 15) +#define GPIO_ALL 0xffff /** @} */ @@ -198,6 +232,7 @@ #define GPIO_MODE_WIREDANDDRIVEFILTER 13 #define GPIO_MODE_WIREDANDDRIVEPULLUP 14 #define GPIO_MODE_WIREDANDDRIVEPULLUPFILTER 15 +#define GPIO_MODE_MASK 0x0f /** @} */ @@ -360,9 +395,108 @@ /** @} */ -//void gpio_set(u32 gpioport, u16 gpios); -//void gpio_clear(u32 gpioport, u16 gpios); -//void gpio_toggle(u32 gpioport, u16 gpios); -//u16 gpio_get(u32 gpioport, u16 gpios); +/** GPIO convenience functions + * + * These functions try to be close to the STM32 F1 utility functions where + * possible. + * + * The functions intentionally don't cover all the possible read- and write + * operations to the GPIO registers. For example, reading the configured output + * strength for a port is rarely required. + * + * Many convenience functions are static to allow inlining by the compiler. + * + * @todo Implement all the non-trivial but useful convenience functions. + * + * @defgroup EFM32TG_GPIO_convenience EFM32 Tiny Gecko GPIO convenience functions + * @{ + */ + +/** Set a whole GPIO port's out data to a particular value + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param gpios Bit pattern the output of the port will be configured to (eg GPIO6|GPIO3 to switch pins 6 and 3 to high and all the others to low) + */ +static void gpio_port_write(u32 gpioport, u16 data) +{ + GPIO_Px_DOUT(gpioport) = data; +} +/** Set some bits in a GPIO port's out data + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param gpios GPIO pin(s) to be set to 1 (eg GPIO6|GPIO3 to switch pins 6 and 3 to high and leave all the others in their previous state) + */ +static void gpio_set(u32 gpioport, u16 gpios) +{ + GPIO_Px_DOUTSET(gpioport) = gpios; +} +/** Clear some bits in a GPIO port's out data + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param gpios GPIO pin(s) to be set to 0 (eg GPIO6|GPIO3 to switch pins 6 and 3 to low and leave all the others in their previous state) + */ +static void gpio_clear(u32 gpioport, u16 gpios) +{ + GPIO_Px_DOUTCLR(gpioport) = gpios; +} +/** Toggle some bits in a GPIO port's out data + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param gpios GPIO pin(s) that will be toggled (eg GPIO6|GPIO3 to toggle the output directions of pins 6 and 3 and leave all the others in their previous state) + */ +static void gpio_toggle(u32 gpioport, u16 gpios) +{ + GPIO_Px_DOUTTGL(gpioport) = gpios; +} + +/** Read input bits from a GPIO's port in data + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \returns Current value of the in register of the given port + */ +static u16 gpio_port_read(u32 gpioport) +{ + return GPIO_Px_DIN(gpioport); +} +/** Read input bits from a GPIO's port in data + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param gpios Bits that will be read (eg GPIO6|GPIO3 to read pins 6 and 3) + * \returns Bit pattern that contains 1 in all pin positions that currently read as high (eg GPIO6 if port A's 6th pin is currently high and the 3rd pin is low) + */ +static u16 gpio_get(u32 gpioport, u16 gpios) +{ + return gpio_port_read(gpioport) & gpios; +} + +/** Configure a particular pin configuration on one or more pins + * + * This function is not atomic. It has to be made sure that it is not + * interrupted by other code that modifies the port's configuration. + * + * @todo Find out if that is really the case (if &= and |= are atomic, the + * worst thing that happens when this function is interrupted with itself is + * that the ports stay disabled for the time being, which is to be expected + * anyway when changing a pin's mode. + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param mode Pin configuration mode to set (eg GPIO_MODE_INPUT) + * \param gpios Pins to configure (eg GPIO6|GPIO3 to set the mode on pins 6 and 3) + */ +void gpio_set_mode(u32 gpioport, u8 mode, u16 gpios); + +/** Configure the alternate drive strength for a port + * + * \param gpioport Address of a GPIO port to use (eg GPIO_PA) + * \param strength Alternate drive strength to configure for the port (eg GPIO_CTRL_DRIVEMODE_HIGH) + */ +static void gpio_set_strength(u32 gpioport, u8 strength) +{ + GPIO_Px_CTRL(gpioport) = strength; +} + +/** @} */ + +/** @} */ #endif diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile index afe1e934..a2bffc1a 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/tinygecko/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o devicerevision.o +OBJS = vector.o devicerevision.o gpio.o VPATH += ../ diff --git a/lib/efm32/tinygecko/gpio.c b/lib/efm32/tinygecko/gpio.c new file mode 100644 index 00000000..6e49f179 --- /dev/null +++ b/lib/efm32/tinygecko/gpio.c @@ -0,0 +1,23 @@ +#include + +void gpio_set_mode(u32 gpioport, u8 mode, u16 gpios) +{ + u8 i; + u32 modemaskl = 0, modesetl = 0, modemaskh = 0, modeseth = 0; + + for (i = 0; i < 8; ++i) + { + if (gpios & (1< Date: Thu, 1 Mar 2012 02:47:06 +0100 Subject: [PATCH 15/56] added efm32 lightswitch example --- .../efm32-tg-stk3300/lightswitch/Makefile | 22 +++++ .../efm32-tg-stk3300/lightswitch/README | 9 ++ .../lightswitch/lightswitch.c | 88 +++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile new file mode 100644 index 00000000..c6e785a0 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile @@ -0,0 +1,22 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2012 chrysn +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## + +BINARY = lightswitch + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README new file mode 100644 index 00000000..4b6b3338 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README @@ -0,0 +1,9 @@ +============================================ +EFM32-TG-STK3300 Examples lightswitch README +============================================ + +This is a small example program for GPIO input and output (and, in future, IRQ +handling). + +It's intended for the EFM32-TG-STK3300 eval board. It turn the User LED on when +PB0 is pressed, and off when PB1 is pressed. diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c new file mode 100644 index 00000000..7b4e0ce1 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c @@ -0,0 +1,88 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +void gpio_setup(void); +void led_on(void); +void led_off(void); +bool pb0_get(void); +bool pb1_get(void); + +/** @file + * Example for switching the User LED of the EFM32-TG-STK330 eval board on and + * off using the buttons. + */ + +int main(void) +{ + gpio_setup(); + + while(1) { + if (pb0_get()) led_on(); + if (pb1_get()) led_off(); + }; +} + +/** + * Enable GPIO, and set up port D7 as an output pin. + */ + +void gpio_setup(void) +{ + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; + + // The User LED is connected to PD7 to the plus side of the LED + // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 + // and 16.3 (called UIF_LED0) + + gpio_set_mode(GPIO_PD, GPIO_MODE_PUSHPULL, GPIO7); + + // Button PB0 is connected to pin PD8 and pulled low when pushed, + // Botton PB1 to pin PB11 (sources as for LED). Pullups and debouncing + // are alreay in place in hardware, so no filtering or pullup is + // needed. + + gpio_set_mode(GPIO_PD, GPIO_MODE_INPUT, GPIO8); + gpio_set_mode(GPIO_PB, GPIO_MODE_INPUT, GPIO11); +} + +void led_on(void) +{ + gpio_set(GPIO_PD, GPIO7); +} + +void led_off(void) +{ + gpio_clear(GPIO_PD, GPIO7); +} + +bool pb0_get(void) +{ + return !gpio_get(GPIO_PD, GPIO8); +} + +bool pb1_get(void) +{ + return !gpio_get(GPIO_PB, GPIO11); +} From eda122180a10edc3bd71ffd6c46a4f2098a0f625 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 2 Mar 2012 21:53:52 +0100 Subject: [PATCH 16/56] (efm32: remove todo that couldn't work out) --- include/libopencm3/efm32/tinygecko/gpio.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index 3e782f3f..1f4ae690 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -474,11 +474,6 @@ static u16 gpio_get(u32 gpioport, u16 gpios) * This function is not atomic. It has to be made sure that it is not * interrupted by other code that modifies the port's configuration. * - * @todo Find out if that is really the case (if &= and |= are atomic, the - * worst thing that happens when this function is interrupted with itself is - * that the ports stay disabled for the time being, which is to be expected - * anyway when changing a pin's mode. - * * \param gpioport Address of a GPIO port to use (eg GPIO_PA) * \param mode Pin configuration mode to set (eg GPIO_MODE_INPUT) * \param gpios Pins to configure (eg GPIO6|GPIO3 to set the mode on pins 6 and 3) From e388056fda84a5c85430f5a31a4cfe3af3f2e35f Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 2 Mar 2012 21:54:23 +0100 Subject: [PATCH 17/56] efm32: energy management unit headers and example --- .../efm32-tg-stk3300/lightswitch/README | 8 +- .../lightswitch/lightswitch-busywait.c | 40 ++++++ .../lightswitch/lightswitch-common.c | 88 ++++++++++++ .../lightswitch/lightswitch-interrupt.c | 71 ++++++++++ .../lightswitch/lightswitch.c | 68 +--------- include/libopencm3/efm32/tinygecko/emu.h | 125 ++++++++++++++++++ 6 files changed, 335 insertions(+), 65 deletions(-) create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c create mode 100644 include/libopencm3/efm32/tinygecko/emu.h diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README index 4b6b3338..41943dc1 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README @@ -2,8 +2,12 @@ EFM32-TG-STK3300 Examples lightswitch README ============================================ -This is a small example program for GPIO input and output (and, in future, IRQ -handling). +This is a small example program for GPIO input and output, and how the device +can be configured to use minimal power (although the example is merely +scratching the surface of what is possible powersaving-wise). It's intended for the EFM32-TG-STK3300 eval board. It turn the User LED on when PB0 is pressed, and off when PB1 is pressed. + +Various implementations are offered (-busywait, -interrupt), and can configured +in lightswitch.c. diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c new file mode 100644 index 00000000..662d9df4 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c @@ -0,0 +1,40 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#define ISER0 MMIO32(0xE000E100) +#define ICER0 MMIO32(0xE000E180) +#define ISPR0 MMIO32(0XE000E200) +#define ICPR0 MMIO32(0XE000E280) + +/** @file Simplest implementation of the lightswitch mechanism. */ + +int main(void) +{ + gpio_setup(); + + while(1) { + if (pb0_get()) + led_on(); + if (pb1_get()) + led_off(); + }; +} diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c new file mode 100644 index 00000000..0cd12042 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c @@ -0,0 +1,88 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** @file Common definitions used by all lightswitch implementations */ + +#include +#include + +/** The User LED is connected to PD7 to the plus side of the LED according to + * t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 and 16.3 (called + * UIF_LED0) + */ +#define LED_PORT GPIO_PD +#define LED_PIN GPIO7 + +#define BUTTON0_PORT GPIO_PD +#define BUTTON0_PORT_EXTIPSEL GPIO_EXTIPSEL_PORTD +#define BUTTON0_PIN_NUMBER 8 +#define BUTTON0_PIN GPIO8 +#define BUTTON1_PORT GPIO_PB +#define BUTTON1_PORT_EXTIPSEL GPIO_EXTIPSEL_PORTB +#define BUTTON1_PIN_NUMBER 11 +#define BUTTON1_PIN GPIO11 + +void gpio_setup(void); +void led_on(void); +void led_off(void); + +bool pb0_get(void); +bool pb1_get(void); + +/** + * Enable GPIO, and set up port D7 as an output pin and D8 and B11 as input. + */ + +void gpio_setup(void) +{ + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; + + gpio_set_mode(LED_PORT, GPIO_MODE_PUSHPULL, LED_PIN); + + // Button PB0 is connected to pin PD8 and pulled low when pushed, + // Botton PB1 to pin PB11 (sources as for LED). Pullups and debouncing + // are alreay in place in hardware, so no filtering or pullup is + // needed. + + gpio_set_mode(BUTTON0_PORT, GPIO_MODE_INPUT, BUTTON0_PIN); + gpio_set_mode(BUTTON1_PORT, GPIO_MODE_INPUT, BUTTON1_PIN); +} + +void led_on(void) +{ + gpio_set(LED_PORT, LED_PIN); +} + +void led_off(void) +{ + gpio_clear(LED_PORT, LED_PIN); +} + +bool pb0_get(void) +{ + return !gpio_get(GPIO_PD, GPIO8); +} + +bool pb1_get(void) +{ + return !gpio_get(GPIO_PB, GPIO11); +} diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c new file mode 100644 index 00000000..f19423ba --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c @@ -0,0 +1,71 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#define ISER0 MMIO32(0xE000E100) + +void interrupt_setup() +{ + // These are the ports the pin interrupts for 8 and 11 are to be + // configured to, and they should trigger on falling edge. + + GPIO_EXTIPSELH = (BUTTON0_PORT_EXTIPSEL << ((BUTTON0_PIN_NUMBER-8)*4)) | + (BUTTON1_PORT_EXTIPSEL << ((BUTTON1_PIN_NUMBER-8)*4)); + + GPIO_EXTIFALL = BUTTON0_PIN | BUTTON1_PIN; + + // Enable interrupts on the GPIO side + + GPIO_INSENSE = GPIO_INSENSE_INT; + GPIO_IEN = BUTTON0_PIN | BUTTON1_PIN; + + // Enable GPIO interrupts in NVIC + + ISER0 = (1<. */ -#include -#include - -void gpio_setup(void); -void led_on(void); -void led_off(void); -bool pb0_get(void); -bool pb1_get(void); - /** @file * Example for switching the User LED of the EFM32-TG-STK330 eval board on and * off using the buttons. */ -int main(void) -{ - gpio_setup(); - - while(1) { - if (pb0_get()) led_on(); - if (pb1_get()) led_off(); - }; -} - -/** - * Enable GPIO, and set up port D7 as an output pin. - */ - -void gpio_setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; - - // The User LED is connected to PD7 to the plus side of the LED - // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 - // and 16.3 (called UIF_LED0) - - gpio_set_mode(GPIO_PD, GPIO_MODE_PUSHPULL, GPIO7); - - // Button PB0 is connected to pin PD8 and pulled low when pushed, - // Botton PB1 to pin PB11 (sources as for LED). Pullups and debouncing - // are alreay in place in hardware, so no filtering or pullup is - // needed. - - gpio_set_mode(GPIO_PD, GPIO_MODE_INPUT, GPIO8); - gpio_set_mode(GPIO_PB, GPIO_MODE_INPUT, GPIO11); -} - -void led_on(void) -{ - gpio_set(GPIO_PD, GPIO7); -} - -void led_off(void) -{ - gpio_clear(GPIO_PD, GPIO7); -} - -bool pb0_get(void) -{ - return !gpio_get(GPIO_PD, GPIO8); -} +#include "lightswitch-common.c" -bool pb1_get(void) -{ - return !gpio_get(GPIO_PB, GPIO11); -} +/** Change this include to -busywait, -interrupt, or -prs (not implemented + * yet). The overall behavior will not change, but different implementations + * will be used. */ +#include "lightswitch-busywait.c" diff --git a/include/libopencm3/efm32/tinygecko/emu.h b/include/libopencm3/efm32/tinygecko/emu.h new file mode 100644 index 00000000..07327fd2 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/emu.h @@ -0,0 +1,125 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** @file + * @see EFM32TG_EMU + */ + +/** Definitions for the EMU subsystem (Energy Management Unit). + * + * This corresponds to the description in d0034_efm32tg_reference_manual.pdf + * section 10. + * + * @defgroup EFM32TG_EMU EFM32 Tiny Gecko EMU + * @{ + */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_EMU_H +#define LIBOPENCM3_EFM32_TINYGECKO_EMU_H + +#include +#include + +/** Register definitions and register value definitions for the EMU subsystem + * + * @defgroup EFM32TG_EMU_regsandvals EFM32 Tiny Gecko EMU registers and values + * @{ + */ + +/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 10.4 + * + * @defgroup EFM32TG_EMU_registers EFM32 Tiny Gecko EMU registers + * @{ + */ + +#define EMU_CTRL MMIO32(EMU_BASE + 0x000) /**< @see EFM32TG_EMU_CTRL_bits */ +#define EMU_LOCK MMIO32(EMU_BASE + 0x008) /**< @see EFM32TG_EMU_LOCK_values */ +#define EMU_AUXCTRL MMIO32(EMU_BASE + 0x024) /**< @see EFM32TG_EMU_AUXCTRL_bits */ + +/** @} */ + +/** Bit states for the EMU_CTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 10.5.1 for definitions, and + * 10.3.2 for details (especially on why EM4CTRL_TWO and _THREE are defined). + * + * @defgroup EFM32TG_EMU_CTRL_bits EFM32 Tiny Gecko EMU CTRL bits + * @{ + */ + +#define EMU_CTRL_EM4CTRL_TWO (2<<2) +#define EMU_CTRL_EM4CTRL_THREE (3<<2) +#define EMU_CTRL_EM2BLOCK (1<<1) /**< When this bit is set, no mode lower than EM1 will be entered */ +#define EMU_CTRL_EMVREG (1<<0) /**< When this bit is set, the voltage regulator will stay on in modes lower than EM1 */ + +/** @} */ + +/** Values for the EMU_LOCK register + * + * See d0034_efm32tg_reference_manual.pdf section 10.5.2. There seems not to be + * another mention of it. + * + * @defgroup EFM32TG_EMU_LOCK_values EFM32 Tiny Gecko EMU LOCK values + * @{ + */ + +#define EMU_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ +#define EMU_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ +#define EMU_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock the EMU */ +#define EMU_LOCK_SET_UNLOCKED 0xade8 /**< Write this to the LOCK register to unlock the EMU */ + +/** @} */ + +/** Bit states for the EMU_AUXCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 10.5.3 for definition, and + * 9.5.3 for details. + * + * @defgroup EFM32TG_EMU_AUXCTRL_bits EFM32 Tiny Gecko EMU AUXCTRL bits + * @{ + */ + +#define EMU_AUXCTRL_HRCCLR (1<<0) + +/** @} */ + +/** @} */ + +/** EMU convenience functions + * + * These functions can be used to send the chip to low energy modes. + * + * @todo Implement other sleep modes than EM1. Implement WFI vs WFE waits. + * + * @defgroup EFM32TG_EMU_convenience EFM32 Tiny Gecko EMU convenience functions + * @{ + */ + +/** Put the system into EM1 low energy mode. */ +static void emu_sleep_em1(void) +{ + /* FIXME: set SLEEPDEEP to 0 */ + __asm__("wfi"); +} + +/** @} */ + +/** @} */ + +#endif From 4668adcf1fa7654434ad3becda8ab4245488d981 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 3 Mar 2012 00:21:21 +0100 Subject: [PATCH 18/56] follow the license change to lgpl3 in efm32 this follows the license change of the master branches in [43561de]. all files whose copyright is not my own are originally based on files whose license has been changed in master. the expression used for the conversion was: sed -i -e 's/This program is free software: you can redistribute/This library is free software: you can redistribute/g' -e 's/under the terms of the GNU General Public License as published/under the terms of the GNU Lesser General Public License as published/' -e 's/This program is distributed in the hope that/This library is distributed in the hope that/g' -e 's/You should have received a copy of the GNU General/You should have received a copy of the GNU Lesser General/' -e 's/along with this program. If not/along with this library. If not/' -e 's/GNU General Public License for more details/GNU Lesser General Public License for more details/' */**/efm32/**/*(.) [43561de] 43561de3297b88d68753cb4625d6dc48bfb43d71 --- examples/efm32/tinygecko/Makefile.include | 12 ++++++------ .../tinygecko/efm32-tg-stk3300/Makefile.include | 12 ++++++------ .../tinygecko/efm32-tg-stk3300/lightswitch/Makefile | 12 ++++++------ .../lightswitch/lightswitch-busywait.c | 12 ++++++------ .../lightswitch/lightswitch-common.c | 12 ++++++------ .../lightswitch/lightswitch-interrupt.c | 12 ++++++------ .../efm32-tg-stk3300/lightswitch/lightswitch.c | 12 ++++++------ .../tinygecko/efm32-tg-stk3300/miniblink/Makefile | 12 ++++++------ .../tinygecko/efm32-tg-stk3300/miniblink/miniblink.c | 12 ++++++------ include/libopencm3/efm32/memorymap.h | 12 ++++++------ include/libopencm3/efm32/tinygecko/cmu.h | 12 ++++++------ include/libopencm3/efm32/tinygecko/emu.h | 12 ++++++------ include/libopencm3/efm32/tinygecko/gpio.h | 12 ++++++------ include/libopencm3/efm32/tinygecko/memorymap.h | 12 ++++++------ lib/efm32/tinygecko/Makefile | 12 ++++++------ lib/efm32/tinygecko/tinygecko.ld | 12 ++++++------ lib/efm32/tinygecko/vector.c | 12 ++++++------ 17 files changed, 102 insertions(+), 102 deletions(-) diff --git a/examples/efm32/tinygecko/Makefile.include b/examples/efm32/tinygecko/Makefile.include index 2426e988..8c42816d 100644 --- a/examples/efm32/tinygecko/Makefile.include +++ b/examples/efm32/tinygecko/Makefile.include @@ -5,18 +5,18 @@ ## Copyright (C) 2010 Piotr Esden-Tempski ## Copyright (C) 2012 chrysn ## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## This library is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. +## GNU Lesser General Public License for more details. ## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . ## PREFIX ?= arm-none-eabi diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include index a2ad07a1..c7d0f388 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include @@ -3,18 +3,18 @@ ## ## Copyright (C) 2012 chrysn ## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## This library is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. +## GNU Lesser General Public License for more details. ## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . ## MCU = EFM32TG840F32 diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile index c6e785a0..d3a1987a 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile @@ -3,18 +3,18 @@ ## ## Copyright (C) 2012 chrysn ## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## This library is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. +## GNU Lesser General Public License for more details. ## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . ## BINARY = lightswitch diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c index 662d9df4..d78d0e10 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ #include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c index 0cd12042..dcc59842 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file Common definitions used by all lightswitch implementations */ diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c index f19423ba..71a1008e 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ #include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c index b8675f8a..72a5299d 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile index a2e44dc0..cf46fb80 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile @@ -4,18 +4,18 @@ ## Copyright (C) 2009 Uwe Hermann ## 2012 chrysn ## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## This library is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. +## GNU Lesser General Public License for more details. ## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . ## BINARY = miniblink diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index e9907d37..72c3b2bd 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -4,18 +4,18 @@ * Copyright (C) 2009 Uwe Hermann * 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ #include diff --git a/include/libopencm3/efm32/memorymap.h b/include/libopencm3/efm32/memorymap.h index 481883c1..ff0e5444 100644 --- a/include/libopencm3/efm32/memorymap.h +++ b/include/libopencm3/efm32/memorymap.h @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index b0032892..63510573 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/include/libopencm3/efm32/tinygecko/emu.h b/include/libopencm3/efm32/tinygecko/emu.h index 07327fd2..307d1d60 100644 --- a/include/libopencm3/efm32/tinygecko/emu.h +++ b/include/libopencm3/efm32/tinygecko/emu.h @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index 1f4ae690..f1e097b8 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/include/libopencm3/efm32/tinygecko/memorymap.h b/include/libopencm3/efm32/tinygecko/memorymap.h index 87395b5c..abf37cec 100644 --- a/include/libopencm3/efm32/tinygecko/memorymap.h +++ b/include/libopencm3/efm32/tinygecko/memorymap.h @@ -3,18 +3,18 @@ * * Copyright (C) 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /** @file diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile index a2bffc1a..b9105091 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/tinygecko/Makefile @@ -4,18 +4,18 @@ ## Copyright (C) 2009 Uwe Hermann ## Copyright (C) 2012 chrysn ## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## This library is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. +## GNU Lesser General Public License for more details. ## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . ## LIBNAME = libopencm3_efm32tinygecko diff --git a/lib/efm32/tinygecko/tinygecko.ld b/lib/efm32/tinygecko/tinygecko.ld index db3b81f5..55d37c6e 100644 --- a/lib/efm32/tinygecko/tinygecko.ld +++ b/lib/efm32/tinygecko/tinygecko.ld @@ -4,18 +4,18 @@ * Copyright (C) 2009 Uwe Hermann , * 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ /* Generic linker script for EFM32 targets using libopencm3. */ diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c index fb8fbd4b..4c6563ee 100644 --- a/lib/efm32/tinygecko/vector.c +++ b/lib/efm32/tinygecko/vector.c @@ -4,18 +4,18 @@ * Copyright (C) 2010 Piotr Esden-Tempski , * 2012 chrysn * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . */ #include From 78c93dc779b42f94f531f81757ad4a911bd3e953 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 3 Mar 2012 00:24:58 +0100 Subject: [PATCH 19/56] add missed license headers to efm32 files some files had nonstandard shared copyright lines, fixed them too --- .../efm32-tg-stk3300/miniblink/Makefile | 2 +- .../efm32-tg-stk3300/miniblink/miniblink.c | 2 +- .../efm32/tinygecko/devicerevision.h | 19 +++++++++++++++++++ include/libopencm3/efm32/tinygecko/irq.h | 19 +++++++++++++++++++ include/libopencm3/efm32/vector.h | 19 +++++++++++++++++++ lib/efm32/tinygecko/devicerevision.c | 19 +++++++++++++++++++ lib/efm32/tinygecko/gpio.c | 19 +++++++++++++++++++ lib/efm32/tinygecko/tinygecko.ld | 2 +- lib/efm32/tinygecko/vector.c | 2 +- 9 files changed, 99 insertions(+), 4 deletions(-) diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile index cf46fb80..760b99ba 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile @@ -2,7 +2,7 @@ ## This file is part of the libopencm3 project. ## ## Copyright (C) 2009 Uwe Hermann -## 2012 chrysn +## Copyright (C) 2012 chrysn ## ## This library is free software: you can redistribute it and/or modify ## it under the terms of the GNU Lesser General Public License as published by diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c index 72c3b2bd..0269847b 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c @@ -2,7 +2,7 @@ * This file is part of the libopencm3 project. * * Copyright (C) 2009 Uwe Hermann - * 2012 chrysn + * Copyright (C) 2012 chrysn * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/include/libopencm3/efm32/tinygecko/devicerevision.h b/include/libopencm3/efm32/tinygecko/devicerevision.h index c7c64aa4..45da408a 100644 --- a/include/libopencm3/efm32/tinygecko/devicerevision.h +++ b/include/libopencm3/efm32/tinygecko/devicerevision.h @@ -1,3 +1,22 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + /* FIXME: proper documentation, see where this fits, if we need this at all * etc. this was just a first attempt at implementing something easy with * MMIO32. */ diff --git a/include/libopencm3/efm32/tinygecko/irq.h b/include/libopencm3/efm32/tinygecko/irq.h index ee0c631c..1b0a4840 100644 --- a/include/libopencm3/efm32/tinygecko/irq.h +++ b/include/libopencm3/efm32/tinygecko/irq.h @@ -1,3 +1,22 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + /** @file * * Definitions of interrupt names on EFM32 Tiny Gecko systems diff --git a/include/libopencm3/efm32/vector.h b/include/libopencm3/efm32/vector.h index ae6b9ba0..2ae55afd 100644 --- a/include/libopencm3/efm32/vector.h +++ b/include/libopencm3/efm32/vector.h @@ -1,3 +1,22 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + /** @file * * Definitions for handling vector tables. diff --git a/lib/efm32/tinygecko/devicerevision.c b/lib/efm32/tinygecko/devicerevision.c index 216ab1bd..0af3e90e 100644 --- a/lib/efm32/tinygecko/devicerevision.c +++ b/lib/efm32/tinygecko/devicerevision.c @@ -1,3 +1,22 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + #include u8 devicerevision_revision_get(void) diff --git a/lib/efm32/tinygecko/gpio.c b/lib/efm32/tinygecko/gpio.c index 6e49f179..839d1b87 100644 --- a/lib/efm32/tinygecko/gpio.c +++ b/lib/efm32/tinygecko/gpio.c @@ -1,3 +1,22 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + #include void gpio_set_mode(u32 gpioport, u8 mode, u16 gpios) diff --git a/lib/efm32/tinygecko/tinygecko.ld b/lib/efm32/tinygecko/tinygecko.ld index 55d37c6e..92f4282a 100644 --- a/lib/efm32/tinygecko/tinygecko.ld +++ b/lib/efm32/tinygecko/tinygecko.ld @@ -2,7 +2,7 @@ * This file is part of the libopencm3 project. * * Copyright (C) 2009 Uwe Hermann , - * 2012 chrysn + * Copyright (C) 2012 chrysn * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c index 4c6563ee..264426bc 100644 --- a/lib/efm32/tinygecko/vector.c +++ b/lib/efm32/tinygecko/vector.c @@ -2,7 +2,7 @@ * This file is part of the libopencm3 project. * * Copyright (C) 2010 Piotr Esden-Tempski , - * 2012 chrysn + * Copyright (C) 2012 chrysn * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by From cdf36e6c8e4d1a6a06d646629c9a00b96cecc100 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 3 Mar 2012 20:19:03 +0100 Subject: [PATCH 20/56] efm32: some more cmu registers and doxygen update --- include/libopencm3/efm32/tinygecko/cmu.h | 38 +++++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 63510573..19accd59 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -18,16 +18,17 @@ */ /** @file - * - * Definitions for the CMU (Clock Management Unit). + * @see EFM32TG_CMU + */ + +/** Definitions for the CMU (Clock Management Unit). * * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 11. * - * @see CMU_registers + * @defgroup EFM32TG_CMU EFM32 Tiny Geco CMU + * @{ */ -/* FIXME: i'd prefer not to @see CMU_registers but have some direct link placed - * automatically from a file to its groups */ #ifndef LIBOPENCM3_EFM32_TINYGECKO_CMU_H #define LIBOPENCM3_EFM32_TINYGECKO_CMU_H @@ -35,10 +36,17 @@ #include #include +/** Register definitions and register value definitions for the CMU subsystem + * + * @defgroup EFM32TG_CMU_regsandvals EFM32 Tiny Gecko CMU registers and values + * @{ + */ + /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4. * - * @defgroup CMU_registers CMU registers - * @{ */ + * @defgroup EFM32TG_CMU_registers EFM32 Tiny Gecko CMU registers + * @{ + */ #define CMU_CTRL MMIO32(CMU_BASE + 0x000) #define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) @@ -71,6 +79,10 @@ /** @} */ +/** @} */ + +/** @} */ + /** * This section is incomplete because i'm impatient and want a working result * quickly @@ -78,6 +90,16 @@ * @todo Include all bits and bit groups from the manual. */ -#define CMU_HFPERCLKEN0_GPIO (1<<6) +#define CMU_HFPERCLKEN0_GPIO (1<<6) +#define CMU_LFCLKSEL_LFB_DISABLED (0<<2) +#define CMU_LFCLKSEL_LFB_LFRCO (1<<2) +#define CMU_LFCLKSEL_LFB_LFXO (2<<2) +#define CMU_LFCLKSEL_LFB_HFCORECLKLEDIV2 (3<<2) +#define CMU_LFCLKSEL_LFB_MASK (0x03<<2) +#define CMU_LFCLKSEL_LFA_DISABLED 0 +#define CMU_LFCLKSEL_LFA_LFRCO 1 +#define CMU_LFCLKSEL_LFA_LFXO 2 +#define CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2 3 +#define CMU_LFCLKSEL_LFA_MASK 0x03 #endif From d3fe8c18f8942bc91062a8c721155582a03123ad Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 4 Mar 2012 04:23:58 +0100 Subject: [PATCH 21/56] experimental yaml based header file generation the header file genertion mechanism here is designed to: * use human readable source data that is better structured and less repetitive than the header files themselves * produce same quality header files than the manual process of writing them. some features were not yet enabled to show that the existing headers didn't change. (look at emu.h's differences. whitespace switched from tabs to spaces as they are easier to handle, use --color-words to see the few differences that stemmed from inconsistencies in the original file.) * be less tedious and thus error prone when doing large modifications (eg, i forgot to add _MASK to bitfields, would like to enable bitbanding acces, and to overhaul the naming in doxygen modules) --- .../efm32/tinygecko/cmu.convenienceheaders | 0 include/libopencm3/efm32/tinygecko/cmu.h | 562 ++++++++++++++++-- include/libopencm3/efm32/tinygecko/cmu.yaml | 437 ++++++++++++++ .../efm32/tinygecko/emu.convenienceheaders | 18 + include/libopencm3/efm32/tinygecko/emu.h | 30 +- include/libopencm3/efm32/tinygecko/emu.yaml | 50 ++ .../efm32/tinygecko/generate-license.yaml | 19 + .../libopencm3/efm32/tinygecko/generate.py | 112 ++++ .../libopencm3/efm32/tinygecko/generate.yaml | 2 + 9 files changed, 1159 insertions(+), 71 deletions(-) create mode 100644 include/libopencm3/efm32/tinygecko/cmu.convenienceheaders create mode 100644 include/libopencm3/efm32/tinygecko/cmu.yaml create mode 100644 include/libopencm3/efm32/tinygecko/emu.convenienceheaders create mode 100644 include/libopencm3/efm32/tinygecko/emu.yaml create mode 100644 include/libopencm3/efm32/tinygecko/generate-license.yaml create mode 100644 include/libopencm3/efm32/tinygecko/generate.py create mode 100644 include/libopencm3/efm32/tinygecko/generate.yaml diff --git a/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders b/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders new file mode 100644 index 00000000..e69de29b diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 19accd59..09145614 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -21,12 +21,12 @@ * @see EFM32TG_CMU */ -/** Definitions for the CMU (Clock Management Unit). +/** Definitions for the CMU subsystem (Clock Management Unit). * * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 11. * - * @defgroup EFM32TG_CMU EFM32 Tiny Geco CMU + * @defgroup EFM32TG_CMU EFM32 Tiny Gecko CMU * @{ */ @@ -42,64 +42,514 @@ * @{ */ -/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4. +/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4 * * @defgroup EFM32TG_CMU_registers EFM32 Tiny Gecko CMU registers * @{ */ -#define CMU_CTRL MMIO32(CMU_BASE + 0x000) -#define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) -#define CMU_HFPERCLKDIV MMIO32(CMU_BASE + 0x008) -#define CMU_HFRCOCTRL MMIO32(CMU_BASE + 0x00C) -#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) -#define CMU_AUXHFRCOCTRL MMIO32(CMU_BASE + 0x014) -#define CMU_CALCTRL MMIO32(CMU_BASE + 0x018) -#define CMU_CALCNT MMIO32(CMU_BASE + 0x01C) -#define CMU_OSCENCMD MMIO32(CMU_BASE + 0x020) -#define CMU_CMD MMIO32(CMU_BASE + 0x024) -#define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) -#define CMU_STATUS MMIO32(CMU_BASE + 0x02C) -#define CMU_IF MMIO32(CMU_BASE + 0x030) -#define CMU_IFS MMIO32(CMU_BASE + 0x034) -#define CMU_IFC MMIO32(CMU_BASE + 0x038) -#define CMU_IEN MMIO32(CMU_BASE + 0x03C) -#define CMU_HFCORECLKEN0 MMIO32(CMU_BASE + 0x040) -#define CMU_HFPERCLKEN0 MMIO32(CMU_BASE + 0x044) -#define CMU_SYNCBUSY MMIO32(CMU_BASE + 0x050) -#define CMU_FREEZE MMIO32(CMU_BASE + 0x054) -#define CMU_LFACLKEN0 MMIO32(CMU_BASE + 0x058) -#define CMU_LFBCLKEN0 MMIO32(CMU_BASE + 0x060) -#define CMU_LFAPRESC0 MMIO32(CMU_BASE + 0x068) -#define CMU_LFBPRESC0 MMIO32(CMU_BASE + 0x070) -#define CMU_PCNTCTRL MMIO32(CMU_BASE + 0x078) -#define CMU_LCDCTRL MMIO32(CMU_BASE + 0x07C) -#define CMU_ROUTE MMIO32(CMU_BASE + 0x080) -#define CMU_LOCK MMIO32(CMU_BASE + 0x084) - -/** @} */ - -/** @} */ - -/** @} */ - -/** - * This section is incomplete because i'm impatient and want a working result - * quickly - * - * @todo Include all bits and bit groups from the manual. - */ - -#define CMU_HFPERCLKEN0_GPIO (1<<6) -#define CMU_LFCLKSEL_LFB_DISABLED (0<<2) -#define CMU_LFCLKSEL_LFB_LFRCO (1<<2) -#define CMU_LFCLKSEL_LFB_LFXO (2<<2) -#define CMU_LFCLKSEL_LFB_HFCORECLKLEDIV2 (3<<2) -#define CMU_LFCLKSEL_LFB_MASK (0x03<<2) -#define CMU_LFCLKSEL_LFA_DISABLED 0 -#define CMU_LFCLKSEL_LFA_LFRCO 1 -#define CMU_LFCLKSEL_LFA_LFXO 2 -#define CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2 3 -#define CMU_LFCLKSEL_LFA_MASK 0x03 +#define CMU_CTRL MMIO32(CMU_BASE + 0x000) /**< @see EFM32TG_CMU_CTRL_bits */ +#define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) /**< @see EFM32TG_CMU_HFCORECLKDIV_values */ +#define CMU_HFPERCLKDIV MMIO32(CMU_BASE + 0x008) /**< @see EFM32TG_CMU_HFPERCLKDIV_bits */ +#define CMU_HFRCOCTRL MMIO32(CMU_BASE + 0x00c) /**< @see EFM32TG_CMU_HFRCOCTRL_bits */ +#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) /**< @see EFM32TG_CMU_LFRCOCTRL_bits */ +#define CMU_AUXHFRCOCTRL MMIO32(CMU_BASE + 0x014) /**< @see EFM32TG_CMU_AUXHFRCOCTRL_bits */ +#define CMU_CALCTRL MMIO32(CMU_BASE + 0x018) /**< @see EFM32TG_CMU_CALCTRL_bits */ +#define CMU_CALCNT MMIO32(CMU_BASE + 0x01c) /**< @see EFM32TG_CMU_CALCNT_bits */ +#define CMU_OSCENCMD MMIO32(CMU_BASE + 0x020) /**< @see EFM32TG_CMU_OSCENCMD_bits */ +#define CMU_CMD MMIO32(CMU_BASE + 0x024) /**< @see EFM32TG_CMU_CMD_bits */ +#define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) /**< @see EFM32TG_CMU_LFCLKSEL_bits */ +#define CMU_STATUS MMIO32(CMU_BASE + 0x02c) /**< @see EFM32TG_CMU_STATUS_bits */ +#define CMU_IF MMIO32(CMU_BASE + 0x030) /**< @see EFM32TG_CMU_IF_bits */ +#define CMU_IFS MMIO32(CMU_BASE + 0x034) /**< @see EFM32TG_CMU_IFS_bits */ +#define CMU_IFC MMIO32(CMU_BASE + 0x038) /**< @see EFM32TG_CMU_IFC_bits */ +#define CMU_IEN MMIO32(CMU_BASE + 0x03c) /**< @see EFM32TG_CMU_IEN_bits */ +#define CMU_HFCORECLKEN0 MMIO32(CMU_BASE + 0x040) /**< @see EFM32TG_CMU_HFCORECLKEN0_bits */ +#define CMU_HFPERCLKEN0 MMIO32(CMU_BASE + 0x044) /**< @see EFM32TG_CMU_HFPERCLKEN0_bits */ +#define CMU_SYNCBUSY MMIO32(CMU_BASE + 0x050) /**< @see EFM32TG_CMU_SYNCBUSY_bits */ +#define CMU_FREEZE MMIO32(CMU_BASE + 0x054) /**< @see EFM32TG_CMU_FREEZE_bits */ +#define CMU_LFACLKEN0 MMIO32(CMU_BASE + 0x058) /**< @see EFM32TG_CMU_LFACLKEN0_bits */ +#define CMU_LFBCLKEN0 MMIO32(CMU_BASE + 0x060) /**< @see EFM32TG_CMU_LFBCLKEN0_bits */ +#define CMU_LFAPRESC0 MMIO32(CMU_BASE + 0x068) /**< @see EFM32TG_CMU_LFAPRESC0_bits */ +#define CMU_LFBPRESC0 MMIO32(CMU_BASE + 0x070) /**< @see EFM32TG_CMU_LFBPRESC0_bits */ +#define CMU_PCNTCTRL MMIO32(CMU_BASE + 0x078) /**< @see EFM32TG_CMU_PCNTCTRL_bits */ +#define CMU_LCDCTRL MMIO32(CMU_BASE + 0x07c) /**< @see EFM32TG_CMU_LCDCTRL_bits */ +#define CMU_ROUTE MMIO32(CMU_BASE + 0x080) /**< @see EFM32TG_CMU_ROUTE_bits */ +#define CMU_LOCK MMIO32(CMU_BASE + 0x084) /**< @see EFM32TG_CMU_LOCK_values */ + +/** @} */ + +/** Bit states for the CMU_CTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.1 for definitions. + * + * @defgroup EFM32TG_CMU_CTRL_bits EFM32 Tiny Gecko CMU CTRL bits + * @{ + */ + +#define CMU_CTRL_DBGCLK_AUXHFRCO (0<<28) +#define CMU_CTRL_DBGCLK_HFCLK (1<<28) +#define CMU_CTRL_CLKOUTSEL1_LFRCO (0<<23) +#define CMU_CTRL_CLKOUTSEL1_LFXO (1<<23) +#define CMU_CTRL_CLKOUTSEL1_HFCLK (2<<23) +#define CMU_CTRL_CLKOUTSEL1_LFXOQ (3<<23) +#define CMU_CTRL_CLKOUTSEL1_HFXOQ (4<<23) +#define CMU_CTRL_CLKOUTSEL1_LFRCOQ (5<<23) +#define CMU_CTRL_CLKOUTSEL1_HFRCOQ (6<<23) +#define CMU_CTRL_CLKOUTSEL1_AUXHFRCOQ (7<<23) +#define CMU_CTRL_CLKOUTSEL0_LFRCO (0<<20) +#define CMU_CTRL_CLKOUTSEL0_LFXO (1<<20) +#define CMU_CTRL_CLKOUTSEL0_HFCLK (2<<20) +#define CMU_CTRL_CLKOUTSEL0_LFXOQ (3<<20) +#define CMU_CTRL_CLKOUTSEL0_HFXOQ (4<<20) +#define CMU_CTRL_CLKOUTSEL0_LFRCOQ (5<<20) +#define CMU_CTRL_CLKOUTSEL0_HFRCOQ (6<<20) +#define CMU_CTRL_CLKOUTSEL0_AUXHFRCOQ (7<<20) +#define CMU_CTRL_LFXOTIMEOUT_8CYCLES (0<<18) +#define CMU_CTRL_LFXOTIMEOUT_1KCYCLES (1<<18) +#define CMU_CTRL_LFXOTIMEOUT_16KCYCLES (2<<18) +#define CMU_CTRL_LFXOTIMEOUT_32KCYCLES (3<<18) +#define CMU_CTRL_LFXOBUFCUR (1<<17) +#define CMU_CTRL_LXFOBOOST_70PCENT (0<<13) +#define CMU_CTRL_LXFOBOOST_100PCENT (1<<13) +#define CMU_CTRL_LFXOMODE_XTAL (0<<11) +#define CMU_CTRL_LFXOMODE_BUFEXTCLK (1<<11) +#define CMU_CTRL_LFXOMODE_DIGEXTCLK (2<<11) +#define CMU_CTRL_HFXOTIMEOUT_8CYCLES (0<<9) +#define CMU_CTRL_HFXOTIMEOUT_256CYCLES (1<<9) +#define CMU_CTRL_HFXOTIMEOUT_1KCYCLES (2<<9) +#define CMU_CTRL_HFXOTIMEOUT_16KCYCLES (3<<9) +#define CMU_CTRL_HFXOGLITCHDETEN (1<<7) +/* No values defined for the field HFXOBUFCUR */ +#define CMU_CTRL_HFXOBOOST_50PCENT (0<<2) +#define CMU_CTRL_HFXOBOOST_70PCENT (1<<2) +#define CMU_CTRL_HFXOBOOST_80PCENT (2<<2) +#define CMU_CTRL_HFXOBOOST_100PCENT (3<<2) +#define CMU_CTRL_HFXOMODE_XTAL (0<<0) +#define CMU_CTRL_HFXOMODE_BUFEXTCLK (1<<0) +#define CMU_CTRL_HFXOMODE_DIGEXTCLK (2<<0) + +/** @} */ + +/** Values for the CMU_HFCORECLKDIV register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.2 for definitions. + * + * @defgroup EFM32TG_CMU_HFCORECLKDIV_values EFM32 Tiny Gecko CMU HFCORECLKDIV + * values + * @{ + */ + +#define CMU_HFCORECLKDIV_HFCLK 0 +#define CMU_HFCORECLKDIV_HFCLK2 1 +#define CMU_HFCORECLKDIV_HFCLK4 2 +#define CMU_HFCORECLKDIV_HFCLK8 3 +#define CMU_HFCORECLKDIV_HFCLK16 4 +#define CMU_HFCORECLKDIV_HFCLK32 5 +#define CMU_HFCORECLKDIV_HFCLK64 6 +#define CMU_HFCORECLKDIV_HFCLK128 7 +#define CMU_HFCORECLKDIV_HFCLK256 8 +#define CMU_HFCORECLKDIV_HFCLK512 9 + +/** @} */ + +/** Bit states for the CMU_HFPERCLKDIV register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.3 for definitions. + * + * @defgroup EFM32TG_CMU_HFPERCLKDIV_bits EFM32 Tiny Gecko CMU HFPERCLKDIV bits + * @{ + */ + +#define CMU_HFPERCLKDIV_HFPERCLKEN (1<<8) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK (0<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK2 (1<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK4 (2<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK8 (3<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK16 (4<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK32 (5<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK64 (6<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK128 (7<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK256 (8<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK512 (9<<0) + +/** @} */ + +/** Bit states for the CMU_HFRCOCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.4 for definitions. + * + * @defgroup EFM32TG_CMU_HFRCOCTRL_bits EFM32 Tiny Gecko CMU HFRCOCTRL bits + * @{ + */ + +/* No values defined for the field SUDELAY */ +#define CMU_HFRCOCTRL_BAND_1MHZ (0<<8) +#define CMU_HFRCOCTRL_BAND_7MHZ (1<<8) +#define CMU_HFRCOCTRL_BAND_11MHZ (2<<8) +#define CMU_HFRCOCTRL_BAND_14MHZ (3<<8) +#define CMU_HFRCOCTRL_BAND_21MHZ (4<<8) +#define CMU_HFRCOCTRL_BAND_28MHZ (5<<8) +/* No values defined for the field TUNING */ + +/** @} */ + +/** Bit states for the CMU_AUXHFRCOCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.6 for definitions. + * + * @defgroup EFM32TG_CMU_AUXHFRCOCTRL_bits EFM32 Tiny Gecko CMU AUXHFRCOCTRL + * bits + * @{ + */ + +#define CMU_AUXHFRCOCTRL_BAND_14MHZ (0<<8) +#define CMU_AUXHFRCOCTRL_BAND_11MHZ (1<<8) +#define CMU_AUXHFRCOCTRL_BAND_7MHZ (2<<8) +#define CMU_AUXHFRCOCTRL_BAND_1MHZ (3<<8) +#define CMU_AUXHFRCOCTRL_BAND_28MHZ (6<<8) +#define CMU_AUXHFRCOCTRL_BAND_21MHZ (7<<8) +/* No values defined for the field TUNING */ + +/** @} */ + +/** Bit states for the CMU_CALCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.6.7 for definitions. + * + * @defgroup EFM32TG_CMU_CALCTRL_bits EFM32 Tiny Gecko CMU CALCTRL bits + * @{ + */ + +#define CMU_CALCTRL_CONT (1<<6) +#define CMU_CALCTRL_DOWNSEL_HFCLK (0<<3) +#define CMU_CALCTRL_DOWNSEL_HFXO (1<<3) +#define CMU_CALCTRL_DOWNSEL_LFXO (2<<3) +#define CMU_CALCTRL_DOWNSEL_HFRCO (3<<3) +#define CMU_CALCTRL_DOWNSEL_LFRCO (4<<3) +#define CMU_CALCTRL_DOWNSEL_AUXHFRCO (5<<3) +#define CMU_CALCTRL_UPSEL_HFXO (0<<0) +#define CMU_CALCTRL_UPSEL_LFXO (1<<0) +#define CMU_CALCTRL_UPSEL_HFRCO (2<<0) +#define CMU_CALCTRL_UPSEL_LFRCO (3<<0) +#define CMU_CALCTRL_UPSEL_AUXHFRCO (4<<0) + +/** @} */ + +/** Bit states for the CMU_OSCENCMD register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.9 for definitions. + * + * @defgroup EFM32TG_CMU_OSCENCMD_bits EFM32 Tiny Gecko CMU OSCENCMD bits + * @{ + */ + +#define CMU_OSCENCMD_LFXODIS (1<<9) +#define CMU_OSCENCMD_LFXOEN (1<<8) +#define CMU_OSCENCMD_LFRCODIS (1<<7) +#define CMU_OSCENCMD_LFRCOEN (1<<6) +#define CMU_OSCENCMD_AUXHFRCODIS (1<<5) +#define CMU_OSCENCMD_AUXHFRCOEN (1<<4) +#define CMU_OSCENCMD_HFXODIS (1<<3) +#define CMU_OSCENCMD_HFXOEN (1<<2) +#define CMU_OSCENCMD_HFRCODIS (1<<1) +#define CMU_OSCENCMD_HFRCOEN (1<<0) + +/** @} */ + +/** Bit states for the CMU_CMD register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.10 for definitions. + * + * @defgroup EFM32TG_CMU_CMD_bits EFM32 Tiny Gecko CMU CMD bits + * @{ + */ + +#define CMU_CMD_CALSTOP (1<<4) +#define CMU_CMD_CALSTART (1<<3) +#define CMU_CMD_HFCLKSEL_HFRCO (1<<0) +#define CMU_CMD_HFCLKSEL_HFXO (2<<0) +#define CMU_CMD_HFCLKSEL_LFRCO (3<<0) +#define CMU_CMD_HFCLKSEL_LFXO (4<<0) + +/** @} */ + +/** Bit states for the CMU_LFCLKSEL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.11 for definitions. + * + * @defgroup EFM32TG_CMU_LFCLKSEL_bits EFM32 Tiny Gecko CMU LFCLKSEL bits + * @{ + */ + +#define CMU_LFCLKSEL_LFBE_DISABLED (0<<20) +#define CMU_LFCLKSEL_LFBE_ULFRCO (1<<20) +#define CMU_LFCLKSEL_LFAE_DISABLED (0<<16) +#define CMU_LFCLKSEL_LFAE_ULFRCO (1<<16) +#define CMU_LFCLKSEL_LFB_DISABLED (0<<2) +#define CMU_LFCLKSEL_LFB_LFRCO (1<<2) +#define CMU_LFCLKSEL_LFB_LFXO (2<<2) +#define CMU_LFCLKSEL_LFB_HFCORECLKLEDIV2 (3<<2) +#define CMU_LFCLKSEL_LFA_DISABLED (0<<0) +#define CMU_LFCLKSEL_LFA_LFRCO (1<<0) +#define CMU_LFCLKSEL_LFA_LFXO (2<<0) +#define CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2 (3<<0) + +/** @} */ + +/** Bit states for the CMU_STATUS register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.12 for definitions. + * + * @defgroup EFM32TG_CMU_STATUS_bits EFM32 Tiny Gecko CMU STATUS bits + * @{ + */ + +#define CMU_STATUS_CALBSY (1<<14) +#define CMU_STATUS_LFXOSEL (1<<13) +#define CMU_STATUS_LFRCOSEL (1<<12) +#define CMU_STATUS_HFXOSEL (1<<11) +#define CMU_STATUS_HFRCOSEL (1<<10) +#define CMU_STATUS_LFXORDY (1<<9) +#define CMU_STATUS_LFXOENS (1<<8) +#define CMU_STATUS_LFRCORDY (1<<7) +#define CMU_STATUS_LFRCOENS (1<<6) +#define CMU_STATUS_AUXHFRCORDY (1<<5) +#define CMU_STATUS_AUXHFRCOENS (1<<4) +#define CMU_STATUS_HFXORDY (1<<3) +#define CMU_STATUS_HFXOENS (1<<2) +#define CMU_STATUS_HFRCORDY (1<<1) +#define CMU_STATUS_HFRCOENS (1<<0) + +/** @} */ + +/** Bit states for the CMU_HFCORECLKEN0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.17 for definitions. + * + * @defgroup EFM32TG_CMU_HFCORECLKEN0_bits EFM32 Tiny Gecko CMU HFCORECLKEN0 + * bits + * @{ + */ + +#define CMU_HFCORECLKEN0_LE (1<<2) +#define CMU_HFCORECLKEN0_DMA (1<<1) +#define CMU_HFCORECLKEN0_AES (1<<0) + +/** @} */ + +/** Bit states for the CMU_HFPERCLKEN0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.18 for definitions. + * + * @defgroup EFM32TG_CMU_HFPERCLKEN0_bits EFM32 Tiny Gecko CMU HFPERCLKEN0 bits + * @{ + */ + +#define CMU_HFPERCLKEN0_I2C0 (1<<11) +#define CMU_HFPERCLKEN0_DAC0 (1<<10) +#define CMU_HFPERCLKEN0_ADC0 (1<<9) +#define CMU_HFPERCLKEN0_PRS (1<<8) +#define CMU_HFPERCLKEN0_VCMP (1<<7) +#define CMU_HFPERCLKEN0_GPIO (1<<6) +#define CMU_HFPERCLKEN0_TIMER1 (1<<5) +#define CMU_HFPERCLKEN0_TIMER0 (1<<4) +#define CMU_HFPERCLKEN0_USART1 (1<<3) +#define CMU_HFPERCLKEN0_USART0 (1<<2) +#define CMU_HFPERCLKEN0_ACMP1 (1<<1) +#define CMU_HFPERCLKEN0_ACMP0 (1<<0) + +/** @} */ + +/** Bit states for the CMU_SYNCBUSY register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.19 for definitions. + * + * @defgroup EFM32TG_CMU_SYNCBUSY_bits EFM32 Tiny Gecko CMU SYNCBUSY bits + * @{ + */ + +#define CMU_SYNCBUSY_LFBPRESC0 (1<<6) +#define CMU_SYNCBUSY_LFBCLKEN0 (1<<4) +#define CMU_SYNCBUSY_LFAPRESC0 (1<<2) +#define CMU_SYNCBUSY_LFACLKEN0 (1<<0) + +/** @} */ + +/** Bit states for the CMU_FREEZE register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.20 for definitions. + * + * @defgroup EFM32TG_CMU_FREEZE_bits EFM32 Tiny Gecko CMU FREEZE bits + * @{ + */ + +#define CMU_FREEZE_REGFREEZE_UPDATE (0<<0) +#define CMU_FREEZE_REGFREEZE_FREEZE (1<<0) + +/** @} */ + +/** Bit states for the CMU_LFACLKEN0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.21 for definitions. + * + * @defgroup EFM32TG_CMU_LFACLKEN0_bits EFM32 Tiny Gecko CMU LFACLKEN0 bits + * @{ + */ + +#define CMU_LFACLKEN0_LCD (1<<3) +#define CMU_LFACLKEN0_LETIMER0 (1<<2) +#define CMU_LFACLKEN0_RTC (1<<1) +#define CMU_LFACLKEN0_LESENSE (1<<0) + +/** @} */ + +/** Bit states for the CMU_LFBCLKEN0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.22 for definitions. + * + * @defgroup EFM32TG_CMU_LFBCLKEN0_bits EFM32 Tiny Gecko CMU LFBCLKEN0 bits + * @{ + */ + +#define CMU_LFBCLKEN0_LEUART0 (1<<0) + +/** @} */ + +/** Bit states for the CMU_LFAPRESC0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.23 for definitions. + * + * @defgroup EFM32TG_CMU_LFAPRESC0_bits EFM32 Tiny Gecko CMU LFAPRESC0 bits + * @{ + */ + +#define CMU_LFAPRESC0_LCD_DIV16 (0<<12) +#define CMU_LFAPRESC0_LCD_DIV32 (1<<12) +#define CMU_LFAPRESC0_LCD_DIV64 (2<<12) +#define CMU_LFAPRESC0_LCD_DIV128 (3<<12) +#define CMU_LFAPRESC0_LETIMER0_DIV1 (0<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV2 (1<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV4 (2<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV8 (3<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV16 (4<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV32 (5<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV64 (6<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV128 (7<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV256 (8<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV512 (9<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV1024 (10<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV2048 (11<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV4096 (12<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV8192 (13<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV16384 (14<<8) +#define CMU_LFAPRESC0_LETIMER0_DIV32768 (15<<8) +#define CMU_LFAPRESC0_RTC_DIV1 (0<<4) +#define CMU_LFAPRESC0_RTC_DIV2 (1<<4) +#define CMU_LFAPRESC0_RTC_DIV4 (2<<4) +#define CMU_LFAPRESC0_RTC_DIV8 (3<<4) +#define CMU_LFAPRESC0_RTC_DIV16 (4<<4) +#define CMU_LFAPRESC0_RTC_DIV32 (5<<4) +#define CMU_LFAPRESC0_RTC_DIV64 (6<<4) +#define CMU_LFAPRESC0_RTC_DIV128 (7<<4) +#define CMU_LFAPRESC0_RTC_DIV256 (8<<4) +#define CMU_LFAPRESC0_RTC_DIV512 (9<<4) +#define CMU_LFAPRESC0_RTC_DIV1024 (10<<4) +#define CMU_LFAPRESC0_RTC_DIV2048 (11<<4) +#define CMU_LFAPRESC0_RTC_DIV4096 (12<<4) +#define CMU_LFAPRESC0_RTC_DIV8192 (13<<4) +#define CMU_LFAPRESC0_RTC_DIV16384 (14<<4) +#define CMU_LFAPRESC0_RTC_DIV32768 (15<<4) +#define CMU_LFAPRESC0_LESENSE_DIV1 (0<<0) +#define CMU_LFAPRESC0_LESENSE_DIV2 (1<<0) +#define CMU_LFAPRESC0_LESENSE_DIV4 (2<<0) +#define CMU_LFAPRESC0_LESENSE_DIV8 (3<<0) + +/** @} */ + +/** Bit states for the CMU_LFBPRESC0 register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.24 for definitions. + * + * @defgroup EFM32TG_CMU_LFBPRESC0_bits EFM32 Tiny Gecko CMU LFBPRESC0 bits + * @{ + */ + +#define CMU_LFBPRESC0_LEUART0_DIV1 (0<<0) +#define CMU_LFBPRESC0_LEUART0_DIV2 (1<<0) +#define CMU_LFBPRESC0_LEUART0_DIV4 (2<<0) +#define CMU_LFBPRESC0_LEUART0_DIV8 (3<<0) + +/** @} */ + +/** Bit states for the CMU_PCNTCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.25 for definitions. + * + * @defgroup EFM32TG_CMU_PCNTCTRL_bits EFM32 Tiny Gecko CMU PCNTCTRL bits + * @{ + */ + +#define CMU_PCNTCTRL_PCNT0CLKSEL_LFACLK (0<<1) +#define CMU_PCNTCTRL_PCNT0CLKSEL_PCNT0S0 (1<<1) +#define CMU_PCNTCTRL_PCNT0CLKEN (1<<0) + +/** @} */ + +/** Bit states for the CMU_LCDCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.26 for definitions. + * + * @defgroup EFM32TG_CMU_LCDCTRL_bits EFM32 Tiny Gecko CMU LCDCTRL bits + * @{ + */ + +#define CMU_LCDCTRL_VBFDIV_DIV1 (0<<4) +#define CMU_LCDCTRL_VBFDIV_DIV2 (1<<4) +#define CMU_LCDCTRL_VBFDIV_DIV4 (2<<4) +#define CMU_LCDCTRL_VBFDIV_DIV8 (3<<4) +#define CMU_LCDCTRL_VBFDIV_DIV16 (4<<4) +#define CMU_LCDCTRL_VBFDIV_DIV32 (5<<4) +#define CMU_LCDCTRL_VBFDIV_DIV64 (6<<4) +#define CMU_LCDCTRL_VBFDIV_DIV128 (7<<4) +#define CMU_LCDCTRL_VBOOSTEN (1<<3) +/* No values defined for the field FDIV */ + +/** @} */ + +/** Bit states for the CMU_ROUTE register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.27 for definitions. + * + * @defgroup EFM32TG_CMU_ROUTE_bits EFM32 Tiny Gecko CMU ROUTE bits + * @{ + */ + +#define CMU_ROUTE_LOCATION_LOC0 (0<<4) +#define CMU_ROUTE_LOCATION_LOC1 (1<<4) +#define CMU_ROUTE_CLKOUT1PEN (1<<1) +#define CMU_ROUTE_CLKOUT0PEN (1<<0) + +/** @} */ + +/** Values for the CMU_LOCK register + * + * See d0034_efm32tg_reference_manual.pdf section 11.5.28 for definitions. + * + * @defgroup EFM32TG_CMU_LOCK_values EFM32 Tiny Gecko CMU LOCK values + * @{ + */ + +#define CMU_LOCK_IS_UNLOCKED 0 +#define CMU_LOCK_IS_LOCKED 1 +#define CMU_LOCK_SET_LOCKED 0 +#define CMU_LOCK_SET_UNLOCKED 0x580E + +/** @} */ + +/** @} */ + + +/** @} */ #endif diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml new file mode 100644 index 00000000..52906f76 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/cmu.yaml @@ -0,0 +1,437 @@ +copyright: "2012 chrysn " +license: lgpl-3+ +shortdocname: EFM32TG_CMU +longdocname: EFM32 Tiny Gecko CMU +shortname: CMU +longname: Clock Management Unit +baseref: d0034_efm32tg_reference_manual.pdf section 11 +registers_baserefext: ".4" +registers: + - name: CTRL + offset: 0x000 + definition_baserefext: ".5.1" + fields: + - name: DBGCLK + shift: 28 + values: + - {name: AUXHFRCO, value: 0} + - {name: HFCLK, value: 1} + - name: CLKOUTSEL1 + shift: 23 + length: 3 + values: &CLKOUTSEL1_values + - {name: LFRCO, value: 0} + - {name: LFXO, value: 1} + - {name: HFCLK, value: 2} + - {name: LFXOQ, value: 3} + - {name: HFXOQ, value: 4} + - {name: LFRCOQ, value: 5} + - {name: HFRCOQ, value: 6} + - {name: AUXHFRCOQ, value: 7} + - name: CLKOUTSEL0 + shift: 20 + length: 3 + values: *CLKOUTSEL1_values + - name: LFXOTIMEOUT + shift: 18 + length: 2 + values: + - {name: 8CYCLES, value: 0} + - {name: 1KCYCLES, value: 1} + - {name: 16KCYCLES, value: 2} + - {name: 32KCYCLES, value: 3} + - name: LFXOBUFCUR + shift: 17 + - name: LXFOBOOST + shift: 13 + values: + - {name: 70PCENT, value: 0} + - {name: 100PCENT, value: 1} + - name: LFXOMODE + shift: 11 + length: 2 + values: + - {name: XTAL, value: 0} + - {name: BUFEXTCLK, value: 1} + - {name: DIGEXTCLK, value: 2} + - name: HFXOTIMEOUT + shift: 9 + length: 2 + values: + - {name: 8CYCLES, value: 0} + - {name: 256CYCLES, value: 1} + - {name: 1KCYCLES, value: 2} + - {name: 16KCYCLES, value: 3} + - name: HFXOGLITCHDETEN + shift: 7 + - name: HFXOBUFCUR + shift: 5 + length: 2 + type: undocumented + - name: HFXOBOOST + shift: 2 + length: 2 + values: + - {name: 50PCENT, value: 0} + - {name: 70PCENT, value: 1} + - {name: 80PCENT, value: 2} + - {name: 100PCENT, value: 3} + - name: HFXOMODE + shift: 0 + length: 2 + values: + - {name: XTAL, value: 0} + - {name: BUFEXTCLK, value: 1} + - {name: DIGEXTCLK, value: 2} + - name: HFCORECLKDIV + offset: 0x004 + definition_baserefext: ".5.2" + values: &HFCORECLKDIV_values + - {value: 0, name: HFCLK} + - {value: 1, name: HFCLK2} + - {value: 2, name: HFCLK4} + - {value: 3, name: HFCLK8} + - {value: 4, name: HFCLK16} + - {value: 5, name: HFCLK32} + - {value: 6, name: HFCLK64} + - {value: 7, name: HFCLK128} + - {value: 8, name: HFCLK256} + - {value: 9, name: HFCLK512} + - name: HFPERCLKDIV + offset: 0x008 + definition_baserefext: ".5.3" + fields: + - name: HFPERCLKEN + shift: 8 + - name: HFPERCLKDIV + shift: 0 + length: 3 + # not using generically named values here due to different register structure + values: *HFCORECLKDIV_values + - name: HFRCOCTRL + offset: 0x00c + definition_baserefext: ".5.4" + fields: + - name: SUDELAY + shift: 12 + length: 5 + type: undocumented + - name: BAND + shift: 8 + length: 3 + values: + - {value: 0, name: 1MHZ} + - {value: 1, name: 7MHZ} + - {value: 2, name: 11MHZ} + - {value: 3, name: 14MHZ} + - {value: 4, name: 21MHZ} + - {value: 5, name: 28MHZ} + - name: TUNING + shift: 0 + length: 8 + type: uint + - name: LFRCOCTRL + offset: 0x010 + definition_baserefext: ".5.5" + length: 7 + - name: AUXHFRCOCTRL + offset: 0x014 + definition_baserefext: ".5.6" + fields: + - name: BAND + shift: 8 + length: 3 + values: + - {value: 0, name: 14MHZ} + - {value: 1, name: 11MHZ} + - {value: 2, name: 7MHZ} + - {value: 3, name: 1MHZ} + - {value: 6, name: 28MHZ} + - {value: 7, name: 21MHZ} + - name: TUNING + shift: 0 + length: 8 + type: uint + - name: CALCTRL + offset: 0x018 + definition_baserefext: ".6.7" + fields: + - name: CONT + shift: 6 + - name: DOWNSEL + shift: 3 + length: 3 + values: + - {value: 0, name: HFCLK} + - {value: 1, name: HFXO} + - {value: 2, name: LFXO} + - {value: 3, name: HFRCO} + - {value: 4, name: LFRCO} + - {value: 5, name: AUXHFRCO} + - name: UPSEL + shift: 0 + length: 3 + values: + - {value: 0, name: HFXO} + - {value: 1, name: LFXO} + - {value: 2, name: HFRCO} + - {value: 3, name: LFRCO} + - {value: 4, name: AUXHFRCO} + - name: CALCNT + offset: 0x01c + definition_baserefext: ".5.8" + length: 19 + - name: OSCENCMD + offset: 0x020 + definition_baserefext: ".5.9" + fields: + - {name: LFXODIS, shift: 9} + - {name: LFXOEN, shift: 8} + - {name: LFRCODIS, shift: 7} + - {name: LFRCOEN, shift: 6} + - {name: AUXHFRCODIS, shift: 5} + - {name: AUXHFRCOEN, shift: 4} + - {name: HFXODIS, shift: 3} + - {name: HFXOEN, shift: 2} + - {name: HFRCODIS, shift: 1} + - {name: HFRCOEN, shift: 0} + - name: CMD + offset: 0x024 + definition_baserefext: ".5.10" + fields: + - name: CALSTOP + shift: 4 + - name: CALSTART + shift: 3 + - name: HFCLKSEL + shift: 0 + length: 3 + values: + - {value: 1, name: HFRCO} + - {value: 2, name: HFXO} + - {value: 3, name: LFRCO} + - {value: 4, name: LFXO} + - name: LFCLKSEL + offset: 0x028 + definition_baserefext: ".5.11" + fields: + - name: LFBE + shift: 20 + values: &LFCLKSEL_LFBE + - {value: 0, name: DISABLED} + - {value: 1, name: ULFRCO} + - name: LFAE + shift: 16 + values: *LFCLKSEL_LFBE + - name: LFB + shift: 2 + length: 2 + values: &LFCLKSEL_LFB + - {value: 0, name: DISABLED} + - {value: 1, name: LFRCO} + - {value: 2, name: LFXO} + - {value: 3, name: HFCORECLKLEDIV2} + - name: LFA + shift: 0 + length: 2 + values: *LFCLKSEL_LFB + - name: STATUS + offset: 0x02c + definition_baserefext: ".5.12" + fields: + - {name: CALBSY, shift: 14} + - {name: LFXOSEL, shift: 13} + - {name: LFRCOSEL, shift: 12} + - {name: HFXOSEL, shift: 11} + - {name: HFRCOSEL, shift: 10} + - {name: LFXORDY, shift: 9} + - {name: LFXOENS, shift: 8} + - {name: LFRCORDY, shift: 7} + - {name: LFRCOENS, shift: 6} + - {name: AUXHFRCORDY, shift: 5} + - {name: AUXHFRCOENS, shift: 4} + - {name: HFXORDY, shift: 3} + - {name: HFXOENS, shift: 2} + - {name: HFRCORDY, shift: 1} + - {name: HFRCOENS, shift: 0} + - name: IF + offset: 0x030 + definition_baserefext: ".5.13" + #fields: I + - name: IFS + offset: 0x034 + definition_baserefext: ".5.14" + #fields: I + - name: IFC + offset: 0x038 + definition_baserefext: ".5.15" + #fields: I + - name: IEN + offset: 0x03c + definition_baserefext: ".5.16" + #fields: I + - name: HFCORECLKEN0 + offset: 0x040 + definition_baserefext: ".5.17" + fields: + - {name: LE, shift: 2} + - {name: DMA, shift: 1} + - {name: AES, shift: 0} + - name: HFPERCLKEN0 + offset: 0x044 + definition_baserefext: ".5.18" + fields: + - {name: I2C0, shift: 11} + - {name: DAC0, shift: 10} + - {name: ADC0, shift: 9} + - {name: PRS, shift: 8} + - {name: VCMP, shift: 7} + - {name: GPIO, shift: 6} + - {name: TIMER1, shift: 5} + - {name: TIMER0, shift: 4} + - {name: USART1, shift: 3} + - {name: USART0, shift: 2} + - {name: ACMP1, shift: 1} + - {name: ACMP0, shift: 0} + - name: SYNCBUSY + offset: 0x050 + definition_baserefext: ".5.19" + fields: + - {name: LFBPRESC0, shift: 6} + - {name: LFBCLKEN0, shift: 4} + - {name: LFAPRESC0, shift: 2} + - {name: LFACLKEN0, shift: 0} + - name: FREEZE + offset: 0x054 + definition_baserefext: ".5.20" + fields: + - name: REGFREEZE + shift: 0 + values: + - {value: 0, name: UPDATE} + - {value: 1, name: FREEZE} + - name: LFACLKEN0 + offset: 0x058 + definition_baserefext: ".5.21" + fields: + - {name: LCD, shift: 3} + - {name: LETIMER0, shift: 2} + - {name: RTC, shift: 1} + - {name: LESENSE, shift: 0} + - name: LFBCLKEN0 + offset: 0x060 + definition_baserefext: ".5.22" + fields: + - {name: LEUART0, shift: 0} + - name: LFAPRESC0 + offset: 0x068 + definition_baserefext: ".5.23" + fields: + - name: LCD + shift: 12 + length: 2 + values: + - {value: 0, name: DIV16} + - {value: 1, name: DIV32} + - {value: 2, name: DIV64} + - {value: 3, name: DIV128} + - name: LETIMER0 + shift: 8 + length: 4 + values: &LFAPRESC0_LETIMER0_values + - {value: 0, name: DIV1} + - {value: 1, name: DIV2} + - {value: 2, name: DIV4} + - {value: 3, name: DIV8} + - {value: 4, name: DIV16} + - {value: 5, name: DIV32} + - {value: 6, name: DIV64} + - {value: 7, name: DIV128} + - {value: 8, name: DIV256} + - {value: 9, name: DIV512} + - {value: 10, name: DIV1024} + - {value: 11, name: DIV2048} + - {value: 12, name: DIV4096} + - {value: 13, name: DIV8192} + - {value: 14, name: DIV16384} + - {value: 15, name: DIV32768} + - name: RTC + shift: 4 + length: 4 + values: *LFAPRESC0_LETIMER0_values + - name: LESENSE + shift: 0 + length: 2 + values: + - {value: 0, name: DIV1} + - {value: 1, name: DIV2} + - {value: 2, name: DIV4} + - {value: 3, name: DIV8} + - name: LFBPRESC0 + offset: 0x070 + definition_baserefext: ".5.24" + fields: + - name: LEUART0 + shift: 0 + length: 2 + values: + - {value: 0, name: DIV1} + - {value: 1, name: DIV2} + - {value: 2, name: DIV4} + - {value: 3, name: DIV8} + - name: PCNTCTRL + offset: 0x078 + definition_baserefext: ".5.25" + fields: + - name: PCNT0CLKSEL + shift: 1 + values: + - {value: 0, name: LFACLK} + - {value: 1, name: PCNT0S0} + - name: PCNT0CLKEN + shift: 0 + - name: LCDCTRL + offset: 0x07c + definition_baserefext: ".5.26" + fields: + - name: VBFDIV + shift: 4 + length: 3 + values: + - {value: 0, name: DIV1} + - {value: 1, name: DIV2} + - {value: 2, name: DIV4} + - {value: 3, name: DIV8} + - {value: 4, name: DIV16} + - {value: 5, name: DIV32} + - {value: 6, name: DIV64} + - {value: 7, name: DIV128} + - name: VBOOSTEN + shift: 3 + - name: FDIV + shift: 0 + length: 3 + type: uint + - name: ROUTE + offset: 0x080 + definition_baserefext: ".5.27" + fields: + - name: LOCATION + shift: 4 + length: 3 + values: + - {value: 0, name: LOC0} + - {value: 1, name: LOC1} + - name: CLKOUT1PEN + shift: 1 + - name: CLKOUT0PEN + shift: 0 + - name: LOCK + offset: 0x084 + definition_baserefext: ".5.28" + length: 16 + values: + - {name: IS_UNLOCKED, value: 0} + - {name: IS_LOCKED, value: 1} + - {name: SET_LOCKED, value: 0} + - {name: SET_UNLOCKED, value: "0x580E"} diff --git a/include/libopencm3/efm32/tinygecko/emu.convenienceheaders b/include/libopencm3/efm32/tinygecko/emu.convenienceheaders new file mode 100644 index 00000000..4be5b30e --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/emu.convenienceheaders @@ -0,0 +1,18 @@ +/** EMU convenience functions + * + * These functions can be used to send the chip to low energy modes. + * + * @todo Implement other sleep modes than EM1. Implement WFI vs WFE waits. + * + * @defgroup EFM32TG_EMU_convenience EFM32 Tiny Gecko EMU convenience functions + * @{ + */ + +/** Put the system into EM1 low energy mode. */ +static void emu_sleep_em1(void) +{ + /* FIXME: set SLEEPDEEP to 0 */ + __asm__("wfi"); +} + +/** @} */ diff --git a/include/libopencm3/efm32/tinygecko/emu.h b/include/libopencm3/efm32/tinygecko/emu.h index 307d1d60..0a97679e 100644 --- a/include/libopencm3/efm32/tinygecko/emu.h +++ b/include/libopencm3/efm32/tinygecko/emu.h @@ -48,9 +48,9 @@ * @{ */ -#define EMU_CTRL MMIO32(EMU_BASE + 0x000) /**< @see EFM32TG_EMU_CTRL_bits */ -#define EMU_LOCK MMIO32(EMU_BASE + 0x008) /**< @see EFM32TG_EMU_LOCK_values */ -#define EMU_AUXCTRL MMIO32(EMU_BASE + 0x024) /**< @see EFM32TG_EMU_AUXCTRL_bits */ +#define EMU_CTRL MMIO32(EMU_BASE + 0x000) /**< @see EFM32TG_EMU_CTRL_bits */ +#define EMU_LOCK MMIO32(EMU_BASE + 0x008) /**< @see EFM32TG_EMU_LOCK_values */ +#define EMU_AUXCTRL MMIO32(EMU_BASE + 0x024) /**< @see EFM32TG_EMU_AUXCTRL_bits */ /** @} */ @@ -63,39 +63,39 @@ * @{ */ -#define EMU_CTRL_EM4CTRL_TWO (2<<2) -#define EMU_CTRL_EM4CTRL_THREE (3<<2) -#define EMU_CTRL_EM2BLOCK (1<<1) /**< When this bit is set, no mode lower than EM1 will be entered */ -#define EMU_CTRL_EMVREG (1<<0) /**< When this bit is set, the voltage regulator will stay on in modes lower than EM1 */ +#define EMU_CTRL_EM4CTRL_TWO (2<<2) +#define EMU_CTRL_EM4CTRL_THREE (3<<2) +#define EMU_CTRL_EM2BLOCK (1<<1) /**< When this bit is set, no mode lower than EM1 will be entered */ +#define EMU_CTRL_EMVREG (1<<0) /**< When this bit is set, the voltage regulator will stay on in modes lower than EM1 */ /** @} */ /** Values for the EMU_LOCK register * - * See d0034_efm32tg_reference_manual.pdf section 10.5.2. There seems not to be - * another mention of it. + * See d0034_efm32tg_reference_manual.pdf section 10.5.2 for definitions. There + * seems not to be another mention of it. * * @defgroup EFM32TG_EMU_LOCK_values EFM32 Tiny Gecko EMU LOCK values * @{ */ -#define EMU_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ -#define EMU_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ -#define EMU_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock the EMU */ -#define EMU_LOCK_SET_UNLOCKED 0xade8 /**< Write this to the LOCK register to unlock the EMU */ +#define EMU_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ +#define EMU_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ +#define EMU_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock the EMU */ +#define EMU_LOCK_SET_UNLOCKED 0xade8 /**< Write this to the LOCK register to unlock the EMU */ /** @} */ /** Bit states for the EMU_AUXCTRL register * - * See d0034_efm32tg_reference_manual.pdf section 10.5.3 for definition, and + * See d0034_efm32tg_reference_manual.pdf section 10.5.3 for definitions, and * 9.5.3 for details. * * @defgroup EFM32TG_EMU_AUXCTRL_bits EFM32 Tiny Gecko EMU AUXCTRL bits * @{ */ -#define EMU_AUXCTRL_HRCCLR (1<<0) +#define EMU_AUXCTRL_HRCCLR (1<<0) /** @} */ diff --git a/include/libopencm3/efm32/tinygecko/emu.yaml b/include/libopencm3/efm32/tinygecko/emu.yaml new file mode 100644 index 00000000..376c76ca --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/emu.yaml @@ -0,0 +1,50 @@ +copyright: "2012 chrysn " +license: lgpl-3+ +shortdocname: EFM32TG_EMU +longdocname: EFM32 Tiny Gecko EMU +shortname: EMU +longname: Energy Management Unit +baseref: d0034_efm32tg_reference_manual.pdf section 10 +registers_baserefext: ".4" +registers: + - name: CTRL + definition_baserefext: .5.1 + details: ", and 10.3.2 for details (especially on why EM4CTRL_TWO and _THREE are defined)." + offset: 0x000 + fields: + - name: EM4CTRL + shift: 2 + length: 2 + values: + - {name: TWO, value: 2} + - {name: THREE, value: 3} + - name: EM2BLOCK + shift: 1 + doc: When this bit is set, no mode lower than EM1 will be entered + - name: EMVREG + shift: 0 + doc: When this bit is set, the voltage regulator will stay on in modes lower than EM1 + - name: LOCK + definition_baserefext: .5.2 + details: ". There seems not to be another mention of it." + offset: 0x008 + values: + - name: IS_UNLOCKED + value: 0 + doc: When the LOCK register reads as this value, it is open + - name: IS_LOCKED + value: 1 + doc: When the LOCK register reads as this value, it is locked + - name: SET_LOCKED + value: 0 + doc: Write this to the LOCK register to lock the EMU + - name: SET_UNLOCKED + value: "0xade8" + doc: Write this to the LOCK register to unlock the EMU + - name: AUXCTRL + definition_baserefext: .5.3 + details: ", and 9.5.3 for details." + offset: 0x024 + fields: + - name: HRCCLR + shift: 0 diff --git a/include/libopencm3/efm32/tinygecko/generate-license.yaml b/include/libopencm3/efm32/tinygecko/generate-license.yaml new file mode 100644 index 00000000..baeef880 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/generate-license.yaml @@ -0,0 +1,19 @@ +"lgpl-3+": | + /* + * This file is part of the {projectname} project. + * + * Copyright (C) {copyright} + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py new file mode 100644 index 00000000..8bd81843 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/generate.py @@ -0,0 +1,112 @@ +#!/usr/bin/env python + +import yaml +import logging +import textwrap + +def commentblock(*textblocks, **formatargs): + ret = [] + ret.extend(textwrap.wrap(textblocks[0].format(**formatargs), 80, initial_indent="/** ", subsequent_indent=" * ")) + last_block_was_at = textblocks[0].startswith('@') + for b in textblocks[1:]: + if not (last_block_was_at and b.startswith('@')): + ret.append(" *") + # FIXME: some blocks don't like being wrapped, eg @defgroup + ret.extend(textwrap.wrap(b.format(**formatargs), 80, initial_indent=" * ", subsequent_indent=" * ")) + last_block_was_at = b.startswith('@') + return "\n".join(ret) + "\n */\n" + +def yaml2h(filenamebase): + headername = "%s.h"%filenamebase + yamlname = "%s.yaml"%filenamebase + conveniencename = "%s.convenienceheaders"%filenamebase + + logging.info("Generating %s from %s", headername, yamlname) + + data = yaml.load(open(yamlname)) + # some defaults + data.setdefault("projectname", "libopencm3") + data.setdefault("includeguard", "LIBOPENCM3_EFM32_TINYGECKO_%s_H"%data['shortname']) + + with open(headername, 'w') as outfile: + def wc(*args, **kwargs): # wrap "outfile" and "data" (as default) arguments -- i'm a lazy typer + final_kwargs = data.copy() + final_kwargs.update(kwargs) + outfile.write(commentblock(*args, **final_kwargs)) + def wc_close(): + outfile.write("/** @} */\n") + def nl(): outfile.write("\n") + def define(key, value, comment=None): + outfile.write("#define ") + outfile.write(key) + outfile.write(" "*max(24-len(key), 1)) + outfile.write(str(value)) + if comment is not None: + outfile.write(" /**< %s */"%comment) + nl() + + outfile.write(licensedata[data['license']].format(**data)) + nl() + wc("@file", "@see {shortdocname}") + nl() + wc("Definitions for the {shortname} subsystem ({longname}).", "This corresponds to the description in {baseref}.", "@defgroup {shortdocname} {longdocname}", "@{{") + nl() + outfile.write("#ifndef {includeguard}\n#define {includeguard}\n".format(**data)) + nl() + outfile.write("#include \n#include \n") + nl() + wc("Register definitions and register value definitions for the {shortname} subsystem", "@defgroup {shortdocname}_regsandvals {longdocname} registers and values", "@{{") + nl() + + regs = data['registers'] + wc("These definitions reflect {baseref}{registers_baserefext}", "@defgroup {shortdocname}_registers {longdocname} registers", "@{{") + nl() + for regdata in regs: + define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], regdata['name'], 'values' if 'values' in regdata else 'bits')) + nl() + wc_close() # close register definitions + nl() + for regdata in regs: + has_bits = "fields" in regdata + has_values = "values" in regdata + if not has_bits and not has_values: + continue + + wc("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values"), "See {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."), '@defgroup {shortdocname}_{name}_%s {longdocname} {name} %s'%(('bits' if has_bits else 'values',)*2), '@{{', **regdata) + nl() + + if has_bits: + for field in regdata['fields']: + #shiftdefine = "_%s_%s_%s_shift"%(shortname, regdata['name'], field['name']) + #define(shiftdefine, field['shift']) + if "values" in field: + for value in field.get("values"): + define("%s_%s_%s_%s"%(data['shortname'], regdata['name'], field['name'], value['name']), "(%s<<%s)"%(value['value'], field['shift']), value.get('doc', None)) + else: + if field.get('length', 1) == 1: + define("%s_%s_%s"%(data['shortname'], regdata['name'], field['name']), "(1<<%s)"%field['shift'], field.get('doc', None)) + else: + # FIXME: this should require the 'type' parameter to be set on this field + outfile.write("/* No values defined for the field %s */\n"%field['name']) + # FIXME: define mask + else: + for value in regdata['values']: + define("%s_%s_%s"%(data['shortname'], regdata['name'], value['name']), value['value'], value.get('doc', None)) + + nl() + wc_close() + nl() + wc_close() # close registers and values + nl() + + outfile.write(open(conveniencename).read()) + + nl() + wc_close() # close convenience + nl() + outfile.write("#endif\n") + +if __name__ == "__main__": + licensedata = yaml.load(open("generate-license.yaml")) + for basename in yaml.load(open('generate.yaml')): + yaml2h(basename) diff --git a/include/libopencm3/efm32/tinygecko/generate.yaml b/include/libopencm3/efm32/tinygecko/generate.yaml new file mode 100644 index 00000000..878d0ad8 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/generate.yaml @@ -0,0 +1,2 @@ +- emu +- cmu From bc1bff477ba038fff46a4c4fd63856475faf0352 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 4 Mar 2012 14:39:40 +0100 Subject: [PATCH 22/56] efm32: shortened doxygen names and grouped them per chip family --- include/libopencm3/efm32/tinygecko/README.dox | 14 +++++ include/libopencm3/efm32/tinygecko/cmu.h | 54 +++++++++---------- include/libopencm3/efm32/tinygecko/cmu.yaml | 2 +- .../efm32/tinygecko/emu.convenienceheaders | 2 +- include/libopencm3/efm32/tinygecko/emu.h | 15 +++--- include/libopencm3/efm32/tinygecko/emu.yaml | 2 +- .../libopencm3/efm32/tinygecko/generate.py | 17 +++--- include/libopencm3/efm32/tinygecko/gpio.h | 33 ++++++------ 8 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 include/libopencm3/efm32/tinygecko/README.dox diff --git a/include/libopencm3/efm32/tinygecko/README.dox b/include/libopencm3/efm32/tinygecko/README.dox new file mode 100644 index 00000000..04da755f --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/README.dox @@ -0,0 +1,14 @@ +/** + +@brief EFM32 Tiny Gecko headers + +This directory contains all headers specific to the Tiny Gecko family of the +Energy Micro EFM32 series. + +The individual peripherials described here all include hints at where the +information was taken from, but usually it stems from +d0034_efm32tg_reference_manual.pdf. + +@defgroup EFM32TG EFM32 Tiny Gecko + +*/ diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 09145614..5926cb0b 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -26,7 +26,8 @@ * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 11. * - * @defgroup EFM32TG_CMU EFM32 Tiny Gecko CMU + * @ingroup EFM32TG + * @defgroup EFM32TG_CMU CMU (Clock Management Unit) * @{ */ @@ -38,13 +39,13 @@ /** Register definitions and register value definitions for the CMU subsystem * - * @defgroup EFM32TG_CMU_regsandvals EFM32 Tiny Gecko CMU registers and values + * @defgroup EFM32TG_CMU_regsandvals CMU registers and values * @{ */ /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4 * - * @defgroup EFM32TG_CMU_registers EFM32 Tiny Gecko CMU registers + * @defgroup EFM32TG_CMU_registers CMU registers * @{ */ @@ -83,7 +84,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.1 for definitions. * - * @defgroup EFM32TG_CMU_CTRL_bits EFM32 Tiny Gecko CMU CTRL bits + * @defgroup EFM32TG_CMU_CTRL_bits CMU CTRL bits * @{ */ @@ -135,8 +136,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.2 for definitions. * - * @defgroup EFM32TG_CMU_HFCORECLKDIV_values EFM32 Tiny Gecko CMU HFCORECLKDIV - * values + * @defgroup EFM32TG_CMU_HFCORECLKDIV_values CMU HFCORECLKDIV values * @{ */ @@ -157,7 +157,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.3 for definitions. * - * @defgroup EFM32TG_CMU_HFPERCLKDIV_bits EFM32 Tiny Gecko CMU HFPERCLKDIV bits + * @defgroup EFM32TG_CMU_HFPERCLKDIV_bits CMU HFPERCLKDIV bits * @{ */ @@ -179,7 +179,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.4 for definitions. * - * @defgroup EFM32TG_CMU_HFRCOCTRL_bits EFM32 Tiny Gecko CMU HFRCOCTRL bits + * @defgroup EFM32TG_CMU_HFRCOCTRL_bits CMU HFRCOCTRL bits * @{ */ @@ -198,8 +198,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.6 for definitions. * - * @defgroup EFM32TG_CMU_AUXHFRCOCTRL_bits EFM32 Tiny Gecko CMU AUXHFRCOCTRL - * bits + * @defgroup EFM32TG_CMU_AUXHFRCOCTRL_bits CMU AUXHFRCOCTRL bits * @{ */ @@ -217,7 +216,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.6.7 for definitions. * - * @defgroup EFM32TG_CMU_CALCTRL_bits EFM32 Tiny Gecko CMU CALCTRL bits + * @defgroup EFM32TG_CMU_CALCTRL_bits CMU CALCTRL bits * @{ */ @@ -240,7 +239,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.9 for definitions. * - * @defgroup EFM32TG_CMU_OSCENCMD_bits EFM32 Tiny Gecko CMU OSCENCMD bits + * @defgroup EFM32TG_CMU_OSCENCMD_bits CMU OSCENCMD bits * @{ */ @@ -261,7 +260,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.10 for definitions. * - * @defgroup EFM32TG_CMU_CMD_bits EFM32 Tiny Gecko CMU CMD bits + * @defgroup EFM32TG_CMU_CMD_bits CMU CMD bits * @{ */ @@ -278,7 +277,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.11 for definitions. * - * @defgroup EFM32TG_CMU_LFCLKSEL_bits EFM32 Tiny Gecko CMU LFCLKSEL bits + * @defgroup EFM32TG_CMU_LFCLKSEL_bits CMU LFCLKSEL bits * @{ */ @@ -301,7 +300,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.12 for definitions. * - * @defgroup EFM32TG_CMU_STATUS_bits EFM32 Tiny Gecko CMU STATUS bits + * @defgroup EFM32TG_CMU_STATUS_bits CMU STATUS bits * @{ */ @@ -327,8 +326,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.17 for definitions. * - * @defgroup EFM32TG_CMU_HFCORECLKEN0_bits EFM32 Tiny Gecko CMU HFCORECLKEN0 - * bits + * @defgroup EFM32TG_CMU_HFCORECLKEN0_bits CMU HFCORECLKEN0 bits * @{ */ @@ -342,7 +340,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.18 for definitions. * - * @defgroup EFM32TG_CMU_HFPERCLKEN0_bits EFM32 Tiny Gecko CMU HFPERCLKEN0 bits + * @defgroup EFM32TG_CMU_HFPERCLKEN0_bits CMU HFPERCLKEN0 bits * @{ */ @@ -365,7 +363,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.19 for definitions. * - * @defgroup EFM32TG_CMU_SYNCBUSY_bits EFM32 Tiny Gecko CMU SYNCBUSY bits + * @defgroup EFM32TG_CMU_SYNCBUSY_bits CMU SYNCBUSY bits * @{ */ @@ -380,7 +378,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.20 for definitions. * - * @defgroup EFM32TG_CMU_FREEZE_bits EFM32 Tiny Gecko CMU FREEZE bits + * @defgroup EFM32TG_CMU_FREEZE_bits CMU FREEZE bits * @{ */ @@ -393,7 +391,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.21 for definitions. * - * @defgroup EFM32TG_CMU_LFACLKEN0_bits EFM32 Tiny Gecko CMU LFACLKEN0 bits + * @defgroup EFM32TG_CMU_LFACLKEN0_bits CMU LFACLKEN0 bits * @{ */ @@ -408,7 +406,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.22 for definitions. * - * @defgroup EFM32TG_CMU_LFBCLKEN0_bits EFM32 Tiny Gecko CMU LFBCLKEN0 bits + * @defgroup EFM32TG_CMU_LFBCLKEN0_bits CMU LFBCLKEN0 bits * @{ */ @@ -420,7 +418,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.23 for definitions. * - * @defgroup EFM32TG_CMU_LFAPRESC0_bits EFM32 Tiny Gecko CMU LFAPRESC0 bits + * @defgroup EFM32TG_CMU_LFAPRESC0_bits CMU LFAPRESC0 bits * @{ */ @@ -471,7 +469,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.24 for definitions. * - * @defgroup EFM32TG_CMU_LFBPRESC0_bits EFM32 Tiny Gecko CMU LFBPRESC0 bits + * @defgroup EFM32TG_CMU_LFBPRESC0_bits CMU LFBPRESC0 bits * @{ */ @@ -486,7 +484,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.25 for definitions. * - * @defgroup EFM32TG_CMU_PCNTCTRL_bits EFM32 Tiny Gecko CMU PCNTCTRL bits + * @defgroup EFM32TG_CMU_PCNTCTRL_bits CMU PCNTCTRL bits * @{ */ @@ -500,7 +498,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.26 for definitions. * - * @defgroup EFM32TG_CMU_LCDCTRL_bits EFM32 Tiny Gecko CMU LCDCTRL bits + * @defgroup EFM32TG_CMU_LCDCTRL_bits CMU LCDCTRL bits * @{ */ @@ -521,7 +519,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.27 for definitions. * - * @defgroup EFM32TG_CMU_ROUTE_bits EFM32 Tiny Gecko CMU ROUTE bits + * @defgroup EFM32TG_CMU_ROUTE_bits CMU ROUTE bits * @{ */ @@ -536,7 +534,7 @@ * * See d0034_efm32tg_reference_manual.pdf section 11.5.28 for definitions. * - * @defgroup EFM32TG_CMU_LOCK_values EFM32 Tiny Gecko CMU LOCK values + * @defgroup EFM32TG_CMU_LOCK_values CMU LOCK values * @{ */ diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml index 52906f76..0229de19 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.yaml +++ b/include/libopencm3/efm32/tinygecko/cmu.yaml @@ -1,7 +1,7 @@ copyright: "2012 chrysn " license: lgpl-3+ +ingroup: EFM32TG shortdocname: EFM32TG_CMU -longdocname: EFM32 Tiny Gecko CMU shortname: CMU longname: Clock Management Unit baseref: d0034_efm32tg_reference_manual.pdf section 11 diff --git a/include/libopencm3/efm32/tinygecko/emu.convenienceheaders b/include/libopencm3/efm32/tinygecko/emu.convenienceheaders index 4be5b30e..7d5893d1 100644 --- a/include/libopencm3/efm32/tinygecko/emu.convenienceheaders +++ b/include/libopencm3/efm32/tinygecko/emu.convenienceheaders @@ -4,7 +4,7 @@ * * @todo Implement other sleep modes than EM1. Implement WFI vs WFE waits. * - * @defgroup EFM32TG_EMU_convenience EFM32 Tiny Gecko EMU convenience functions + * @defgroup EFM32TG_EMU_convenience EMU convenience functions * @{ */ diff --git a/include/libopencm3/efm32/tinygecko/emu.h b/include/libopencm3/efm32/tinygecko/emu.h index 0a97679e..31f4241d 100644 --- a/include/libopencm3/efm32/tinygecko/emu.h +++ b/include/libopencm3/efm32/tinygecko/emu.h @@ -26,7 +26,8 @@ * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 10. * - * @defgroup EFM32TG_EMU EFM32 Tiny Gecko EMU + * @ingroup EFM32TG + * @defgroup EFM32TG_EMU EMU (Energy Management Unit) * @{ */ @@ -38,13 +39,13 @@ /** Register definitions and register value definitions for the EMU subsystem * - * @defgroup EFM32TG_EMU_regsandvals EFM32 Tiny Gecko EMU registers and values + * @defgroup EFM32TG_EMU_regsandvals EMU registers and values * @{ */ /** These definitions reflect d0034_efm32tg_reference_manual.pdf section 10.4 * - * @defgroup EFM32TG_EMU_registers EFM32 Tiny Gecko EMU registers + * @defgroup EFM32TG_EMU_registers EMU registers * @{ */ @@ -59,7 +60,7 @@ * See d0034_efm32tg_reference_manual.pdf section 10.5.1 for definitions, and * 10.3.2 for details (especially on why EM4CTRL_TWO and _THREE are defined). * - * @defgroup EFM32TG_EMU_CTRL_bits EFM32 Tiny Gecko EMU CTRL bits + * @defgroup EFM32TG_EMU_CTRL_bits EMU CTRL bits * @{ */ @@ -75,7 +76,7 @@ * See d0034_efm32tg_reference_manual.pdf section 10.5.2 for definitions. There * seems not to be another mention of it. * - * @defgroup EFM32TG_EMU_LOCK_values EFM32 Tiny Gecko EMU LOCK values + * @defgroup EFM32TG_EMU_LOCK_values EMU LOCK values * @{ */ @@ -91,7 +92,7 @@ * See d0034_efm32tg_reference_manual.pdf section 10.5.3 for definitions, and * 9.5.3 for details. * - * @defgroup EFM32TG_EMU_AUXCTRL_bits EFM32 Tiny Gecko EMU AUXCTRL bits + * @defgroup EFM32TG_EMU_AUXCTRL_bits EMU AUXCTRL bits * @{ */ @@ -107,7 +108,7 @@ * * @todo Implement other sleep modes than EM1. Implement WFI vs WFE waits. * - * @defgroup EFM32TG_EMU_convenience EFM32 Tiny Gecko EMU convenience functions + * @defgroup EFM32TG_EMU_convenience EMU convenience functions * @{ */ diff --git a/include/libopencm3/efm32/tinygecko/emu.yaml b/include/libopencm3/efm32/tinygecko/emu.yaml index 376c76ca..4e0b30ee 100644 --- a/include/libopencm3/efm32/tinygecko/emu.yaml +++ b/include/libopencm3/efm32/tinygecko/emu.yaml @@ -1,7 +1,7 @@ copyright: "2012 chrysn " license: lgpl-3+ +ingroup: EFM32TG shortdocname: EFM32TG_EMU -longdocname: EFM32 Tiny Gecko EMU shortname: EMU longname: Energy Management Unit baseref: d0034_efm32tg_reference_manual.pdf section 10 diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py index 8bd81843..96407b55 100644 --- a/include/libopencm3/efm32/tinygecko/generate.py +++ b/include/libopencm3/efm32/tinygecko/generate.py @@ -6,13 +6,18 @@ import textwrap def commentblock(*textblocks, **formatargs): ret = [] + nowrapcommands = set("@defgroup") ret.extend(textwrap.wrap(textblocks[0].format(**formatargs), 80, initial_indent="/** ", subsequent_indent=" * ")) last_block_was_at = textblocks[0].startswith('@') for b in textblocks[1:]: + formatted = b.format(**formatargs) + if not (last_block_was_at and b.startswith('@')): ret.append(" *") - # FIXME: some blocks don't like being wrapped, eg @defgroup - ret.extend(textwrap.wrap(b.format(**formatargs), 80, initial_indent=" * ", subsequent_indent=" * ")) + if any(b.startswith(c) for c in nowrapcommands): + ret.append(" * " + formatted) + else: + ret.extend(textwrap.wrap(formatted, 80, initial_indent=" * ", subsequent_indent=" * ")) last_block_was_at = b.startswith('@') return "\n".join(ret) + "\n */\n" @@ -49,17 +54,17 @@ def yaml2h(filenamebase): nl() wc("@file", "@see {shortdocname}") nl() - wc("Definitions for the {shortname} subsystem ({longname}).", "This corresponds to the description in {baseref}.", "@defgroup {shortdocname} {longdocname}", "@{{") + wc("Definitions for the {shortname} subsystem ({longname}).", "This corresponds to the description in {baseref}.", "@ingroup {ingroup}", "@defgroup {shortdocname} {shortname} ({longname})", "@{{") nl() outfile.write("#ifndef {includeguard}\n#define {includeguard}\n".format(**data)) nl() outfile.write("#include \n#include \n") nl() - wc("Register definitions and register value definitions for the {shortname} subsystem", "@defgroup {shortdocname}_regsandvals {longdocname} registers and values", "@{{") + wc("Register definitions and register value definitions for the {shortname} subsystem", "@defgroup {shortdocname}_regsandvals {shortname} registers and values", "@{{") nl() regs = data['registers'] - wc("These definitions reflect {baseref}{registers_baserefext}", "@defgroup {shortdocname}_registers {longdocname} registers", "@{{") + wc("These definitions reflect {baseref}{registers_baserefext}", "@defgroup {shortdocname}_registers {shortname} registers", "@{{") nl() for regdata in regs: define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], regdata['name'], 'values' if 'values' in regdata else 'bits')) @@ -72,7 +77,7 @@ def yaml2h(filenamebase): if not has_bits and not has_values: continue - wc("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values"), "See {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."), '@defgroup {shortdocname}_{name}_%s {longdocname} {name} %s'%(('bits' if has_bits else 'values',)*2), '@{{', **regdata) + wc("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values"), "See {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."), '@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values',)*2), '@{{', **regdata) nl() if has_bits: diff --git a/include/libopencm3/efm32/tinygecko/gpio.h b/include/libopencm3/efm32/tinygecko/gpio.h index f1e097b8..2c65d0dc 100644 --- a/include/libopencm3/efm32/tinygecko/gpio.h +++ b/include/libopencm3/efm32/tinygecko/gpio.h @@ -26,7 +26,8 @@ * This corresponds to the description in d0034_efm32tg_reference_manual.pdf * section 28. * - * @defgroup EFM32TG_GPIO EFM32 Tiny Gecko GPIO + * @ingroup EFM32TG + * @defgroup EFM32TG_GPIO GPIO (General Purpose Input Output) * @{ */ @@ -38,7 +39,7 @@ /** Register definitions and register value definitions for the GPIO subsystem * - * @defgroup EFM32TG_GPIO_regsandvals EFM32 Tiny Gecko GPIO registers and values + * @defgroup EFM32TG_GPIO_regsandvals GPIO registers and values * @{ */ @@ -49,7 +50,7 @@ * * @todo This section could profit from bit-banding. * - * @defgroup EFM32TG_GPIO_registers EFM32 Tiny Gecko GPIO registers + * @defgroup EFM32TG_GPIO_registers GPIO registers * @{ */ #define GPIO_Px_CTRL(port) MMIO32(port + 0x000) /**< @see EFM32TG_GPIO_Px_CTRL_bits */ @@ -154,7 +155,7 @@ * GPIO_Px_PINLOCKN, GPIO_Px_EXTIRISE, GPIO_Px_EXTIFALL, GPIO_IEN, GPIO_IF, * GPIO_IFS, and GPIO_IFC registers. * - * @defgroup EFM32TG_GPIO_pinnumberbits EFM32 Tiny Gecko GPIO pin number bits + * @defgroup EFM32TG_GPIO_pinnumberbits GPIO pin number bits * @{ */ @@ -183,7 +184,7 @@ * They are named as in d0034_efm32tg_reference_manual.pdf's section * 28.5.1. * - * @defgroup EFM32TG_GPIO_Px_CTRL_bits EFM32 Tiny Gecko GPIO Px CTRL bits + * @defgroup EFM32TG_GPIO_Px_CTRL_bits GPIO Px CTRL bits * @{ */ @@ -212,7 +213,7 @@ * 28.5.2/28.5.3. For explanations of what they really do, rather see section * 28.3.1. * - * @defgroup EFM32TG_GPIO_MODE_values EFM32 Tiny Gecko GPIO MODE values + * @defgroup EFM32TG_GPIO_MODE_values GPIO MODE values * @{ */ @@ -248,7 +249,7 @@ * 28.5.10/28.5.11. For explanations of what they do, rather see section * 28.3.5. * - * @defgroup EFM32TG_GPIO_EXTIP_values EFM32 Tiny Gecko GPIO EXTIPSEL values + * @defgroup EFM32TG_GPIO_EXTIP_values GPIO EXTIPSEL values * @{ */ @@ -266,7 +267,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.18 for definitions, and * 28.3.4.1 for explanations. * - * @defgroup EFM32TG_GPIO_ROUTE_bits EFM32 Tiny Gecko GPIO ROUTE bits + * @defgroup EFM32TG_GPIO_ROUTE_bits GPIO ROUTE bits * @{ */ @@ -287,7 +288,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.19 for definitions, and * 28.3.7 for details. * - * @defgroup EFM32TG_GPIO_INSENSE_bits EFM32 Tiny Gecko GPIO INSENSE bits + * @defgroup EFM32TG_GPIO_INSENSE_bits GPIO INSENSE bits * @{ */ @@ -301,7 +302,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.20 for definitions, and * 28.3.1.1 for explanations. * - * @defgroup EFM32TG_GPIO_LOCK_values EFM32 Tiny Gecko GPIO LOCK bits + * @defgroup EFM32TG_GPIO_LOCK_values GPIO LOCK bits * @{ */ @@ -317,7 +318,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.21 for definitions, and * 28.3.4 for explanations. * - * @defgroup EFM32TG_GPIO_CTRL_bits EFM32 Tiny Gecko GPIO CTRL bits + * @defgroup EFM32TG_GPIO_CTRL_bits GPIO CTRL bits * @{ */ @@ -331,7 +332,7 @@ * figure 28.5 in case you wonder if that register is mentioned anywhere else * at all. * - * @defgroup EFM32TG_GPIO_CMD_bits EFM32 Tiny Gecko GPIO CMD bits + * @defgroup EFM32TG_GPIO_CMD_bits GPIO CMD bits * @{ */ @@ -344,7 +345,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.23 for definitions, and * 28.3.2 for explanations. * - * @defgroup EFM32TG_GPIO_EM4WUEN_bits EFM32 Tiny Gecko GPIO EM4WUEN bits + * @defgroup EFM32TG_GPIO_EM4WUEN_bits GPIO EM4WUEN bits * @{ */ @@ -362,7 +363,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.24 for definitions, and * 28.3.2 for explanations. * - * @defgroup EFM32TG_GPIO_EM4WUPOL_bits EFM32 Tiny Gecko GPIO EM4WUPOL bits + * @defgroup EFM32TG_GPIO_EM4WUPOL_bits GPIO EM4WUPOL bits * @{ */ @@ -380,7 +381,7 @@ * See d0034_efm32tg_reference_manual.pdf section 28.5.25 for definitions, and * 28.3.2 for explanations. * - * @defgroup EFM32TG_GPIO_EM4WUCAUSE_bits EFM32 Tiny Gecko GPIO EM4WUCAUSE bits + * @defgroup EFM32TG_GPIO_EM4WUCAUSE_bits GPIO EM4WUCAUSE bits * @{ */ @@ -408,7 +409,7 @@ * * @todo Implement all the non-trivial but useful convenience functions. * - * @defgroup EFM32TG_GPIO_convenience EFM32 Tiny Gecko GPIO convenience functions + * @defgroup EFM32TG_GPIO_convenience GPIO convenience functions * @{ */ From 61b649370f87313a9ff2a10299538f4430ce24ce Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 4 Mar 2012 16:57:43 +0100 Subject: [PATCH 23/56] efm32: generate _MASK constants constants are generated for all fields that either have named values or length > 1 --- include/libopencm3/efm32/tinygecko/cmu.h | 33 +++++++++++++++++++ include/libopencm3/efm32/tinygecko/emu.h | 1 + .../libopencm3/efm32/tinygecko/generate.py | 5 ++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 5926cb0b..aafb261b 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -90,6 +90,7 @@ #define CMU_CTRL_DBGCLK_AUXHFRCO (0<<28) #define CMU_CTRL_DBGCLK_HFCLK (1<<28) +#define CMU_CTRL_DBGCLK_MASK (0x1<<28) #define CMU_CTRL_CLKOUTSEL1_LFRCO (0<<23) #define CMU_CTRL_CLKOUTSEL1_LFXO (1<<23) #define CMU_CTRL_CLKOUTSEL1_HFCLK (2<<23) @@ -98,6 +99,7 @@ #define CMU_CTRL_CLKOUTSEL1_LFRCOQ (5<<23) #define CMU_CTRL_CLKOUTSEL1_HFRCOQ (6<<23) #define CMU_CTRL_CLKOUTSEL1_AUXHFRCOQ (7<<23) +#define CMU_CTRL_CLKOUTSEL1_MASK (0x7<<23) #define CMU_CTRL_CLKOUTSEL0_LFRCO (0<<20) #define CMU_CTRL_CLKOUTSEL0_LFXO (1<<20) #define CMU_CTRL_CLKOUTSEL0_HFCLK (2<<20) @@ -106,29 +108,37 @@ #define CMU_CTRL_CLKOUTSEL0_LFRCOQ (5<<20) #define CMU_CTRL_CLKOUTSEL0_HFRCOQ (6<<20) #define CMU_CTRL_CLKOUTSEL0_AUXHFRCOQ (7<<20) +#define CMU_CTRL_CLKOUTSEL0_MASK (0x7<<20) #define CMU_CTRL_LFXOTIMEOUT_8CYCLES (0<<18) #define CMU_CTRL_LFXOTIMEOUT_1KCYCLES (1<<18) #define CMU_CTRL_LFXOTIMEOUT_16KCYCLES (2<<18) #define CMU_CTRL_LFXOTIMEOUT_32KCYCLES (3<<18) +#define CMU_CTRL_LFXOTIMEOUT_MASK (0x3<<18) #define CMU_CTRL_LFXOBUFCUR (1<<17) #define CMU_CTRL_LXFOBOOST_70PCENT (0<<13) #define CMU_CTRL_LXFOBOOST_100PCENT (1<<13) +#define CMU_CTRL_LXFOBOOST_MASK (0x1<<13) #define CMU_CTRL_LFXOMODE_XTAL (0<<11) #define CMU_CTRL_LFXOMODE_BUFEXTCLK (1<<11) #define CMU_CTRL_LFXOMODE_DIGEXTCLK (2<<11) +#define CMU_CTRL_LFXOMODE_MASK (0x3<<11) #define CMU_CTRL_HFXOTIMEOUT_8CYCLES (0<<9) #define CMU_CTRL_HFXOTIMEOUT_256CYCLES (1<<9) #define CMU_CTRL_HFXOTIMEOUT_1KCYCLES (2<<9) #define CMU_CTRL_HFXOTIMEOUT_16KCYCLES (3<<9) +#define CMU_CTRL_HFXOTIMEOUT_MASK (0x3<<9) #define CMU_CTRL_HFXOGLITCHDETEN (1<<7) /* No values defined for the field HFXOBUFCUR */ +#define CMU_CTRL_HFXOBUFCUR_MASK (0x3<<5) #define CMU_CTRL_HFXOBOOST_50PCENT (0<<2) #define CMU_CTRL_HFXOBOOST_70PCENT (1<<2) #define CMU_CTRL_HFXOBOOST_80PCENT (2<<2) #define CMU_CTRL_HFXOBOOST_100PCENT (3<<2) +#define CMU_CTRL_HFXOBOOST_MASK (0x3<<2) #define CMU_CTRL_HFXOMODE_XTAL (0<<0) #define CMU_CTRL_HFXOMODE_BUFEXTCLK (1<<0) #define CMU_CTRL_HFXOMODE_DIGEXTCLK (2<<0) +#define CMU_CTRL_HFXOMODE_MASK (0x3<<0) /** @} */ @@ -172,6 +182,7 @@ #define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK128 (7<<0) #define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK256 (8<<0) #define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK512 (9<<0) +#define CMU_HFPERCLKDIV_HFPERCLKDIV_MASK (0x7<<0) /** @} */ @@ -184,13 +195,16 @@ */ /* No values defined for the field SUDELAY */ +#define CMU_HFRCOCTRL_SUDELAY_MASK (0x1f<<12) #define CMU_HFRCOCTRL_BAND_1MHZ (0<<8) #define CMU_HFRCOCTRL_BAND_7MHZ (1<<8) #define CMU_HFRCOCTRL_BAND_11MHZ (2<<8) #define CMU_HFRCOCTRL_BAND_14MHZ (3<<8) #define CMU_HFRCOCTRL_BAND_21MHZ (4<<8) #define CMU_HFRCOCTRL_BAND_28MHZ (5<<8) +#define CMU_HFRCOCTRL_BAND_MASK (0x7<<8) /* No values defined for the field TUNING */ +#define CMU_HFRCOCTRL_TUNING_MASK (0xff<<0) /** @} */ @@ -208,7 +222,9 @@ #define CMU_AUXHFRCOCTRL_BAND_1MHZ (3<<8) #define CMU_AUXHFRCOCTRL_BAND_28MHZ (6<<8) #define CMU_AUXHFRCOCTRL_BAND_21MHZ (7<<8) +#define CMU_AUXHFRCOCTRL_BAND_MASK (0x7<<8) /* No values defined for the field TUNING */ +#define CMU_AUXHFRCOCTRL_TUNING_MASK (0xff<<0) /** @} */ @@ -227,11 +243,13 @@ #define CMU_CALCTRL_DOWNSEL_HFRCO (3<<3) #define CMU_CALCTRL_DOWNSEL_LFRCO (4<<3) #define CMU_CALCTRL_DOWNSEL_AUXHFRCO (5<<3) +#define CMU_CALCTRL_DOWNSEL_MASK (0x7<<3) #define CMU_CALCTRL_UPSEL_HFXO (0<<0) #define CMU_CALCTRL_UPSEL_LFXO (1<<0) #define CMU_CALCTRL_UPSEL_HFRCO (2<<0) #define CMU_CALCTRL_UPSEL_LFRCO (3<<0) #define CMU_CALCTRL_UPSEL_AUXHFRCO (4<<0) +#define CMU_CALCTRL_UPSEL_MASK (0x7<<0) /** @} */ @@ -270,6 +288,7 @@ #define CMU_CMD_HFCLKSEL_HFXO (2<<0) #define CMU_CMD_HFCLKSEL_LFRCO (3<<0) #define CMU_CMD_HFCLKSEL_LFXO (4<<0) +#define CMU_CMD_HFCLKSEL_MASK (0x7<<0) /** @} */ @@ -283,16 +302,20 @@ #define CMU_LFCLKSEL_LFBE_DISABLED (0<<20) #define CMU_LFCLKSEL_LFBE_ULFRCO (1<<20) +#define CMU_LFCLKSEL_LFBE_MASK (0x1<<20) #define CMU_LFCLKSEL_LFAE_DISABLED (0<<16) #define CMU_LFCLKSEL_LFAE_ULFRCO (1<<16) +#define CMU_LFCLKSEL_LFAE_MASK (0x1<<16) #define CMU_LFCLKSEL_LFB_DISABLED (0<<2) #define CMU_LFCLKSEL_LFB_LFRCO (1<<2) #define CMU_LFCLKSEL_LFB_LFXO (2<<2) #define CMU_LFCLKSEL_LFB_HFCORECLKLEDIV2 (3<<2) +#define CMU_LFCLKSEL_LFB_MASK (0x3<<2) #define CMU_LFCLKSEL_LFA_DISABLED (0<<0) #define CMU_LFCLKSEL_LFA_LFRCO (1<<0) #define CMU_LFCLKSEL_LFA_LFXO (2<<0) #define CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2 (3<<0) +#define CMU_LFCLKSEL_LFA_MASK (0x3<<0) /** @} */ @@ -384,6 +407,7 @@ #define CMU_FREEZE_REGFREEZE_UPDATE (0<<0) #define CMU_FREEZE_REGFREEZE_FREEZE (1<<0) +#define CMU_FREEZE_REGFREEZE_MASK (0x1<<0) /** @} */ @@ -426,6 +450,7 @@ #define CMU_LFAPRESC0_LCD_DIV32 (1<<12) #define CMU_LFAPRESC0_LCD_DIV64 (2<<12) #define CMU_LFAPRESC0_LCD_DIV128 (3<<12) +#define CMU_LFAPRESC0_LCD_MASK (0x3<<12) #define CMU_LFAPRESC0_LETIMER0_DIV1 (0<<8) #define CMU_LFAPRESC0_LETIMER0_DIV2 (1<<8) #define CMU_LFAPRESC0_LETIMER0_DIV4 (2<<8) @@ -442,6 +467,7 @@ #define CMU_LFAPRESC0_LETIMER0_DIV8192 (13<<8) #define CMU_LFAPRESC0_LETIMER0_DIV16384 (14<<8) #define CMU_LFAPRESC0_LETIMER0_DIV32768 (15<<8) +#define CMU_LFAPRESC0_LETIMER0_MASK (0xf<<8) #define CMU_LFAPRESC0_RTC_DIV1 (0<<4) #define CMU_LFAPRESC0_RTC_DIV2 (1<<4) #define CMU_LFAPRESC0_RTC_DIV4 (2<<4) @@ -458,10 +484,12 @@ #define CMU_LFAPRESC0_RTC_DIV8192 (13<<4) #define CMU_LFAPRESC0_RTC_DIV16384 (14<<4) #define CMU_LFAPRESC0_RTC_DIV32768 (15<<4) +#define CMU_LFAPRESC0_RTC_MASK (0xf<<4) #define CMU_LFAPRESC0_LESENSE_DIV1 (0<<0) #define CMU_LFAPRESC0_LESENSE_DIV2 (1<<0) #define CMU_LFAPRESC0_LESENSE_DIV4 (2<<0) #define CMU_LFAPRESC0_LESENSE_DIV8 (3<<0) +#define CMU_LFAPRESC0_LESENSE_MASK (0x3<<0) /** @} */ @@ -477,6 +505,7 @@ #define CMU_LFBPRESC0_LEUART0_DIV2 (1<<0) #define CMU_LFBPRESC0_LEUART0_DIV4 (2<<0) #define CMU_LFBPRESC0_LEUART0_DIV8 (3<<0) +#define CMU_LFBPRESC0_LEUART0_MASK (0x3<<0) /** @} */ @@ -490,6 +519,7 @@ #define CMU_PCNTCTRL_PCNT0CLKSEL_LFACLK (0<<1) #define CMU_PCNTCTRL_PCNT0CLKSEL_PCNT0S0 (1<<1) +#define CMU_PCNTCTRL_PCNT0CLKSEL_MASK (0x1<<1) #define CMU_PCNTCTRL_PCNT0CLKEN (1<<0) /** @} */ @@ -510,8 +540,10 @@ #define CMU_LCDCTRL_VBFDIV_DIV32 (5<<4) #define CMU_LCDCTRL_VBFDIV_DIV64 (6<<4) #define CMU_LCDCTRL_VBFDIV_DIV128 (7<<4) +#define CMU_LCDCTRL_VBFDIV_MASK (0x7<<4) #define CMU_LCDCTRL_VBOOSTEN (1<<3) /* No values defined for the field FDIV */ +#define CMU_LCDCTRL_FDIV_MASK (0x7<<0) /** @} */ @@ -525,6 +557,7 @@ #define CMU_ROUTE_LOCATION_LOC0 (0<<4) #define CMU_ROUTE_LOCATION_LOC1 (1<<4) +#define CMU_ROUTE_LOCATION_MASK (0x7<<4) #define CMU_ROUTE_CLKOUT1PEN (1<<1) #define CMU_ROUTE_CLKOUT0PEN (1<<0) diff --git a/include/libopencm3/efm32/tinygecko/emu.h b/include/libopencm3/efm32/tinygecko/emu.h index 31f4241d..9a043cb2 100644 --- a/include/libopencm3/efm32/tinygecko/emu.h +++ b/include/libopencm3/efm32/tinygecko/emu.h @@ -66,6 +66,7 @@ #define EMU_CTRL_EM4CTRL_TWO (2<<2) #define EMU_CTRL_EM4CTRL_THREE (3<<2) +#define EMU_CTRL_EM4CTRL_MASK (0x3<<2) #define EMU_CTRL_EM2BLOCK (1<<1) /**< When this bit is set, no mode lower than EM1 will be entered */ #define EMU_CTRL_EMVREG (1<<0) /**< When this bit is set, the voltage regulator will stay on in modes lower than EM1 */ diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py index 96407b55..f96f38b5 100644 --- a/include/libopencm3/efm32/tinygecko/generate.py +++ b/include/libopencm3/efm32/tinygecko/generate.py @@ -93,7 +93,10 @@ def yaml2h(filenamebase): else: # FIXME: this should require the 'type' parameter to be set on this field outfile.write("/* No values defined for the field %s */\n"%field['name']) - # FIXME: define mask + + if "values" in field or field.get("length", 1) != 1: + mask = "(%#x<<%s)"%(~(~0< Date: Sun, 4 Mar 2012 16:59:20 +0100 Subject: [PATCH 24/56] efm32 cmu: convenience functions includes a fix for the register definitions (subtle differences between two fields) --- .../efm32/tinygecko/cmu.convenienceheaders | 63 +++++++++++++++ include/libopencm3/efm32/tinygecko/cmu.h | 79 +++++++++++++++++-- include/libopencm3/efm32/tinygecko/cmu.yaml | 12 ++- 3 files changed, 144 insertions(+), 10 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders b/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders index e69de29b..212405d9 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders +++ b/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders @@ -0,0 +1,63 @@ +/** CMU convenience functions + * + * These functions assist in clock switching, and are intended to be safer to + * use than direct fiddling with registers. They try to be suitable for typical + * applications, and will invest some bytes of code in order to minimize power + * consumption. + * + * @todo Work on this module is stalled until I can figure out if there is a + * way to have a cmu_shutdown_unused function at all. + * + * @defgroup EFM32TG_CMU_convenience CMU convenience functions + * @{ + */ + +/** Disable all oscillators not currently in use. + * + * The implementation follows d0034_efm32tg_reference_manual.pdf figure 11.1. + * The clock out pin configurations are not depicted there, but described in + * section 11.3.4. + * + * @todo This function is ignorant of ongoing calibrations. + * + * @todo This doesn't work at all: Fields like HFCLKSEL are write-only. + * */ +static void cmu_shutdown_unused(void) +{ + /* Is HFXO needed? */ + if (!( + (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFXO || + ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFXOQ && + (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) + ) || ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFXO && + (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) + ))) + CMU_OSCENCMD = CMU_OSCENCMD_HFXODIS; + + /* Is HFRCO neede? */ + if (!( + (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFRCO || + ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFRCOQ && + (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) + ) || ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFRCO && + (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) + ))) + {} +// CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; +} + +/** Switch HFCLK to LFRC. This call is not only blocking, but even freezes + * everything depending on HFCLK until LFRC is stable. The procedure is + * sketched in d0034_efm32tg_reference_manual.pdf figure 11.2. */ +static void cmu_hfclk_switch_blocking(void) +{ + CMU_OSCENCMD = CMU_OSCENCMD_LFRCOEN; + CMU_CMD = CMU_CMD_HFCLKSEL_LFRCO; + CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; +} + +/** @} */ diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index aafb261b..210a6382 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -100,14 +100,14 @@ #define CMU_CTRL_CLKOUTSEL1_HFRCOQ (6<<23) #define CMU_CTRL_CLKOUTSEL1_AUXHFRCOQ (7<<23) #define CMU_CTRL_CLKOUTSEL1_MASK (0x7<<23) -#define CMU_CTRL_CLKOUTSEL0_LFRCO (0<<20) -#define CMU_CTRL_CLKOUTSEL0_LFXO (1<<20) -#define CMU_CTRL_CLKOUTSEL0_HFCLK (2<<20) -#define CMU_CTRL_CLKOUTSEL0_LFXOQ (3<<20) -#define CMU_CTRL_CLKOUTSEL0_HFXOQ (4<<20) -#define CMU_CTRL_CLKOUTSEL0_LFRCOQ (5<<20) -#define CMU_CTRL_CLKOUTSEL0_HFRCOQ (6<<20) -#define CMU_CTRL_CLKOUTSEL0_AUXHFRCOQ (7<<20) +#define CMU_CTRL_CLKOUTSEL0_HFRCO (0<<20) +#define CMU_CTRL_CLKOUTSEL0_HFXO (1<<20) +#define CMU_CTRL_CLKOUTSEL0_HFCLK2 (2<<20) +#define CMU_CTRL_CLKOUTSEL0_HFCLK4 (3<<20) +#define CMU_CTRL_CLKOUTSEL0_HFCLK8 (4<<20) +#define CMU_CTRL_CLKOUTSEL0_HFCLK16 (5<<20) +#define CMU_CTRL_CLKOUTSEL0_ULFRCO (6<<20) +#define CMU_CTRL_CLKOUTSEL0_AUXHFRCO (7<<20) #define CMU_CTRL_CLKOUTSEL0_MASK (0x7<<20) #define CMU_CTRL_LFXOTIMEOUT_8CYCLES (0<<18) #define CMU_CTRL_LFXOTIMEOUT_1KCYCLES (1<<18) @@ -580,6 +580,69 @@ /** @} */ +/** CMU convenience functions + * + * These functions assist in clock switching, and are intended to be safer to + * use than direct fiddling with registers. They try to be suitable for typical + * applications, and will invest some bytes of code in order to minimize power + * consumption. + * + * @todo Work on this module is stalled until I can figure out if there is a + * way to have a cmu_shutdown_unused function at all. + * + * @defgroup EFM32TG_CMU_convenience CMU convenience functions + * @{ + */ + +/** Disable all oscillators not currently in use. + * + * The implementation follows d0034_efm32tg_reference_manual.pdf figure 11.1. + * The clock out pin configurations are not depicted there, but described in + * section 11.3.4. + * + * @todo This function is ignorant of ongoing calibrations. + * + * @todo This doesn't work at all: Fields like HFCLKSEL are write-only. + * */ +static void cmu_shutdown_unused(void) +{ + /* Is HFXO needed? */ + if (!( + (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFXO || + ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFXOQ && + (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) + ) || ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFXO && + (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) + ))) + CMU_OSCENCMD = CMU_OSCENCMD_HFXODIS; + + /* Is HFRCO neede? */ + if (!( + (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFRCO || + ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFRCOQ && + (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) + ) || ( + (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFRCO && + (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) + ))) + {} +// CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; +} + +/** Switch HFCLK to LFRC. This call is not only blocking, but even freezes + * everything depending on HFCLK until LFRC is stable. The procedure is + * sketched in d0034_efm32tg_reference_manual.pdf figure 11.2. */ +static void cmu_hfclk_switch_blocking(void) +{ + CMU_OSCENCMD = CMU_OSCENCMD_LFRCOEN; + CMU_CMD = CMU_CMD_HFCLKSEL_LFRCO; + CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; +} + +/** @} */ /** @} */ diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml index 0229de19..bba053c4 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.yaml +++ b/include/libopencm3/efm32/tinygecko/cmu.yaml @@ -19,7 +19,7 @@ registers: - name: CLKOUTSEL1 shift: 23 length: 3 - values: &CLKOUTSEL1_values + values: - {name: LFRCO, value: 0} - {name: LFXO, value: 1} - {name: HFCLK, value: 2} @@ -31,7 +31,15 @@ registers: - name: CLKOUTSEL0 shift: 20 length: 3 - values: *CLKOUTSEL1_values + values: + - {name: HFRCO, value: 0} + - {name: HFXO, value: 1} + - {name: HFCLK2, value: 2} + - {name: HFCLK4, value: 3} + - {name: HFCLK8, value: 4} + - {name: HFCLK16, value: 5} + - {name: ULFRCO, value: 6} + - {name: AUXHFRCO, value: 7} - name: LFXOTIMEOUT shift: 18 length: 2 From c2fdd6e75148911306cff8c32bf341f3533c178f Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 4 Mar 2012 19:45:13 +0100 Subject: [PATCH 25/56] header file generation learned register templates registers that have the same structure can now use shared value definitions. the abstraction is kept active through the header generation; that is, no cartesian product code is generated. --- include/libopencm3/efm32/tinygecko/cmu.h | 42 +++++++++++++++-- include/libopencm3/efm32/tinygecko/cmu.yaml | 19 ++++++-- .../libopencm3/efm32/tinygecko/generate.py | 46 ++++++++++++++++++- 3 files changed, 97 insertions(+), 10 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index 210a6382..db0cbde7 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -61,10 +61,10 @@ #define CMU_CMD MMIO32(CMU_BASE + 0x024) /**< @see EFM32TG_CMU_CMD_bits */ #define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) /**< @see EFM32TG_CMU_LFCLKSEL_bits */ #define CMU_STATUS MMIO32(CMU_BASE + 0x02c) /**< @see EFM32TG_CMU_STATUS_bits */ -#define CMU_IF MMIO32(CMU_BASE + 0x030) /**< @see EFM32TG_CMU_IF_bits */ -#define CMU_IFS MMIO32(CMU_BASE + 0x034) /**< @see EFM32TG_CMU_IFS_bits */ -#define CMU_IFC MMIO32(CMU_BASE + 0x038) /**< @see EFM32TG_CMU_IFC_bits */ -#define CMU_IEN MMIO32(CMU_BASE + 0x03c) /**< @see EFM32TG_CMU_IEN_bits */ +#define CMU_IF MMIO32(CMU_BASE + 0x030) /**< @see EFM32TG_CMU_I_bits */ +#define CMU_IFS MMIO32(CMU_BASE + 0x034) /**< @see EFM32TG_CMU_I_bits */ +#define CMU_IFC MMIO32(CMU_BASE + 0x038) /**< @see EFM32TG_CMU_I_bits */ +#define CMU_IEN MMIO32(CMU_BASE + 0x03c) /**< @see EFM32TG_CMU_I_bits */ #define CMU_HFCORECLKEN0 MMIO32(CMU_BASE + 0x040) /**< @see EFM32TG_CMU_HFCORECLKEN0_bits */ #define CMU_HFPERCLKEN0 MMIO32(CMU_BASE + 0x044) /**< @see EFM32TG_CMU_HFPERCLKEN0_bits */ #define CMU_SYNCBUSY MMIO32(CMU_BASE + 0x050) /**< @see EFM32TG_CMU_SYNCBUSY_bits */ @@ -578,6 +578,40 @@ /** @} */ +/** Bit states for the CMU "I" group of registers (IF, IFS, IFC, IEN) + * + * These registers use this: + * + *
    + * + *
  • The CMU_IF register; see d0034_efm32tg_reference_manual.pdf section + * 11.5.13 for definitions.
    • + * + *
  • The CMU_IFS register; see d0034_efm32tg_reference_manual.pdf section + * 11.5.14 for definitions.
    • + * + *
  • The CMU_IFC register; see d0034_efm32tg_reference_manual.pdf section + * 11.5.15 for definitions.
    • + * + *
  • The CMU_IEN register; see d0034_efm32tg_reference_manual.pdf section + * 11.5.16 for definitions.
    • + * + *
+ * + * @defgroup EFM32TG_CMU_I_bits CMU I bits group + * @{ + */ + +#define CMU_I_CALOF (1<<6) +#define CMU_I_CALRDY (1<<5) +#define CMU_I_AUXHFRCORDY (1<<4) +#define CMU_I_LFXORDY (1<<3) +#define CMU_I_LFRCORDY (1<<2) +#define CMU_I_HFXORDY (1<<1) +#define CMU_I_HFRCORDY (1<<0) + +/** @} */ + /** @} */ /** CMU convenience functions diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml index bba053c4..6153c47f 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.yaml +++ b/include/libopencm3/efm32/tinygecko/cmu.yaml @@ -6,6 +6,17 @@ shortname: CMU longname: Clock Management Unit baseref: d0034_efm32tg_reference_manual.pdf section 11 registers_baserefext: ".4" +templateregs: + - name: I + comment: Bits for the various CMU interrupt registers + fields: + - {name: CALOF, shift: 6} + - {name: CALRDY, shift: 5} + - {name: AUXHFRCORDY, shift: 4} + - {name: LFXORDY, shift: 3} + - {name: LFRCORDY, shift: 2} + - {name: HFXORDY, shift: 1} + - {name: HFRCORDY, shift: 0} registers: - name: CTRL offset: 0x000 @@ -265,19 +276,19 @@ registers: - name: IF offset: 0x030 definition_baserefext: ".5.13" - #fields: I + fields: I - name: IFS offset: 0x034 definition_baserefext: ".5.14" - #fields: I + fields: I - name: IFC offset: 0x038 definition_baserefext: ".5.15" - #fields: I + fields: I - name: IEN offset: 0x03c definition_baserefext: ".5.16" - #fields: I + fields: I - name: HFCORECLKEN0 offset: 0x040 definition_baserefext: ".5.17" diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py index f96f38b5..035b4d97 100644 --- a/include/libopencm3/efm32/tinygecko/generate.py +++ b/include/libopencm3/efm32/tinygecko/generate.py @@ -64,20 +64,62 @@ def yaml2h(filenamebase): nl() regs = data['registers'] + + for template in data.get('templateregs', []): + template['is_template'] = [] + regs.append(template) + + regs_dict = dict((x['name'], x) for x in regs) # for easier access. they've got to be a list in yaml to preserve order + wc("These definitions reflect {baseref}{registers_baserefext}", "@defgroup {shortdocname}_registers {shortname} registers", "@{{") nl() + for regdata in regs: - define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], regdata['name'], 'values' if 'values' in regdata else 'bits')) + if 'is_template' in regdata: + # this isn't a real register, just a template + continue + secondcomponent_name = regdata['name'] + if ('fields' in regdata and isinstance(regdata['fields'], str)) or ('values' in regdata and isinstance(regdata['values'], str)): + # uses a template + secondcomponent_name = regdata['fields'] if 'fields' in regdata else regdata['values'] + regs_dict[secondcomponent_name]['is_template'].append(regdata['name']) + + define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], secondcomponent_name, 'values' if 'values' in regdata else 'bits')) nl() wc_close() # close register definitions nl() + for regdata in regs: has_bits = "fields" in regdata has_values = "values" in regdata + is_template = "is_template" in regdata if not has_bits and not has_values: continue - wc("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values"), "See {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."), '@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values',)*2), '@{{', **regdata) + if (has_bits and isinstance(regdata['fields'], str)) or (has_values and isinstance(regdata['values'], str)): + # uses a template, doesn't need own section + continue + + commentlines = [] + if is_template: + commentlines.append("%s for the {shortname} \"{name}\" group of registers (%s)"%("Bit states" if has_bits else "Values", ", ".join(regdata['is_template']))) + assert len(regdata['is_template']) > 0, "What should I talk about when nobody uses this template?" + commentlines.append("These registers use this:") + commentlines.append("
    ") # FIXME: once we're using markdown 1.8, this can be changed to markdown + for user in regdata['is_template']: + userdata = regs_dict[user] + # FIXME: this is an ugly hack around this being in a single wc() line which doesn't take per-line contexts + mergeddata = data.copy() + mergeddata.update(userdata) + commentlines.append(("
  • The {shortname}_{name} register; see {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."+"
    • ")).format(**mergeddata)) + commentlines.append("
") + commentlines.append('@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values', 'bits group' if has_bits else 'values group'))) + else: + commentlines.append("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values")) + commentlines.append("See {baseref}{definition_baserefext} for definitions"+regdata.get("details", ".")) + commentlines.append('@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values',)*2)) + commentlines.append('@{{') + wc(*commentlines, **regdata) nl() if has_bits: From 692817059cb53fe854e7c4d8f3c0e3a8a6836eab Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 4 Mar 2012 22:43:52 +0100 Subject: [PATCH 26/56] various enhancements for header generation * don't reference sections that don't exist (typically happens for registers that don't contain any fields and are interpreted numerically. * allow templates to use override_backref for surpressing the list of registers that use it * print doc for fields even when it uses values or only exports a mask * allow fields to define their own mask; those fields have to define their values explicitly too, and don't have to provide a shift * don't print a "No values defined for the field" lines, as there's always a mask in that case by now. --- include/libopencm3/efm32/tinygecko/cmu.h | 9 +--- include/libopencm3/efm32/tinygecko/cmu.yaml | 2 + .../libopencm3/efm32/tinygecko/generate.py | 46 ++++++++++++------- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h index db0cbde7..80c959ff 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ b/include/libopencm3/efm32/tinygecko/cmu.h @@ -53,10 +53,10 @@ #define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) /**< @see EFM32TG_CMU_HFCORECLKDIV_values */ #define CMU_HFPERCLKDIV MMIO32(CMU_BASE + 0x008) /**< @see EFM32TG_CMU_HFPERCLKDIV_bits */ #define CMU_HFRCOCTRL MMIO32(CMU_BASE + 0x00c) /**< @see EFM32TG_CMU_HFRCOCTRL_bits */ -#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) /**< @see EFM32TG_CMU_LFRCOCTRL_bits */ +#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) #define CMU_AUXHFRCOCTRL MMIO32(CMU_BASE + 0x014) /**< @see EFM32TG_CMU_AUXHFRCOCTRL_bits */ #define CMU_CALCTRL MMIO32(CMU_BASE + 0x018) /**< @see EFM32TG_CMU_CALCTRL_bits */ -#define CMU_CALCNT MMIO32(CMU_BASE + 0x01c) /**< @see EFM32TG_CMU_CALCNT_bits */ +#define CMU_CALCNT MMIO32(CMU_BASE + 0x01c) #define CMU_OSCENCMD MMIO32(CMU_BASE + 0x020) /**< @see EFM32TG_CMU_OSCENCMD_bits */ #define CMU_CMD MMIO32(CMU_BASE + 0x024) /**< @see EFM32TG_CMU_CMD_bits */ #define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) /**< @see EFM32TG_CMU_LFCLKSEL_bits */ @@ -128,7 +128,6 @@ #define CMU_CTRL_HFXOTIMEOUT_16KCYCLES (3<<9) #define CMU_CTRL_HFXOTIMEOUT_MASK (0x3<<9) #define CMU_CTRL_HFXOGLITCHDETEN (1<<7) -/* No values defined for the field HFXOBUFCUR */ #define CMU_CTRL_HFXOBUFCUR_MASK (0x3<<5) #define CMU_CTRL_HFXOBOOST_50PCENT (0<<2) #define CMU_CTRL_HFXOBOOST_70PCENT (1<<2) @@ -194,7 +193,6 @@ * @{ */ -/* No values defined for the field SUDELAY */ #define CMU_HFRCOCTRL_SUDELAY_MASK (0x1f<<12) #define CMU_HFRCOCTRL_BAND_1MHZ (0<<8) #define CMU_HFRCOCTRL_BAND_7MHZ (1<<8) @@ -203,7 +201,6 @@ #define CMU_HFRCOCTRL_BAND_21MHZ (4<<8) #define CMU_HFRCOCTRL_BAND_28MHZ (5<<8) #define CMU_HFRCOCTRL_BAND_MASK (0x7<<8) -/* No values defined for the field TUNING */ #define CMU_HFRCOCTRL_TUNING_MASK (0xff<<0) /** @} */ @@ -223,7 +220,6 @@ #define CMU_AUXHFRCOCTRL_BAND_28MHZ (6<<8) #define CMU_AUXHFRCOCTRL_BAND_21MHZ (7<<8) #define CMU_AUXHFRCOCTRL_BAND_MASK (0x7<<8) -/* No values defined for the field TUNING */ #define CMU_AUXHFRCOCTRL_TUNING_MASK (0xff<<0) /** @} */ @@ -542,7 +538,6 @@ #define CMU_LCDCTRL_VBFDIV_DIV128 (7<<4) #define CMU_LCDCTRL_VBFDIV_MASK (0x7<<4) #define CMU_LCDCTRL_VBOOSTEN (1<<3) -/* No values defined for the field FDIV */ #define CMU_LCDCTRL_FDIV_MASK (0x7<<0) /** @} */ diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml index 6153c47f..7b83b7fb 100644 --- a/include/libopencm3/efm32/tinygecko/cmu.yaml +++ b/include/libopencm3/efm32/tinygecko/cmu.yaml @@ -153,6 +153,7 @@ registers: offset: 0x010 definition_baserefext: ".5.5" length: 7 + type: uint - name: AUXHFRCOCTRL offset: 0x014 definition_baserefext: ".5.6" @@ -200,6 +201,7 @@ registers: offset: 0x01c definition_baserefext: ".5.8" length: 19 + type: uint - name: OSCENCMD offset: 0x020 definition_baserefext: ".5.9" diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py index 035b4d97..7f426a4d 100644 --- a/include/libopencm3/efm32/tinygecko/generate.py +++ b/include/libopencm3/efm32/tinygecko/generate.py @@ -75,16 +75,19 @@ def yaml2h(filenamebase): nl() for regdata in regs: - if 'is_template' in regdata: + has_bits = "fields" in regdata + has_values = "values" in regdata + is_template = "is_template" in regdata + if is_template: # this isn't a real register, just a template continue secondcomponent_name = regdata['name'] - if ('fields' in regdata and isinstance(regdata['fields'], str)) or ('values' in regdata and isinstance(regdata['values'], str)): + if (has_bits and isinstance(regdata['fields'], str)) or (has_values and isinstance(regdata['values'], str)): # uses a template - secondcomponent_name = regdata['fields'] if 'fields' in regdata else regdata['values'] + secondcomponent_name = regdata['fields'] if has_bits else regdata['values'] regs_dict[secondcomponent_name]['is_template'].append(regdata['name']) - define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], secondcomponent_name, 'values' if 'values' in regdata else 'bits')) + define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], secondcomponent_name, 'values' if 'values' in regdata else 'bits') if has_bits or has_values else None) nl() wc_close() # close register definitions nl() @@ -104,15 +107,18 @@ def yaml2h(filenamebase): if is_template: commentlines.append("%s for the {shortname} \"{name}\" group of registers (%s)"%("Bit states" if has_bits else "Values", ", ".join(regdata['is_template']))) assert len(regdata['is_template']) > 0, "What should I talk about when nobody uses this template?" - commentlines.append("These registers use this:") - commentlines.append("
    ") # FIXME: once we're using markdown 1.8, this can be changed to markdown - for user in regdata['is_template']: - userdata = regs_dict[user] - # FIXME: this is an ugly hack around this being in a single wc() line which doesn't take per-line contexts - mergeddata = data.copy() - mergeddata.update(userdata) - commentlines.append(("
  • The {shortname}_{name} register; see {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."+"
    • ")).format(**mergeddata)) - commentlines.append("
") + if 'override_backref' in regdata: + commentlines.append(regdata['override_backref']) + else: + commentlines.append("These registers use this:") + commentlines.append("
    ") # FIXME: once we're using markdown 1.8, this can be changed to markdown + for user in regdata['is_template']: + userdata = regs_dict[user] + # FIXME: this is an ugly hack around this being in a single wc() line which doesn't take per-line contexts + mergeddata = data.copy() + mergeddata.update(userdata) + commentlines.append(("
  • The {shortname}_{name} register; see {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."+"
    • ")).format(**mergeddata)) + commentlines.append("
") commentlines.append('@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values', 'bits group' if has_bits else 'values group'))) else: commentlines.append("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values")) @@ -126,18 +132,26 @@ def yaml2h(filenamebase): for field in regdata['fields']: #shiftdefine = "_%s_%s_%s_shift"%(shortname, regdata['name'], field['name']) #define(shiftdefine, field['shift']) + + # there is one condition under which field's doc would get shown; show it immediately otherwise + if 'doc' in field and not ("values" not in field and field.get("length", 1) == 1): + wc(field['doc']) + if "values" in field: for value in field.get("values"): - define("%s_%s_%s_%s"%(data['shortname'], regdata['name'], field['name'], value['name']), "(%s<<%s)"%(value['value'], field['shift']), value.get('doc', None)) + define("%s_%s_%s_%s"%(data['shortname'], regdata['name'], field['name'], value['name']), value['value'] if "mask" in field else "(%s<<%s)"%(value['value'], field['shift']), value.get('doc', None)) else: if field.get('length', 1) == 1: define("%s_%s_%s"%(data['shortname'], regdata['name'], field['name']), "(1<<%s)"%field['shift'], field.get('doc', None)) else: # FIXME: this should require the 'type' parameter to be set on this field - outfile.write("/* No values defined for the field %s */\n"%field['name']) + pass if "values" in field or field.get("length", 1) != 1: - mask = "(%#x<<%s)"%(~(~0< Date: Sun, 4 Mar 2012 22:48:13 +0100 Subject: [PATCH 27/56] efm32: registers for leds --- .../libopencm3/efm32/tinygecko/generate.yaml | 1 + .../efm32/tinygecko/lcd.convenienceheaders | 0 include/libopencm3/efm32/tinygecko/lcd.h | 293 ++++++++++++++++++ include/libopencm3/efm32/tinygecko/lcd.yaml | 238 ++++++++++++++ 4 files changed, 532 insertions(+) create mode 100644 include/libopencm3/efm32/tinygecko/lcd.convenienceheaders create mode 100644 include/libopencm3/efm32/tinygecko/lcd.h create mode 100644 include/libopencm3/efm32/tinygecko/lcd.yaml diff --git a/include/libopencm3/efm32/tinygecko/generate.yaml b/include/libopencm3/efm32/tinygecko/generate.yaml index 878d0ad8..b7ade5db 100644 --- a/include/libopencm3/efm32/tinygecko/generate.yaml +++ b/include/libopencm3/efm32/tinygecko/generate.yaml @@ -1,2 +1,3 @@ - emu - cmu +- lcd diff --git a/include/libopencm3/efm32/tinygecko/lcd.convenienceheaders b/include/libopencm3/efm32/tinygecko/lcd.convenienceheaders new file mode 100644 index 00000000..e69de29b diff --git a/include/libopencm3/efm32/tinygecko/lcd.h b/include/libopencm3/efm32/tinygecko/lcd.h new file mode 100644 index 00000000..29f4b43d --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/lcd.h @@ -0,0 +1,293 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/** @file + * @see EFM32TG_LCD + */ + +/** Definitions for the LCD subsystem (Liquid Crystal Display driver). + * + * This corresponds to the description in d0034_efm32tg_reference_manual.pdf + * section 29. + * + * @ingroup EFM32TG + * @defgroup EFM32TG_LCD LCD (Liquid Crystal Display driver) + * @{ + */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_LCD_H +#define LIBOPENCM3_EFM32_TINYGECKO_LCD_H + +#include +#include + +/** Register definitions and register value definitions for the LCD subsystem + * + * @defgroup EFM32TG_LCD_regsandvals LCD registers and values + * @{ + */ + +/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 29.4 + * + * @defgroup EFM32TG_LCD_registers LCD registers + * @{ + */ + +#define LCD_CTRL MMIO32(LCD_BASE + 0x000) /**< @see EFM32TG_LCD_CTRL_bits */ +#define LCD_DISPCTRL MMIO32(LCD_BASE + 0x004) /**< @see EFM32TG_LCD_DISPCTRL_bits */ +#define LCD_SEGEN MMIO32(LCD_BASE + 0x008) +#define LCD_BACTRL MMIO32(LCD_BASE + 0x00c) /**< @see EFM32TG_LCD_BACTRL_bits */ +#define LCD_STATUS MMIO32(LCD_BASE + 0x010) /**< @see EFM32TG_LCD_STATUS_bits */ +#define LCD_AREGA MMIO32(LCD_BASE + 0x014) +#define LCD_AREGB MMIO32(LCD_BASE + 0x018) +#define LCD_IF MMIO32(LCD_BASE + 0x01c) /**< @see EFM32TG_LCD_I_bits */ +#define LCD_IFS MMIO32(LCD_BASE + 0x020) /**< @see EFM32TG_LCD_I_bits */ +#define LCD_IFC MMIO32(LCD_BASE + 0x024) /**< @see EFM32TG_LCD_I_bits */ +#define LCD_IEN MMIO32(LCD_BASE + 0x028) /**< @see EFM32TG_LCD_I_bits */ +#define LCD_SEGD0L MMIO32(LCD_BASE + 0x040) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD1L MMIO32(LCD_BASE + 0x044) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD2L MMIO32(LCD_BASE + 0x048) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD3L MMIO32(LCD_BASE + 0x04c) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_FREEZE MMIO32(LCD_BASE + 0x060) /**< @see EFM32TG_LCD_FREEZE_bits */ +#define LCD_SYNGBUSY MMIO32(LCD_BASE + 0x064) /**< @see EFM32TG_LCD_SYNGBUSY_bits */ +#define LCD_SEGD4L MMIO32(LCD_BASE + 0x0cc) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD5L MMIO32(LCD_BASE + 0x0d0) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD6L MMIO32(LCD_BASE + 0x0d4) /**< @see EFM32TG_LCD_SEG_bits */ +#define LCD_SEGD7L MMIO32(LCD_BASE + 0x0d8) /**< @see EFM32TG_LCD_SEG_bits */ + +/** @} */ + +/** Bit states for the LCD_CTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.1 for definitions. + * + * @defgroup EFM32TG_LCD_CTRL_bits LCD CTRL bits + * @{ + */ + +#define LCD_CTRL_DSC (1<<23) +#define LCD_CTRL_UDCTRL_REGULAR (0<<1) +#define LCD_CTRL_UDCTRL_FCEVENT (1<<1) +#define LCD_CTRL_UDCTRL_FRAMESTART (2<<1) +#define LCD_CTRL_UDCTRL_MASK (0x3<<1) +#define LCD_CTRL_EN (1<<0) + +/** @} */ + +/** Bit states for the LCD_DISPCTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.2 for definitions. + * + * @defgroup EFM32TG_LCD_DISPCTRL_bits LCD DISPCTRL bits + * @{ + */ + +#define LCD_DISPCTRL_VBLEV_LEVEL0 (0<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL1 (1<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL2 (2<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL3 (3<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL4 (4<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL5 (5<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL6 (6<<18) +#define LCD_DISPCTRL_VBLEV_LEVEL7 (7<<18) +#define LCD_DISPCTRL_VBLEV_MASK (0x7<<18) +#define LCD_DISPCTRL_VLCDSEL_VDD (0<<16) +#define LCD_DISPCTRL_VLCDSEL_VEXTBOOST (1<<16) +#define LCD_DISPCTRL_VLCDSEL_MASK (0x1<<16) +#define LCD_DISPCTRL_CONCONF_VLCD (0<<15) +#define LCD_DISPCTRL_CONCONF_GND (1<<15) +#define LCD_DISPCTRL_CONCONF_MASK (0x1<<15) +/** By this parameter, the voltage V_LCD_OUT is interpolated linearly from + * 0.5V_LCD to V_LCD. + */ +#define LCD_DISPCTRL_CONLEV_MASK (0x1f<<8) +#define LCD_DISPCTRL_WAVE_LOWPOWER (0<<4) +#define LCD_DISPCTRL_WAVE_NORMAL (1<<4) +#define LCD_DISPCTRL_WAVE_MASK (0x1<<4) +#define LCD_DISPCTRL_BIAS_STATIC (0<<2) +#define LCD_DISPCTRL_BIAS_ONEHALF (1<<2) +#define LCD_DISPCTRL_BIAS_ONETHIRD (2<<2) +#define LCD_DISPCTRL_BIAS_ONEFOURTH (3<<2) +#define LCD_DISPCTRL_BIAS_MASK (0x3<<2) +/** These definitions munge the MUX and the MUXE fields, as they are described + * in the documentation only together too. + */ +#define LCD_DISPCTRL_MUX_STATIC 0x00000000 +#define LCD_DISPCTRL_MUX_DUPLEX 0x00000001 +#define LCD_DISPCTRL_MUX_TRIPLEX 0x00000002 +#define LCD_DISPCTRL_MUX_QUADRUPLEX 0x00000003 +#define LCD_DISPCTRL_MUX_SEXTAPLEX 0x00400001 +#define LCD_DISPCTRL_MUX_OCTAPLEX 0x00400003 +#define LCD_DISPCTRL_MUX_MASK 0x00400003 + +/** @} */ + +/** Bit states for the LCD_BACTRL register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.4 for definitions. + * + * @defgroup EFM32TG_LCD_BACTRL_bits LCD BACTRL bits + * @{ + */ + +#define LCD_BACTRL_FCTOP_MASK (0x3f<<18) +#define LCD_BACTRL_FCPRESC_DIV1 (0<<16) +#define LCD_BACTRL_FCPRESC_DIV2 (1<<16) +#define LCD_BACTRL_FCPRESC_DIV4 (2<<16) +#define LCD_BACTRL_FCPRESC_DIV8 (3<<16) +#define LCD_BACTRL_FCPRESC_MASK (0x3<<16) +#define LCD_BACTRL_FCEN (1<<8) +#define LCD_BACTRL_ALGOSEL_AND (0<<7) +#define LCD_BACTRL_ALGOSEL_OR (1<<7) +#define LCD_BACTRL_ALGOSEL_MASK (0x1<<7) +#define LCD_BACTRL_AREGBSC_NOSHIFT (0<<5) +#define LCD_BACTRL_AREGBSC_SHIFTLEFT (1<<5) +#define LCD_BACTRL_AREGBSC_SHIFTRIGHT (2<<5) +#define LCD_BACTRL_AREGBSC_MASK (0x3<<5) +#define LCD_BACTRL_AREGASC_NOSHIFT (0<<3) +#define LCD_BACTRL_AREGASC_SHIFTLEFT (1<<3) +#define LCD_BACTRL_AREGASC_SHIFTRIGHT (2<<3) +#define LCD_BACTRL_AREGASC_MASK (0x3<<3) +#define LCD_BACTRL_AEN (1<<2) +#define LCD_BACTRL_BLANK (1<<1) +#define LCD_BACTRL_BLINKEN (1<<0) + +/** @} */ + +/** Bit states for the LCD_STATUS register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.5 for definitions. + * + * @defgroup EFM32TG_LCD_STATUS_bits LCD STATUS bits + * @{ + */ + +#define LCD_STATUS_BLINK (1<<8) +#define LCD_STATUS_ASTATE_MASK (0xf<<0) + +/** @} */ + +/** Bit states for the LCD_FREEZE register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.16 for definitions. + * + * @defgroup EFM32TG_LCD_FREEZE_bits LCD FREEZE bits + * @{ + */ + +#define LCD_FREEZE_REGFREEZE_UPDATE (0<<0) +#define LCD_FREEZE_REGFREEZE_FREEZE (1<<0) +#define LCD_FREEZE_REGFREEZE_MASK (0x1<<0) + +/** @} */ + +/** Bit states for the LCD_SYNGBUSY register + * + * See d0034_efm32tg_reference_manual.pdf section 29.5.17 for definitions. + * + * @defgroup EFM32TG_LCD_SYNGBUSY_bits LCD SYNGBUSY bits + * @{ + */ + +#define LCD_SYNGBUSY_SEGD7L (1<<19) +#define LCD_SYNGBUSY_SEGD6L (1<<18) +#define LCD_SYNGBUSY_SEGD5L (1<<17) +#define LCD_SYNGBUSY_SEGD4L (1<<16) +#define LCD_SYNGBUSY_SEGD3L (1<<7) +#define LCD_SYNGBUSY_SEGD2L (1<<6) +#define LCD_SYNGBUSY_SEGD1L (1<<5) +#define LCD_SYNGBUSY_SEGD0L (1<<4) +#define LCD_SYNGBUSY_AREGB (1<<3) +#define LCD_SYNGBUSY_AREGA (1<<2) +#define LCD_SYNGBUSY_BACTRL (1<<1) +#define LCD_SYNGBUSY_CTRL (1<<0) + +/** @} */ + +/** Bit states for the LCD "I" group of registers (IF, IFS, IFC, IEN) + * + * These registers use this: + * + *
    + * + *
  • The LCD_IF register; see d0034_efm32tg_reference_manual.pdf section + * 29.5.8 for definitions.
    • + * + *
  • The LCD_IFS register; see d0034_efm32tg_reference_manual.pdf section + * 29.5.9 for definitions.
    • + * + *
  • The LCD_IFC register; see d0034_efm32tg_reference_manual.pdf section + * 29.5.10 for definitions.
    • + * + *
  • The LCD_IEN register; see d0034_efm32tg_reference_manual.pdf section + * 29.5.11 for definitions.
    • + * + *
+ * + * @defgroup EFM32TG_LCD_I_bits LCD I bits group + * @{ + */ + +#define LCD_I_FC (1<<0) + +/** @} */ + +/** Bit states for the LCD "SEG" group of registers (SEGD0L, SEGD1L, SEGD2L, + * SEGD3L, SEGD4L, SEGD5L, SEGD6L, SEGD7L) + * + * These values are used by the SEGDxL registers, as defined in + * d0034_efm32tg_reference_manual.pdf sections 29.5.12 to .15 and .18 to .21. + * + * @defgroup EFM32TG_LCD_SEG_bits LCD SEG bits group + * @{ + */ + +#define LCD_SEG_23 (1<<23) +#define LCD_SEG_22 (1<<22) +#define LCD_SEG_21 (1<<21) +#define LCD_SEG_20 (1<<20) +#define LCD_SEG_19 (1<<19) +#define LCD_SEG_18 (1<<18) +#define LCD_SEG_17 (1<<17) +#define LCD_SEG_16 (1<<16) +#define LCD_SEG_15 (1<<15) +#define LCD_SEG_14 (1<<14) +#define LCD_SEG_13 (1<<13) +#define LCD_SEG_12 (1<<12) +#define LCD_SEG_11 (1<<11) +#define LCD_SEG_10 (1<<10) +#define LCD_SEG_9 (1<<9) +#define LCD_SEG_8 (1<<8) +#define LCD_SEG_7 (1<<7) +#define LCD_SEG_6 (1<<6) +#define LCD_SEG_5 (1<<5) +#define LCD_SEG_4 (1<<4) +#define LCD_SEG_3 (1<<3) +#define LCD_SEG_2 (1<<2) +#define LCD_SEG_1 (1<<1) +#define LCD_SEG_0 (1<<0) + +/** @} */ + +/** @} */ + + +/** @} */ + +#endif diff --git a/include/libopencm3/efm32/tinygecko/lcd.yaml b/include/libopencm3/efm32/tinygecko/lcd.yaml new file mode 100644 index 00000000..1b2b7581 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/lcd.yaml @@ -0,0 +1,238 @@ +copyright: "2012 chrysn " +license: lgpl-3+ +ingroup: EFM32TG +shortdocname: EFM32TG_LCD +shortname: LCD +longname: Liquid Crystal Display driver +baseref: d0034_efm32tg_reference_manual.pdf section 29 +registers_baserefext: ".4" +templateregs: + - name: I + comment: Bits for the various LCD interrupt registers + fields: + - {name: FC, shift: 0} + - name: SEG + comment: Bits for the individual SEG pins + override_backref: These values are used by the SEGDxL registers, as defined in d0034_efm32tg_reference_manual.pdf sections 29.5.12 to .15 and .18 to .21. + fields: + - {name: 23, shift: 23} + - {name: 22, shift: 22} + - {name: 21, shift: 21} + - {name: 20, shift: 20} + - {name: 19, shift: 19} + - {name: 18, shift: 18} + - {name: 17, shift: 17} + - {name: 16, shift: 16} + - {name: 15, shift: 15} + - {name: 14, shift: 14} + - {name: 13, shift: 13} + - {name: 12, shift: 12} + - {name: 11, shift: 11} + - {name: 10, shift: 10} + - {name: 9, shift: 9} + - {name: 8, shift: 8} + - {name: 7, shift: 7} + - {name: 6, shift: 6} + - {name: 5, shift: 5} + - {name: 4, shift: 4} + - {name: 3, shift: 3} + - {name: 2, shift: 2} + - {name: 1, shift: 1} + - {name: 0, shift: 0} +registers: + - name: CTRL + offset: 0x000 + definition_baserefext: .5.1 + fields: + - name: DSC + shift: 23 + - name: UDCTRL + shift: 1 + length: 2 + values: + - {name: REGULAR, value: 0} + - {name: FCEVENT, value: 1} + - {name: FRAMESTART, value: 2} + - name: EN + shift: 0 + - name: DISPCTRL + offset: 0x004 + definition_baserefext: .5.2 + fields: + # MUXE left out and defined manually at the end + - name: VBLEV + shift: 18 + length: 3 + values: + - {name: LEVEL0, value: 0} + - {name: LEVEL1, value: 1} + - {name: LEVEL2, value: 2} + - {name: LEVEL3, value: 3} + - {name: LEVEL4, value: 4} + - {name: LEVEL5, value: 5} + - {name: LEVEL6, value: 6} + - {name: LEVEL7, value: 7} + - name: VLCDSEL + shift: 16 + values: + - {name: VDD, value: 0} + - {name: VEXTBOOST, value: 1} + - name: CONCONF + shift: 15 + values: + - {value: 0, name: VLCD} + - {value: 1, name: GND} + - name: CONLEV + shift: 8 + length: 5 + type: uint + doc: "By this parameter, the voltage V_LCD_OUT is interpolated linearly from 0.5V_LCD to V_LCD." + - name: WAVE + shift: 4 + values: + - {value: 0, name: LOWPOWER} + - {value: 1, name: NORMAL} + - name: BIAS + shift: 2 + length: 2 + values: + - {value: 0, name: STATIC} + - {value: 1, name: ONEHALF} + - {value: 2, name: ONETHIRD} + - {value: 3, name: ONEFOURTH} + - name: MUX + mask: "0x00400003" + values: + - {value: "0x00000000", name: STATIC} + - {value: "0x00000001", name: DUPLEX} + - {value: "0x00000002", name: TRIPLEX} + - {value: "0x00000003", name: QUADRUPLEX} + - {value: "0x00400001", name: SEXTAPLEX} + - {value: "0x00400003", name: OCTAPLEX} + doc: These definitions munge the MUX and the MUXE fields, as they are described in the documentation only together too. + - name: SEGEN + offset: 0x008 + definition_baserefext: .5.3 + # FIXME how do we reperesent this best? + - name: BACTRL + offset: 0x00c + definition_baserefext: .5.4 + fields: + - name: FCTOP + shift: 18 + length: 6 + type: uint + - name: FCPRESC + shift: 16 + length: 2 + values: + - {value: 0, name: DIV1} + - {value: 1, name: DIV2} + - {value: 2, name: DIV4} + - {value: 3, name: DIV8} + - name: FCEN + shift: 8 + - name: ALGOSEL + shift: 7 + values: + - {value: 0, name: AND} + - {value: 1, name: OR} + - name: AREGBSC + shift: 5 + length: 2 + values: &BACTRL_AREGBSC + - {value: 0, name: NOSHIFT} + - {value: 1, name: SHIFTLEFT} + - {value: 2, name: SHIFTRIGHT} + - name: AREGASC + shift: 3 + length: 2 + values: *BACTRL_AREGBSC + - name: AEN + shift: 2 + - name: BLANK + shift: 1 + - name: BLINKEN + shift: 0 + - name: STATUS + offset: 0x010 + definition_baserefext: .5.5 + fields: + - name: BLINK + shift: 8 + - name: ASTATE + shift: 0 + length: 4 + type: uint + - name: AREGA + offset: 0x014 + # FIXME: how do we represent this in the header? + - name: AREGB + offset: 0x018 + # FIXME: how do we represent this in the header? + - name: IF + offset: 0x01c + definition_baserefext: .5.8 + fields: I + - name: IFS + offset: 0x020 + definition_baserefext: .5.9 + fields: I + - name: IFC + offset: 0x024 + definition_baserefext: .5.10 + fields: I + - name: IEN + offset: 0x028 + definition_baserefext: .5.11 + fields: I + - name: SEGD0L + offset: 0x040 + fields: SEG + - name: SEGD1L + offset: 0x044 + fields: SEG + - name: SEGD2L + offset: 0x048 + fields: SEG + - name: SEGD3L + offset: 0x04c + fields: SEG + - name: FREEZE + offset: 0x060 + definition_baserefext: .5.16 + fields: + - name: REGFREEZE + shift: 0 + values: + - {value: 0, name: UPDATE} + - {value: 1, name: FREEZE} + # FIXME: this seems to be a typical FREEZE register + - name: SYNGBUSY + offset: 0x064 + definition_baserefext: .5.17 + fields: + - {name: SEGD7L, shift: 19} + - {name: SEGD6L, shift: 18} + - {name: SEGD5L, shift: 17} + - {name: SEGD4L, shift: 16} + - {name: SEGD3L, shift: 7} + - {name: SEGD2L, shift: 6} + - {name: SEGD1L, shift: 5} + - {name: SEGD0L, shift: 4} + - {name: AREGB, shift: 3} + - {name: AREGA, shift: 2} + - {name: BACTRL, shift: 1} + - {name: CTRL, shift: 0} + - name: SEGD4L + offset: 0x0CC + fields: SEG + - name: SEGD5L + offset: 0x0D0 + fields: SEG + - name: SEGD6L + offset: 0x0D4 + fields: SEG + - name: SEGD7L + offset: 0x0D8 + fields: SEG From 48b3cd49fb7570ae105bae113cb512594e216cac Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 23 Mar 2012 01:18:16 +0100 Subject: [PATCH 28/56] first working example utilizing efm32lib this *does* include hardcoded paths of my local machine; that will be fixed with the next commits. --- .../miniblink-efm32lib/Makefile | 26 +++++++ .../miniblink-efm32lib/README | 9 +++ .../miniblink-efm32lib/core_cm3.h | 41 +++++++++++ .../miniblink-efm32lib/efm32_cmu.c | 1 + .../miniblink-efm32lib/efm32_gpio.c | 1 + .../miniblink-efm32lib/miniblink.c | 69 +++++++++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h create mode 120000 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c create mode 120000 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile new file mode 100644 index 00000000..0da7462e --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile @@ -0,0 +1,26 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +BINARY = miniblink + +OBJS += efm32_gpio.o efm32_cmu.o +CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32TG840F32 -I. + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README new file mode 100644 index 00000000..49c6d114 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README @@ -0,0 +1,9 @@ +=================================================== +EFM32-TG-STK3300 Examples miniblink-efm32lib README +=================================================== + +This is a port of the miniblink example to the efm32lib library. + +It's intended for the EFM32-TG-STK3300 eval board. It should blink the user LED +on the board, just as the original miniblink example does. + diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h new file mode 100644 index 00000000..6a3fdbbd --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h @@ -0,0 +1,41 @@ +/* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ +#include + +/* needed by system_efm32.h:196, guessing */ +#define __INLINE inline + +/* needed around efm32tg840f32.h:229. comparing the efm32lib definitions to the + * libopencm3 ones, "volatile" is all that's missing. */ +#define __IO volatile +#define __O volatile +#define __I volatile + +/* -> style access for what is defined in libopencm3/stm32/f1/scb.h / + * cm3/memorymap.h, as it's needed by efm32lib/inc/efm32_emu.h */ + +/* from stm32/f1/scb.h */ +#define SCB_SCR_SLEEPDEEP_Msk (1 << 2) +/* structure as in, for example, + * DeviceSupport/EnergyMicro/EFM32/efm32tg840f32.h, data from + * libopencm3/stm32/f1/scb.h. incomplete. */ +typedef struct +{ + __IO uint32_t CPUID; + __IO uint32_t ICSR; + __IO uint32_t VTOR; + __IO uint32_t AIRCR; + __IO uint32_t SCR; + __IO uint32_t CCR; +} SCB_TypeDef; +#define SCB ((SCB_TypeDef *) SCB_BASE) +/* from libopencm3/cm3/memorymap.h */ +#define PPBI_BASE 0xE0000000 +#define SCS_BASE (PPBI_BASE + 0xE000) +#define SCB_BASE (SCS_BASE + 0x0D00) + +/* needed by efm32_emu.h, guessing and taking the implementation used in + * lightswitch-interrupt.c */ +#define __WFI() __asm__("wfi") + +/* needed by efm32_cmu.h, probably it's just what gcc provides anyway */ +#define __CLZ(div) __builtin_clz(div) diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c new file mode 120000 index 00000000..168574b0 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c new file mode 120000 index 00000000..0b2df219 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c new file mode 100644 index 00000000..9fa0b230 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c @@ -0,0 +1,69 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include + +void led_setup(void); +void led_toggle(void); + +/** @file + * Minimal example for making the User LED of the EFM32-TG-STK330 eval board blink. + */ + +/** + * Toggle the User LED in an infinite loop, with time between the toggling + * determined by a busy loop stupidly counting up. + */ + +int main(void) +{ + int x; + + led_setup(); + + while(1) { + for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ + led_toggle(); + }; +} + +/** + * Enable GPIO, and set up port D7 as an output pin. + */ + +void led_setup(void) +{ + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; + + // The User LED is connected to PD7 to the plus side of the LED + // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 + // and 16.3 (called UIF_LED0) + + GPIO_PinModeSet(gpioPortD, 7, gpioModePushPull, 0); +} + +void led_toggle(void) +{ + GPIO_PinOutToggle(gpioPortD, 7); +} From 0e62b15125c46b63913dd240d8cccefe510034d1 Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 4 Apr 2012 19:59:45 +0200 Subject: [PATCH 29/56] added lcd example the way text is generated is currently rather awkward, looking for a better solution. --- .../efm32-tg-stk3300/lcd_demo/Makefile | 23 +++ .../efm32-tg-stk3300/lcd_demo/README | 8 + .../lcd_demo/generate_lcd_mapping.py | 76 +++++++ .../efm32-tg-stk3300/lcd_demo/lcd_demo.c | 130 ++++++++++++ .../lcd_demo/lcd_mapping.yaml | 192 ++++++++++++++++++ include/libopencm3/efm32/tinygecko/lcd.h | 32 +-- include/libopencm3/efm32/tinygecko/lcd.yaml | 5 +- 7 files changed, 450 insertions(+), 16 deletions(-) create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/lcd_demo.c create mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/lcd_mapping.yaml diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile new file mode 100644 index 00000000..7ef06ad9 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile @@ -0,0 +1,23 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +BINARY = lcd_demo + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README new file mode 100644 index 00000000..207ed107 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README @@ -0,0 +1,8 @@ +========================================= +EFM32-TG-STK3300 Examples LCD Demo README +========================================= + +This is an example on how to use the LCD peripherial on Energy Micro Tiny Gecko +chips. + +It's intended for the EFM32-TG-STK3300 eval board. diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py new file mode 100644 index 00000000..1b6405f5 --- /dev/null +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python + +import yaml + +class Font(dict): + def __init__(self, letterdict): + for (k, v) in letterdict.items(): + self[k] = set(v.split()) + +class Display(object): + def __init__(self, data): + self.mapping = {} + + for c, segs in enumerate(data['coms']): + for s, name in enumerate(segs): + self.mapping[name] = (c, s) + + def render_text(self, text, symbols, font): + cursor = 1 + segments = set() + for letter in text: + if letter == '.': + segments.add("a%s_dp"%(cursor-1)) + elif letter == ':': + segments.add("a%s_colon"%(cursor-1)) + elif letter in font: + for segment in font[letter]: + segments.add("a%s_%s"%(cursor, segment)) + cursor += 1 + + for s in symbols: + segments.add(s) + + coms = {} + for segment in segments: + com, seg = self.mapping[segment] + coms[com] = coms.get(com, 0) | (1< + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/** @file + * Demo of the LCD display aboard the EFM32-TG-STK330 eval board. + */ + +#include +#include +#include +#include "../lightswitch/lightswitch-common.c" +void led_toggle(void) { gpio_toggle(GPIO_PD, GPIO7); } + +void delay(void) +{ + int x; + + /* Start up delay until we mess with clock stuff, so the debugger can catch up. */ + for(x = 0; x < 10000000; ++x) led_on(); +} + +void lcd_init(void) +{ + /* LCD is a LE module. We're constantly powered on for now, so using + * HFCORECLK/2 */ + CMU_HFCORECLKEN0 |= CMU_HFCORECLKEN0_LE; + CMU_LFCLKSEL = (CMU_LFCLKSEL & ~CMU_LFCLKSEL_LFA_MASK) | CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2; + /* We need to get this down to reasonable 100Hz from 14MHz, 7MHz at + * LFACLK, 70kHz after LFA prescaler, 10kHz after FDIV. Octaplexing + * brings us down to about 500Hz. */ + CMU_LFAPRESC0 |= CMU_LFAPRESC0_LCD_DIV128; + CMU_LCDCTRL |= CMU_LCDCTRL_FDIV_MASK; /* factor 7+1 */ + + /* If we don't wait for the prescaler to become ready, the "Do it" step + * won't pass. */ + while (CMU_SYNCBUSY & CMU_SYNCBUSY_LFAPRESC0); + + CMU_LFACLKEN0 |= CMU_LFACLKEN0_LCD; + + while (CMU_SYNCBUSY & CMU_SYNCBUSY_LFACLKEN0); + + /* Voltage is around 3.3V anyway, we don't need voltage boosting, + * leaving it disabled. I don't fully understand the implications of + * biasing yet, but it seems like he more biased the better, and will + * just affect frame rate negatively. */ + LCD_DISPCTRL = (LCD_DISPCTRL & ~(LCD_DISPCTRL_BIAS_MASK | LCD_DISPCTRL_MUX_MASK)) | LCD_DISPCTRL_BIAS_ONEFOURTH | LCD_DISPCTRL_MUX_OCTAPLEX; + + /* Segments default to disabled, enable the 20 relevant ones */ + LCD_SEGEN = ~(~0<<5); + + /* Do it */ + LCD_CTRL |= LCD_CTRL_EN; + + while (LCD_SYNCBUSY & LCD_SYNCBUSY_CTRL) led_off(); + led_on(); +} + +void set_bank(u8 com, u32 data) +{ + switch(com) + { + case 0: LCD_SEGD0L = data; break; + case 1: LCD_SEGD1L = data; break; + case 2: LCD_SEGD2L = data; break; + case 3: LCD_SEGD3L = data; break; + case 4: LCD_SEGD4L = data; break; + case 5: LCD_SEGD5L = data; break; + case 6: LCD_SEGD6L = data; break; + case 7: LCD_SEGD7L = data; break; + } +} + +int main(void) +{ + u8 active_bit = 0; + u8 active_com = 0; + + gpio_setup(); + +// delay(); + + lcd_init(); + + /* "{FNORD}" with a gecko as generated by current generate_lcd_mapping.py */ +set_bank(0, 0x000a00); +set_bank(1, 0x0031cb); +set_bank(2, 0x004622); +set_bank(3, 0x0012a8); +set_bank(4, 0x00481a); +set_bank(5, 0x001140); +set_bank(6, 0x004642); +set_bank(7, 0x0051ac); + + while(1) + { + if (pb0_get()) + { + while(pb0_get()); + + set_bank(active_com, ~0); + active_bit = (active_bit + 1) % 21; /* one more to see where 0 is */ + set_bank(active_com, ~(1< Date: Tue, 17 Apr 2012 00:07:26 +0200 Subject: [PATCH 30/56] very simple demo for other board using efm32lib and hacked-together makefiles --- .../olimex-em32-32g880f128-h/Makefile.include | 49 +++++++++++++ .../tinygecko/olimex-em32-32g880f128-h/README | 14 ++++ .../miniblink-efm32lib/Makefile | 26 +++++++ .../miniblink-efm32lib/README | 9 +++ .../miniblink-efm32lib/core_cm3.h | 1 + .../miniblink-efm32lib/efm32_cmu.c | 1 + .../miniblink-efm32lib/efm32_gpio.c | 1 + .../miniblink-efm32lib/miniblink.c | 70 +++++++++++++++++++ 8 files changed, 171 insertions(+) create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/README create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include new file mode 100644 index 00000000..9dc18c49 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include @@ -0,0 +1,49 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +MCU = EFM32TG840F32 +FAMILY = GECKO + +include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include + +# FIXME: i'd much rather have this in a heredoc, but heredocs are not that easy +# in makefiles. furthermore, this isn't caught by the clean target. actually, +# i'd very much prefer using openocd anyway, this would also get rid of the +# Default.ini and JLink.log files jlink.sh drops. + +# just the next hack: jlink, as shipped in energy micro's +# energyAwareToolsBeta_30082011.tgz, needs its LD_LIBRARY_PATH explicitly set. +# it provides a wrapper script, but that fails to pass on arguments. set this +# path to the energymicro folder extracted from the tools, and we'll take care +# of the test +JLINKDIR = ${HOME}/energymicro/energymicro + +$(BINARY)-upload.sh: + rm -f "$@" + echo "exec device = EFM32G880G128" >> "$@" + echo "exec EnableFlashDL" >> "$@" + echo "h" >> "$@" + echo "loadbin ${BINARY}.bin 0" >> "$@" + echo "r" >> "$@" + echo "go" >> "$@" + echo "q" >> "$@" + chmod +x "$@" + +upload: $(BINARY)-upload.sh $(BINARY).bin + LD_LIBRARY_PATH=$(JLINKDIR)/lib/ $(JLINKDIR)/bin/JLinkExe "$<" || echo "JLink exited with non-zero exit status, but that's normal." diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README new file mode 100644 index 00000000..7360a8ca --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README @@ -0,0 +1,14 @@ +======================== +EM-32G880F128-H Examples +======================== + +Examples in this directory are designed to be run on the OlimexEM-32G880F128-H +header breakout board, which is based on the EFM32G880F128 MCU. + +The board is equipped with two user LEDs, a user button, reset button, power +supply, 20 pin debug connector and 10 pin UEXT connector (Olimex' open +versatile microcontroller connector). + +The build system is designed to upload programs using the EFM32-TG-STK3300 +board's external Segger debugger, which has to be configured for external +operation beforehand. diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile new file mode 100644 index 00000000..df8985ac --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile @@ -0,0 +1,26 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +BINARY = miniblink + +OBJS += efm32_gpio.o efm32_cmu.o +CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32G880F128 -I. + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README new file mode 100644 index 00000000..2500f4dc --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README @@ -0,0 +1,9 @@ +==================================================== +EM32-32G880F128-H Examples miniblink-efm32lib README +==================================================== + +This is a port of the miniblink example to the efm32lib library. + +It's intended for the EM32-32G880F128-H eval board. It should blink LED1 on the +board, just as the original miniblink example does. + diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h new file mode 120000 index 00000000..b7a19ea6 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h @@ -0,0 +1 @@ +../../efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c new file mode 120000 index 00000000..168574b0 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c new file mode 120000 index 00000000..0b2df219 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c new file mode 100644 index 00000000..3838c94f --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c @@ -0,0 +1,70 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include + +void led_setup(void); +void led_toggle(void); + +/** @file + * Minimal example for making the User LED of the olimex EM32-32G880F128-H eval + * board blink. + */ + +/** + * Toggle the User LED in an infinite loop, with time between the toggling + * determined by a busy loop stupidly counting up. + */ + +int main(void) +{ + int x; + + led_setup(); + + while(1) { + for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ + led_toggle(); + }; +} + +/** + * Enable GPIO, and set up port E1 as an output pin, and inverted. + */ + +void led_setup(void) +{ + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; + + // The User LED is connected to PD7 to the plus side of the LED + // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 + // and 16.3 (called UIF_LED0) + + GPIO_PinModeSet(gpioPortE, 1, gpioModePushPull, 0); +} + +void led_toggle(void) +{ + GPIO_PinOutToggle(gpioPortE, 1); +} From 43acfc531a30874f080a41769778fc56bbcb45e4 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 17 Apr 2012 00:38:42 +0200 Subject: [PATCH 31/56] use eacommander instead of jlink for example uploading --- .../efm32-tg-stk3300/Makefile.include | 30 ++++--------------- .../olimex-em32-32g880f128-h/Makefile.include | 30 ++++--------------- 2 files changed, 10 insertions(+), 50 deletions(-) diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include index c7d0f388..218abd81 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include @@ -20,30 +20,10 @@ MCU = EFM32TG840F32 FAMILY = TINYGECKO -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include - -# FIXME: i'd much rather have this in a heredoc, but heredocs are not that easy -# in makefiles. furthermore, this isn't caught by the clean target. actually, -# i'd very much prefer using openocd anyway, this would also get rid of the -# Default.ini and JLink.log files jlink.sh drops. +EACOMMANDER = ~/energymicro/energymicro/eACommander.sh -# just the next hack: jlink, as shipped in energy micro's -# energyAwareToolsBeta_30082011.tgz, needs its LD_LIBRARY_PATH explicitly set. -# it provides a wrapper script, but that fails to pass on arguments. set this -# path to the energymicro folder extracted from the tools, and we'll take care -# of the test -JLINKDIR = ${HOME}/energymicro/energymicro - -$(BINARY)-upload.sh: - rm -f "$@" - echo "exec device = EFM32TG840F32" >> "$@" - echo "exec EnableFlashDL" >> "$@" - echo "h" >> "$@" - echo "loadbin ${BINARY}.bin 0" >> "$@" - echo "r" >> "$@" - echo "go" >> "$@" - echo "q" >> "$@" - chmod +x "$@" +include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include -upload: $(BINARY)-upload.sh $(BINARY).bin - LD_LIBRARY_PATH=$(JLINKDIR)/lib/ $(JLINKDIR)/bin/JLinkExe "$<" || echo "JLink exited with non-zero exit status, but that's normal." +upload: $(BINARY).bin + # eacommander is just as nonfree as jlink.sh, but much less of a hasle + $(EACOMMANDER) --flash $< --verify --mode mcu --address 0 --reset diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include index 9dc18c49..6e927a6a 100644 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include @@ -20,30 +20,10 @@ MCU = EFM32TG840F32 FAMILY = GECKO -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include - -# FIXME: i'd much rather have this in a heredoc, but heredocs are not that easy -# in makefiles. furthermore, this isn't caught by the clean target. actually, -# i'd very much prefer using openocd anyway, this would also get rid of the -# Default.ini and JLink.log files jlink.sh drops. +EACOMMANDER = ~/energymicro/energymicro/eACommander.sh -# just the next hack: jlink, as shipped in energy micro's -# energyAwareToolsBeta_30082011.tgz, needs its LD_LIBRARY_PATH explicitly set. -# it provides a wrapper script, but that fails to pass on arguments. set this -# path to the energymicro folder extracted from the tools, and we'll take care -# of the test -JLINKDIR = ${HOME}/energymicro/energymicro - -$(BINARY)-upload.sh: - rm -f "$@" - echo "exec device = EFM32G880G128" >> "$@" - echo "exec EnableFlashDL" >> "$@" - echo "h" >> "$@" - echo "loadbin ${BINARY}.bin 0" >> "$@" - echo "r" >> "$@" - echo "go" >> "$@" - echo "q" >> "$@" - chmod +x "$@" +include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include -upload: $(BINARY)-upload.sh $(BINARY).bin - LD_LIBRARY_PATH=$(JLINKDIR)/lib/ $(JLINKDIR)/bin/JLinkExe "$<" || echo "JLink exited with non-zero exit status, but that's normal." +upload: $(BINARY).bin + # eacommander is just as nonfree as jlink.sh, but much less of a hasle + $(EACOMMANDER) --flash $< --verify --mode out --address 0 --reset From 705cdab7d702772829fd4cff37cf22bab9f59ddb Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 19 Apr 2012 13:14:54 +0200 Subject: [PATCH 32/56] extend the cmsis emulation layer to compile with the complete efm32lib most of this is non-functional but just a list of stubs that are absolutely required to make it compile --- .../miniblink-efm32lib/core_cm3.h | 59 +++++++++ .../test-efm32lib/Makefile | 26 ++++ .../test-efm32lib/core_cm3.c | 8 ++ .../test-efm32lib/core_cm3.h | 1 + .../test-efm32lib/efm32_acmp.c | 1 + .../test-efm32lib/efm32_adc.c | 1 + .../test-efm32lib/efm32_aes.c | 1 + .../test-efm32lib/efm32_assert.c | 1 + .../test-efm32lib/efm32_burtc.c | 1 + .../test-efm32lib/efm32_cmu.c | 1 + .../test-efm32lib/efm32_dac.c | 1 + .../test-efm32lib/efm32_dbg.c | 1 + .../test-efm32lib/efm32_dma.c | 1 + .../test-efm32lib/efm32_ebi.c | 1 + .../test-efm32lib/efm32_emu.c | 1 + .../test-efm32lib/efm32_gpio.c | 1 + .../test-efm32lib/efm32_i2c.c | 1 + .../test-efm32lib/efm32_int.c | 1 + .../test-efm32lib/efm32_lcd.c | 1 + .../test-efm32lib/efm32_lesense.c | 1 + .../test-efm32lib/efm32_letimer.c | 1 + .../test-efm32lib/efm32_leuart.c | 1 + .../test-efm32lib/efm32_mpu.c | 1 + .../test-efm32lib/efm32_msc.c | 1 + .../test-efm32lib/efm32_opamp.c | 1 + .../test-efm32lib/efm32_pcnt.c | 1 + .../test-efm32lib/efm32_prs.c | 1 + .../test-efm32lib/efm32_rmu.c | 1 + .../test-efm32lib/efm32_rtc.c | 1 + .../test-efm32lib/efm32_system.c | 1 + .../test-efm32lib/efm32_timer.c | 1 + .../test-efm32lib/efm32_usart.c | 1 + .../test-efm32lib/efm32_vcmp.c | 1 + .../test-efm32lib/efm32_wdog.c | 1 + .../test-efm32lib/gdbinit | 14 +++ .../test-efm32lib/test.c | 115 ++++++++++++++++++ 36 files changed, 253 insertions(+) create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c create mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit create mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h index 6a3fdbbd..2ce16621 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h +++ b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h @@ -1,3 +1,6 @@ +#ifndef OPENCMSIS_CORECM3_H +#define OPENCMSIS_CORECM3_H + /* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ #include @@ -26,6 +29,8 @@ typedef struct __IO uint32_t AIRCR; __IO uint32_t SCR; __IO uint32_t CCR; + __IO uint8_t SHPR[12]; /* FIXME: how is this properly indexed? */ + __IO uint32_t SHCSR; } SCB_TypeDef; #define SCB ((SCB_TypeDef *) SCB_BASE) /* from libopencm3/cm3/memorymap.h */ @@ -39,3 +44,57 @@ typedef struct /* needed by efm32_cmu.h, probably it's just what gcc provides anyway */ #define __CLZ(div) __builtin_clz(div) + +/* needed by efm32_aes.c. __builtin_bswap32 does the same thing as the rev instruction according to https://bugzilla.mozilla.org/show_bug.cgi?id=600106 */ +#define __REV(x) __builtin_bswap32(x) + +/* stubs for efm32_cmu.c */ +uint32_t SystemCoreClockGet(void); +uint32_t SystemHFClockGet(void); + +uint32_t SystemLFRCOClockGet(void); +uint32_t SystemLFXOClockGet(void); + +/* stubs for efm32_dbg.h */ +typedef struct +{ + uint32_t DHCSR; +} CoreDebug_TypeDef; +#define CoreDebug ((CoreDebug_TypeDef *) 0) +#define CoreDebug_DHCSR_C_DEBUGEN_Msk 0 + +/* stubs for efm32_dma */ + +#define NVIC_ClearPendingIRQ(irq) 1 +#define NVIC_EnableIRQ(irq) 1 +#define NVIC_DisableIRQ(irq) 1 + +/* stubs for efm32_int */ + +#define __enable_irq() 1 +#define __disable_irq() 1 + +/* stubs for efm32_mpu */ + +#define SCB_SHCSR_MEMFAULTENA_Msk 0 + +typedef struct +{ + uint32_t CTRL; + uint32_t RNR; + uint32_t RBAR; + uint32_t RASR; +} MPU_TypeDef; +#define MPU ((MPU_TypeDef *) 0) +#define MPU_CTRL_ENABLE_Msk 0 +#define MPU_RASR_XN_Pos 0 +#define MPU_RASR_AP_Pos 0 +#define MPU_RASR_TEX_Pos 0 +#define MPU_RASR_S_Pos 0 +#define MPU_RASR_C_Pos 0 +#define MPU_RASR_B_Pos 0 +#define MPU_RASR_SRD_Pos 0 +#define MPU_RASR_SIZE_Pos 0 +#define MPU_RASR_ENA_Pos 0 + +#endif diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile new file mode 100644 index 00000000..181e15a9 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile @@ -0,0 +1,26 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +BINARY = test + +OBJS += core_cm3.o $(patsubst %.c,%.o,$(wildcard efm32_*.c)) +CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32G880F128 -I. + +include ../Makefile.include diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c new file mode 100644 index 00000000..8b412ad2 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c @@ -0,0 +1,8 @@ +#include "core_cm3.h" + +/* stubs for efm32_cmu.c */ +uint32_t SystemCoreClockGet(void) {return 1;} +uint32_t SystemHFClockGet(void) {return 1;} + +uint32_t SystemLFRCOClockGet(void) {return 1;} +uint32_t SystemLFXOClockGet(void) {return 1;} diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h new file mode 120000 index 00000000..b7a19ea6 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h @@ -0,0 +1 @@ +../../efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c new file mode 120000 index 00000000..1e1fceff --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_acmp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c new file mode 120000 index 00000000..00fca913 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_adc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c new file mode 120000 index 00000000..5048a829 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_aes.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c new file mode 120000 index 00000000..d5de54dc --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_assert.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c new file mode 120000 index 00000000..8a73bbd3 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_burtc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c new file mode 120000 index 00000000..168574b0 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c new file mode 120000 index 00000000..7e12e03b --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dac.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c new file mode 120000 index 00000000..1e0b9aed --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dbg.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c new file mode 120000 index 00000000..c72b91c1 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dma.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c new file mode 120000 index 00000000..c9d26bb1 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_ebi.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c new file mode 120000 index 00000000..7a8b76eb --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_emu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c new file mode 120000 index 00000000..0b2df219 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c new file mode 120000 index 00000000..681adc3d --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_i2c.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c new file mode 120000 index 00000000..176d6cf8 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_int.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c new file mode 120000 index 00000000..4d6026b1 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_lcd.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c new file mode 120000 index 00000000..8c7ea284 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_lesense.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c new file mode 120000 index 00000000..aa5eca64 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_letimer.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c new file mode 120000 index 00000000..64b3a570 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_leuart.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c new file mode 120000 index 00000000..141dcfbc --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_mpu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c new file mode 120000 index 00000000..c1f750e0 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_msc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c new file mode 120000 index 00000000..b6a558b9 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_opamp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c new file mode 120000 index 00000000..2df78bd9 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_pcnt.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c new file mode 120000 index 00000000..15b98fea --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_prs.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c new file mode 120000 index 00000000..242f40de --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_rmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c new file mode 120000 index 00000000..9ec9a467 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_rtc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c new file mode 120000 index 00000000..74114f46 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_system.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c new file mode 120000 index 00000000..b81acaa7 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_timer.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c new file mode 120000 index 00000000..7c78c2cf --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_usart.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c new file mode 120000 index 00000000..e3b66508 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_vcmp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c new file mode 120000 index 00000000..12c48f15 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c @@ -0,0 +1 @@ +/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_wdog.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit new file mode 100644 index 00000000..7ccaa720 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit @@ -0,0 +1,14 @@ +# gets set when loading the file, without this i get the "Remote 'g' packet +# reply is too long" errors +set arm abi AAPCS + +target remote localhost:2331 +monitor speed auto +# this seems to be less about the architecture and more about how to +# communicate with gdb. "set endian big" works just as well. +monitor endian little + +# sometimes this doesn't work, then the gdbserver has to be restarted +monitor reset +monitor go +monitor halt diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c new file mode 100644 index 00000000..02954bb1 --- /dev/null +++ b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c @@ -0,0 +1,115 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +void setup(void); +void led_toggle(void); +bool button_is_pressed(void); +void debug(int a); + +#define LOG_SIZE 1024 +volatile char logbuffer[LOG_SIZE]; + +int main(void) +{ + int x; + int n_pressed = 0; + + setup(); + + while(1) { + if (button_is_pressed()) + { + for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ + n_pressed += 1; + debug(n_pressed); + } + led_toggle(); + }; +} + +void debug(int a) +{ + snprintf(logbuffer, LOG_SIZE, "Data %d.\n", a); +} + +void setup(void) +{ + // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf + // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 + + CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; + + GPIO_PinModeSet(gpioPortE, 1, gpioModePushPull, 0); + GPIO_PinModeSet(gpioPortE, 2, gpioModePushPull, 0); + + GPIO_PinModeSet(gpioPortE, 0, gpioModeInputPull, 1); /* pull up */ + + // Counter-blink the other user LED + + GPIO_PinOutToggle(gpioPortE, 2); +} + +void led_toggle(void) +{ + GPIO_PinOutToggle(gpioPortE, 1); + GPIO_PinOutToggle(gpioPortE, 2); +} + +bool button_is_pressed(void) +{ + return !GPIO_PinInGet(gpioPortE, 0); +} From 8359caff3b6abb69bbdc6c4c5ad93c3066ed450a Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 22 Apr 2012 22:07:01 +0200 Subject: [PATCH 33/56] moved core_cm3.h to more general location --- .../miniblink-efm32lib/core_cm3.h | 1 - .../olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c | 8 -------- .../olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h | 1 - .../libopencmsis}/core_cm3.h | 4 ++-- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h rename {examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib => include/libopencmsis}/core_cm3.h (97%) diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h deleted file mode 120000 index b7a19ea6..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/core_cm3.h +++ /dev/null @@ -1 +0,0 @@ -../../efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c deleted file mode 100644 index 8b412ad2..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "core_cm3.h" - -/* stubs for efm32_cmu.c */ -uint32_t SystemCoreClockGet(void) {return 1;} -uint32_t SystemHFClockGet(void) {return 1;} - -uint32_t SystemLFRCOClockGet(void) {return 1;} -uint32_t SystemLFXOClockGet(void) {return 1;} diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h deleted file mode 120000 index b7a19ea6..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/core_cm3.h +++ /dev/null @@ -1 +0,0 @@ -../../efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h \ No newline at end of file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h b/include/libopencmsis/core_cm3.h similarity index 97% rename from examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h rename to include/libopencmsis/core_cm3.h index 2ce16621..999fc48f 100644 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -49,8 +49,8 @@ typedef struct #define __REV(x) __builtin_bswap32(x) /* stubs for efm32_cmu.c */ -uint32_t SystemCoreClockGet(void); -uint32_t SystemHFClockGet(void); +#define SystemCoreClockGet() 1 +#define SystemHFClockGet() 1 uint32_t SystemLFRCOClockGet(void); uint32_t SystemLFXOClockGet(void); From 286af7f26e756cf47eac75f441f17012cedce44b Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 27 Apr 2012 14:10:29 +0200 Subject: [PATCH 34/56] new requirements form emlib and -examples --- include/libopencmsis/core_cm3.h | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 999fc48f..f27d7811 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -6,6 +6,8 @@ /* needed by system_efm32.h:196, guessing */ #define __INLINE inline +/* new since emlib 3.0 */ +#define __STATIC_INLINE static inline /* needed around efm32tg840f32.h:229. comparing the efm32lib definitions to the * libopencm3 ones, "volatile" is all that's missing. */ @@ -48,20 +50,15 @@ typedef struct /* needed by efm32_aes.c. __builtin_bswap32 does the same thing as the rev instruction according to https://bugzilla.mozilla.org/show_bug.cgi?id=600106 */ #define __REV(x) __builtin_bswap32(x) -/* stubs for efm32_cmu.c */ -#define SystemCoreClockGet() 1 -#define SystemHFClockGet() 1 - -uint32_t SystemLFRCOClockGet(void); -uint32_t SystemLFXOClockGet(void); - /* stubs for efm32_dbg.h */ typedef struct { uint32_t DHCSR; + uint32_t DEMCR; /* needed by efm32tg stk trace.c */ } CoreDebug_TypeDef; #define CoreDebug ((CoreDebug_TypeDef *) 0) #define CoreDebug_DHCSR_C_DEBUGEN_Msk 0 +#define CoreDebug_DEMCR_TRCENA_Msk 0 /* stubs for efm32_dma */ @@ -95,6 +92,18 @@ typedef struct #define MPU_RASR_B_Pos 0 #define MPU_RASR_SRD_Pos 0 #define MPU_RASR_SIZE_Pos 0 -#define MPU_RASR_ENA_Pos 0 +#define MPU_RASR_ENABLE_Pos 0 + +/* required for the blink example */ + +#define SysTick_Config(x) 0 + +/* stubs for efm32tg stk trace.c */ +typedef struct +{ + uint32_t LAR; + uint32_t TCR; +} ITM_TypeDef; +#define ITM ((ITM_TypeDef *) 0) #endif From c9b074a120baea1af4fa15fd678a3f1635fe4daa Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 27 Apr 2012 15:21:59 +0200 Subject: [PATCH 35/56] sys tick cmsis interface for blink example --- include/libopencmsis/core_cm3.h | 41 ++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index f27d7811..708fd487 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -96,7 +96,41 @@ typedef struct /* required for the blink example */ -#define SysTick_Config(x) 0 +/* if if (SysTick_Config(CMU_ClockFreqGet(cmuClock_CORE) / 1000)) while (1) ; + * configures the sys ticks to 1ms, then the argument to SysTick_Config + * describes how many cycles to wait between two systicks. + * + * the endless loop part looks like an "if it returns an error condition, + * rather loop here than continue"; every other solution would involve things + * that are dark magic to my understanding. + * + * implementation more or less copypasted from lib/stm32/systick.c, FIXME until + * the generic cm3 functionality is moved out from stm32 and can be used here + * easily (systick_set_reload, systick_interrupt_enable, systick_counter_enable + * and systick_set_clocksource). + * */ +#define SYS_TICK_BASE (SCS_BASE + 0x0010) +#define MMIO32(addr) (*(volatile uint32_t *)(addr)) +#define STK_LOAD MMIO32(SYS_TICK_BASE + 0x04) +#define STK_CTRL MMIO32(SYS_TICK_BASE + 0x00) +#define STK_CTRL_TICKINT (1 << 1) +#define STK_CTRL_ENABLE (1 << 0) + +#define STK_CTRL_CLKSOURCE_LSB 2 +#define STK_CTRL_CLKSOURCE_AHB 1 +static inline uint32_t SysTick_Config(uint32_t n_ticks) +{ + if (n_ticks & ~0x00FFFFFF) return 1; + STK_LOAD = n_ticks; + + STK_CTRL |= (STK_CTRL_CLKSOURCE_AHB << STK_CTRL_CLKSOURCE_LSB); + + STK_CTRL |= STK_CTRL_TICKINT; + + STK_CTRL |= STK_CTRL_ENABLE; + + return 0; +} /* stubs for efm32tg stk trace.c */ typedef struct @@ -106,4 +140,9 @@ typedef struct } ITM_TypeDef; #define ITM ((ITM_TypeDef *) 0) +/* blink.h expects the isr for systicks to be named SysTick_Handler. with this, + * its Systick_Handler function gets renamed to the weak symbol exported by + * vector.c */ +#define SysTick_Handler sys_tick_handler + #endif From dfbb7912c35184b25953e33da0b7c31a44fc6a91 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 27 Apr 2012 15:55:43 +0200 Subject: [PATCH 36/56] additions to opencmsis to make the clock example run --- include/libopencmsis/core_cm3.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 708fd487..ddff8a1b 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -1,6 +1,9 @@ #ifndef OPENCMSIS_CORECM3_H #define OPENCMSIS_CORECM3_H +/* needed in various places where we rather should include libopencm3 functionality */ +#define MMIO32(addr) (*(volatile uint32_t *)(addr)) + /* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ #include @@ -62,9 +65,25 @@ typedef struct /* stubs for efm32_dma */ -#define NVIC_ClearPendingIRQ(irq) 1 -#define NVIC_EnableIRQ(irq) 1 -#define NVIC_DisableIRQ(irq) 1 +/* also used by the clock example. code taken from stm32's nvic.[hc], FIXME until + * the generic cm3 functionality is moved out from stm32 and can be used here + * easily (nvic_clear_pending_irq, nvic_enable_irq, nvic_disable_irq). */ +#define NVIC_BASE (SCS_BASE + 0x0100) +#define NVIC_ISER(iser_id) MMIO32(NVIC_BASE + 0x00 + (iser_id * 4)) +#define NVIC_ICER(icer_id) MMIO32(NVIC_BASE + 0x80 + (icer_id * 4)) +#define NVIC_ICPR(icpr_id) MMIO32(NVIC_BASE + 0x180 + (icpr_id * 4)) +static inline void NVIC_ClearPendingIRQ(uint8_t irqn) +{ + NVIC_ICPR(irqn / 32) = (1 << (irqn % 32)); +} +static inline void NVIC_EnableIRQ(uint8_t irqn) +{ + NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); +} +static inline void NVIC_DisableIRQ(uint8_t irqn) +{ + NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); +} /* stubs for efm32_int */ @@ -110,7 +129,6 @@ typedef struct * and systick_set_clocksource). * */ #define SYS_TICK_BASE (SCS_BASE + 0x0010) -#define MMIO32(addr) (*(volatile uint32_t *)(addr)) #define STK_LOAD MMIO32(SYS_TICK_BASE + 0x04) #define STK_CTRL MMIO32(SYS_TICK_BASE + 0x00) #define STK_CTRL_TICKINT (1 << 1) @@ -145,4 +163,9 @@ typedef struct * vector.c */ #define SysTick_Handler sys_tick_handler +/* likewise, clock.c defines GPIO_ODD_IRQHandler and GPIO_EVEN_IRQHandler */ +#define GPIO_ODD_IRQHandler gpio_odd_isr +#define GPIO_EVEN_IRQHandler gpio_even_isr +#define RTC_IRQHandler rtc_isr + #endif From 4a36d23d8c35a564337ac0dcf9de4f80ced0990b Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 27 Apr 2012 17:00:24 +0200 Subject: [PATCH 37/56] more irq/isr translations --- include/libopencmsis/core_cm3.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index ddff8a1b..8de7c8ba 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -168,4 +168,8 @@ typedef struct #define GPIO_EVEN_IRQHandler gpio_even_isr #define RTC_IRQHandler rtc_isr +/* for inttemp (i should really get a list and convert them all) */ + +#define ADC0_IRQHandler adc0_isr + #endif From 9324f00038c48e9522559c6e936e6d35aca65fad Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 29 Apr 2012 00:18:03 +0200 Subject: [PATCH 38/56] enhanced cmsis again for other efm32tg examples --- include/libopencmsis/core_cm3.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 8de7c8ba..1f684648 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -127,10 +127,21 @@ typedef struct * the generic cm3 functionality is moved out from stm32 and can be used here * easily (systick_set_reload, systick_interrupt_enable, systick_counter_enable * and systick_set_clocksource). + * + * modified for CMSIS style array as the powertest example needs it. * */ #define SYS_TICK_BASE (SCS_BASE + 0x0010) -#define STK_LOAD MMIO32(SYS_TICK_BASE + 0x04) -#define STK_CTRL MMIO32(SYS_TICK_BASE + 0x00) + +/* from d0002_efm32_cortex-m3_reference_manual.pdf section 4.4 */ +typedef struct +{ + uint32_t CTRL; + uint32_t LOAD; + uint32_t VAL; + uint32_t CALIB; +} SysTick_TypeDef; +#define SysTick ((SysTick_TypeDef *) SYS_TICK_BASE) + #define STK_CTRL_TICKINT (1 << 1) #define STK_CTRL_ENABLE (1 << 0) @@ -139,13 +150,13 @@ typedef struct static inline uint32_t SysTick_Config(uint32_t n_ticks) { if (n_ticks & ~0x00FFFFFF) return 1; - STK_LOAD = n_ticks; + SysTick->LOAD = n_ticks; - STK_CTRL |= (STK_CTRL_CLKSOURCE_AHB << STK_CTRL_CLKSOURCE_LSB); + SysTick->CTRL |= (STK_CTRL_CLKSOURCE_AHB << STK_CTRL_CLKSOURCE_LSB); - STK_CTRL |= STK_CTRL_TICKINT; + SysTick->CTRL |= STK_CTRL_TICKINT; - STK_CTRL |= STK_CTRL_ENABLE; + SysTick->CTRL |= STK_CTRL_ENABLE; return 0; } @@ -172,4 +183,9 @@ typedef struct #define ADC0_IRQHandler adc0_isr +/* for the lightsense example */ + +#define LESENSE_IRQHandler lesense_isr +#define PCNT0_IRQHandler pcnt0_isr + #endif From 99975d9a058690f6faa3077dccadbdd5353db4fe Mon Sep 17 00:00:00 2001 From: chrysn Date: Sun, 29 Apr 2012 03:05:27 +0200 Subject: [PATCH 39/56] comment updates --- include/libopencmsis/core_cm3.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 1f684648..5ad13279 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -1,3 +1,9 @@ +/* big fat FIXME: this should use a consistent structure, and reference + * functionality from libopencm3 instead of copypasting. + * + * particularly unimplemented features are FIXME'd extra + * */ + #ifndef OPENCMSIS_CORECM3_H #define OPENCMSIS_CORECM3_H @@ -25,7 +31,7 @@ #define SCB_SCR_SLEEPDEEP_Msk (1 << 2) /* structure as in, for example, * DeviceSupport/EnergyMicro/EFM32/efm32tg840f32.h, data from - * libopencm3/stm32/f1/scb.h. incomplete. */ + * libopencm3/stm32/f1/scb.h. FIXME incomplete. */ typedef struct { __IO uint32_t CPUID; @@ -59,6 +65,7 @@ typedef struct uint32_t DHCSR; uint32_t DEMCR; /* needed by efm32tg stk trace.c */ } CoreDebug_TypeDef; +/* FIXME let's just hope writes to flash are protected */ #define CoreDebug ((CoreDebug_TypeDef *) 0) #define CoreDebug_DHCSR_C_DEBUGEN_Msk 0 #define CoreDebug_DEMCR_TRCENA_Msk 0 @@ -85,12 +92,13 @@ static inline void NVIC_DisableIRQ(uint8_t irqn) NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); } -/* stubs for efm32_int */ +/* stubs for efm32_int. FIXME: how do they do that? nvic documentation in the + * efm32 core manual doesn't tell anything of a global on/off switch */ #define __enable_irq() 1 #define __disable_irq() 1 -/* stubs for efm32_mpu */ +/* stubs for efm32_mpu FIXME */ #define SCB_SHCSR_MEMFAULTENA_Msk 0 @@ -101,6 +109,7 @@ typedef struct uint32_t RBAR; uint32_t RASR; } MPU_TypeDef; +/* FIXME struct at NULL */ #define MPU ((MPU_TypeDef *) 0) #define MPU_CTRL_ENABLE_Msk 0 #define MPU_RASR_XN_Pos 0 @@ -167,6 +176,7 @@ typedef struct uint32_t LAR; uint32_t TCR; } ITM_TypeDef; +/* FIXME struct at NULL */ #define ITM ((ITM_TypeDef *) 0) /* blink.h expects the isr for systicks to be named SysTick_Handler. with this, From 50b3c92d7ff7230b1527ba391ace74a876e404f1 Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 13 Sep 2012 23:41:52 +0200 Subject: [PATCH 40/56] removed efm32lib examples they would have needed migration work from efm32lib to emlib, and depend on non-free cmsis anyway. --- .../miniblink-efm32lib/Makefile | 26 ---- .../miniblink-efm32lib/README | 9 -- .../miniblink-efm32lib/efm32_cmu.c | 1 - .../miniblink-efm32lib/efm32_gpio.c | 1 - .../miniblink-efm32lib/miniblink.c | 69 ----------- .../olimex-em32-32g880f128-h/Makefile.include | 29 ----- .../tinygecko/olimex-em32-32g880f128-h/README | 14 --- .../miniblink-efm32lib/Makefile | 26 ---- .../miniblink-efm32lib/README | 9 -- .../miniblink-efm32lib/efm32_cmu.c | 1 - .../miniblink-efm32lib/efm32_gpio.c | 1 - .../miniblink-efm32lib/miniblink.c | 70 ----------- .../test-efm32lib/Makefile | 26 ---- .../test-efm32lib/efm32_acmp.c | 1 - .../test-efm32lib/efm32_adc.c | 1 - .../test-efm32lib/efm32_aes.c | 1 - .../test-efm32lib/efm32_assert.c | 1 - .../test-efm32lib/efm32_burtc.c | 1 - .../test-efm32lib/efm32_cmu.c | 1 - .../test-efm32lib/efm32_dac.c | 1 - .../test-efm32lib/efm32_dbg.c | 1 - .../test-efm32lib/efm32_dma.c | 1 - .../test-efm32lib/efm32_ebi.c | 1 - .../test-efm32lib/efm32_emu.c | 1 - .../test-efm32lib/efm32_gpio.c | 1 - .../test-efm32lib/efm32_i2c.c | 1 - .../test-efm32lib/efm32_int.c | 1 - .../test-efm32lib/efm32_lcd.c | 1 - .../test-efm32lib/efm32_lesense.c | 1 - .../test-efm32lib/efm32_letimer.c | 1 - .../test-efm32lib/efm32_leuart.c | 1 - .../test-efm32lib/efm32_mpu.c | 1 - .../test-efm32lib/efm32_msc.c | 1 - .../test-efm32lib/efm32_opamp.c | 1 - .../test-efm32lib/efm32_pcnt.c | 1 - .../test-efm32lib/efm32_prs.c | 1 - .../test-efm32lib/efm32_rmu.c | 1 - .../test-efm32lib/efm32_rtc.c | 1 - .../test-efm32lib/efm32_system.c | 1 - .../test-efm32lib/efm32_timer.c | 1 - .../test-efm32lib/efm32_usart.c | 1 - .../test-efm32lib/efm32_vcmp.c | 1 - .../test-efm32lib/efm32_wdog.c | 1 - .../test-efm32lib/gdbinit | 14 --- .../test-efm32lib/test.c | 115 ------------------ 45 files changed, 441 deletions(-) delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README delete mode 120000 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c delete mode 120000 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/README delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c delete mode 120000 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit delete mode 100644 examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile deleted file mode 100644 index 0da7462e..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = miniblink - -OBJS += efm32_gpio.o efm32_cmu.o -CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32TG840F32 -I. - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README deleted file mode 100644 index 49c6d114..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/README +++ /dev/null @@ -1,9 +0,0 @@ -=================================================== -EFM32-TG-STK3300 Examples miniblink-efm32lib README -=================================================== - -This is a port of the miniblink example to the efm32lib library. - -It's intended for the EFM32-TG-STK3300 eval board. It should blink the user LED -on the board, just as the original miniblink example does. - diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c deleted file mode 120000 index 168574b0..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_cmu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c deleted file mode 120000 index 0b2df219..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/efm32_gpio.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c deleted file mode 100644 index 9fa0b230..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink-efm32lib/miniblink.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -void led_setup(void); -void led_toggle(void); - -/** @file - * Minimal example for making the User LED of the EFM32-TG-STK330 eval board blink. - */ - -/** - * Toggle the User LED in an infinite loop, with time between the toggling - * determined by a busy loop stupidly counting up. - */ - -int main(void) -{ - int x; - - led_setup(); - - while(1) { - for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ - led_toggle(); - }; -} - -/** - * Enable GPIO, and set up port D7 as an output pin. - */ - -void led_setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; - - // The User LED is connected to PD7 to the plus side of the LED - // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 - // and 16.3 (called UIF_LED0) - - GPIO_PinModeSet(gpioPortD, 7, gpioModePushPull, 0); -} - -void led_toggle(void) -{ - GPIO_PinOutToggle(gpioPortD, 7); -} diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include deleted file mode 100644 index 6e927a6a..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/Makefile.include +++ /dev/null @@ -1,29 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -MCU = EFM32TG840F32 -FAMILY = GECKO - -EACOMMANDER = ~/energymicro/energymicro/eACommander.sh - -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include - -upload: $(BINARY).bin - # eacommander is just as nonfree as jlink.sh, but much less of a hasle - $(EACOMMANDER) --flash $< --verify --mode out --address 0 --reset diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README deleted file mode 100644 index 7360a8ca..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/README +++ /dev/null @@ -1,14 +0,0 @@ -======================== -EM-32G880F128-H Examples -======================== - -Examples in this directory are designed to be run on the OlimexEM-32G880F128-H -header breakout board, which is based on the EFM32G880F128 MCU. - -The board is equipped with two user LEDs, a user button, reset button, power -supply, 20 pin debug connector and 10 pin UEXT connector (Olimex' open -versatile microcontroller connector). - -The build system is designed to upload programs using the EFM32-TG-STK3300 -board's external Segger debugger, which has to be configured for external -operation beforehand. diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile deleted file mode 100644 index df8985ac..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = miniblink - -OBJS += efm32_gpio.o efm32_cmu.o -CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32G880F128 -I. - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README deleted file mode 100644 index 2500f4dc..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/README +++ /dev/null @@ -1,9 +0,0 @@ -==================================================== -EM32-32G880F128-H Examples miniblink-efm32lib README -==================================================== - -This is a port of the miniblink example to the efm32lib library. - -It's intended for the EM32-32G880F128-H eval board. It should blink LED1 on the -board, just as the original miniblink example does. - diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c deleted file mode 120000 index 168574b0..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_cmu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c deleted file mode 120000 index 0b2df219..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/efm32_gpio.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c deleted file mode 100644 index 3838c94f..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/miniblink-efm32lib/miniblink.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -void led_setup(void); -void led_toggle(void); - -/** @file - * Minimal example for making the User LED of the olimex EM32-32G880F128-H eval - * board blink. - */ - -/** - * Toggle the User LED in an infinite loop, with time between the toggling - * determined by a busy loop stupidly counting up. - */ - -int main(void) -{ - int x; - - led_setup(); - - while(1) { - for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ - led_toggle(); - }; -} - -/** - * Enable GPIO, and set up port E1 as an output pin, and inverted. - */ - -void led_setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; - - // The User LED is connected to PD7 to the plus side of the LED - // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 - // and 16.3 (called UIF_LED0) - - GPIO_PinModeSet(gpioPortE, 1, gpioModePushPull, 0); -} - -void led_toggle(void) -{ - GPIO_PinOutToggle(gpioPortE, 1); -} diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile deleted file mode 100644 index 181e15a9..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = test - -OBJS += core_cm3.o $(patsubst %.c,%.o,$(wildcard efm32_*.c)) -CFLAGS += -I/tmp/EFM32_CMSIS_2.4.1/efm32lib/inc/ -I /tmp/EFM32_CMSIS_2.4.1/CMSIS/CM3/DeviceSupport/EnergyMicro/EFM32/ -DEFM32G880F128 -I. - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c deleted file mode 120000 index 1e1fceff..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_acmp.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_acmp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c deleted file mode 120000 index 00fca913..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_adc.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_adc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c deleted file mode 120000 index 5048a829..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_aes.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_aes.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c deleted file mode 120000 index d5de54dc..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_assert.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_assert.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c deleted file mode 120000 index 8a73bbd3..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_burtc.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_burtc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c deleted file mode 120000 index 168574b0..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_cmu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_cmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c deleted file mode 120000 index 7e12e03b..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dac.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dac.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c deleted file mode 120000 index 1e0b9aed..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dbg.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dbg.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c deleted file mode 120000 index c72b91c1..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_dma.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_dma.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c deleted file mode 120000 index c9d26bb1..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_ebi.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_ebi.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c deleted file mode 120000 index 7a8b76eb..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_emu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_emu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c deleted file mode 120000 index 0b2df219..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_gpio.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_gpio.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c deleted file mode 120000 index 681adc3d..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_i2c.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_i2c.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c deleted file mode 120000 index 176d6cf8..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_int.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_int.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c deleted file mode 120000 index 4d6026b1..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lcd.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_lcd.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c deleted file mode 120000 index 8c7ea284..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_lesense.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_lesense.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c deleted file mode 120000 index aa5eca64..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_letimer.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_letimer.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c deleted file mode 120000 index 64b3a570..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_leuart.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_leuart.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c deleted file mode 120000 index 141dcfbc..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_mpu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_mpu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c deleted file mode 120000 index c1f750e0..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_msc.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_msc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c deleted file mode 120000 index b6a558b9..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_opamp.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_opamp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c deleted file mode 120000 index 2df78bd9..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_pcnt.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_pcnt.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c deleted file mode 120000 index 15b98fea..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_prs.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_prs.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c deleted file mode 120000 index 242f40de..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rmu.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_rmu.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c deleted file mode 120000 index 9ec9a467..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_rtc.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_rtc.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c deleted file mode 120000 index 74114f46..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_system.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_system.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c deleted file mode 120000 index b81acaa7..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_timer.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_timer.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c deleted file mode 120000 index 7c78c2cf..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_usart.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_usart.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c deleted file mode 120000 index e3b66508..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_vcmp.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_vcmp.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c deleted file mode 120000 index 12c48f15..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/efm32_wdog.c +++ /dev/null @@ -1 +0,0 @@ -/tmp/EFM32_CMSIS_2.4.1/efm32lib/src/efm32_wdog.c \ No newline at end of file diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit deleted file mode 100644 index 7ccaa720..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/gdbinit +++ /dev/null @@ -1,14 +0,0 @@ -# gets set when loading the file, without this i get the "Remote 'g' packet -# reply is too long" errors -set arm abi AAPCS - -target remote localhost:2331 -monitor speed auto -# this seems to be less about the architecture and more about how to -# communicate with gdb. "set endian big" works just as well. -monitor endian little - -# sometimes this doesn't work, then the gdbserver has to be restarted -monitor reset -monitor go -monitor halt diff --git a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c b/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c deleted file mode 100644 index 02954bb1..00000000 --- a/examples/efm32/tinygecko/olimex-em32-32g880f128-h/test-efm32lib/test.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -void setup(void); -void led_toggle(void); -bool button_is_pressed(void); -void debug(int a); - -#define LOG_SIZE 1024 -volatile char logbuffer[LOG_SIZE]; - -int main(void) -{ - int x; - int n_pressed = 0; - - setup(); - - while(1) { - if (button_is_pressed()) - { - for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ - n_pressed += 1; - debug(n_pressed); - } - led_toggle(); - }; -} - -void debug(int a) -{ - snprintf(logbuffer, LOG_SIZE, "Data %d.\n", a); -} - -void setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU->HFPERCLKEN0 |= _CMU_HFPERCLKEN0_GPIO_MASK; - - GPIO_PinModeSet(gpioPortE, 1, gpioModePushPull, 0); - GPIO_PinModeSet(gpioPortE, 2, gpioModePushPull, 0); - - GPIO_PinModeSet(gpioPortE, 0, gpioModeInputPull, 1); /* pull up */ - - // Counter-blink the other user LED - - GPIO_PinOutToggle(gpioPortE, 2); -} - -void led_toggle(void) -{ - GPIO_PinOutToggle(gpioPortE, 1); - GPIO_PinOutToggle(gpioPortE, 2); -} - -bool button_is_pressed(void) -{ - return !GPIO_PinInGet(gpioPortE, 0); -} From 4a6f4c0f7d62858a4a9afba18f11289cb0bb8358 Mon Sep 17 00:00:00 2001 From: chrysn Date: Sat, 15 Sep 2012 01:29:31 +0200 Subject: [PATCH 41/56] remove the support libraries for efm32 i don't plan to extend or support them, and they'll just grow stale --- examples/efm32/tinygecko/Makefile.include | 97 --- .../efm32-tg-stk3300/Makefile.include | 29 - .../efm32/tinygecko/efm32-tg-stk3300/README | 9 - .../efm32-tg-stk3300/lcd_demo/Makefile | 23 - .../efm32-tg-stk3300/lcd_demo/README | 8 - .../lcd_demo/generate_lcd_mapping.py | 76 -- .../efm32-tg-stk3300/lcd_demo/lcd_demo.c | 130 ---- .../lcd_demo/lcd_mapping.yaml | 192 ----- .../efm32-tg-stk3300/lightswitch/Makefile | 22 - .../efm32-tg-stk3300/lightswitch/README | 13 - .../lightswitch/lightswitch-busywait.c | 40 -- .../lightswitch/lightswitch-common.c | 88 --- .../lightswitch/lightswitch-interrupt.c | 71 -- .../lightswitch/lightswitch.c | 30 - .../efm32-tg-stk3300/miniblink/Makefile | 23 - .../efm32-tg-stk3300/miniblink/README | 9 - .../efm32-tg-stk3300/miniblink/miniblink.c | 71 -- include/libopencm3/efm32/tinygecko/README.dox | 14 - .../efm32/tinygecko/cmu.convenienceheaders | 63 -- include/libopencm3/efm32/tinygecko/cmu.h | 678 ------------------ include/libopencm3/efm32/tinygecko/cmu.yaml | 458 ------------ .../efm32/tinygecko/devicerevision.h | 49 -- .../efm32/tinygecko/emu.convenienceheaders | 18 - include/libopencm3/efm32/tinygecko/emu.h | 127 ---- include/libopencm3/efm32/tinygecko/emu.yaml | 50 -- .../efm32/tinygecko/generate-license.yaml | 19 - .../libopencm3/efm32/tinygecko/generate.py | 176 ----- .../libopencm3/efm32/tinygecko/generate.yaml | 3 - include/libopencm3/efm32/tinygecko/gpio.h | 498 ------------- include/libopencm3/efm32/tinygecko/irq.h | 55 -- .../efm32/tinygecko/lcd.convenienceheaders | 0 include/libopencm3/efm32/tinygecko/lcd.h | 295 -------- include/libopencm3/efm32/tinygecko/lcd.yaml | 241 ------- lib/efm32/tinygecko/devicerevision.c | 29 - lib/efm32/tinygecko/gpio.c | 42 -- 35 files changed, 3746 deletions(-) delete mode 100644 examples/efm32/tinygecko/Makefile.include delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/README delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/lcd_demo.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/lcd_mapping.yaml delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/Makefile delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch.c delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README delete mode 100644 examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c delete mode 100644 include/libopencm3/efm32/tinygecko/README.dox delete mode 100644 include/libopencm3/efm32/tinygecko/cmu.convenienceheaders delete mode 100644 include/libopencm3/efm32/tinygecko/cmu.h delete mode 100644 include/libopencm3/efm32/tinygecko/cmu.yaml delete mode 100644 include/libopencm3/efm32/tinygecko/devicerevision.h delete mode 100644 include/libopencm3/efm32/tinygecko/emu.convenienceheaders delete mode 100644 include/libopencm3/efm32/tinygecko/emu.h delete mode 100644 include/libopencm3/efm32/tinygecko/emu.yaml delete mode 100644 include/libopencm3/efm32/tinygecko/generate-license.yaml delete mode 100644 include/libopencm3/efm32/tinygecko/generate.py delete mode 100644 include/libopencm3/efm32/tinygecko/generate.yaml delete mode 100644 include/libopencm3/efm32/tinygecko/gpio.h delete mode 100644 include/libopencm3/efm32/tinygecko/irq.h delete mode 100644 include/libopencm3/efm32/tinygecko/lcd.convenienceheaders delete mode 100644 include/libopencm3/efm32/tinygecko/lcd.h delete mode 100644 include/libopencm3/efm32/tinygecko/lcd.yaml delete mode 100644 lib/efm32/tinygecko/devicerevision.c delete mode 100644 lib/efm32/tinygecko/gpio.c diff --git a/examples/efm32/tinygecko/Makefile.include b/examples/efm32/tinygecko/Makefile.include deleted file mode 100644 index 8c42816d..00000000 --- a/examples/efm32/tinygecko/Makefile.include +++ /dev/null @@ -1,97 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2010 Piotr Esden-Tempski -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -PREFIX ?= arm-none-eabi -#PREFIX ?= arm-elf -CC = $(PREFIX)-gcc -LD = $(PREFIX)-gcc -OBJCOPY = $(PREFIX)-objcopy -OBJDUMP = $(PREFIX)-objdump -GDB = $(PREFIX)-gdb -# Uncomment this line if you want to use the installed (not local) library. -#TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) -TOOLCHAIN_DIR = ../../../../.. -CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ - -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD\ - -D$(FAMILY) -LDSCRIPT ?= ${TOOLCHAIN_DIR}/lib/efm32/tinygecko/$(MCU).ld -LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib/efm32/tinygecko \ - -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \ - -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float -OBJS += $(BINARY).o - -# Be silent per default, but 'make V=1' will show all compiler calls. -ifneq ($(V),1) -Q := @ -NULL := 2>/dev/null -else -LDFLAGS += -Wl,--print-gc-sections -endif - -.SUFFIXES: .elf .bin .hex .srec .list .images -.SECONDEXPANSION: -.SECONDARY: - -all: images - -images: $(BINARY).images -flash: $(BINARY).flash - -%.images: %.bin %.hex %.srec %.list - @#echo "*** $* images generated ***" - -%.bin: %.elf - @#printf " OBJCOPY $(*).bin\n" - $(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin - -%.hex: %.elf - @#printf " OBJCOPY $(*).hex\n" - $(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex - -%.srec: %.elf - @#printf " OBJCOPY $(*).srec\n" - $(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec - -%.list: %.elf - @#printf " OBJDUMP $(*).list\n" - $(Q)$(OBJDUMP) -S $(*).elf > $(*).list - -%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/efm32/tinygecko/libopencm3_efm32tinygecko.a - @#printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_efm32tinygecko $(LDFLAGS) - -%.o: %.c Makefile - @#printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) $(CFLAGS) -o $@ -c $< - -clean: - $(Q)rm -f *.o - $(Q)rm -f *.d - $(Q)rm -f *.elf - $(Q)rm -f *.bin - $(Q)rm -f *.hex - $(Q)rm -f *.srec - $(Q)rm -f *.list - -.PHONY: images clean - --include $(OBJS:.o=.d) - diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include b/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include deleted file mode 100644 index 218abd81..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/Makefile.include +++ /dev/null @@ -1,29 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -MCU = EFM32TG840F32 -FAMILY = TINYGECKO - -EACOMMANDER = ~/energymicro/energymicro/eACommander.sh - -include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.include - -upload: $(BINARY).bin - # eacommander is just as nonfree as jlink.sh, but much less of a hasle - $(EACOMMANDER) --flash $< --verify --mode mcu --address 0 --reset diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/README b/examples/efm32/tinygecko/efm32-tg-stk3300/README deleted file mode 100644 index ffa3b595..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/README +++ /dev/null @@ -1,9 +0,0 @@ -========================= -EFM32-TG-STK3300 Examples -========================= - -Examples in this directory are designed to be run on the Energy Micro EFM32 -Tiny Gecko Starter Kit, which is based on the EFM32TG840F32 MCU, has an onboard -USB debug and power management interface, and a bunch of peripherials built in -that demonstrate the chip's low power capabilities (LED, LCD display, light -sensor, touch slider, LC sensor, push buttons). diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile deleted file mode 100644 index 7ef06ad9..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = lcd_demo - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README deleted file mode 100644 index 207ed107..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/README +++ /dev/null @@ -1,8 +0,0 @@ -========================================= -EFM32-TG-STK3300 Examples LCD Demo README -========================================= - -This is an example on how to use the LCD peripherial on Energy Micro Tiny Gecko -chips. - -It's intended for the EFM32-TG-STK3300 eval board. diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py b/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py deleted file mode 100644 index 1b6405f5..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lcd_demo/generate_lcd_mapping.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python - -import yaml - -class Font(dict): - def __init__(self, letterdict): - for (k, v) in letterdict.items(): - self[k] = set(v.split()) - -class Display(object): - def __init__(self, data): - self.mapping = {} - - for c, segs in enumerate(data['coms']): - for s, name in enumerate(segs): - self.mapping[name] = (c, s) - - def render_text(self, text, symbols, font): - cursor = 1 - segments = set() - for letter in text: - if letter == '.': - segments.add("a%s_dp"%(cursor-1)) - elif letter == ':': - segments.add("a%s_colon"%(cursor-1)) - elif letter in font: - for segment in font[letter]: - segments.add("a%s_%s"%(cursor, segment)) - cursor += 1 - - for s in symbols: - segments.add(s) - - coms = {} - for segment in segments: - com, seg = self.mapping[segment] - coms[com] = coms.get(com, 0) | (1< - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * Demo of the LCD display aboard the EFM32-TG-STK330 eval board. - */ - -#include -#include -#include -#include "../lightswitch/lightswitch-common.c" -void led_toggle(void) { gpio_toggle(GPIO_PD, GPIO7); } - -void delay(void) -{ - int x; - - /* Start up delay until we mess with clock stuff, so the debugger can catch up. */ - for(x = 0; x < 10000000; ++x) led_on(); -} - -void lcd_init(void) -{ - /* LCD is a LE module. We're constantly powered on for now, so using - * HFCORECLK/2 */ - CMU_HFCORECLKEN0 |= CMU_HFCORECLKEN0_LE; - CMU_LFCLKSEL = (CMU_LFCLKSEL & ~CMU_LFCLKSEL_LFA_MASK) | CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2; - /* We need to get this down to reasonable 100Hz from 14MHz, 7MHz at - * LFACLK, 70kHz after LFA prescaler, 10kHz after FDIV. Octaplexing - * brings us down to about 500Hz. */ - CMU_LFAPRESC0 |= CMU_LFAPRESC0_LCD_DIV128; - CMU_LCDCTRL |= CMU_LCDCTRL_FDIV_MASK; /* factor 7+1 */ - - /* If we don't wait for the prescaler to become ready, the "Do it" step - * won't pass. */ - while (CMU_SYNCBUSY & CMU_SYNCBUSY_LFAPRESC0); - - CMU_LFACLKEN0 |= CMU_LFACLKEN0_LCD; - - while (CMU_SYNCBUSY & CMU_SYNCBUSY_LFACLKEN0); - - /* Voltage is around 3.3V anyway, we don't need voltage boosting, - * leaving it disabled. I don't fully understand the implications of - * biasing yet, but it seems like he more biased the better, and will - * just affect frame rate negatively. */ - LCD_DISPCTRL = (LCD_DISPCTRL & ~(LCD_DISPCTRL_BIAS_MASK | LCD_DISPCTRL_MUX_MASK)) | LCD_DISPCTRL_BIAS_ONEFOURTH | LCD_DISPCTRL_MUX_OCTAPLEX; - - /* Segments default to disabled, enable the 20 relevant ones */ - LCD_SEGEN = ~(~0<<5); - - /* Do it */ - LCD_CTRL |= LCD_CTRL_EN; - - while (LCD_SYNCBUSY & LCD_SYNCBUSY_CTRL) led_off(); - led_on(); -} - -void set_bank(u8 com, u32 data) -{ - switch(com) - { - case 0: LCD_SEGD0L = data; break; - case 1: LCD_SEGD1L = data; break; - case 2: LCD_SEGD2L = data; break; - case 3: LCD_SEGD3L = data; break; - case 4: LCD_SEGD4L = data; break; - case 5: LCD_SEGD5L = data; break; - case 6: LCD_SEGD6L = data; break; - case 7: LCD_SEGD7L = data; break; - } -} - -int main(void) -{ - u8 active_bit = 0; - u8 active_com = 0; - - gpio_setup(); - -// delay(); - - lcd_init(); - - /* "{FNORD}" with a gecko as generated by current generate_lcd_mapping.py */ -set_bank(0, 0x000a00); -set_bank(1, 0x0031cb); -set_bank(2, 0x004622); -set_bank(3, 0x0012a8); -set_bank(4, 0x00481a); -set_bank(5, 0x001140); -set_bank(6, 0x004642); -set_bank(7, 0x0051ac); - - while(1) - { - if (pb0_get()) - { - while(pb0_get()); - - set_bank(active_com, ~0); - active_bit = (active_bit + 1) % 21; /* one more to see where 0 is */ - set_bank(active_com, ~(1< -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = lightswitch - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README deleted file mode 100644 index 41943dc1..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/README +++ /dev/null @@ -1,13 +0,0 @@ -============================================ -EFM32-TG-STK3300 Examples lightswitch README -============================================ - -This is a small example program for GPIO input and output, and how the device -can be configured to use minimal power (although the example is merely -scratching the surface of what is possible powersaving-wise). - -It's intended for the EFM32-TG-STK3300 eval board. It turn the User LED on when -PB0 is pressed, and off when PB1 is pressed. - -Various implementations are offered (-busywait, -interrupt), and can configured -in lightswitch.c. diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c deleted file mode 100644 index d78d0e10..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-busywait.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -#define ISER0 MMIO32(0xE000E100) -#define ICER0 MMIO32(0xE000E180) -#define ISPR0 MMIO32(0XE000E200) -#define ICPR0 MMIO32(0XE000E280) - -/** @file Simplest implementation of the lightswitch mechanism. */ - -int main(void) -{ - gpio_setup(); - - while(1) { - if (pb0_get()) - led_on(); - if (pb1_get()) - led_off(); - }; -} diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c deleted file mode 100644 index dcc59842..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-common.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file Common definitions used by all lightswitch implementations */ - -#include -#include - -/** The User LED is connected to PD7 to the plus side of the LED according to - * t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 and 16.3 (called - * UIF_LED0) - */ -#define LED_PORT GPIO_PD -#define LED_PIN GPIO7 - -#define BUTTON0_PORT GPIO_PD -#define BUTTON0_PORT_EXTIPSEL GPIO_EXTIPSEL_PORTD -#define BUTTON0_PIN_NUMBER 8 -#define BUTTON0_PIN GPIO8 -#define BUTTON1_PORT GPIO_PB -#define BUTTON1_PORT_EXTIPSEL GPIO_EXTIPSEL_PORTB -#define BUTTON1_PIN_NUMBER 11 -#define BUTTON1_PIN GPIO11 - -void gpio_setup(void); -void led_on(void); -void led_off(void); - -bool pb0_get(void); -bool pb1_get(void); - -/** - * Enable GPIO, and set up port D7 as an output pin and D8 and B11 as input. - */ - -void gpio_setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; - - gpio_set_mode(LED_PORT, GPIO_MODE_PUSHPULL, LED_PIN); - - // Button PB0 is connected to pin PD8 and pulled low when pushed, - // Botton PB1 to pin PB11 (sources as for LED). Pullups and debouncing - // are alreay in place in hardware, so no filtering or pullup is - // needed. - - gpio_set_mode(BUTTON0_PORT, GPIO_MODE_INPUT, BUTTON0_PIN); - gpio_set_mode(BUTTON1_PORT, GPIO_MODE_INPUT, BUTTON1_PIN); -} - -void led_on(void) -{ - gpio_set(LED_PORT, LED_PIN); -} - -void led_off(void) -{ - gpio_clear(LED_PORT, LED_PIN); -} - -bool pb0_get(void) -{ - return !gpio_get(GPIO_PD, GPIO8); -} - -bool pb1_get(void) -{ - return !gpio_get(GPIO_PB, GPIO11); -} diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c b/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c deleted file mode 100644 index 71a1008e..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/lightswitch/lightswitch-interrupt.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -#define ISER0 MMIO32(0xE000E100) - -void interrupt_setup() -{ - // These are the ports the pin interrupts for 8 and 11 are to be - // configured to, and they should trigger on falling edge. - - GPIO_EXTIPSELH = (BUTTON0_PORT_EXTIPSEL << ((BUTTON0_PIN_NUMBER-8)*4)) | - (BUTTON1_PORT_EXTIPSEL << ((BUTTON1_PIN_NUMBER-8)*4)); - - GPIO_EXTIFALL = BUTTON0_PIN | BUTTON1_PIN; - - // Enable interrupts on the GPIO side - - GPIO_INSENSE = GPIO_INSENSE_INT; - GPIO_IEN = BUTTON0_PIN | BUTTON1_PIN; - - // Enable GPIO interrupts in NVIC - - ISER0 = (1< - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * Example for switching the User LED of the EFM32-TG-STK330 eval board on and - * off using the buttons. - */ - -#include "lightswitch-common.c" - -/** Change this include to -busywait, -interrupt, or -prs (not implemented - * yet). The overall behavior will not change, but different implementations - * will be used. */ -#include "lightswitch-busywait.c" diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile deleted file mode 100644 index 760b99ba..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2012 chrysn -## -## This library is free software: you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public License -## along with this library. If not, see . -## - -BINARY = miniblink - -include ../Makefile.include diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README deleted file mode 100644 index d19e4fee..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/README +++ /dev/null @@ -1,9 +0,0 @@ -========================================== -EFM32-TG-STK3300 Examples miniblink README -========================================== - -This is the smallest-possible example program using libopencm3. - -It's intended for the EFM32-TG-STK3300 eval board. It should blink -the user LED on the board. - diff --git a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c b/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c deleted file mode 100644 index 0269847b..00000000 --- a/examples/efm32/tinygecko/efm32-tg-stk3300/miniblink/miniblink.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -void led_setup(void); -void led_toggle(void); - -/** @file - * Minimal example for making the User LED of the EFM32-TG-STK330 eval board blink. - */ - -/** - * Toggle the User LED in an infinite loop, with time between the toggling - * determined by a busy loop stupidly counting up. - */ - -int main(void) -{ - int x; - - led_setup(); - - while(1) { - for(x = 0; x < 200000; ++x) asm("mov r0,r0"); /* no-op, prevent compiler from optimizing this away */ - led_toggle(); - }; -} - -/** - * Enable GPIO, and set up port D7 as an output pin. - */ - -void led_setup(void) -{ - // Before GPIO works, according to d0034_efm32tg_reference_manual.pdf - // note in section 28.3.7, we'll have to enable GPIO in CMU_HFPERCLKEN0 - - CMU_HFPERCLKEN0 |= CMU_HFPERCLKEN0_GPIO; - - // The User LED is connected to PD7 to the plus side of the LED - // according to t0011_efm32_tiny_gecko_stk_user_manual.pdf figures 16.2 - // and 16.3 (called UIF_LED0) - - gpio_set_mode(GPIO_PD, GPIO_MODE_PUSHPULL, GPIO7); - // GPIO_PD_MODEL = GPIO_MODE_PUSHPULL<<(7*4); -} - -void led_toggle(void) -{ - gpio_toggle(GPIO_PD, GPIO7); - // GPIO_PD_DOUTTGL = 1<<7; -} diff --git a/include/libopencm3/efm32/tinygecko/README.dox b/include/libopencm3/efm32/tinygecko/README.dox deleted file mode 100644 index 04da755f..00000000 --- a/include/libopencm3/efm32/tinygecko/README.dox +++ /dev/null @@ -1,14 +0,0 @@ -/** - -@brief EFM32 Tiny Gecko headers - -This directory contains all headers specific to the Tiny Gecko family of the -Energy Micro EFM32 series. - -The individual peripherials described here all include hints at where the -information was taken from, but usually it stems from -d0034_efm32tg_reference_manual.pdf. - -@defgroup EFM32TG EFM32 Tiny Gecko - -*/ diff --git a/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders b/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders deleted file mode 100644 index 212405d9..00000000 --- a/include/libopencm3/efm32/tinygecko/cmu.convenienceheaders +++ /dev/null @@ -1,63 +0,0 @@ -/** CMU convenience functions - * - * These functions assist in clock switching, and are intended to be safer to - * use than direct fiddling with registers. They try to be suitable for typical - * applications, and will invest some bytes of code in order to minimize power - * consumption. - * - * @todo Work on this module is stalled until I can figure out if there is a - * way to have a cmu_shutdown_unused function at all. - * - * @defgroup EFM32TG_CMU_convenience CMU convenience functions - * @{ - */ - -/** Disable all oscillators not currently in use. - * - * The implementation follows d0034_efm32tg_reference_manual.pdf figure 11.1. - * The clock out pin configurations are not depicted there, but described in - * section 11.3.4. - * - * @todo This function is ignorant of ongoing calibrations. - * - * @todo This doesn't work at all: Fields like HFCLKSEL are write-only. - * */ -static void cmu_shutdown_unused(void) -{ - /* Is HFXO needed? */ - if (!( - (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFXO || - ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFXOQ && - (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) - ) || ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFXO && - (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) - ))) - CMU_OSCENCMD = CMU_OSCENCMD_HFXODIS; - - /* Is HFRCO neede? */ - if (!( - (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFRCO || - ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFRCOQ && - (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) - ) || ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFRCO && - (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) - ))) - {} -// CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; -} - -/** Switch HFCLK to LFRC. This call is not only blocking, but even freezes - * everything depending on HFCLK until LFRC is stable. The procedure is - * sketched in d0034_efm32tg_reference_manual.pdf figure 11.2. */ -static void cmu_hfclk_switch_blocking(void) -{ - CMU_OSCENCMD = CMU_OSCENCMD_LFRCOEN; - CMU_CMD = CMU_CMD_HFCLKSEL_LFRCO; - CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; -} - -/** @} */ diff --git a/include/libopencm3/efm32/tinygecko/cmu.h b/include/libopencm3/efm32/tinygecko/cmu.h deleted file mode 100644 index 80c959ff..00000000 --- a/include/libopencm3/efm32/tinygecko/cmu.h +++ /dev/null @@ -1,678 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * @see EFM32TG_CMU - */ - -/** Definitions for the CMU subsystem (Clock Management Unit). - * - * This corresponds to the description in d0034_efm32tg_reference_manual.pdf - * section 11. - * - * @ingroup EFM32TG - * @defgroup EFM32TG_CMU CMU (Clock Management Unit) - * @{ - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_CMU_H -#define LIBOPENCM3_EFM32_TINYGECKO_CMU_H - -#include -#include - -/** Register definitions and register value definitions for the CMU subsystem - * - * @defgroup EFM32TG_CMU_regsandvals CMU registers and values - * @{ - */ - -/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 11.4 - * - * @defgroup EFM32TG_CMU_registers CMU registers - * @{ - */ - -#define CMU_CTRL MMIO32(CMU_BASE + 0x000) /**< @see EFM32TG_CMU_CTRL_bits */ -#define CMU_HFCORECLKDIV MMIO32(CMU_BASE + 0x004) /**< @see EFM32TG_CMU_HFCORECLKDIV_values */ -#define CMU_HFPERCLKDIV MMIO32(CMU_BASE + 0x008) /**< @see EFM32TG_CMU_HFPERCLKDIV_bits */ -#define CMU_HFRCOCTRL MMIO32(CMU_BASE + 0x00c) /**< @see EFM32TG_CMU_HFRCOCTRL_bits */ -#define CMU_LFRCOCTRL MMIO32(CMU_BASE + 0x010) -#define CMU_AUXHFRCOCTRL MMIO32(CMU_BASE + 0x014) /**< @see EFM32TG_CMU_AUXHFRCOCTRL_bits */ -#define CMU_CALCTRL MMIO32(CMU_BASE + 0x018) /**< @see EFM32TG_CMU_CALCTRL_bits */ -#define CMU_CALCNT MMIO32(CMU_BASE + 0x01c) -#define CMU_OSCENCMD MMIO32(CMU_BASE + 0x020) /**< @see EFM32TG_CMU_OSCENCMD_bits */ -#define CMU_CMD MMIO32(CMU_BASE + 0x024) /**< @see EFM32TG_CMU_CMD_bits */ -#define CMU_LFCLKSEL MMIO32(CMU_BASE + 0x028) /**< @see EFM32TG_CMU_LFCLKSEL_bits */ -#define CMU_STATUS MMIO32(CMU_BASE + 0x02c) /**< @see EFM32TG_CMU_STATUS_bits */ -#define CMU_IF MMIO32(CMU_BASE + 0x030) /**< @see EFM32TG_CMU_I_bits */ -#define CMU_IFS MMIO32(CMU_BASE + 0x034) /**< @see EFM32TG_CMU_I_bits */ -#define CMU_IFC MMIO32(CMU_BASE + 0x038) /**< @see EFM32TG_CMU_I_bits */ -#define CMU_IEN MMIO32(CMU_BASE + 0x03c) /**< @see EFM32TG_CMU_I_bits */ -#define CMU_HFCORECLKEN0 MMIO32(CMU_BASE + 0x040) /**< @see EFM32TG_CMU_HFCORECLKEN0_bits */ -#define CMU_HFPERCLKEN0 MMIO32(CMU_BASE + 0x044) /**< @see EFM32TG_CMU_HFPERCLKEN0_bits */ -#define CMU_SYNCBUSY MMIO32(CMU_BASE + 0x050) /**< @see EFM32TG_CMU_SYNCBUSY_bits */ -#define CMU_FREEZE MMIO32(CMU_BASE + 0x054) /**< @see EFM32TG_CMU_FREEZE_bits */ -#define CMU_LFACLKEN0 MMIO32(CMU_BASE + 0x058) /**< @see EFM32TG_CMU_LFACLKEN0_bits */ -#define CMU_LFBCLKEN0 MMIO32(CMU_BASE + 0x060) /**< @see EFM32TG_CMU_LFBCLKEN0_bits */ -#define CMU_LFAPRESC0 MMIO32(CMU_BASE + 0x068) /**< @see EFM32TG_CMU_LFAPRESC0_bits */ -#define CMU_LFBPRESC0 MMIO32(CMU_BASE + 0x070) /**< @see EFM32TG_CMU_LFBPRESC0_bits */ -#define CMU_PCNTCTRL MMIO32(CMU_BASE + 0x078) /**< @see EFM32TG_CMU_PCNTCTRL_bits */ -#define CMU_LCDCTRL MMIO32(CMU_BASE + 0x07c) /**< @see EFM32TG_CMU_LCDCTRL_bits */ -#define CMU_ROUTE MMIO32(CMU_BASE + 0x080) /**< @see EFM32TG_CMU_ROUTE_bits */ -#define CMU_LOCK MMIO32(CMU_BASE + 0x084) /**< @see EFM32TG_CMU_LOCK_values */ - -/** @} */ - -/** Bit states for the CMU_CTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.1 for definitions. - * - * @defgroup EFM32TG_CMU_CTRL_bits CMU CTRL bits - * @{ - */ - -#define CMU_CTRL_DBGCLK_AUXHFRCO (0<<28) -#define CMU_CTRL_DBGCLK_HFCLK (1<<28) -#define CMU_CTRL_DBGCLK_MASK (0x1<<28) -#define CMU_CTRL_CLKOUTSEL1_LFRCO (0<<23) -#define CMU_CTRL_CLKOUTSEL1_LFXO (1<<23) -#define CMU_CTRL_CLKOUTSEL1_HFCLK (2<<23) -#define CMU_CTRL_CLKOUTSEL1_LFXOQ (3<<23) -#define CMU_CTRL_CLKOUTSEL1_HFXOQ (4<<23) -#define CMU_CTRL_CLKOUTSEL1_LFRCOQ (5<<23) -#define CMU_CTRL_CLKOUTSEL1_HFRCOQ (6<<23) -#define CMU_CTRL_CLKOUTSEL1_AUXHFRCOQ (7<<23) -#define CMU_CTRL_CLKOUTSEL1_MASK (0x7<<23) -#define CMU_CTRL_CLKOUTSEL0_HFRCO (0<<20) -#define CMU_CTRL_CLKOUTSEL0_HFXO (1<<20) -#define CMU_CTRL_CLKOUTSEL0_HFCLK2 (2<<20) -#define CMU_CTRL_CLKOUTSEL0_HFCLK4 (3<<20) -#define CMU_CTRL_CLKOUTSEL0_HFCLK8 (4<<20) -#define CMU_CTRL_CLKOUTSEL0_HFCLK16 (5<<20) -#define CMU_CTRL_CLKOUTSEL0_ULFRCO (6<<20) -#define CMU_CTRL_CLKOUTSEL0_AUXHFRCO (7<<20) -#define CMU_CTRL_CLKOUTSEL0_MASK (0x7<<20) -#define CMU_CTRL_LFXOTIMEOUT_8CYCLES (0<<18) -#define CMU_CTRL_LFXOTIMEOUT_1KCYCLES (1<<18) -#define CMU_CTRL_LFXOTIMEOUT_16KCYCLES (2<<18) -#define CMU_CTRL_LFXOTIMEOUT_32KCYCLES (3<<18) -#define CMU_CTRL_LFXOTIMEOUT_MASK (0x3<<18) -#define CMU_CTRL_LFXOBUFCUR (1<<17) -#define CMU_CTRL_LXFOBOOST_70PCENT (0<<13) -#define CMU_CTRL_LXFOBOOST_100PCENT (1<<13) -#define CMU_CTRL_LXFOBOOST_MASK (0x1<<13) -#define CMU_CTRL_LFXOMODE_XTAL (0<<11) -#define CMU_CTRL_LFXOMODE_BUFEXTCLK (1<<11) -#define CMU_CTRL_LFXOMODE_DIGEXTCLK (2<<11) -#define CMU_CTRL_LFXOMODE_MASK (0x3<<11) -#define CMU_CTRL_HFXOTIMEOUT_8CYCLES (0<<9) -#define CMU_CTRL_HFXOTIMEOUT_256CYCLES (1<<9) -#define CMU_CTRL_HFXOTIMEOUT_1KCYCLES (2<<9) -#define CMU_CTRL_HFXOTIMEOUT_16KCYCLES (3<<9) -#define CMU_CTRL_HFXOTIMEOUT_MASK (0x3<<9) -#define CMU_CTRL_HFXOGLITCHDETEN (1<<7) -#define CMU_CTRL_HFXOBUFCUR_MASK (0x3<<5) -#define CMU_CTRL_HFXOBOOST_50PCENT (0<<2) -#define CMU_CTRL_HFXOBOOST_70PCENT (1<<2) -#define CMU_CTRL_HFXOBOOST_80PCENT (2<<2) -#define CMU_CTRL_HFXOBOOST_100PCENT (3<<2) -#define CMU_CTRL_HFXOBOOST_MASK (0x3<<2) -#define CMU_CTRL_HFXOMODE_XTAL (0<<0) -#define CMU_CTRL_HFXOMODE_BUFEXTCLK (1<<0) -#define CMU_CTRL_HFXOMODE_DIGEXTCLK (2<<0) -#define CMU_CTRL_HFXOMODE_MASK (0x3<<0) - -/** @} */ - -/** Values for the CMU_HFCORECLKDIV register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.2 for definitions. - * - * @defgroup EFM32TG_CMU_HFCORECLKDIV_values CMU HFCORECLKDIV values - * @{ - */ - -#define CMU_HFCORECLKDIV_HFCLK 0 -#define CMU_HFCORECLKDIV_HFCLK2 1 -#define CMU_HFCORECLKDIV_HFCLK4 2 -#define CMU_HFCORECLKDIV_HFCLK8 3 -#define CMU_HFCORECLKDIV_HFCLK16 4 -#define CMU_HFCORECLKDIV_HFCLK32 5 -#define CMU_HFCORECLKDIV_HFCLK64 6 -#define CMU_HFCORECLKDIV_HFCLK128 7 -#define CMU_HFCORECLKDIV_HFCLK256 8 -#define CMU_HFCORECLKDIV_HFCLK512 9 - -/** @} */ - -/** Bit states for the CMU_HFPERCLKDIV register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.3 for definitions. - * - * @defgroup EFM32TG_CMU_HFPERCLKDIV_bits CMU HFPERCLKDIV bits - * @{ - */ - -#define CMU_HFPERCLKDIV_HFPERCLKEN (1<<8) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK (0<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK2 (1<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK4 (2<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK8 (3<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK16 (4<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK32 (5<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK64 (6<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK128 (7<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK256 (8<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_HFCLK512 (9<<0) -#define CMU_HFPERCLKDIV_HFPERCLKDIV_MASK (0x7<<0) - -/** @} */ - -/** Bit states for the CMU_HFRCOCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.4 for definitions. - * - * @defgroup EFM32TG_CMU_HFRCOCTRL_bits CMU HFRCOCTRL bits - * @{ - */ - -#define CMU_HFRCOCTRL_SUDELAY_MASK (0x1f<<12) -#define CMU_HFRCOCTRL_BAND_1MHZ (0<<8) -#define CMU_HFRCOCTRL_BAND_7MHZ (1<<8) -#define CMU_HFRCOCTRL_BAND_11MHZ (2<<8) -#define CMU_HFRCOCTRL_BAND_14MHZ (3<<8) -#define CMU_HFRCOCTRL_BAND_21MHZ (4<<8) -#define CMU_HFRCOCTRL_BAND_28MHZ (5<<8) -#define CMU_HFRCOCTRL_BAND_MASK (0x7<<8) -#define CMU_HFRCOCTRL_TUNING_MASK (0xff<<0) - -/** @} */ - -/** Bit states for the CMU_AUXHFRCOCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.6 for definitions. - * - * @defgroup EFM32TG_CMU_AUXHFRCOCTRL_bits CMU AUXHFRCOCTRL bits - * @{ - */ - -#define CMU_AUXHFRCOCTRL_BAND_14MHZ (0<<8) -#define CMU_AUXHFRCOCTRL_BAND_11MHZ (1<<8) -#define CMU_AUXHFRCOCTRL_BAND_7MHZ (2<<8) -#define CMU_AUXHFRCOCTRL_BAND_1MHZ (3<<8) -#define CMU_AUXHFRCOCTRL_BAND_28MHZ (6<<8) -#define CMU_AUXHFRCOCTRL_BAND_21MHZ (7<<8) -#define CMU_AUXHFRCOCTRL_BAND_MASK (0x7<<8) -#define CMU_AUXHFRCOCTRL_TUNING_MASK (0xff<<0) - -/** @} */ - -/** Bit states for the CMU_CALCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.6.7 for definitions. - * - * @defgroup EFM32TG_CMU_CALCTRL_bits CMU CALCTRL bits - * @{ - */ - -#define CMU_CALCTRL_CONT (1<<6) -#define CMU_CALCTRL_DOWNSEL_HFCLK (0<<3) -#define CMU_CALCTRL_DOWNSEL_HFXO (1<<3) -#define CMU_CALCTRL_DOWNSEL_LFXO (2<<3) -#define CMU_CALCTRL_DOWNSEL_HFRCO (3<<3) -#define CMU_CALCTRL_DOWNSEL_LFRCO (4<<3) -#define CMU_CALCTRL_DOWNSEL_AUXHFRCO (5<<3) -#define CMU_CALCTRL_DOWNSEL_MASK (0x7<<3) -#define CMU_CALCTRL_UPSEL_HFXO (0<<0) -#define CMU_CALCTRL_UPSEL_LFXO (1<<0) -#define CMU_CALCTRL_UPSEL_HFRCO (2<<0) -#define CMU_CALCTRL_UPSEL_LFRCO (3<<0) -#define CMU_CALCTRL_UPSEL_AUXHFRCO (4<<0) -#define CMU_CALCTRL_UPSEL_MASK (0x7<<0) - -/** @} */ - -/** Bit states for the CMU_OSCENCMD register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.9 for definitions. - * - * @defgroup EFM32TG_CMU_OSCENCMD_bits CMU OSCENCMD bits - * @{ - */ - -#define CMU_OSCENCMD_LFXODIS (1<<9) -#define CMU_OSCENCMD_LFXOEN (1<<8) -#define CMU_OSCENCMD_LFRCODIS (1<<7) -#define CMU_OSCENCMD_LFRCOEN (1<<6) -#define CMU_OSCENCMD_AUXHFRCODIS (1<<5) -#define CMU_OSCENCMD_AUXHFRCOEN (1<<4) -#define CMU_OSCENCMD_HFXODIS (1<<3) -#define CMU_OSCENCMD_HFXOEN (1<<2) -#define CMU_OSCENCMD_HFRCODIS (1<<1) -#define CMU_OSCENCMD_HFRCOEN (1<<0) - -/** @} */ - -/** Bit states for the CMU_CMD register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.10 for definitions. - * - * @defgroup EFM32TG_CMU_CMD_bits CMU CMD bits - * @{ - */ - -#define CMU_CMD_CALSTOP (1<<4) -#define CMU_CMD_CALSTART (1<<3) -#define CMU_CMD_HFCLKSEL_HFRCO (1<<0) -#define CMU_CMD_HFCLKSEL_HFXO (2<<0) -#define CMU_CMD_HFCLKSEL_LFRCO (3<<0) -#define CMU_CMD_HFCLKSEL_LFXO (4<<0) -#define CMU_CMD_HFCLKSEL_MASK (0x7<<0) - -/** @} */ - -/** Bit states for the CMU_LFCLKSEL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.11 for definitions. - * - * @defgroup EFM32TG_CMU_LFCLKSEL_bits CMU LFCLKSEL bits - * @{ - */ - -#define CMU_LFCLKSEL_LFBE_DISABLED (0<<20) -#define CMU_LFCLKSEL_LFBE_ULFRCO (1<<20) -#define CMU_LFCLKSEL_LFBE_MASK (0x1<<20) -#define CMU_LFCLKSEL_LFAE_DISABLED (0<<16) -#define CMU_LFCLKSEL_LFAE_ULFRCO (1<<16) -#define CMU_LFCLKSEL_LFAE_MASK (0x1<<16) -#define CMU_LFCLKSEL_LFB_DISABLED (0<<2) -#define CMU_LFCLKSEL_LFB_LFRCO (1<<2) -#define CMU_LFCLKSEL_LFB_LFXO (2<<2) -#define CMU_LFCLKSEL_LFB_HFCORECLKLEDIV2 (3<<2) -#define CMU_LFCLKSEL_LFB_MASK (0x3<<2) -#define CMU_LFCLKSEL_LFA_DISABLED (0<<0) -#define CMU_LFCLKSEL_LFA_LFRCO (1<<0) -#define CMU_LFCLKSEL_LFA_LFXO (2<<0) -#define CMU_LFCLKSEL_LFA_HFCORECLKLEDIV2 (3<<0) -#define CMU_LFCLKSEL_LFA_MASK (0x3<<0) - -/** @} */ - -/** Bit states for the CMU_STATUS register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.12 for definitions. - * - * @defgroup EFM32TG_CMU_STATUS_bits CMU STATUS bits - * @{ - */ - -#define CMU_STATUS_CALBSY (1<<14) -#define CMU_STATUS_LFXOSEL (1<<13) -#define CMU_STATUS_LFRCOSEL (1<<12) -#define CMU_STATUS_HFXOSEL (1<<11) -#define CMU_STATUS_HFRCOSEL (1<<10) -#define CMU_STATUS_LFXORDY (1<<9) -#define CMU_STATUS_LFXOENS (1<<8) -#define CMU_STATUS_LFRCORDY (1<<7) -#define CMU_STATUS_LFRCOENS (1<<6) -#define CMU_STATUS_AUXHFRCORDY (1<<5) -#define CMU_STATUS_AUXHFRCOENS (1<<4) -#define CMU_STATUS_HFXORDY (1<<3) -#define CMU_STATUS_HFXOENS (1<<2) -#define CMU_STATUS_HFRCORDY (1<<1) -#define CMU_STATUS_HFRCOENS (1<<0) - -/** @} */ - -/** Bit states for the CMU_HFCORECLKEN0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.17 for definitions. - * - * @defgroup EFM32TG_CMU_HFCORECLKEN0_bits CMU HFCORECLKEN0 bits - * @{ - */ - -#define CMU_HFCORECLKEN0_LE (1<<2) -#define CMU_HFCORECLKEN0_DMA (1<<1) -#define CMU_HFCORECLKEN0_AES (1<<0) - -/** @} */ - -/** Bit states for the CMU_HFPERCLKEN0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.18 for definitions. - * - * @defgroup EFM32TG_CMU_HFPERCLKEN0_bits CMU HFPERCLKEN0 bits - * @{ - */ - -#define CMU_HFPERCLKEN0_I2C0 (1<<11) -#define CMU_HFPERCLKEN0_DAC0 (1<<10) -#define CMU_HFPERCLKEN0_ADC0 (1<<9) -#define CMU_HFPERCLKEN0_PRS (1<<8) -#define CMU_HFPERCLKEN0_VCMP (1<<7) -#define CMU_HFPERCLKEN0_GPIO (1<<6) -#define CMU_HFPERCLKEN0_TIMER1 (1<<5) -#define CMU_HFPERCLKEN0_TIMER0 (1<<4) -#define CMU_HFPERCLKEN0_USART1 (1<<3) -#define CMU_HFPERCLKEN0_USART0 (1<<2) -#define CMU_HFPERCLKEN0_ACMP1 (1<<1) -#define CMU_HFPERCLKEN0_ACMP0 (1<<0) - -/** @} */ - -/** Bit states for the CMU_SYNCBUSY register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.19 for definitions. - * - * @defgroup EFM32TG_CMU_SYNCBUSY_bits CMU SYNCBUSY bits - * @{ - */ - -#define CMU_SYNCBUSY_LFBPRESC0 (1<<6) -#define CMU_SYNCBUSY_LFBCLKEN0 (1<<4) -#define CMU_SYNCBUSY_LFAPRESC0 (1<<2) -#define CMU_SYNCBUSY_LFACLKEN0 (1<<0) - -/** @} */ - -/** Bit states for the CMU_FREEZE register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.20 for definitions. - * - * @defgroup EFM32TG_CMU_FREEZE_bits CMU FREEZE bits - * @{ - */ - -#define CMU_FREEZE_REGFREEZE_UPDATE (0<<0) -#define CMU_FREEZE_REGFREEZE_FREEZE (1<<0) -#define CMU_FREEZE_REGFREEZE_MASK (0x1<<0) - -/** @} */ - -/** Bit states for the CMU_LFACLKEN0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.21 for definitions. - * - * @defgroup EFM32TG_CMU_LFACLKEN0_bits CMU LFACLKEN0 bits - * @{ - */ - -#define CMU_LFACLKEN0_LCD (1<<3) -#define CMU_LFACLKEN0_LETIMER0 (1<<2) -#define CMU_LFACLKEN0_RTC (1<<1) -#define CMU_LFACLKEN0_LESENSE (1<<0) - -/** @} */ - -/** Bit states for the CMU_LFBCLKEN0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.22 for definitions. - * - * @defgroup EFM32TG_CMU_LFBCLKEN0_bits CMU LFBCLKEN0 bits - * @{ - */ - -#define CMU_LFBCLKEN0_LEUART0 (1<<0) - -/** @} */ - -/** Bit states for the CMU_LFAPRESC0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.23 for definitions. - * - * @defgroup EFM32TG_CMU_LFAPRESC0_bits CMU LFAPRESC0 bits - * @{ - */ - -#define CMU_LFAPRESC0_LCD_DIV16 (0<<12) -#define CMU_LFAPRESC0_LCD_DIV32 (1<<12) -#define CMU_LFAPRESC0_LCD_DIV64 (2<<12) -#define CMU_LFAPRESC0_LCD_DIV128 (3<<12) -#define CMU_LFAPRESC0_LCD_MASK (0x3<<12) -#define CMU_LFAPRESC0_LETIMER0_DIV1 (0<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV2 (1<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV4 (2<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV8 (3<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV16 (4<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV32 (5<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV64 (6<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV128 (7<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV256 (8<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV512 (9<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV1024 (10<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV2048 (11<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV4096 (12<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV8192 (13<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV16384 (14<<8) -#define CMU_LFAPRESC0_LETIMER0_DIV32768 (15<<8) -#define CMU_LFAPRESC0_LETIMER0_MASK (0xf<<8) -#define CMU_LFAPRESC0_RTC_DIV1 (0<<4) -#define CMU_LFAPRESC0_RTC_DIV2 (1<<4) -#define CMU_LFAPRESC0_RTC_DIV4 (2<<4) -#define CMU_LFAPRESC0_RTC_DIV8 (3<<4) -#define CMU_LFAPRESC0_RTC_DIV16 (4<<4) -#define CMU_LFAPRESC0_RTC_DIV32 (5<<4) -#define CMU_LFAPRESC0_RTC_DIV64 (6<<4) -#define CMU_LFAPRESC0_RTC_DIV128 (7<<4) -#define CMU_LFAPRESC0_RTC_DIV256 (8<<4) -#define CMU_LFAPRESC0_RTC_DIV512 (9<<4) -#define CMU_LFAPRESC0_RTC_DIV1024 (10<<4) -#define CMU_LFAPRESC0_RTC_DIV2048 (11<<4) -#define CMU_LFAPRESC0_RTC_DIV4096 (12<<4) -#define CMU_LFAPRESC0_RTC_DIV8192 (13<<4) -#define CMU_LFAPRESC0_RTC_DIV16384 (14<<4) -#define CMU_LFAPRESC0_RTC_DIV32768 (15<<4) -#define CMU_LFAPRESC0_RTC_MASK (0xf<<4) -#define CMU_LFAPRESC0_LESENSE_DIV1 (0<<0) -#define CMU_LFAPRESC0_LESENSE_DIV2 (1<<0) -#define CMU_LFAPRESC0_LESENSE_DIV4 (2<<0) -#define CMU_LFAPRESC0_LESENSE_DIV8 (3<<0) -#define CMU_LFAPRESC0_LESENSE_MASK (0x3<<0) - -/** @} */ - -/** Bit states for the CMU_LFBPRESC0 register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.24 for definitions. - * - * @defgroup EFM32TG_CMU_LFBPRESC0_bits CMU LFBPRESC0 bits - * @{ - */ - -#define CMU_LFBPRESC0_LEUART0_DIV1 (0<<0) -#define CMU_LFBPRESC0_LEUART0_DIV2 (1<<0) -#define CMU_LFBPRESC0_LEUART0_DIV4 (2<<0) -#define CMU_LFBPRESC0_LEUART0_DIV8 (3<<0) -#define CMU_LFBPRESC0_LEUART0_MASK (0x3<<0) - -/** @} */ - -/** Bit states for the CMU_PCNTCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.25 for definitions. - * - * @defgroup EFM32TG_CMU_PCNTCTRL_bits CMU PCNTCTRL bits - * @{ - */ - -#define CMU_PCNTCTRL_PCNT0CLKSEL_LFACLK (0<<1) -#define CMU_PCNTCTRL_PCNT0CLKSEL_PCNT0S0 (1<<1) -#define CMU_PCNTCTRL_PCNT0CLKSEL_MASK (0x1<<1) -#define CMU_PCNTCTRL_PCNT0CLKEN (1<<0) - -/** @} */ - -/** Bit states for the CMU_LCDCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.26 for definitions. - * - * @defgroup EFM32TG_CMU_LCDCTRL_bits CMU LCDCTRL bits - * @{ - */ - -#define CMU_LCDCTRL_VBFDIV_DIV1 (0<<4) -#define CMU_LCDCTRL_VBFDIV_DIV2 (1<<4) -#define CMU_LCDCTRL_VBFDIV_DIV4 (2<<4) -#define CMU_LCDCTRL_VBFDIV_DIV8 (3<<4) -#define CMU_LCDCTRL_VBFDIV_DIV16 (4<<4) -#define CMU_LCDCTRL_VBFDIV_DIV32 (5<<4) -#define CMU_LCDCTRL_VBFDIV_DIV64 (6<<4) -#define CMU_LCDCTRL_VBFDIV_DIV128 (7<<4) -#define CMU_LCDCTRL_VBFDIV_MASK (0x7<<4) -#define CMU_LCDCTRL_VBOOSTEN (1<<3) -#define CMU_LCDCTRL_FDIV_MASK (0x7<<0) - -/** @} */ - -/** Bit states for the CMU_ROUTE register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.27 for definitions. - * - * @defgroup EFM32TG_CMU_ROUTE_bits CMU ROUTE bits - * @{ - */ - -#define CMU_ROUTE_LOCATION_LOC0 (0<<4) -#define CMU_ROUTE_LOCATION_LOC1 (1<<4) -#define CMU_ROUTE_LOCATION_MASK (0x7<<4) -#define CMU_ROUTE_CLKOUT1PEN (1<<1) -#define CMU_ROUTE_CLKOUT0PEN (1<<0) - -/** @} */ - -/** Values for the CMU_LOCK register - * - * See d0034_efm32tg_reference_manual.pdf section 11.5.28 for definitions. - * - * @defgroup EFM32TG_CMU_LOCK_values CMU LOCK values - * @{ - */ - -#define CMU_LOCK_IS_UNLOCKED 0 -#define CMU_LOCK_IS_LOCKED 1 -#define CMU_LOCK_SET_LOCKED 0 -#define CMU_LOCK_SET_UNLOCKED 0x580E - -/** @} */ - -/** Bit states for the CMU "I" group of registers (IF, IFS, IFC, IEN) - * - * These registers use this: - * - *
    - * - *
  • The CMU_IF register; see d0034_efm32tg_reference_manual.pdf section - * 11.5.13 for definitions.
    • - * - *
  • The CMU_IFS register; see d0034_efm32tg_reference_manual.pdf section - * 11.5.14 for definitions.
    • - * - *
  • The CMU_IFC register; see d0034_efm32tg_reference_manual.pdf section - * 11.5.15 for definitions.
    • - * - *
  • The CMU_IEN register; see d0034_efm32tg_reference_manual.pdf section - * 11.5.16 for definitions.
    • - * - *
- * - * @defgroup EFM32TG_CMU_I_bits CMU I bits group - * @{ - */ - -#define CMU_I_CALOF (1<<6) -#define CMU_I_CALRDY (1<<5) -#define CMU_I_AUXHFRCORDY (1<<4) -#define CMU_I_LFXORDY (1<<3) -#define CMU_I_LFRCORDY (1<<2) -#define CMU_I_HFXORDY (1<<1) -#define CMU_I_HFRCORDY (1<<0) - -/** @} */ - -/** @} */ - -/** CMU convenience functions - * - * These functions assist in clock switching, and are intended to be safer to - * use than direct fiddling with registers. They try to be suitable for typical - * applications, and will invest some bytes of code in order to minimize power - * consumption. - * - * @todo Work on this module is stalled until I can figure out if there is a - * way to have a cmu_shutdown_unused function at all. - * - * @defgroup EFM32TG_CMU_convenience CMU convenience functions - * @{ - */ - -/** Disable all oscillators not currently in use. - * - * The implementation follows d0034_efm32tg_reference_manual.pdf figure 11.1. - * The clock out pin configurations are not depicted there, but described in - * section 11.3.4. - * - * @todo This function is ignorant of ongoing calibrations. - * - * @todo This doesn't work at all: Fields like HFCLKSEL are write-only. - * */ -static void cmu_shutdown_unused(void) -{ - /* Is HFXO needed? */ - if (!( - (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFXO || - ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFXOQ && - (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) - ) || ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFXO && - (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) - ))) - CMU_OSCENCMD = CMU_OSCENCMD_HFXODIS; - - /* Is HFRCO neede? */ - if (!( - (CMU_CMD & CMU_CMD_HFCLKSEL_MASK) == CMU_CMD_HFCLKSEL_HFRCO || - ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL1_MASK) == CMU_CTRL_CLKOUTSEL1_HFRCOQ && - (CMU_ROUTE & CMU_ROUTE_CLKOUT1PEN) - ) || ( - (CMU_CTRL & CMU_CTRL_CLKOUTSEL0_MASK) == CMU_CTRL_CLKOUTSEL0_HFRCO && - (CMU_ROUTE & CMU_ROUTE_CLKOUT0PEN) - ))) - {} -// CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; -} - -/** Switch HFCLK to LFRC. This call is not only blocking, but even freezes - * everything depending on HFCLK until LFRC is stable. The procedure is - * sketched in d0034_efm32tg_reference_manual.pdf figure 11.2. */ -static void cmu_hfclk_switch_blocking(void) -{ - CMU_OSCENCMD = CMU_OSCENCMD_LFRCOEN; - CMU_CMD = CMU_CMD_HFCLKSEL_LFRCO; - CMU_OSCENCMD = CMU_OSCENCMD_HFRCODIS; -} - -/** @} */ - -/** @} */ - -#endif diff --git a/include/libopencm3/efm32/tinygecko/cmu.yaml b/include/libopencm3/efm32/tinygecko/cmu.yaml deleted file mode 100644 index 7b83b7fb..00000000 --- a/include/libopencm3/efm32/tinygecko/cmu.yaml +++ /dev/null @@ -1,458 +0,0 @@ -copyright: "2012 chrysn " -license: lgpl-3+ -ingroup: EFM32TG -shortdocname: EFM32TG_CMU -shortname: CMU -longname: Clock Management Unit -baseref: d0034_efm32tg_reference_manual.pdf section 11 -registers_baserefext: ".4" -templateregs: - - name: I - comment: Bits for the various CMU interrupt registers - fields: - - {name: CALOF, shift: 6} - - {name: CALRDY, shift: 5} - - {name: AUXHFRCORDY, shift: 4} - - {name: LFXORDY, shift: 3} - - {name: LFRCORDY, shift: 2} - - {name: HFXORDY, shift: 1} - - {name: HFRCORDY, shift: 0} -registers: - - name: CTRL - offset: 0x000 - definition_baserefext: ".5.1" - fields: - - name: DBGCLK - shift: 28 - values: - - {name: AUXHFRCO, value: 0} - - {name: HFCLK, value: 1} - - name: CLKOUTSEL1 - shift: 23 - length: 3 - values: - - {name: LFRCO, value: 0} - - {name: LFXO, value: 1} - - {name: HFCLK, value: 2} - - {name: LFXOQ, value: 3} - - {name: HFXOQ, value: 4} - - {name: LFRCOQ, value: 5} - - {name: HFRCOQ, value: 6} - - {name: AUXHFRCOQ, value: 7} - - name: CLKOUTSEL0 - shift: 20 - length: 3 - values: - - {name: HFRCO, value: 0} - - {name: HFXO, value: 1} - - {name: HFCLK2, value: 2} - - {name: HFCLK4, value: 3} - - {name: HFCLK8, value: 4} - - {name: HFCLK16, value: 5} - - {name: ULFRCO, value: 6} - - {name: AUXHFRCO, value: 7} - - name: LFXOTIMEOUT - shift: 18 - length: 2 - values: - - {name: 8CYCLES, value: 0} - - {name: 1KCYCLES, value: 1} - - {name: 16KCYCLES, value: 2} - - {name: 32KCYCLES, value: 3} - - name: LFXOBUFCUR - shift: 17 - - name: LXFOBOOST - shift: 13 - values: - - {name: 70PCENT, value: 0} - - {name: 100PCENT, value: 1} - - name: LFXOMODE - shift: 11 - length: 2 - values: - - {name: XTAL, value: 0} - - {name: BUFEXTCLK, value: 1} - - {name: DIGEXTCLK, value: 2} - - name: HFXOTIMEOUT - shift: 9 - length: 2 - values: - - {name: 8CYCLES, value: 0} - - {name: 256CYCLES, value: 1} - - {name: 1KCYCLES, value: 2} - - {name: 16KCYCLES, value: 3} - - name: HFXOGLITCHDETEN - shift: 7 - - name: HFXOBUFCUR - shift: 5 - length: 2 - type: undocumented - - name: HFXOBOOST - shift: 2 - length: 2 - values: - - {name: 50PCENT, value: 0} - - {name: 70PCENT, value: 1} - - {name: 80PCENT, value: 2} - - {name: 100PCENT, value: 3} - - name: HFXOMODE - shift: 0 - length: 2 - values: - - {name: XTAL, value: 0} - - {name: BUFEXTCLK, value: 1} - - {name: DIGEXTCLK, value: 2} - - name: HFCORECLKDIV - offset: 0x004 - definition_baserefext: ".5.2" - values: &HFCORECLKDIV_values - - {value: 0, name: HFCLK} - - {value: 1, name: HFCLK2} - - {value: 2, name: HFCLK4} - - {value: 3, name: HFCLK8} - - {value: 4, name: HFCLK16} - - {value: 5, name: HFCLK32} - - {value: 6, name: HFCLK64} - - {value: 7, name: HFCLK128} - - {value: 8, name: HFCLK256} - - {value: 9, name: HFCLK512} - - name: HFPERCLKDIV - offset: 0x008 - definition_baserefext: ".5.3" - fields: - - name: HFPERCLKEN - shift: 8 - - name: HFPERCLKDIV - shift: 0 - length: 3 - # not using generically named values here due to different register structure - values: *HFCORECLKDIV_values - - name: HFRCOCTRL - offset: 0x00c - definition_baserefext: ".5.4" - fields: - - name: SUDELAY - shift: 12 - length: 5 - type: undocumented - - name: BAND - shift: 8 - length: 3 - values: - - {value: 0, name: 1MHZ} - - {value: 1, name: 7MHZ} - - {value: 2, name: 11MHZ} - - {value: 3, name: 14MHZ} - - {value: 4, name: 21MHZ} - - {value: 5, name: 28MHZ} - - name: TUNING - shift: 0 - length: 8 - type: uint - - name: LFRCOCTRL - offset: 0x010 - definition_baserefext: ".5.5" - length: 7 - type: uint - - name: AUXHFRCOCTRL - offset: 0x014 - definition_baserefext: ".5.6" - fields: - - name: BAND - shift: 8 - length: 3 - values: - - {value: 0, name: 14MHZ} - - {value: 1, name: 11MHZ} - - {value: 2, name: 7MHZ} - - {value: 3, name: 1MHZ} - - {value: 6, name: 28MHZ} - - {value: 7, name: 21MHZ} - - name: TUNING - shift: 0 - length: 8 - type: uint - - name: CALCTRL - offset: 0x018 - definition_baserefext: ".6.7" - fields: - - name: CONT - shift: 6 - - name: DOWNSEL - shift: 3 - length: 3 - values: - - {value: 0, name: HFCLK} - - {value: 1, name: HFXO} - - {value: 2, name: LFXO} - - {value: 3, name: HFRCO} - - {value: 4, name: LFRCO} - - {value: 5, name: AUXHFRCO} - - name: UPSEL - shift: 0 - length: 3 - values: - - {value: 0, name: HFXO} - - {value: 1, name: LFXO} - - {value: 2, name: HFRCO} - - {value: 3, name: LFRCO} - - {value: 4, name: AUXHFRCO} - - name: CALCNT - offset: 0x01c - definition_baserefext: ".5.8" - length: 19 - type: uint - - name: OSCENCMD - offset: 0x020 - definition_baserefext: ".5.9" - fields: - - {name: LFXODIS, shift: 9} - - {name: LFXOEN, shift: 8} - - {name: LFRCODIS, shift: 7} - - {name: LFRCOEN, shift: 6} - - {name: AUXHFRCODIS, shift: 5} - - {name: AUXHFRCOEN, shift: 4} - - {name: HFXODIS, shift: 3} - - {name: HFXOEN, shift: 2} - - {name: HFRCODIS, shift: 1} - - {name: HFRCOEN, shift: 0} - - name: CMD - offset: 0x024 - definition_baserefext: ".5.10" - fields: - - name: CALSTOP - shift: 4 - - name: CALSTART - shift: 3 - - name: HFCLKSEL - shift: 0 - length: 3 - values: - - {value: 1, name: HFRCO} - - {value: 2, name: HFXO} - - {value: 3, name: LFRCO} - - {value: 4, name: LFXO} - - name: LFCLKSEL - offset: 0x028 - definition_baserefext: ".5.11" - fields: - - name: LFBE - shift: 20 - values: &LFCLKSEL_LFBE - - {value: 0, name: DISABLED} - - {value: 1, name: ULFRCO} - - name: LFAE - shift: 16 - values: *LFCLKSEL_LFBE - - name: LFB - shift: 2 - length: 2 - values: &LFCLKSEL_LFB - - {value: 0, name: DISABLED} - - {value: 1, name: LFRCO} - - {value: 2, name: LFXO} - - {value: 3, name: HFCORECLKLEDIV2} - - name: LFA - shift: 0 - length: 2 - values: *LFCLKSEL_LFB - - name: STATUS - offset: 0x02c - definition_baserefext: ".5.12" - fields: - - {name: CALBSY, shift: 14} - - {name: LFXOSEL, shift: 13} - - {name: LFRCOSEL, shift: 12} - - {name: HFXOSEL, shift: 11} - - {name: HFRCOSEL, shift: 10} - - {name: LFXORDY, shift: 9} - - {name: LFXOENS, shift: 8} - - {name: LFRCORDY, shift: 7} - - {name: LFRCOENS, shift: 6} - - {name: AUXHFRCORDY, shift: 5} - - {name: AUXHFRCOENS, shift: 4} - - {name: HFXORDY, shift: 3} - - {name: HFXOENS, shift: 2} - - {name: HFRCORDY, shift: 1} - - {name: HFRCOENS, shift: 0} - - name: IF - offset: 0x030 - definition_baserefext: ".5.13" - fields: I - - name: IFS - offset: 0x034 - definition_baserefext: ".5.14" - fields: I - - name: IFC - offset: 0x038 - definition_baserefext: ".5.15" - fields: I - - name: IEN - offset: 0x03c - definition_baserefext: ".5.16" - fields: I - - name: HFCORECLKEN0 - offset: 0x040 - definition_baserefext: ".5.17" - fields: - - {name: LE, shift: 2} - - {name: DMA, shift: 1} - - {name: AES, shift: 0} - - name: HFPERCLKEN0 - offset: 0x044 - definition_baserefext: ".5.18" - fields: - - {name: I2C0, shift: 11} - - {name: DAC0, shift: 10} - - {name: ADC0, shift: 9} - - {name: PRS, shift: 8} - - {name: VCMP, shift: 7} - - {name: GPIO, shift: 6} - - {name: TIMER1, shift: 5} - - {name: TIMER0, shift: 4} - - {name: USART1, shift: 3} - - {name: USART0, shift: 2} - - {name: ACMP1, shift: 1} - - {name: ACMP0, shift: 0} - - name: SYNCBUSY - offset: 0x050 - definition_baserefext: ".5.19" - fields: - - {name: LFBPRESC0, shift: 6} - - {name: LFBCLKEN0, shift: 4} - - {name: LFAPRESC0, shift: 2} - - {name: LFACLKEN0, shift: 0} - - name: FREEZE - offset: 0x054 - definition_baserefext: ".5.20" - fields: - - name: REGFREEZE - shift: 0 - values: - - {value: 0, name: UPDATE} - - {value: 1, name: FREEZE} - - name: LFACLKEN0 - offset: 0x058 - definition_baserefext: ".5.21" - fields: - - {name: LCD, shift: 3} - - {name: LETIMER0, shift: 2} - - {name: RTC, shift: 1} - - {name: LESENSE, shift: 0} - - name: LFBCLKEN0 - offset: 0x060 - definition_baserefext: ".5.22" - fields: - - {name: LEUART0, shift: 0} - - name: LFAPRESC0 - offset: 0x068 - definition_baserefext: ".5.23" - fields: - - name: LCD - shift: 12 - length: 2 - values: - - {value: 0, name: DIV16} - - {value: 1, name: DIV32} - - {value: 2, name: DIV64} - - {value: 3, name: DIV128} - - name: LETIMER0 - shift: 8 - length: 4 - values: &LFAPRESC0_LETIMER0_values - - {value: 0, name: DIV1} - - {value: 1, name: DIV2} - - {value: 2, name: DIV4} - - {value: 3, name: DIV8} - - {value: 4, name: DIV16} - - {value: 5, name: DIV32} - - {value: 6, name: DIV64} - - {value: 7, name: DIV128} - - {value: 8, name: DIV256} - - {value: 9, name: DIV512} - - {value: 10, name: DIV1024} - - {value: 11, name: DIV2048} - - {value: 12, name: DIV4096} - - {value: 13, name: DIV8192} - - {value: 14, name: DIV16384} - - {value: 15, name: DIV32768} - - name: RTC - shift: 4 - length: 4 - values: *LFAPRESC0_LETIMER0_values - - name: LESENSE - shift: 0 - length: 2 - values: - - {value: 0, name: DIV1} - - {value: 1, name: DIV2} - - {value: 2, name: DIV4} - - {value: 3, name: DIV8} - - name: LFBPRESC0 - offset: 0x070 - definition_baserefext: ".5.24" - fields: - - name: LEUART0 - shift: 0 - length: 2 - values: - - {value: 0, name: DIV1} - - {value: 1, name: DIV2} - - {value: 2, name: DIV4} - - {value: 3, name: DIV8} - - name: PCNTCTRL - offset: 0x078 - definition_baserefext: ".5.25" - fields: - - name: PCNT0CLKSEL - shift: 1 - values: - - {value: 0, name: LFACLK} - - {value: 1, name: PCNT0S0} - - name: PCNT0CLKEN - shift: 0 - - name: LCDCTRL - offset: 0x07c - definition_baserefext: ".5.26" - fields: - - name: VBFDIV - shift: 4 - length: 3 - values: - - {value: 0, name: DIV1} - - {value: 1, name: DIV2} - - {value: 2, name: DIV4} - - {value: 3, name: DIV8} - - {value: 4, name: DIV16} - - {value: 5, name: DIV32} - - {value: 6, name: DIV64} - - {value: 7, name: DIV128} - - name: VBOOSTEN - shift: 3 - - name: FDIV - shift: 0 - length: 3 - type: uint - - name: ROUTE - offset: 0x080 - definition_baserefext: ".5.27" - fields: - - name: LOCATION - shift: 4 - length: 3 - values: - - {value: 0, name: LOC0} - - {value: 1, name: LOC1} - - name: CLKOUT1PEN - shift: 1 - - name: CLKOUT0PEN - shift: 0 - - name: LOCK - offset: 0x084 - definition_baserefext: ".5.28" - length: 16 - values: - - {name: IS_UNLOCKED, value: 0} - - {name: IS_LOCKED, value: 1} - - {name: SET_LOCKED, value: 0} - - {name: SET_UNLOCKED, value: "0x580E"} diff --git a/include/libopencm3/efm32/tinygecko/devicerevision.h b/include/libopencm3/efm32/tinygecko/devicerevision.h deleted file mode 100644 index 45da408a..00000000 --- a/include/libopencm3/efm32/tinygecko/devicerevision.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/* FIXME: proper documentation, see where this fits, if we need this at all - * etc. this was just a first attempt at implementing something easy with - * MMIO32. */ - -/* this implements d0034_efm32tg_reference_manual.pdf's 7.3.4 "Device Revision" - * section */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_DEVICEREVISION_H -#define LIBOPENCM3_EFM32_TINYGECKO_DEVICEREVISION_H - -#include - -#define DEVICEREVISION_PID2 MMIO32(0xE00FFFE8) -#define DEVICEREVISION_PID3 MMIO32(0xE00FFFEC) - -/* devicerevision_revision_get has a comment that would make these definitions - * obsolete; i'm not sure how far it is reasonable to parameterize everythin - * g*/ -#define DEVICEREVISION_REVISION_LENGTH 4 -#define DEVICEREVISION_REVISION_SHIFT 4 -#define DEVICEREVISION_REVISION_MASK (~(~0< - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * @see EFM32TG_EMU - */ - -/** Definitions for the EMU subsystem (Energy Management Unit). - * - * This corresponds to the description in d0034_efm32tg_reference_manual.pdf - * section 10. - * - * @ingroup EFM32TG - * @defgroup EFM32TG_EMU EMU (Energy Management Unit) - * @{ - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_EMU_H -#define LIBOPENCM3_EFM32_TINYGECKO_EMU_H - -#include -#include - -/** Register definitions and register value definitions for the EMU subsystem - * - * @defgroup EFM32TG_EMU_regsandvals EMU registers and values - * @{ - */ - -/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 10.4 - * - * @defgroup EFM32TG_EMU_registers EMU registers - * @{ - */ - -#define EMU_CTRL MMIO32(EMU_BASE + 0x000) /**< @see EFM32TG_EMU_CTRL_bits */ -#define EMU_LOCK MMIO32(EMU_BASE + 0x008) /**< @see EFM32TG_EMU_LOCK_values */ -#define EMU_AUXCTRL MMIO32(EMU_BASE + 0x024) /**< @see EFM32TG_EMU_AUXCTRL_bits */ - -/** @} */ - -/** Bit states for the EMU_CTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 10.5.1 for definitions, and - * 10.3.2 for details (especially on why EM4CTRL_TWO and _THREE are defined). - * - * @defgroup EFM32TG_EMU_CTRL_bits EMU CTRL bits - * @{ - */ - -#define EMU_CTRL_EM4CTRL_TWO (2<<2) -#define EMU_CTRL_EM4CTRL_THREE (3<<2) -#define EMU_CTRL_EM4CTRL_MASK (0x3<<2) -#define EMU_CTRL_EM2BLOCK (1<<1) /**< When this bit is set, no mode lower than EM1 will be entered */ -#define EMU_CTRL_EMVREG (1<<0) /**< When this bit is set, the voltage regulator will stay on in modes lower than EM1 */ - -/** @} */ - -/** Values for the EMU_LOCK register - * - * See d0034_efm32tg_reference_manual.pdf section 10.5.2 for definitions. There - * seems not to be another mention of it. - * - * @defgroup EFM32TG_EMU_LOCK_values EMU LOCK values - * @{ - */ - -#define EMU_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ -#define EMU_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ -#define EMU_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock the EMU */ -#define EMU_LOCK_SET_UNLOCKED 0xade8 /**< Write this to the LOCK register to unlock the EMU */ - -/** @} */ - -/** Bit states for the EMU_AUXCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 10.5.3 for definitions, and - * 9.5.3 for details. - * - * @defgroup EFM32TG_EMU_AUXCTRL_bits EMU AUXCTRL bits - * @{ - */ - -#define EMU_AUXCTRL_HRCCLR (1<<0) - -/** @} */ - -/** @} */ - -/** EMU convenience functions - * - * These functions can be used to send the chip to low energy modes. - * - * @todo Implement other sleep modes than EM1. Implement WFI vs WFE waits. - * - * @defgroup EFM32TG_EMU_convenience EMU convenience functions - * @{ - */ - -/** Put the system into EM1 low energy mode. */ -static void emu_sleep_em1(void) -{ - /* FIXME: set SLEEPDEEP to 0 */ - __asm__("wfi"); -} - -/** @} */ - -/** @} */ - -#endif diff --git a/include/libopencm3/efm32/tinygecko/emu.yaml b/include/libopencm3/efm32/tinygecko/emu.yaml deleted file mode 100644 index 4e0b30ee..00000000 --- a/include/libopencm3/efm32/tinygecko/emu.yaml +++ /dev/null @@ -1,50 +0,0 @@ -copyright: "2012 chrysn " -license: lgpl-3+ -ingroup: EFM32TG -shortdocname: EFM32TG_EMU -shortname: EMU -longname: Energy Management Unit -baseref: d0034_efm32tg_reference_manual.pdf section 10 -registers_baserefext: ".4" -registers: - - name: CTRL - definition_baserefext: .5.1 - details: ", and 10.3.2 for details (especially on why EM4CTRL_TWO and _THREE are defined)." - offset: 0x000 - fields: - - name: EM4CTRL - shift: 2 - length: 2 - values: - - {name: TWO, value: 2} - - {name: THREE, value: 3} - - name: EM2BLOCK - shift: 1 - doc: When this bit is set, no mode lower than EM1 will be entered - - name: EMVREG - shift: 0 - doc: When this bit is set, the voltage regulator will stay on in modes lower than EM1 - - name: LOCK - definition_baserefext: .5.2 - details: ". There seems not to be another mention of it." - offset: 0x008 - values: - - name: IS_UNLOCKED - value: 0 - doc: When the LOCK register reads as this value, it is open - - name: IS_LOCKED - value: 1 - doc: When the LOCK register reads as this value, it is locked - - name: SET_LOCKED - value: 0 - doc: Write this to the LOCK register to lock the EMU - - name: SET_UNLOCKED - value: "0xade8" - doc: Write this to the LOCK register to unlock the EMU - - name: AUXCTRL - definition_baserefext: .5.3 - details: ", and 9.5.3 for details." - offset: 0x024 - fields: - - name: HRCCLR - shift: 0 diff --git a/include/libopencm3/efm32/tinygecko/generate-license.yaml b/include/libopencm3/efm32/tinygecko/generate-license.yaml deleted file mode 100644 index baeef880..00000000 --- a/include/libopencm3/efm32/tinygecko/generate-license.yaml +++ /dev/null @@ -1,19 +0,0 @@ -"lgpl-3+": | - /* - * This file is part of the {projectname} project. - * - * Copyright (C) {copyright} - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ diff --git a/include/libopencm3/efm32/tinygecko/generate.py b/include/libopencm3/efm32/tinygecko/generate.py deleted file mode 100644 index 7f426a4d..00000000 --- a/include/libopencm3/efm32/tinygecko/generate.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python - -import yaml -import logging -import textwrap - -def commentblock(*textblocks, **formatargs): - ret = [] - nowrapcommands = set("@defgroup") - ret.extend(textwrap.wrap(textblocks[0].format(**formatargs), 80, initial_indent="/** ", subsequent_indent=" * ")) - last_block_was_at = textblocks[0].startswith('@') - for b in textblocks[1:]: - formatted = b.format(**formatargs) - - if not (last_block_was_at and b.startswith('@')): - ret.append(" *") - if any(b.startswith(c) for c in nowrapcommands): - ret.append(" * " + formatted) - else: - ret.extend(textwrap.wrap(formatted, 80, initial_indent=" * ", subsequent_indent=" * ")) - last_block_was_at = b.startswith('@') - return "\n".join(ret) + "\n */\n" - -def yaml2h(filenamebase): - headername = "%s.h"%filenamebase - yamlname = "%s.yaml"%filenamebase - conveniencename = "%s.convenienceheaders"%filenamebase - - logging.info("Generating %s from %s", headername, yamlname) - - data = yaml.load(open(yamlname)) - # some defaults - data.setdefault("projectname", "libopencm3") - data.setdefault("includeguard", "LIBOPENCM3_EFM32_TINYGECKO_%s_H"%data['shortname']) - - with open(headername, 'w') as outfile: - def wc(*args, **kwargs): # wrap "outfile" and "data" (as default) arguments -- i'm a lazy typer - final_kwargs = data.copy() - final_kwargs.update(kwargs) - outfile.write(commentblock(*args, **final_kwargs)) - def wc_close(): - outfile.write("/** @} */\n") - def nl(): outfile.write("\n") - def define(key, value, comment=None): - outfile.write("#define ") - outfile.write(key) - outfile.write(" "*max(24-len(key), 1)) - outfile.write(str(value)) - if comment is not None: - outfile.write(" /**< %s */"%comment) - nl() - - outfile.write(licensedata[data['license']].format(**data)) - nl() - wc("@file", "@see {shortdocname}") - nl() - wc("Definitions for the {shortname} subsystem ({longname}).", "This corresponds to the description in {baseref}.", "@ingroup {ingroup}", "@defgroup {shortdocname} {shortname} ({longname})", "@{{") - nl() - outfile.write("#ifndef {includeguard}\n#define {includeguard}\n".format(**data)) - nl() - outfile.write("#include \n#include \n") - nl() - wc("Register definitions and register value definitions for the {shortname} subsystem", "@defgroup {shortdocname}_regsandvals {shortname} registers and values", "@{{") - nl() - - regs = data['registers'] - - for template in data.get('templateregs', []): - template['is_template'] = [] - regs.append(template) - - regs_dict = dict((x['name'], x) for x in regs) # for easier access. they've got to be a list in yaml to preserve order - - wc("These definitions reflect {baseref}{registers_baserefext}", "@defgroup {shortdocname}_registers {shortname} registers", "@{{") - nl() - - for regdata in regs: - has_bits = "fields" in regdata - has_values = "values" in regdata - is_template = "is_template" in regdata - if is_template: - # this isn't a real register, just a template - continue - secondcomponent_name = regdata['name'] - if (has_bits and isinstance(regdata['fields'], str)) or (has_values and isinstance(regdata['values'], str)): - # uses a template - secondcomponent_name = regdata['fields'] if has_bits else regdata['values'] - regs_dict[secondcomponent_name]['is_template'].append(regdata['name']) - - define("%s_%s"%(data['shortname'], regdata['name']), "MMIO32(%s_BASE + %#.003x)"%(data['shortname'], regdata['offset']), "@see %s_%s_%s"%(data['shortdocname'], secondcomponent_name, 'values' if 'values' in regdata else 'bits') if has_bits or has_values else None) - nl() - wc_close() # close register definitions - nl() - - for regdata in regs: - has_bits = "fields" in regdata - has_values = "values" in regdata - is_template = "is_template" in regdata - if not has_bits and not has_values: - continue - - if (has_bits and isinstance(regdata['fields'], str)) or (has_values and isinstance(regdata['values'], str)): - # uses a template, doesn't need own section - continue - - commentlines = [] - if is_template: - commentlines.append("%s for the {shortname} \"{name}\" group of registers (%s)"%("Bit states" if has_bits else "Values", ", ".join(regdata['is_template']))) - assert len(regdata['is_template']) > 0, "What should I talk about when nobody uses this template?" - if 'override_backref' in regdata: - commentlines.append(regdata['override_backref']) - else: - commentlines.append("These registers use this:") - commentlines.append("
    ") # FIXME: once we're using markdown 1.8, this can be changed to markdown - for user in regdata['is_template']: - userdata = regs_dict[user] - # FIXME: this is an ugly hack around this being in a single wc() line which doesn't take per-line contexts - mergeddata = data.copy() - mergeddata.update(userdata) - commentlines.append(("
  • The {shortname}_{name} register; see {baseref}{definition_baserefext} for definitions"+regdata.get("details", "."+"
    • ")).format(**mergeddata)) - commentlines.append("
") - commentlines.append('@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values', 'bits group' if has_bits else 'values group'))) - else: - commentlines.append("%s for the {shortname}_{name} register"%("Bit states" if has_bits else "Values")) - commentlines.append("See {baseref}{definition_baserefext} for definitions"+regdata.get("details", ".")) - commentlines.append('@defgroup {shortdocname}_{name}_%s {shortname} {name} %s'%(('bits' if has_bits else 'values',)*2)) - commentlines.append('@{{') - wc(*commentlines, **regdata) - nl() - - if has_bits: - for field in regdata['fields']: - #shiftdefine = "_%s_%s_%s_shift"%(shortname, regdata['name'], field['name']) - #define(shiftdefine, field['shift']) - - # there is one condition under which field's doc would get shown; show it immediately otherwise - if 'doc' in field and not ("values" not in field and field.get("length", 1) == 1): - wc(field['doc']) - - if "values" in field: - for value in field.get("values"): - define("%s_%s_%s_%s"%(data['shortname'], regdata['name'], field['name'], value['name']), value['value'] if "mask" in field else "(%s<<%s)"%(value['value'], field['shift']), value.get('doc', None)) - else: - if field.get('length', 1) == 1: - define("%s_%s_%s"%(data['shortname'], regdata['name'], field['name']), "(1<<%s)"%field['shift'], field.get('doc', None)) - else: - # FIXME: this should require the 'type' parameter to be set on this field - pass - - if "values" in field or field.get("length", 1) != 1: - if "mask" in field: - mask = field['mask'] - else: - mask = "(%#x<<%s)"%(~(~0< - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * @see EFM32TG_GPIO - */ - -/** Definitions for the GPIO subsystem (General Purpose Input Output). - * - * This corresponds to the description in d0034_efm32tg_reference_manual.pdf - * section 28. - * - * @ingroup EFM32TG - * @defgroup EFM32TG_GPIO GPIO (General Purpose Input Output) - * @{ - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_GPIO_H -#define LIBOPENCM3_EFM32_TINYGECKO_GPIO_H - -#include -#include - -/** Register definitions and register value definitions for the GPIO subsystem - * - * @defgroup EFM32TG_GPIO_regsandvals GPIO registers and values - * @{ - */ - -/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 28.4 - * - * The bulk of the registers defined here (like GPIO_PA_CTRL) will not be used - * inside the convenience functions, but are provided for direct access. - * - * @todo This section could profit from bit-banding. - * - * @defgroup EFM32TG_GPIO_registers GPIO registers - * @{ - */ -#define GPIO_Px_CTRL(port) MMIO32(port + 0x000) /**< @see EFM32TG_GPIO_Px_CTRL_bits */ -#define GPIO_Px_MODEL(port) MMIO32(port + 0x004) /**< @see EFM32TG_GPIO_MODE_values */ -#define GPIO_Px_MODEH(port) MMIO32(port + 0x008) /**< @see EFM32TG_GPIO_MODE_values */ -#define GPIO_Px_DOUT(port) MMIO32(port + 0x00C) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_Px_DOUTSET(port) MMIO32(port + 0x010) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_Px_DOUTCLR(port) MMIO32(port + 0x014) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_Px_DOUTTGL(port) MMIO32(port + 0x018) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_Px_DIN(port) MMIO32(port + 0x01C) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_Px_PINLOCKN(port) MMIO32(port + 0x020) /**< @see EFM32TG_GPIO_pinnumberbits */ - -#define GPIO_PA (GPIO_BASE + 0x000) -#define GPIO_PA_CTRL GPIO_Px_CTRL(GPIO_PA) -#define GPIO_PA_MODEL GPIO_Px_MODEL(GPIO_PA) -#define GPIO_PA_MODEH GPIO_Px_MODEH(GPIO_PA) -#define GPIO_PA_DOUT GPIO_Px_DOUT(GPIO_PA) -#define GPIO_PA_DOUTSET GPIO_Px_DOUTSET(GPIO_PA) -#define GPIO_PA_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PA) -#define GPIO_PA_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PA) -#define GPIO_PA_DIN GPIO_Px_DIN(GPIO_PA) -#define GPIO_PA_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PA) - -#define GPIO_PB (GPIO_BASE + 0x024) -#define GPIO_PB_CTRL GPIO_Px_CTRL(GPIO_PB) -#define GPIO_PB_MODEL GPIO_Px_MODEL(GPIO_PB) -#define GPIO_PB_MODEH GPIO_Px_MODEH(GPIO_PB) -#define GPIO_PB_DOUT GPIO_Px_DOUT(GPIO_PB) -#define GPIO_PB_DOUTSET GPIO_Px_DOUTSET(GPIO_PB) -#define GPIO_PB_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PB) -#define GPIO_PB_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PB) -#define GPIO_PB_DIN GPIO_Px_DIN(GPIO_PB) -#define GPIO_PB_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PB) - -#define GPIO_PC (GPIO_BASE + 0x048) -#define GPIO_PC_CTRL GPIO_Px_CTRL(GPIO_PC) -#define GPIO_PC_MODEL GPIO_Px_MODEL(GPIO_PC) -#define GPIO_PC_MODEH GPIO_Px_MODEH(GPIO_PC) -#define GPIO_PC_DOUT GPIO_Px_DOUT(GPIO_PC) -#define GPIO_PC_DOUTSET GPIO_Px_DOUTSET(GPIO_PC) -#define GPIO_PC_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PC) -#define GPIO_PC_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PC) -#define GPIO_PC_DIN GPIO_Px_DIN(GPIO_PC) -#define GPIO_PC_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PC) - -#define GPIO_PD (GPIO_BASE + 0x06C) -#define GPIO_PD_CTRL GPIO_Px_CTRL(GPIO_PD) -#define GPIO_PD_MODEL GPIO_Px_MODEL(GPIO_PD) -#define GPIO_PD_MODEH GPIO_Px_MODEH(GPIO_PD) -#define GPIO_PD_DOUT GPIO_Px_DOUT(GPIO_PD) -#define GPIO_PD_DOUTSET GPIO_Px_DOUTSET(GPIO_PD) -#define GPIO_PD_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PD) -#define GPIO_PD_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PD) -#define GPIO_PD_DIN GPIO_Px_DIN(GPIO_PD) -#define GPIO_PD_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PD) - -#define GPIO_PE (GPIO_BASE + 0x090) -#define GPIO_PE_CTRL GPIO_Px_CTRL(GPIO_PE) -#define GPIO_PE_MODEL GPIO_Px_MODEL(GPIO_PE) -#define GPIO_PE_MODEH GPIO_Px_MODEH(GPIO_PE) -#define GPIO_PE_DOUT GPIO_Px_DOUT(GPIO_PE) -#define GPIO_PE_DOUTSET GPIO_Px_DOUTSET(GPIO_PE) -#define GPIO_PE_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PE) -#define GPIO_PE_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PE) -#define GPIO_PE_DIN GPIO_Px_DIN(GPIO_PE) -#define GPIO_PE_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PE) - -#define GPIO_PF (GPIO_BASE + 0x0B4) -#define GPIO_PF_CTRL GPIO_Px_CTRL(GPIO_PF) -#define GPIO_PF_MODEL GPIO_Px_MODEL(GPIO_PF) -#define GPIO_PF_MODEH GPIO_Px_MODEH(GPIO_PF) -#define GPIO_PF_DOUT GPIO_Px_DOUT(GPIO_PF) -#define GPIO_PF_DOUTSET GPIO_Px_DOUTSET(GPIO_PF) -#define GPIO_PF_DOUTCLR GPIO_Px_DOUTCLR(GPIO_PF) -#define GPIO_PF_DOUTTGL GPIO_Px_DOUTTGL(GPIO_PF) -#define GPIO_PF_DIN GPIO_Px_DIN(GPIO_PF) -#define GPIO_PF_PINLOCKN GPIO_Px_PINLOCKN(GPIO_PF) - -#define GPIO_EXTIPSELL MMIO32(GPIO_BASE + 0x100) /**< @see EFM32TG_GPIO_EXTIP_values */ -#define GPIO_EXTIPSELH MMIO32(GPIO_BASE + 0x104) /**< @see EFM32TG_GPIO_EXTIP_values */ -#define GPIO_EXTIRISE MMIO32(GPIO_BASE + 0x108) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_EXTIFALL MMIO32(GPIO_BASE + 0x10C) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_IEN MMIO32(GPIO_BASE + 0x110) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_IF MMIO32(GPIO_BASE + 0x114) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_IFS MMIO32(GPIO_BASE + 0x118) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_IFC MMIO32(GPIO_BASE + 0x11C) /**< @see EFM32TG_GPIO_pinnumberbits */ -#define GPIO_ROUTE MMIO32(GPIO_BASE + 0x120) /**< @see EFM32TG_GPIO_ROUTE_bits */ -#define GPIO_INSENSE MMIO32(GPIO_BASE + 0x124) /**< @see EFM32TG_GPIO_INSENSE_bits */ -#define GPIO_LOCK MMIO32(GPIO_BASE + 0x128) /**< @see EFM32TG_GPIO_LOCK_values */ -#define GPIO_CTRL MMIO32(GPIO_BASE + 0x12C) /**< @see EFM32TG_GPIO_CTRL_bits */ -#define GPIO_CMD MMIO32(GPIO_BASE + 0x130) /**< @see EFM32TG_GPIO_CMD_bits */ -#define GPIO_EM4WUEN MMIO32(GPIO_BASE + 0x134) /**< @see EFM32TG_GPIO_EM4WUEN_bits */ -#define GPIO_EM4WUPOL MMIO32(GPIO_BASE + 0x138) /**< @see EFM32TG_GPIO_EM4WUPOL_bits */ -#define GPIO_EM4WUCAUSE MMIO32(GPIO_BASE + 0x13C) /**< @see EFM32TG_GPIO_EM4WUCAUSE_bits */ - -/** @} */ - -/** Pin number bits - * - * Provided for convenience. They can be used on the GPIO_Px_DOUT, - * GPIO_Px_DOUTSET, GPIO_Px_DOUTCLR, GPIO_Px_DOUTTGL, GPIO_Px_DIN, - * GPIO_Px_PINLOCKN, GPIO_Px_EXTIRISE, GPIO_Px_EXTIFALL, GPIO_IEN, GPIO_IF, - * GPIO_IFS, and GPIO_IFC registers. - * - * @defgroup EFM32TG_GPIO_pinnumberbits GPIO pin number bits - * @{ - */ - -#define GPIO0 (1 << 0) -#define GPIO1 (1 << 1) -#define GPIO2 (1 << 2) -#define GPIO3 (1 << 3) -#define GPIO4 (1 << 4) -#define GPIO5 (1 << 5) -#define GPIO6 (1 << 6) -#define GPIO7 (1 << 7) -#define GPIO8 (1 << 8) -#define GPIO9 (1 << 9) -#define GPIO10 (1 << 10) -#define GPIO11 (1 << 11) -#define GPIO12 (1 << 12) -#define GPIO13 (1 << 13) -#define GPIO14 (1 << 14) -#define GPIO15 (1 << 15) -#define GPIO_ALL 0xffff - -/** @} */ - -/** Bit states for the GPIO_Px_CTRL register - * - * They are named as in d0034_efm32tg_reference_manual.pdf's section - * 28.5.1. - * - * @defgroup EFM32TG_GPIO_Px_CTRL_bits GPIO Px CTRL bits - * @{ - */ - -#define GPIO_CTRL_DRIVEMODE_STANDARD 0 /**< 6mA drive current */ -#define GPIO_CTRL_DRIVEMODE_LOWEST 1 /**< 0.5mA drive current */ -#define GPIO_CTRL_DRIVEMODE_HIGH 2 /**< 20mA drive current */ -#define GPIO_CTRL_DRIVEMODE_LOW 3 /**< 2mA drive current */ - -/** @} */ - -/** These are the modes defined for the MODEx fields in the GPIO_Px_MODEL and - * GPIO_Px_MODEH registers. - * - * These bit state definitions are not localized, meaning that they have to be - * bitshifted by multiples of 4 to configure other pins than 0; configurations - * for pins 0 to 7 go to GPIO_Px_MODEL (shifted by 4*pin), configurations for - * pins 8 to 15 go to GPIO_Px_MODEH (shifted by 4*(pin-8)). - * - * For example, to set the mode for the 3rd pin of port A to pushpull, set - * `GPIO_PA_MODEL = GPIO_MODE_PUSHPULL << (3*4);`. - * - * @todo Update the example as soon as there are convenience functions to do - * this properly. - * - * They are named as in d0034_efm32tg_reference_manual.pdf's sections - * 28.5.2/28.5.3. For explanations of what they really do, rather see section - * 28.3.1. - * - * @defgroup EFM32TG_GPIO_MODE_values GPIO MODE values - * @{ - */ - -#define GPIO_MODE_DISABLED 0 -#define GPIO_MODE_INPUT 1 -#define GPIO_MODE_INPUTPULL 2 -#define GPIO_MODE_INPUTPULLFILTER 3 -#define GPIO_MODE_PUSHPULL 4 -#define GPIO_MODE_PUSHPULLDRIVE 5 -#define GPIO_MODE_WIREDOR 6 -#define GPIO_MODE_WIREDORPULLDOWN 7 -#define GPIO_MODE_WIREDAND 8 -#define GPIO_MODE_WIREDANDFILTER 9 -#define GPIO_MODE_WIREDANDPULLUP 10 -#define GPIO_MODE_WIREDANDPULLUPFILTER 11 -#define GPIO_MODE_WIREDANDDRIVE 12 -#define GPIO_MODE_WIREDANDDRIVEFILTER 13 -#define GPIO_MODE_WIREDANDDRIVEPULLUP 14 -#define GPIO_MODE_WIREDANDDRIVEPULLUPFILTER 15 -#define GPIO_MODE_MASK 0x0f - -/** @} */ - -/** These are the modes defined for the EXTIPSELx fields in the GPIO_EXTIPSELL - * and GPIO_EXTIPSELH registers. - * - * These bit state definitions are not localized, meaning that they have to be - * bitshifted by multiples of 4 to configure other pins than 0; configurations - * for pins 0 to 7 go to GPIO_EXTIPSELL (shifted by 4*pin), configurations for - * pins 8 to 15 go to GPIO_EXTIPSELH (shifted by 4*(pin-8)). - * - * They are named as in d0034_efm32tg_reference_manual.pdf's sections - * 28.5.10/28.5.11. For explanations of what they do, rather see section - * 28.3.5. - * - * @defgroup EFM32TG_GPIO_EXTIP_values GPIO EXTIPSEL values - * @{ - */ - -#define GPIO_EXTIPSEL_PORTA 0 /**< Port A pin x selected for external interrupt x */ -#define GPIO_EXTIPSEL_PORTB 1 /**< Port B pin x selected for external interrupt x */ -#define GPIO_EXTIPSEL_PORTC 2 /**< Port C pin x selected for external interrupt x */ -#define GPIO_EXTIPSEL_PORTD 3 /**< Port D pin x selected for external interrupt x */ -#define GPIO_EXTIPSEL_PORTE 4 /**< Port E pin x selected for external interrupt x */ -#define GPIO_EXTIPSEL_PORTF 5 /**< Port F pin x selected for external interrupt x */ - -/** @} */ - -/** Bit states for the GPIO_ROUTE register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.18 for definitions, and - * 28.3.4.1 for explanations. - * - * @defgroup EFM32TG_GPIO_ROUTE_bits GPIO ROUTE bits - * @{ - */ - -#define GPIO_ROUTE_SWLOCATION_MASK (0x03<<8) -#define GPIO_ROUTE_SWLOCATION_LOC0 (0<<8) /**< Route SW pins to location 0 (see chip data sheet for exact pins */ -#define GPIO_ROUTE_SWLOCATION_LOC1 (1<<8) /**< Route SW pins to location 1 (see chip data sheet for exact pins */ -#define GPIO_ROUTE_SWLOCATION_LOC2 (2<<8) /**< Route SW pins to location 2 (see chip data sheet for exact pins */ -#define GPIO_ROUTE_SWLOCATION_LOC3 (3<<8) /**< Route SW pins to location 3 (see chip data sheet for exact pins */ - -#define GPIO_ROUTE_SWOPEN (1<<2) /**< Serial Wire Viewer Output pin enabled */ -#define GPIO_ROUTE_SWDIOPEN (1<<1) /**< Serial Wire Data pin enabled */ -#define GPIO_ROUTE_SWCLKPEN (1<<0) /**< Serial Wire Clock pin enabled */ - -/** @} */ - -/** Bit states for the GPIO_INSENSE register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.19 for definitions, and - * 28.3.7 for details. - * - * @defgroup EFM32TG_GPIO_INSENSE_bits GPIO INSENSE bits - * @{ - */ - -#define GPIO_INSENSE_PRS (1<<1) /**< Input sensing for PRS enabled */ -#define GPIO_INSENSE_INT (1<<0) /**< Input sensing for interrupts enabled */ - -/** @} */ - -/** Values for the GPIO_LOCK register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.20 for definitions, and - * 28.3.1.1 for explanations. - * - * @defgroup EFM32TG_GPIO_LOCK_values GPIO LOCK bits - * @{ - */ - -#define GPIO_LOCK_IS_UNLOCKED 0 /**< When the LOCK register reads as this value, it is open */ -#define GPIO_LOCK_IS_LOCKED 1 /**< When the LOCK register reads as this value, it is locked */ -#define GPIO_LOCK_SET_LOCKED 0 /**< Write this to the LOCK register to lock down GPIO */ -#define GPIO_LOCK_SET_UNLOCKED 0xa543 /**< Write this to the LOCK register to unlock the GPIO */ - -/** @} */ - -/** Bit states for the GPIO_CTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.21 for definitions, and - * 28.3.4 for explanations. - * - * @defgroup EFM32TG_GPIO_CTRL_bits GPIO CTRL bits - * @{ - */ - -#define GPIO_CTRL_EM4RET (1<<0) /**< Retention of states in EM4 */ - -/** @} */ - -/** Bit states for the GPIO_CMD register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.22 for definitions and - * figure 28.5 in case you wonder if that register is mentioned anywhere else - * at all. - * - * @defgroup EFM32TG_GPIO_CMD_bits GPIO CMD bits - * @{ - */ - -#define GPIO_CMD_EM4WUCLR (1<<0) /**< Write this flag to clear EM4 wakeup requests */ - -/** @} */ - -/** Bit states for the GPIO_EM4WUEN register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.23 for definitions, and - * 28.3.2 for explanations. - * - * @defgroup EFM32TG_GPIO_EM4WUEN_bits GPIO EM4WUEN bits - * @{ - */ - -#define GPIO_EM4WUEN_A0 0x01 /**< Wake up from EM4 on A0 activity */ -#define GPIO_EM4WUEN_A6 0x02 /**< Wake up from EM4 on A6 activity */ -#define GPIO_EM4WUEN_C9 0x04 /**< Wake up from EM4 on C9 activity */ -#define GPIO_EM4WUEN_F1 0x08 /**< Wake up from EM4 on F1 activity */ -#define GPIO_EM4WUEN_F3 0x10 /**< Wake up from EM4 on F3 activity */ -#define GPIO_EM4WUEN_E13 0x20 /**< Wake up from EM4 on E13 activity */ - -/** @} */ - -/** Bit states for the GPIO_EM4WUPOL register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.24 for definitions, and - * 28.3.2 for explanations. - * - * @defgroup EFM32TG_GPIO_EM4WUPOL_bits GPIO EM4WUPOL bits - * @{ - */ - -#define GPIO_EM4WUPOL_A0 0x01 /**< High wake up from EM4 on A0 */ -#define GPIO_EM4WUPOL_A6 0x02 /**< High wake up from EM4 on A6 */ -#define GPIO_EM4WUPOL_C9 0x04 /**< High wake up from EM4 on C9 */ -#define GPIO_EM4WUPOL_F1 0x08 /**< High wake up from EM4 on F1 */ -#define GPIO_EM4WUPOL_F3 0x10 /**< High wake up from EM4 on F3 */ -#define GPIO_EM4WUPOL_E13 0x20 /**< High wake up from EM4 on E13 */ - -/** @} */ - -/** Bit states for the GPIO_EM4WUCAUSE register - * - * See d0034_efm32tg_reference_manual.pdf section 28.5.25 for definitions, and - * 28.3.2 for explanations. - * - * @defgroup EFM32TG_GPIO_EM4WUCAUSE_bits GPIO EM4WUCAUSE bits - * @{ - */ - -#define GPIO_EM4WUCAUSE_A0 0x01 /**< Woke up from EM4 on A0 */ -#define GPIO_EM4WUCAUSE_A6 0x02 /**< Woke up from EM4 on A6 */ -#define GPIO_EM4WUCAUSE_C9 0x04 /**< Woke up from EM4 on C9 */ -#define GPIO_EM4WUCAUSE_F1 0x08 /**< Woke up from EM4 on F1 */ -#define GPIO_EM4WUCAUSE_F3 0x10 /**< Woke up from EM4 on F3 */ -#define GPIO_EM4WUCAUSE_E13 0x20 /**< Woke up from EM4 on E13 */ - -/** @} */ - -/** @} */ - -/** GPIO convenience functions - * - * These functions try to be close to the STM32 F1 utility functions where - * possible. - * - * The functions intentionally don't cover all the possible read- and write - * operations to the GPIO registers. For example, reading the configured output - * strength for a port is rarely required. - * - * Many convenience functions are static to allow inlining by the compiler. - * - * @todo Implement all the non-trivial but useful convenience functions. - * - * @defgroup EFM32TG_GPIO_convenience GPIO convenience functions - * @{ - */ - -/** Set a whole GPIO port's out data to a particular value - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param gpios Bit pattern the output of the port will be configured to (eg GPIO6|GPIO3 to switch pins 6 and 3 to high and all the others to low) - */ -static void gpio_port_write(u32 gpioport, u16 data) -{ - GPIO_Px_DOUT(gpioport) = data; -} -/** Set some bits in a GPIO port's out data - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param gpios GPIO pin(s) to be set to 1 (eg GPIO6|GPIO3 to switch pins 6 and 3 to high and leave all the others in their previous state) - */ -static void gpio_set(u32 gpioport, u16 gpios) -{ - GPIO_Px_DOUTSET(gpioport) = gpios; -} -/** Clear some bits in a GPIO port's out data - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param gpios GPIO pin(s) to be set to 0 (eg GPIO6|GPIO3 to switch pins 6 and 3 to low and leave all the others in their previous state) - */ -static void gpio_clear(u32 gpioport, u16 gpios) -{ - GPIO_Px_DOUTCLR(gpioport) = gpios; -} -/** Toggle some bits in a GPIO port's out data - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param gpios GPIO pin(s) that will be toggled (eg GPIO6|GPIO3 to toggle the output directions of pins 6 and 3 and leave all the others in their previous state) - */ -static void gpio_toggle(u32 gpioport, u16 gpios) -{ - GPIO_Px_DOUTTGL(gpioport) = gpios; -} - -/** Read input bits from a GPIO's port in data - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \returns Current value of the in register of the given port - */ -static u16 gpio_port_read(u32 gpioport) -{ - return GPIO_Px_DIN(gpioport); -} -/** Read input bits from a GPIO's port in data - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param gpios Bits that will be read (eg GPIO6|GPIO3 to read pins 6 and 3) - * \returns Bit pattern that contains 1 in all pin positions that currently read as high (eg GPIO6 if port A's 6th pin is currently high and the 3rd pin is low) - */ -static u16 gpio_get(u32 gpioport, u16 gpios) -{ - return gpio_port_read(gpioport) & gpios; -} - -/** Configure a particular pin configuration on one or more pins - * - * This function is not atomic. It has to be made sure that it is not - * interrupted by other code that modifies the port's configuration. - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param mode Pin configuration mode to set (eg GPIO_MODE_INPUT) - * \param gpios Pins to configure (eg GPIO6|GPIO3 to set the mode on pins 6 and 3) - */ -void gpio_set_mode(u32 gpioport, u8 mode, u16 gpios); - -/** Configure the alternate drive strength for a port - * - * \param gpioport Address of a GPIO port to use (eg GPIO_PA) - * \param strength Alternate drive strength to configure for the port (eg GPIO_CTRL_DRIVEMODE_HIGH) - */ -static void gpio_set_strength(u32 gpioport, u8 strength) -{ - GPIO_Px_CTRL(gpioport) = strength; -} - -/** @} */ - -/** @} */ - -#endif diff --git a/include/libopencm3/efm32/tinygecko/irq.h b/include/libopencm3/efm32/tinygecko/irq.h deleted file mode 100644 index 1b0a4840..00000000 --- a/include/libopencm3/efm32/tinygecko/irq.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * - * Definitions of interrupt names on EFM32 Tiny Gecko systems - * - * The names and numbers are taken from d0034_efm32tg_reference_manual.pdf table 4.1. - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H -#define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H - -#define IRQ_DMA 0 -#define IRQ_GPIO_EVEN 1 -#define IRQ_TIMER0 2 -#define IRQ_USART0_RX 3 -#define IRQ_USART0_TX 4 -#define IRQ_ACMP01 5 -#define IRQ_ADC0 6 -#define IRQ_DAC0 7 -#define IRQ_I2C0 8 -#define IRQ_GPIO_ODD 9 -#define IRQ_TIMER1 10 -#define IRQ_USART1_RX 11 -#define IRQ_USART1_TX 12 -#define IRQ_LESENSE 13 -#define IRQ_LEUART0 14 -#define IRQ_LETIMER0 15 -#define IRQ_PCNT0 16 -#define IRQ_RTC 17 -#define IRQ_CMU 18 -#define IRQ_VCMP 19 -#define IRQ_LCD 20 -#define IRQ_MSC 21 -#define IRQ_AES 22 -#define IRQ_COUNT 23 /**< See also d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line, which shows that there are really no more interrupts and it is sufficient to allocate only 23 slots. */ - -#endif diff --git a/include/libopencm3/efm32/tinygecko/lcd.convenienceheaders b/include/libopencm3/efm32/tinygecko/lcd.convenienceheaders deleted file mode 100644 index e69de29b..00000000 diff --git a/include/libopencm3/efm32/tinygecko/lcd.h b/include/libopencm3/efm32/tinygecko/lcd.h deleted file mode 100644 index d46ef249..00000000 --- a/include/libopencm3/efm32/tinygecko/lcd.h +++ /dev/null @@ -1,295 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * @see EFM32TG_LCD - */ - -/** Definitions for the LCD subsystem (Liquid Crystal Display driver). - * - * This corresponds to the description in d0034_efm32tg_reference_manual.pdf - * section 29. - * - * @ingroup EFM32TG - * @defgroup EFM32TG_LCD LCD (Liquid Crystal Display driver) - * @{ - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_LCD_H -#define LIBOPENCM3_EFM32_TINYGECKO_LCD_H - -#include -#include - -/** Register definitions and register value definitions for the LCD subsystem - * - * @defgroup EFM32TG_LCD_regsandvals LCD registers and values - * @{ - */ - -/** These definitions reflect d0034_efm32tg_reference_manual.pdf section 29.4 - * - * @defgroup EFM32TG_LCD_registers LCD registers - * @{ - */ - -#define LCD_CTRL MMIO32(LCD_BASE + 0x000) /**< @see EFM32TG_LCD_CTRL_bits */ -#define LCD_DISPCTRL MMIO32(LCD_BASE + 0x004) /**< @see EFM32TG_LCD_DISPCTRL_bits */ -#define LCD_SEGEN MMIO32(LCD_BASE + 0x008) -#define LCD_BACTRL MMIO32(LCD_BASE + 0x00c) /**< @see EFM32TG_LCD_BACTRL_bits */ -#define LCD_STATUS MMIO32(LCD_BASE + 0x010) /**< @see EFM32TG_LCD_STATUS_bits */ -#define LCD_AREGA MMIO32(LCD_BASE + 0x014) -#define LCD_AREGB MMIO32(LCD_BASE + 0x018) -#define LCD_IF MMIO32(LCD_BASE + 0x01c) /**< @see EFM32TG_LCD_I_bits */ -#define LCD_IFS MMIO32(LCD_BASE + 0x020) /**< @see EFM32TG_LCD_I_bits */ -#define LCD_IFC MMIO32(LCD_BASE + 0x024) /**< @see EFM32TG_LCD_I_bits */ -#define LCD_IEN MMIO32(LCD_BASE + 0x028) /**< @see EFM32TG_LCD_I_bits */ -#define LCD_SEGD0L MMIO32(LCD_BASE + 0x040) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD1L MMIO32(LCD_BASE + 0x044) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD2L MMIO32(LCD_BASE + 0x048) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD3L MMIO32(LCD_BASE + 0x04c) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_FREEZE MMIO32(LCD_BASE + 0x060) /**< @see EFM32TG_LCD_FREEZE_bits */ -#define LCD_SYNCBUSY MMIO32(LCD_BASE + 0x064) /**< @see EFM32TG_LCD_SYNCBUSY_bits */ -#define LCD_SEGD4L MMIO32(LCD_BASE + 0x0cc) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD5L MMIO32(LCD_BASE + 0x0d0) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD6L MMIO32(LCD_BASE + 0x0d4) /**< @see EFM32TG_LCD_SEG_bits */ -#define LCD_SEGD7L MMIO32(LCD_BASE + 0x0d8) /**< @see EFM32TG_LCD_SEG_bits */ - -/** @} */ - -/** Bit states for the LCD_CTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.1 for definitions. - * - * @defgroup EFM32TG_LCD_CTRL_bits LCD CTRL bits - * @{ - */ - -#define LCD_CTRL_DSC (1<<23) -#define LCD_CTRL_UDCTRL_REGULAR (0<<1) -#define LCD_CTRL_UDCTRL_FCEVENT (1<<1) -#define LCD_CTRL_UDCTRL_FRAMESTART (2<<1) -#define LCD_CTRL_UDCTRL_MASK (0x3<<1) -#define LCD_CTRL_EN (1<<0) - -/** @} */ - -/** Bit states for the LCD_DISPCTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.2 for definitions. - * - * @defgroup EFM32TG_LCD_DISPCTRL_bits LCD DISPCTRL bits - * @{ - */ - -#define LCD_DISPCTRL_VBLEV_LEVEL0 (0<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL1 (1<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL2 (2<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL3 (3<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL4 (4<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL5 (5<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL6 (6<<18) -#define LCD_DISPCTRL_VBLEV_LEVEL7 (7<<18) -#define LCD_DISPCTRL_VBLEV_MASK (0x7<<18) -#define LCD_DISPCTRL_VLCDSEL_VDD (0<<16) -#define LCD_DISPCTRL_VLCDSEL_VEXTBOOST (1<<16) -#define LCD_DISPCTRL_VLCDSEL_MASK (0x1<<16) -#define LCD_DISPCTRL_CONCONF_VLCD (0<<15) -#define LCD_DISPCTRL_CONCONF_GND (1<<15) -#define LCD_DISPCTRL_CONCONF_MASK (0x1<<15) -/** By this parameter, the voltage V_LCD_OUT is interpolated linearly from - * 0.5V_LCD to V_LCD. - */ -#define LCD_DISPCTRL_CONLEV_MIN (0<<8) -#define LCD_DISPCTRL_CONLEV_MAX (31<<8) -#define LCD_DISPCTRL_CONLEV_MASK (0x1f<<8) -#define LCD_DISPCTRL_WAVE_LOWPOWER (0<<4) -#define LCD_DISPCTRL_WAVE_NORMAL (1<<4) -#define LCD_DISPCTRL_WAVE_MASK (0x1<<4) -#define LCD_DISPCTRL_BIAS_STATIC (0<<2) -#define LCD_DISPCTRL_BIAS_ONEHALF (1<<2) -#define LCD_DISPCTRL_BIAS_ONETHIRD (2<<2) -#define LCD_DISPCTRL_BIAS_ONEFOURTH (3<<2) -#define LCD_DISPCTRL_BIAS_MASK (0x3<<2) -/** These definitions munge the MUX and the MUXE fields, as they are described - * in the documentation only together too. - */ -#define LCD_DISPCTRL_MUX_STATIC 0x00000000 -#define LCD_DISPCTRL_MUX_DUPLEX 0x00000001 -#define LCD_DISPCTRL_MUX_TRIPLEX 0x00000002 -#define LCD_DISPCTRL_MUX_QUADRUPLEX 0x00000003 -#define LCD_DISPCTRL_MUX_SEXTAPLEX 0x00400001 -#define LCD_DISPCTRL_MUX_OCTAPLEX 0x00400003 -#define LCD_DISPCTRL_MUX_MASK 0x00400003 - -/** @} */ - -/** Bit states for the LCD_BACTRL register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.4 for definitions. - * - * @defgroup EFM32TG_LCD_BACTRL_bits LCD BACTRL bits - * @{ - */ - -#define LCD_BACTRL_FCTOP_MASK (0x3f<<18) -#define LCD_BACTRL_FCPRESC_DIV1 (0<<16) -#define LCD_BACTRL_FCPRESC_DIV2 (1<<16) -#define LCD_BACTRL_FCPRESC_DIV4 (2<<16) -#define LCD_BACTRL_FCPRESC_DIV8 (3<<16) -#define LCD_BACTRL_FCPRESC_MASK (0x3<<16) -#define LCD_BACTRL_FCEN (1<<8) -#define LCD_BACTRL_ALGOSEL_AND (0<<7) -#define LCD_BACTRL_ALGOSEL_OR (1<<7) -#define LCD_BACTRL_ALGOSEL_MASK (0x1<<7) -#define LCD_BACTRL_AREGBSC_NOSHIFT (0<<5) -#define LCD_BACTRL_AREGBSC_SHIFTLEFT (1<<5) -#define LCD_BACTRL_AREGBSC_SHIFTRIGHT (2<<5) -#define LCD_BACTRL_AREGBSC_MASK (0x3<<5) -#define LCD_BACTRL_AREGASC_NOSHIFT (0<<3) -#define LCD_BACTRL_AREGASC_SHIFTLEFT (1<<3) -#define LCD_BACTRL_AREGASC_SHIFTRIGHT (2<<3) -#define LCD_BACTRL_AREGASC_MASK (0x3<<3) -#define LCD_BACTRL_AEN (1<<2) -#define LCD_BACTRL_BLANK (1<<1) -#define LCD_BACTRL_BLINKEN (1<<0) - -/** @} */ - -/** Bit states for the LCD_STATUS register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.5 for definitions. - * - * @defgroup EFM32TG_LCD_STATUS_bits LCD STATUS bits - * @{ - */ - -#define LCD_STATUS_BLINK (1<<8) -#define LCD_STATUS_ASTATE_MASK (0xf<<0) - -/** @} */ - -/** Bit states for the LCD_FREEZE register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.16 for definitions. - * - * @defgroup EFM32TG_LCD_FREEZE_bits LCD FREEZE bits - * @{ - */ - -#define LCD_FREEZE_REGFREEZE_UPDATE (0<<0) -#define LCD_FREEZE_REGFREEZE_FREEZE (1<<0) -#define LCD_FREEZE_REGFREEZE_MASK (0x1<<0) - -/** @} */ - -/** Bit states for the LCD_SYNCBUSY register - * - * See d0034_efm32tg_reference_manual.pdf section 29.5.17 for definitions. - * - * @defgroup EFM32TG_LCD_SYNCBUSY_bits LCD SYNCBUSY bits - * @{ - */ - -#define LCD_SYNCBUSY_SEGD7L (1<<19) -#define LCD_SYNCBUSY_SEGD6L (1<<18) -#define LCD_SYNCBUSY_SEGD5L (1<<17) -#define LCD_SYNCBUSY_SEGD4L (1<<16) -#define LCD_SYNCBUSY_SEGD3L (1<<7) -#define LCD_SYNCBUSY_SEGD2L (1<<6) -#define LCD_SYNCBUSY_SEGD1L (1<<5) -#define LCD_SYNCBUSY_SEGD0L (1<<4) -#define LCD_SYNCBUSY_AREGB (1<<3) -#define LCD_SYNCBUSY_AREGA (1<<2) -#define LCD_SYNCBUSY_BACTRL (1<<1) -#define LCD_SYNCBUSY_CTRL (1<<0) - -/** @} */ - -/** Bit states for the LCD "I" group of registers (IF, IFS, IFC, IEN) - * - * These registers use this: - * - *
    - * - *
  • The LCD_IF register; see d0034_efm32tg_reference_manual.pdf section - * 29.5.8 for definitions.
    • - * - *
  • The LCD_IFS register; see d0034_efm32tg_reference_manual.pdf section - * 29.5.9 for definitions.
    • - * - *
  • The LCD_IFC register; see d0034_efm32tg_reference_manual.pdf section - * 29.5.10 for definitions.
    • - * - *
  • The LCD_IEN register; see d0034_efm32tg_reference_manual.pdf section - * 29.5.11 for definitions.
    • - * - *
- * - * @defgroup EFM32TG_LCD_I_bits LCD I bits group - * @{ - */ - -#define LCD_I_FC (1<<0) - -/** @} */ - -/** Bit states for the LCD "SEG" group of registers (SEGD0L, SEGD1L, SEGD2L, - * SEGD3L, SEGD4L, SEGD5L, SEGD6L, SEGD7L) - * - * These values are used by the SEGDxL registers, as defined in - * d0034_efm32tg_reference_manual.pdf sections 29.5.12 to .15 and .18 to .21. - * - * @defgroup EFM32TG_LCD_SEG_bits LCD SEG bits group - * @{ - */ - -#define LCD_SEG_23 (1<<23) -#define LCD_SEG_22 (1<<22) -#define LCD_SEG_21 (1<<21) -#define LCD_SEG_20 (1<<20) -#define LCD_SEG_19 (1<<19) -#define LCD_SEG_18 (1<<18) -#define LCD_SEG_17 (1<<17) -#define LCD_SEG_16 (1<<16) -#define LCD_SEG_15 (1<<15) -#define LCD_SEG_14 (1<<14) -#define LCD_SEG_13 (1<<13) -#define LCD_SEG_12 (1<<12) -#define LCD_SEG_11 (1<<11) -#define LCD_SEG_10 (1<<10) -#define LCD_SEG_9 (1<<9) -#define LCD_SEG_8 (1<<8) -#define LCD_SEG_7 (1<<7) -#define LCD_SEG_6 (1<<6) -#define LCD_SEG_5 (1<<5) -#define LCD_SEG_4 (1<<4) -#define LCD_SEG_3 (1<<3) -#define LCD_SEG_2 (1<<2) -#define LCD_SEG_1 (1<<1) -#define LCD_SEG_0 (1<<0) - -/** @} */ - -/** @} */ - - -/** @} */ - -#endif diff --git a/include/libopencm3/efm32/tinygecko/lcd.yaml b/include/libopencm3/efm32/tinygecko/lcd.yaml deleted file mode 100644 index 0e003bd8..00000000 --- a/include/libopencm3/efm32/tinygecko/lcd.yaml +++ /dev/null @@ -1,241 +0,0 @@ -copyright: "2012 chrysn " -license: lgpl-3+ -ingroup: EFM32TG -shortdocname: EFM32TG_LCD -shortname: LCD -longname: Liquid Crystal Display driver -baseref: d0034_efm32tg_reference_manual.pdf section 29 -registers_baserefext: ".4" -templateregs: - - name: I - comment: Bits for the various LCD interrupt registers - fields: - - {name: FC, shift: 0} - - name: SEG - comment: Bits for the individual SEG pins - override_backref: These values are used by the SEGDxL registers, as defined in d0034_efm32tg_reference_manual.pdf sections 29.5.12 to .15 and .18 to .21. - fields: - - {name: 23, shift: 23} - - {name: 22, shift: 22} - - {name: 21, shift: 21} - - {name: 20, shift: 20} - - {name: 19, shift: 19} - - {name: 18, shift: 18} - - {name: 17, shift: 17} - - {name: 16, shift: 16} - - {name: 15, shift: 15} - - {name: 14, shift: 14} - - {name: 13, shift: 13} - - {name: 12, shift: 12} - - {name: 11, shift: 11} - - {name: 10, shift: 10} - - {name: 9, shift: 9} - - {name: 8, shift: 8} - - {name: 7, shift: 7} - - {name: 6, shift: 6} - - {name: 5, shift: 5} - - {name: 4, shift: 4} - - {name: 3, shift: 3} - - {name: 2, shift: 2} - - {name: 1, shift: 1} - - {name: 0, shift: 0} -registers: - - name: CTRL - offset: 0x000 - definition_baserefext: .5.1 - fields: - - name: DSC - shift: 23 - - name: UDCTRL - shift: 1 - length: 2 - values: - - {name: REGULAR, value: 0} - - {name: FCEVENT, value: 1} - - {name: FRAMESTART, value: 2} - - name: EN - shift: 0 - - name: DISPCTRL - offset: 0x004 - definition_baserefext: .5.2 - fields: - # MUXE left out and defined manually at the end - - name: VBLEV - shift: 18 - length: 3 - values: - - {name: LEVEL0, value: 0} - - {name: LEVEL1, value: 1} - - {name: LEVEL2, value: 2} - - {name: LEVEL3, value: 3} - - {name: LEVEL4, value: 4} - - {name: LEVEL5, value: 5} - - {name: LEVEL6, value: 6} - - {name: LEVEL7, value: 7} - - name: VLCDSEL - shift: 16 - values: - - {name: VDD, value: 0} - - {name: VEXTBOOST, value: 1} - - name: CONCONF - shift: 15 - values: - - {value: 0, name: VLCD} - - {value: 1, name: GND} - - name: CONLEV - shift: 8 - length: 5 - type: uint - doc: "By this parameter, the voltage V_LCD_OUT is interpolated linearly from 0.5V_LCD to V_LCD." - values: - - {value: 0, name: MIN} - - {value: 31, name: MAX} - - name: WAVE - shift: 4 - values: - - {value: 0, name: LOWPOWER} - - {value: 1, name: NORMAL} - - name: BIAS - shift: 2 - length: 2 - values: - - {value: 0, name: STATIC} - - {value: 1, name: ONEHALF} - - {value: 2, name: ONETHIRD} - - {value: 3, name: ONEFOURTH} - - name: MUX - mask: "0x00400003" - values: - - {value: "0x00000000", name: STATIC} - - {value: "0x00000001", name: DUPLEX} - - {value: "0x00000002", name: TRIPLEX} - - {value: "0x00000003", name: QUADRUPLEX} - - {value: "0x00400001", name: SEXTAPLEX} - - {value: "0x00400003", name: OCTAPLEX} - doc: These definitions munge the MUX and the MUXE fields, as they are described in the documentation only together too. - - name: SEGEN - offset: 0x008 - definition_baserefext: .5.3 - # FIXME how do we reperesent this best? - - name: BACTRL - offset: 0x00c - definition_baserefext: .5.4 - fields: - - name: FCTOP - shift: 18 - length: 6 - type: uint - - name: FCPRESC - shift: 16 - length: 2 - values: - - {value: 0, name: DIV1} - - {value: 1, name: DIV2} - - {value: 2, name: DIV4} - - {value: 3, name: DIV8} - - name: FCEN - shift: 8 - - name: ALGOSEL - shift: 7 - values: - - {value: 0, name: AND} - - {value: 1, name: OR} - - name: AREGBSC - shift: 5 - length: 2 - values: &BACTRL_AREGBSC - - {value: 0, name: NOSHIFT} - - {value: 1, name: SHIFTLEFT} - - {value: 2, name: SHIFTRIGHT} - - name: AREGASC - shift: 3 - length: 2 - values: *BACTRL_AREGBSC - - name: AEN - shift: 2 - - name: BLANK - shift: 1 - - name: BLINKEN - shift: 0 - - name: STATUS - offset: 0x010 - definition_baserefext: .5.5 - fields: - - name: BLINK - shift: 8 - - name: ASTATE - shift: 0 - length: 4 - type: uint - - name: AREGA - offset: 0x014 - # FIXME: how do we represent this in the header? - - name: AREGB - offset: 0x018 - # FIXME: how do we represent this in the header? - - name: IF - offset: 0x01c - definition_baserefext: .5.8 - fields: I - - name: IFS - offset: 0x020 - definition_baserefext: .5.9 - fields: I - - name: IFC - offset: 0x024 - definition_baserefext: .5.10 - fields: I - - name: IEN - offset: 0x028 - definition_baserefext: .5.11 - fields: I - - name: SEGD0L - offset: 0x040 - fields: SEG - - name: SEGD1L - offset: 0x044 - fields: SEG - - name: SEGD2L - offset: 0x048 - fields: SEG - - name: SEGD3L - offset: 0x04c - fields: SEG - - name: FREEZE - offset: 0x060 - definition_baserefext: .5.16 - fields: - - name: REGFREEZE - shift: 0 - values: - - {value: 0, name: UPDATE} - - {value: 1, name: FREEZE} - # FIXME: this seems to be a typical FREEZE register - - name: SYNCBUSY - offset: 0x064 - definition_baserefext: .5.17 - fields: - - {name: SEGD7L, shift: 19} - - {name: SEGD6L, shift: 18} - - {name: SEGD5L, shift: 17} - - {name: SEGD4L, shift: 16} - - {name: SEGD3L, shift: 7} - - {name: SEGD2L, shift: 6} - - {name: SEGD1L, shift: 5} - - {name: SEGD0L, shift: 4} - - {name: AREGB, shift: 3} - - {name: AREGA, shift: 2} - - {name: BACTRL, shift: 1} - - {name: CTRL, shift: 0} - - name: SEGD4L - offset: 0x0CC - fields: SEG - - name: SEGD5L - offset: 0x0D0 - fields: SEG - - name: SEGD6L - offset: 0x0D4 - fields: SEG - - name: SEGD7L - offset: 0x0D8 - fields: SEG diff --git a/lib/efm32/tinygecko/devicerevision.c b/lib/efm32/tinygecko/devicerevision.c deleted file mode 100644 index 0af3e90e..00000000 --- a/lib/efm32/tinygecko/devicerevision.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include - -u8 devicerevision_revision_get(void) -{ - /* probably this is more elegant, more readable and closer to the spec, - * and i'll just get used to doing things like that: - return (DEVICEREVISION_PID2 & 0xf0) | ((DEVICEREVISION_PID3 & 0xf0) >> 4); - */ - return ((DEVICEREVISION_PID2 & DEVICEREVISION_REVISION_MASK) >> DEVICEREVISION_REVISION_SHIFT << DEVICEREVISION_REVISION_LENGTH) | ((DEVICEREVISION_PID3 & DEVICEREVISION_REVISION_MASK) >> DEVICEREVISION_REVISION_SHIFT); -} diff --git a/lib/efm32/tinygecko/gpio.c b/lib/efm32/tinygecko/gpio.c deleted file mode 100644 index 839d1b87..00000000 --- a/lib/efm32/tinygecko/gpio.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include - -void gpio_set_mode(u32 gpioport, u8 mode, u16 gpios) -{ - u8 i; - u32 modemaskl = 0, modesetl = 0, modemaskh = 0, modeseth = 0; - - for (i = 0; i < 8; ++i) - { - if (gpios & (1< Date: Tue, 2 Oct 2012 11:51:11 +0200 Subject: [PATCH 42/56] add back minimal support libraries some of the libraries removed in [1] were essential to building anything on efm32 (especially, irq.h). [1] 4a6f4c0f7d62858a4a9afba18f11289cb0bb8358 --- include/libopencm3/efm32/tinygecko/irq.h | 55 ++++++++++++++++++++++++ lib/efm32/tinygecko/Makefile | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 include/libopencm3/efm32/tinygecko/irq.h diff --git a/include/libopencm3/efm32/tinygecko/irq.h b/include/libopencm3/efm32/tinygecko/irq.h new file mode 100644 index 00000000..1b0a4840 --- /dev/null +++ b/include/libopencm3/efm32/tinygecko/irq.h @@ -0,0 +1,55 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/** @file + * + * Definitions of interrupt names on EFM32 Tiny Gecko systems + * + * The names and numbers are taken from d0034_efm32tg_reference_manual.pdf table 4.1. + */ + +#ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H +#define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H + +#define IRQ_DMA 0 +#define IRQ_GPIO_EVEN 1 +#define IRQ_TIMER0 2 +#define IRQ_USART0_RX 3 +#define IRQ_USART0_TX 4 +#define IRQ_ACMP01 5 +#define IRQ_ADC0 6 +#define IRQ_DAC0 7 +#define IRQ_I2C0 8 +#define IRQ_GPIO_ODD 9 +#define IRQ_TIMER1 10 +#define IRQ_USART1_RX 11 +#define IRQ_USART1_TX 12 +#define IRQ_LESENSE 13 +#define IRQ_LEUART0 14 +#define IRQ_LETIMER0 15 +#define IRQ_PCNT0 16 +#define IRQ_RTC 17 +#define IRQ_CMU 18 +#define IRQ_VCMP 19 +#define IRQ_LCD 20 +#define IRQ_MSC 21 +#define IRQ_AES 22 +#define IRQ_COUNT 23 /**< See also d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line, which shows that there are really no more interrupts and it is sufficient to allocate only 23 slots. */ + +#endif diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile index b9105091..934508d1 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/tinygecko/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o devicerevision.o gpio.o +OBJS = vector.o VPATH += ../ From b5de267b0671493d138f940c25f21f834f7275c4 Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 2 Oct 2012 12:05:36 +0200 Subject: [PATCH 43/56] use _data_loadaddr instead of _etext this change was done in master in [1] and just merged here. [1] 74cd991e7e8972cf22933743c847b5ce2b165798 --- lib/efm32/tinygecko/tinygecko.ld | 1 + lib/efm32/tinygecko/vector.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/efm32/tinygecko/tinygecko.ld b/lib/efm32/tinygecko/tinygecko.ld index 92f4282a..8ef5e426 100644 --- a/lib/efm32/tinygecko/tinygecko.ld +++ b/lib/efm32/tinygecko/tinygecko.ld @@ -57,6 +57,7 @@ SECTIONS . = ALIGN(4); _ebss = .; } >ram AT >rom + _data_loadaddr = LOADADDR(.data); /* * The .eh_frame section appears to be used for C++ exception handling. diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c index 264426bc..81421e79 100644 --- a/lib/efm32/tinygecko/vector.c +++ b/lib/efm32/tinygecko/vector.c @@ -23,8 +23,8 @@ #define WEAK __attribute__ ((weak)) -/* Symbols exported by the linker script(s). */ -extern unsigned _etext, _data, _edata, _ebss, _stack; +/* Symbols exported by the linker script(s): */ +extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack; void main(void); void blocking_handler(void); @@ -109,7 +109,7 @@ void WEAK reset_handler(void) __asm__("MSR msp, %0" : : "r"(&_stack)); - for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++) + for (src = &_data_loadaddr, dest = &_data; dest < &_edata; src++, dest++) *dest = *src; while (dest < &_ebss) From 0e3fdc57d5880ed41269dd3ab3ed33f6e0dc3fd9 Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 18 Oct 2012 19:18:25 +0200 Subject: [PATCH 44/56] remove files not required in generalizations branch any more --- include/libopencm3/efm32/tinygecko/irq.h | 55 -------- include/libopencm3/efm32/vector.h | 66 ---------- lib/efm32/tinygecko/vector.c | 159 ----------------------- 3 files changed, 280 deletions(-) delete mode 100644 include/libopencm3/efm32/tinygecko/irq.h delete mode 100644 include/libopencm3/efm32/vector.h delete mode 100644 lib/efm32/tinygecko/vector.c diff --git a/include/libopencm3/efm32/tinygecko/irq.h b/include/libopencm3/efm32/tinygecko/irq.h deleted file mode 100644 index 1b0a4840..00000000 --- a/include/libopencm3/efm32/tinygecko/irq.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * - * Definitions of interrupt names on EFM32 Tiny Gecko systems - * - * The names and numbers are taken from d0034_efm32tg_reference_manual.pdf table 4.1. - */ - -#ifndef LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H -#define LIBOPENCM3_EFM32_TINYGECKO_VECTOR_H - -#define IRQ_DMA 0 -#define IRQ_GPIO_EVEN 1 -#define IRQ_TIMER0 2 -#define IRQ_USART0_RX 3 -#define IRQ_USART0_TX 4 -#define IRQ_ACMP01 5 -#define IRQ_ADC0 6 -#define IRQ_DAC0 7 -#define IRQ_I2C0 8 -#define IRQ_GPIO_ODD 9 -#define IRQ_TIMER1 10 -#define IRQ_USART1_RX 11 -#define IRQ_USART1_TX 12 -#define IRQ_LESENSE 13 -#define IRQ_LEUART0 14 -#define IRQ_LETIMER0 15 -#define IRQ_PCNT0 16 -#define IRQ_RTC 17 -#define IRQ_CMU 18 -#define IRQ_VCMP 19 -#define IRQ_LCD 20 -#define IRQ_MSC 21 -#define IRQ_AES 22 -#define IRQ_COUNT 23 /**< See also d0002_efm32_cortex-m3_reference_manual.pdf's table 1.1's "number of interrupts" line, which shows that there are really no more interrupts and it is sufficient to allocate only 23 slots. */ - -#endif diff --git a/include/libopencm3/efm32/vector.h b/include/libopencm3/efm32/vector.h deleted file mode 100644 index 2ae55afd..00000000 --- a/include/libopencm3/efm32/vector.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/** @file - * - * Definitions for handling vector tables. - * - * This implements d0002_efm32_cortex-m3_reference_manual.pdf's figure 2.2. - * - * The structure of the vector table is implemented independently of the system - * vector table starting at memory position 0x0, as it can be relocated to - * other memory locations too. - * - * The exact size of a vector interrupt table depends on the number of - * interrupts IRQ_COUNT, which is defined per family. - */ - -#ifndef LIBOPENCM3_EFM32_VECTOR_H -#define LIBOPENCM3_EFM32_VECTOR_H - -#include - -#ifdef TINYGECKO -# include -#else -# error "efm32 family not defined." -#endif - -/** Type of an interrupt function. Only used to avoid hard-to-read function - * pointers in the efm32_vector_table_t struct. */ -typedef void (*efm32_vector_table_entry_t)(void); - -typedef struct { - unsigned int *initial_sp_value; /**< The value the stack pointer is set to initially */ - efm32_vector_table_entry_t reset; - efm32_vector_table_entry_t nmi; - efm32_vector_table_entry_t hard_fault; - efm32_vector_table_entry_t memory_manage_fault; - efm32_vector_table_entry_t bus_fault; - efm32_vector_table_entry_t usage_fault; - efm32_vector_table_entry_t reserved_x001c[4]; - efm32_vector_table_entry_t sv_call; - efm32_vector_table_entry_t reserved_debug; - efm32_vector_table_entry_t reserved_x0034; - efm32_vector_table_entry_t pend_sv; - efm32_vector_table_entry_t systick; - efm32_vector_table_entry_t irq[IRQ_COUNT]; -} efm32_vector_table_t; - -#endif diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c deleted file mode 100644 index 81421e79..00000000 --- a/lib/efm32/tinygecko/vector.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Piotr Esden-Tempski , - * Copyright (C) 2012 chrysn - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include -#include - -#define WEAK __attribute__ ((weak)) - -/* Symbols exported by the linker script(s): */ -extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack; - -void main(void); -void blocking_handler(void); - -void WEAK reset_handler(void); -void WEAK nmi_handler(void); -void WEAK hard_fault_handler(void); -void WEAK mem_manage_handler(void); -void WEAK bus_fault_handler(void); -void WEAK usage_fault_handler(void); -void WEAK sv_call_handler(void); -void WEAK debug_monitor_handler(void); -void WEAK pend_sv_handler(void); -void WEAK sys_tick_handler(void); - -void WEAK dma_isr(void); -void WEAK gpio_even_isr(void); -void WEAK timer0_isr(void); -void WEAK usart0_rx_isr(void); -void WEAK usart0_tx_isr(void); -void WEAK acmp01_isr(void); -void WEAK adc0_isr(void); -void WEAK dac0_isr(void); -void WEAK i2c0_isr(void); -void WEAK gpio_odd_isr(void); -void WEAK timer1_isr(void); -void WEAK usart1_rx_isr(void); -void WEAK usart1_tx_isr(void); -void WEAK lesense_isr(void); -void WEAK leuart0_isr(void); -void WEAK letimer0_isr(void); -void WEAK pcnt0_isr(void); -void WEAK rtc_isr(void); -void WEAK cmu_isr(void); -void WEAK vcmp_isr(void); -void WEAK lcd_isr(void); -void WEAK msc_isr(void); -void WEAK aes_isr(void); - -__attribute__ ((section(".vectors"))) -efm32_vector_table_t vector_table = { - .initial_sp_value = &_stack, - .reset = reset_handler, - .nmi = nmi_handler, - .hard_fault = hard_fault_handler, - .memory_manage_fault = mem_manage_handler, - .bus_fault = bus_fault_handler, - .usage_fault = usage_fault_handler, - .sv_call = sv_call_handler, - .pend_sv = pend_sv_handler, - .systick = sys_tick_handler, - .irq = { - [IRQ_DMA] = dma_isr, - [IRQ_GPIO_EVEN] = gpio_even_isr, - [IRQ_TIMER0] = timer0_isr, - [IRQ_USART0_RX] = usart0_rx_isr, - [IRQ_USART0_TX] = usart0_tx_isr, - [IRQ_ACMP01] = acmp01_isr, - [IRQ_ADC0] = adc0_isr, - [IRQ_DAC0] = dac0_isr, - [IRQ_I2C0] = i2c0_isr, - [IRQ_GPIO_ODD] = gpio_odd_isr, - [IRQ_TIMER1] = timer1_isr, - [IRQ_USART1_RX] = usart1_rx_isr, - [IRQ_USART1_TX] = usart1_tx_isr, - [IRQ_LESENSE] = lesense_isr, - [IRQ_LEUART0] = leuart0_isr, - [IRQ_LETIMER0] = letimer0_isr, - [IRQ_PCNT0] = pcnt0_isr, - [IRQ_RTC] = rtc_isr, - [IRQ_CMU] = cmu_isr, - [IRQ_VCMP] = vcmp_isr, - [IRQ_LCD] = lcd_isr, - [IRQ_MSC] = msc_isr, - [IRQ_AES] = aes_isr, - } -}; - -void WEAK reset_handler(void) -{ - volatile unsigned *src, *dest; - - __asm__("MSR msp, %0" : : "r"(&_stack)); - - for (src = &_data_loadaddr, dest = &_data; dest < &_edata; src++, dest++) - *dest = *src; - - while (dest < &_ebss) - *dest++ = 0; - - /* Call the application's entry point. */ - main(); -} - -void blocking_handler(void) -{ - while (1) ; -} - -#pragma weak nmi_handler = blocking_handler -#pragma weak hard_fault_handler = blocking_handler -#pragma weak mem_manage_handler = blocking_handler -#pragma weak bus_fault_handler = blocking_handler -#pragma weak usage_fault_handler = blocking_handler -#pragma weak sv_call_handler = blocking_handler -#pragma weak debug_monitor_handler = blocking_handler -#pragma weak pend_sv_handler = blocking_handler -#pragma weak sys_tick_handler = blocking_handler - -#pragma weak dma_isr = blocking_handler -#pragma weak gpio_even_isr = blocking_handler -#pragma weak timer0_isr = blocking_handler -#pragma weak usart0_rx_isr = blocking_handler -#pragma weak usart0_tx_isr = blocking_handler -#pragma weak acmp01_isr = blocking_handler -#pragma weak adc0_isr = blocking_handler -#pragma weak dac0_isr = blocking_handler -#pragma weak i2c0_isr = blocking_handler -#pragma weak gpio_odd_isr = blocking_handler -#pragma weak timer1_isr = blocking_handler -#pragma weak usart1_rx_isr = blocking_handler -#pragma weak usart1_tx_isr = blocking_handler -#pragma weak lesense_isr = blocking_handler -#pragma weak leuart0_isr = blocking_handler -#pragma weak letimer0_isr = blocking_handler -#pragma weak pcnt0_isr = blocking_handler -#pragma weak rtc_isr = blocking_handler -#pragma weak cmu_isr = blocking_handler -#pragma weak vcmp_isr = blocking_handler -#pragma weak lcd_isr = blocking_handler -#pragma weak msc_isr = blocking_handler -#pragma weak aes_isr = blocking_handler From a818dbe7293b0f7235f866c43e60e54b2da9fb86 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:04:07 +0200 Subject: [PATCH 45/56] use generalized libopencm3 functions in cmsis --- include/libopencmsis/core_cm3.h | 69 +++++++-------------- include/libopencmsis/dispatch/irqhandlers.h | 17 +++++ scripts/irq2nvic_h | 20 +++++- 3 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 include/libopencmsis/dispatch/irqhandlers.h diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 5ad13279..292a4564 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -4,14 +4,15 @@ * particularly unimplemented features are FIXME'd extra * */ +/* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ + #ifndef OPENCMSIS_CORECM3_H #define OPENCMSIS_CORECM3_H -/* needed in various places where we rather should include libopencm3 functionality */ -#define MMIO32(addr) (*(volatile uint32_t *)(addr)) - -/* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ -#include +#include +#include +#include +#include /* needed by system_efm32.h:196, guessing */ #define __INLINE inline @@ -27,11 +28,12 @@ /* -> style access for what is defined in libopencm3/stm32/f1/scb.h / * cm3/memorymap.h, as it's needed by efm32lib/inc/efm32_emu.h */ -/* from stm32/f1/scb.h */ -#define SCB_SCR_SLEEPDEEP_Msk (1 << 2) +/* from cm3/scb.h */ +#define SCB_SCR_SLEEPDEEP_Msk SCB_SCR_SLEEPDEEP + /* structure as in, for example, * DeviceSupport/EnergyMicro/EFM32/efm32tg840f32.h, data from - * libopencm3/stm32/f1/scb.h. FIXME incomplete. */ + * libopencm3/cm3/scb.h. FIXME incomplete. */ typedef struct { __IO uint32_t CPUID; @@ -44,10 +46,6 @@ typedef struct __IO uint32_t SHCSR; } SCB_TypeDef; #define SCB ((SCB_TypeDef *) SCB_BASE) -/* from libopencm3/cm3/memorymap.h */ -#define PPBI_BASE 0xE0000000 -#define SCS_BASE (PPBI_BASE + 0xE000) -#define SCB_BASE (SCS_BASE + 0x0D00) /* needed by efm32_emu.h, guessing and taking the implementation used in * lightswitch-interrupt.c */ @@ -72,24 +70,17 @@ typedef struct /* stubs for efm32_dma */ -/* also used by the clock example. code taken from stm32's nvic.[hc], FIXME until - * the generic cm3 functionality is moved out from stm32 and can be used here - * easily (nvic_clear_pending_irq, nvic_enable_irq, nvic_disable_irq). */ -#define NVIC_BASE (SCS_BASE + 0x0100) -#define NVIC_ISER(iser_id) MMIO32(NVIC_BASE + 0x00 + (iser_id * 4)) -#define NVIC_ICER(icer_id) MMIO32(NVIC_BASE + 0x80 + (icer_id * 4)) -#define NVIC_ICPR(icpr_id) MMIO32(NVIC_BASE + 0x180 + (icpr_id * 4)) static inline void NVIC_ClearPendingIRQ(uint8_t irqn) { - NVIC_ICPR(irqn / 32) = (1 << (irqn % 32)); + nvic_clear_pending_irq(irqn); } static inline void NVIC_EnableIRQ(uint8_t irqn) { - NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); + nvic_enable_irq(irqn); } static inline void NVIC_DisableIRQ(uint8_t irqn) { - NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); + nvic_disable_irq(irqn); } /* stubs for efm32_int. FIXME: how do they do that? nvic documentation in the @@ -139,7 +130,6 @@ typedef struct * * modified for CMSIS style array as the powertest example needs it. * */ -#define SYS_TICK_BASE (SCS_BASE + 0x0010) /* from d0002_efm32_cortex-m3_reference_manual.pdf section 4.4 */ typedef struct @@ -151,21 +141,16 @@ typedef struct } SysTick_TypeDef; #define SysTick ((SysTick_TypeDef *) SYS_TICK_BASE) -#define STK_CTRL_TICKINT (1 << 1) -#define STK_CTRL_ENABLE (1 << 0) - -#define STK_CTRL_CLKSOURCE_LSB 2 -#define STK_CTRL_CLKSOURCE_AHB 1 static inline uint32_t SysTick_Config(uint32_t n_ticks) { + /* constant from systick_set_reload -- as this returns something that's + * not void, this is the only possible error condition */ if (n_ticks & ~0x00FFFFFF) return 1; - SysTick->LOAD = n_ticks; - SysTick->CTRL |= (STK_CTRL_CLKSOURCE_AHB << STK_CTRL_CLKSOURCE_LSB); - - SysTick->CTRL |= STK_CTRL_TICKINT; - - SysTick->CTRL |= STK_CTRL_ENABLE; + systick_set_reload(n_ticks); + systick_set_clocksource(true); + systick_interrupt_enable(); + systick_counter_enable(); return 0; } @@ -182,20 +167,10 @@ typedef struct /* blink.h expects the isr for systicks to be named SysTick_Handler. with this, * its Systick_Handler function gets renamed to the weak symbol exported by * vector.c */ -#define SysTick_Handler sys_tick_handler - -/* likewise, clock.c defines GPIO_ODD_IRQHandler and GPIO_EVEN_IRQHandler */ -#define GPIO_ODD_IRQHandler gpio_odd_isr -#define GPIO_EVEN_IRQHandler gpio_even_isr -#define RTC_IRQHandler rtc_isr -/* for inttemp (i should really get a list and convert them all) */ - -#define ADC0_IRQHandler adc0_isr - -/* for the lightsense example */ +#define SysTick_Handler sys_tick_handler +/* FIXME: this needs to be done for all of the 14 hard vectors */ -#define LESENSE_IRQHandler lesense_isr -#define PCNT0_IRQHandler pcnt0_isr +#include #endif diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h new file mode 100644 index 00000000..1f6b02af --- /dev/null +++ b/include/libopencmsis/dispatch/irqhandlers.h @@ -0,0 +1,17 @@ +#if defined(STM32F1) +# include +#elif defined(STM32F2) +# include +#elif defined(STM32F4) +# include + +#elif defined(TINYGECKO) +# include + +#elif defined(LPC43XX) +# include + +#else +# warning"no chipset defined; user interrupts are not redirected" + +#endif diff --git a/scripts/irq2nvic_h b/scripts/irq2nvic_h index f84c88e4..6e45fa21 100755 --- a/scripts/irq2nvic_h +++ b/scripts/irq2nvic_h @@ -99,7 +99,19 @@ template_vector_nvic_c = '''\ {vectortableinitialization} ''' -def convert(infile, outfile_nvic, outfile_vectornvic): +template_cmsis_h = '''\ +/* This file is part of the libopencm3 project. + * + * It was generated by the irq2nvic_h script. + * + * These definitions bend every interrupt handler that is defined CMSIS style + * to the weak symbol exported by libopenmc3. + */ + +{cmsisbends} +''' + +def convert(infile, outfile_nvic, outfile_vectornvic, outfile_cmsis): data = yaml.load(infile) irq2name = list(enumerate(data['irqs']) if isinstance(data['irqs'], list) else data['irqs'].items()) @@ -114,9 +126,11 @@ def convert(infile, outfile_nvic, outfile_vectornvic): data['isrprototypes'] = "\n".join('void WEAK %s_isr(void);'%name.lower() for name in irqnames) data['isrpragmas'] = "\n".join('#pragma weak %s_isr = blocking_handler'%name.lower() for name in irqnames) data['vectortableinitialization'] = ', \\\n '.join('[NVIC_%s_IRQ] = %s_isr'%(name.upper(), name.lower()) for name in irqnames) + data['cmsisbends'] = "\n".join("#define %s_IRQHandler %s_isr"%(name.upper(), name.lower()) for name in irqnames) outfile_nvic.write(template_nvic_h.format(**data)) outfile_vectornvic.write(template_vector_nvic_c.format(**data)) + outfile_cmsis.write(template_cmsis_h.format(**data)) def makeparentdir(filename): try: @@ -131,11 +145,13 @@ def main(): raise ValueError("Arguent must match ./include/libopencm3/**/irq.yaml") nvic_h = infile.replace('irq.yaml', 'nvic.h') vector_nvic_c = infile.replace('./include/libopencm3/', './lib/').replace('irq.yaml', 'vector_nvic.c') + cmsis = infile.replace('irq.yaml', 'irqhandlers.h').replace('/libopencm3/', '/libopencmsis/') makeparentdir(nvic_h) makeparentdir(vector_nvic_c) + makeparentdir(cmsis) - convert(open(infile), open(nvic_h, 'w'), open(vector_nvic_c, 'w')) + convert(open(infile), open(nvic_h, 'w'), open(vector_nvic_c, 'w'), open(cmsis, 'w')) if __name__ == "__main__": main() From fa3c1ea6a237036b5d2730ea5bd56f4f0ad72bdc Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:19:07 +0200 Subject: [PATCH 46/56] pulling in a simplification in per-arch makefiles --- lib/efm32/tinygecko/Makefile | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/tinygecko/Makefile index 934508d1..550860c0 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/tinygecko/Makefile @@ -32,29 +32,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ ARFLAGS = rcs OBJS = vector.o -VPATH += ../ +VPATH += ../:../../cm3 -# Be silent per default, but 'make V=1' will show all compiler calls. -ifneq ($(V),1) -Q := @ -endif - -all: $(LIBNAME).a - -$(LIBNAME).a: $(OBJS) - @printf " AR $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(AR) $(ARFLAGS) $@ $^ - -%.o: %.c - @printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) $(CFLAGS) -o $@ -c $< - -clean: - @printf " CLEAN lib/efm32/tinygecko\n" - $(Q)rm -f *.o *.d - $(Q)rm -f $(LIBNAME).a - -.PHONY: clean - --include $(OBJS:.o=.d) +include ../../Makefile.include From d13043d787146f82ce70ba8b81a8660f7a04b697 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:31:10 +0200 Subject: [PATCH 47/56] change discriminator in efm32 series from TINYGECKO to EFM32TG --- include/libopencm3/dispatch/nvic.h | 2 +- include/libopencmsis/core_cm3.h | 1 + include/libopencmsis/dispatch/irqhandlers.h | 2 +- lib/dispatch/vector_nvic.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h index d8e7889a..2146c83b 100644 --- a/include/libopencm3/dispatch/nvic.h +++ b/include/libopencm3/dispatch/nvic.h @@ -5,7 +5,7 @@ #elif defined(STM32F4) # include -#elif defined(TINYGECKO) +#elif defined(EFM32TG) # include #elif defined(LPC43XX) diff --git a/include/libopencmsis/core_cm3.h b/include/libopencmsis/core_cm3.h index 292a4564..0a89381d 100644 --- a/include/libopencmsis/core_cm3.h +++ b/include/libopencmsis/core_cm3.h @@ -12,6 +12,7 @@ #include #include #include +#include #include /* needed by system_efm32.h:196, guessing */ diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h index 1f6b02af..ad3f4a17 100644 --- a/include/libopencmsis/dispatch/irqhandlers.h +++ b/include/libopencmsis/dispatch/irqhandlers.h @@ -5,7 +5,7 @@ #elif defined(STM32F4) # include -#elif defined(TINYGECKO) +#elif defined(EFM32TG) # include #elif defined(LPC43XX) diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c index fc5fdd2a..9ac9517e 100644 --- a/lib/dispatch/vector_nvic.c +++ b/lib/dispatch/vector_nvic.c @@ -5,7 +5,7 @@ #elif defined(STM32F4) # include "../stm32/f4/vector_nvic.c" -#elif defined(TINYGECKO) +#elif defined(EFM32TG) # include "../efm32/tinygecko/vector_nvic.c" #elif defined(LPC43XX) From 962f3286914d97a55713ba17c6c0797e0d120362 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:41:22 +0200 Subject: [PATCH 48/56] renamed linker file to work with included makefile --- .../tinygecko/{tinygecko.ld => libopencm3_efm32tinygecko.ld} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/efm32/tinygecko/{tinygecko.ld => libopencm3_efm32tinygecko.ld} (100%) diff --git a/lib/efm32/tinygecko/tinygecko.ld b/lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld similarity index 100% rename from lib/efm32/tinygecko/tinygecko.ld rename to lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld From d526dd3268500d397746b19d2ab6688abf524077 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 00:49:27 +0200 Subject: [PATCH 49/56] rename tinygecko->efm32tg everywhere --- Makefile | 2 +- include/libopencm3/dispatch/nvic.h | 2 +- include/libopencm3/efm32/{tinygecko => efm32tg}/irq.yaml | 2 +- include/libopencm3/efm32/{tinygecko => efm32tg}/memorymap.h | 0 include/libopencmsis/dispatch/irqhandlers.h | 2 +- lib/dispatch/vector_nvic.c | 2 +- lib/efm32/{tinygecko => efm32tg}/EFM32TG840F32.ld | 0 lib/efm32/{tinygecko => efm32tg}/Makefile | 4 ++-- .../libopencm3_efm32tg.ld} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename include/libopencm3/efm32/{tinygecko => efm32tg}/irq.yaml (89%) rename include/libopencm3/efm32/{tinygecko => efm32tg}/memorymap.h (100%) rename lib/efm32/{tinygecko => efm32tg}/EFM32TG840F32.ld (100%) rename lib/efm32/{tinygecko => efm32tg}/Makefile (95%) rename lib/efm32/{tinygecko/libopencm3_efm32tinygecko.ld => efm32tg/libopencm3_efm32tg.ld} (100%) diff --git a/Makefile b/Makefile index 02d3c7a0..80f08227 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts INSTALL = install SRCLIBDIR = $(shell pwd)/lib -TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/tinygecko +TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/efm32tg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h index 2146c83b..27c61611 100644 --- a/include/libopencm3/dispatch/nvic.h +++ b/include/libopencm3/dispatch/nvic.h @@ -6,7 +6,7 @@ # include #elif defined(EFM32TG) -# include +# include #elif defined(LPC43XX) # include diff --git a/include/libopencm3/efm32/tinygecko/irq.yaml b/include/libopencm3/efm32/efm32tg/irq.yaml similarity index 89% rename from include/libopencm3/efm32/tinygecko/irq.yaml rename to include/libopencm3/efm32/efm32tg/irq.yaml index da954f60..f4aaba33 100644 --- a/include/libopencm3/efm32/tinygecko/irq.yaml +++ b/include/libopencm3/efm32/efm32tg/irq.yaml @@ -1,4 +1,4 @@ -includeguard: LIBOPENCM3_EFM32_TINYGECKO_NVIC_H +includeguard: LIBOPENCM3_EFM32TG_NVIC_H partname_humanreadable: EFM32 Tiny Gecko series partname_doxygen: EFM32TG # The names and sequence are taken from d0034_efm32tg_reference_manual.pdf table 4.1. diff --git a/include/libopencm3/efm32/tinygecko/memorymap.h b/include/libopencm3/efm32/efm32tg/memorymap.h similarity index 100% rename from include/libopencm3/efm32/tinygecko/memorymap.h rename to include/libopencm3/efm32/efm32tg/memorymap.h diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h index ad3f4a17..41c4b28e 100644 --- a/include/libopencmsis/dispatch/irqhandlers.h +++ b/include/libopencmsis/dispatch/irqhandlers.h @@ -6,7 +6,7 @@ # include #elif defined(EFM32TG) -# include +# include #elif defined(LPC43XX) # include diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c index 9ac9517e..9373319b 100644 --- a/lib/dispatch/vector_nvic.c +++ b/lib/dispatch/vector_nvic.c @@ -6,7 +6,7 @@ # include "../stm32/f4/vector_nvic.c" #elif defined(EFM32TG) -# include "../efm32/tinygecko/vector_nvic.c" +# include "../efm32/efm32tg/vector_nvic.c" #elif defined(LPC43XX) # include "../lpc43xx/vector_nvic.c" diff --git a/lib/efm32/tinygecko/EFM32TG840F32.ld b/lib/efm32/efm32tg/EFM32TG840F32.ld similarity index 100% rename from lib/efm32/tinygecko/EFM32TG840F32.ld rename to lib/efm32/efm32tg/EFM32TG840F32.ld diff --git a/lib/efm32/tinygecko/Makefile b/lib/efm32/efm32tg/Makefile similarity index 95% rename from lib/efm32/tinygecko/Makefile rename to lib/efm32/efm32tg/Makefile index 550860c0..65f8d025 100644 --- a/lib/efm32/tinygecko/Makefile +++ b/lib/efm32/efm32tg/Makefile @@ -18,8 +18,8 @@ ## along with this library. If not, see . ## -LIBNAME = libopencm3_efm32tinygecko -FAMILY = TINYGECKO +LIBNAME = libopencm3_efm32tg +FAMILY = EFM32TG PREFIX ?= arm-none-eabi #PREFIX ?= arm-elf diff --git a/lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld b/lib/efm32/efm32tg/libopencm3_efm32tg.ld similarity index 100% rename from lib/efm32/tinygecko/libopencm3_efm32tinygecko.ld rename to lib/efm32/efm32tg/libopencm3_efm32tg.ld From ab5a544d45dc3a6af3f976847d4dda81aa931892 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 01:09:51 +0200 Subject: [PATCH 50/56] added irqs for the rest of the efm32 devices --- include/libopencm3/dispatch/nvic.h | 6 +++ include/libopencm3/efm32/efm32g/irq.yaml | 35 +++++++++++++++++ include/libopencm3/efm32/efm32gg/irq.yaml | 43 +++++++++++++++++++++ include/libopencm3/efm32/efm32lg/irq.yaml | 43 +++++++++++++++++++++ include/libopencmsis/dispatch/irqhandlers.h | 6 +++ lib/dispatch/vector_nvic.c | 6 +++ 6 files changed, 139 insertions(+) create mode 100644 include/libopencm3/efm32/efm32g/irq.yaml create mode 100644 include/libopencm3/efm32/efm32gg/irq.yaml create mode 100644 include/libopencm3/efm32/efm32lg/irq.yaml diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h index 27c61611..a0db5100 100644 --- a/include/libopencm3/dispatch/nvic.h +++ b/include/libopencm3/dispatch/nvic.h @@ -7,6 +7,12 @@ #elif defined(EFM32TG) # include +#elif defined(EFM32G) +# include +#elif defined(EFM32LG) +# include +#elif defined(EFM32GG) +# include #elif defined(LPC43XX) # include diff --git a/include/libopencm3/efm32/efm32g/irq.yaml b/include/libopencm3/efm32/efm32g/irq.yaml new file mode 100644 index 00000000..770f755f --- /dev/null +++ b/include/libopencm3/efm32/efm32g/irq.yaml @@ -0,0 +1,35 @@ +includeguard: LIBOPENCM3_EFM32G_NVIC_H +partname_humanreadable: EFM32 Gecko series +partname_doxygen: EFM32G +# The names and sequence are taken from d0001_efm32g_reference_manual.pdf table 4.1. +irqs: + - dma + - gpio_even + - timer0 + - usart0_rx + - usart0_tx + - acmp01 + - adc0 + - dac0 + - i2c0 + - gpio_odd + - timer1 + - timer2 + - usart1_rx + - usart1_tx + - usart2_rx + - usart2_tx + - uart0_rx + - uart0_tx + - leuart0 + - leuart1 + - letimer0 + - pcnt0 + - pcnt1 + - pcnt2 + - rtc + - cmu + - vcmp + - lcd + - msc + - aes diff --git a/include/libopencm3/efm32/efm32gg/irq.yaml b/include/libopencm3/efm32/efm32gg/irq.yaml new file mode 100644 index 00000000..1cb46018 --- /dev/null +++ b/include/libopencm3/efm32/efm32gg/irq.yaml @@ -0,0 +1,43 @@ +includeguard: LIBOPENCM3_EFM32GG_NVIC_H +partname_humanreadable: EFM32 Giant Gecko series +partname_doxygen: EFM32GG +# The names and sequence are taken from d0053_efm32gg_refreence_manual.pdf table 4.1. +irqs: + - dma + - gpio_even + - timer0 + - usart0_rx + - usart0_tx + - usb + - acmp01 + - adc0 + - dac0 + - i2c0 + - i2c1 + - gpio_odd + - timer1 + - timer2 + - timer3 + - usart1_rx + - usart1_tx + - lesense + - usart2_rx + - usart2_tx + - uart0_rx + - uart0_tx + - uart1_rx + - uart1_tx + - leuart0 + - leuart1 + - letimer0 + - pcnt0 + - pcnt1 + - pcnt2 + - rtc + - burtc + - cmu + - vcmp + - lcd + - msc + - aes + - ebi diff --git a/include/libopencm3/efm32/efm32lg/irq.yaml b/include/libopencm3/efm32/efm32lg/irq.yaml new file mode 100644 index 00000000..ec38bc15 --- /dev/null +++ b/include/libopencm3/efm32/efm32lg/irq.yaml @@ -0,0 +1,43 @@ +includeguard: LIBOPENCM3_EFM32LG_NVIC_H +partname_humanreadable: EFM32 Leopard Gecko series +partname_doxygen: EFM32LG +# The names and sequence are taken from d0183_efm32lg_reference_manual.pdf table 4.1. +irqs: + - dma + - gpio_even + - timer0 + - usart0_rx + - usart0_tx + - usb + - acmp01 + - adc0 + - dac0 + - i2c0 + - i2c1 + - gpio_odd + - timer1 + - timer2 + - timer3 + - usart1_rx + - usart1_tx + - lesense + - usart2_rx + - usart2_tx + - uart0_rx + - uart0_tx + - uart1_rx + - uart1_tx + - leuart0 + - leuart1 + - letimer0 + - pcnt0 + - pcnt1 + - pcnt2 + - rtc + - burtc + - cmu + - vcmp + - lcd + - msc + - aes + - ebi diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h index 41c4b28e..65e071d7 100644 --- a/include/libopencmsis/dispatch/irqhandlers.h +++ b/include/libopencmsis/dispatch/irqhandlers.h @@ -7,6 +7,12 @@ #elif defined(EFM32TG) # include +#elif defined(EFM32G) +# include +#elif defined(EFM32LG) +# include +#elif defined(EFM32GG) +# include #elif defined(LPC43XX) # include diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c index 9373319b..d710d315 100644 --- a/lib/dispatch/vector_nvic.c +++ b/lib/dispatch/vector_nvic.c @@ -7,6 +7,12 @@ #elif defined(EFM32TG) # include "../efm32/efm32tg/vector_nvic.c" +#elif defined(EFM32G) +# include "../efm32/efm32g/vector_nvic.c" +#elif defined(EFM32LG) +# include "../efm32/efm32lg/vector_nvic.c" +#elif defined(EFM32GG) +# include "../efm32/efm32gg/vector_nvic.c" #elif defined(LPC43XX) # include "../lpc43xx/vector_nvic.c" From 62345af9ee354bce9f705b1370dbce2aa25d6d70 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 13:51:16 +0200 Subject: [PATCH 51/56] install opencmsis --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 80f08227..b2a31c3a 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,11 @@ examples: lib install: lib @printf " INSTALL headers\n" $(Q)$(INSTALL) -d $(INCDIR)/libopencm3 + $(Q)$(INSTALL) -d $(INCDIR)/libopencmsis $(Q)$(INSTALL) -d $(LIBDIR) $(Q)$(INSTALL) -d $(SHAREDIR) $(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3 + $(Q)cp -r include/libopencmsis/* $(INCDIR)/libopencmsis @printf " INSTALL libs\n" $(Q)$(INSTALL) -m 0644 lib/*.a $(LIBDIR) @printf " INSTALL ldscripts\n" From e11edaff11fc48736a801453e6cd4c64be8e96ca Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 14:04:55 +0200 Subject: [PATCH 52/56] build all efm32 families --- Makefile | 2 +- lib/efm32/efm32g/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ lib/efm32/efm32gg/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ lib/efm32/efm32lg/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 lib/efm32/efm32g/Makefile create mode 100644 lib/efm32/efm32gg/Makefile create mode 100644 lib/efm32/efm32lg/Makefile diff --git a/Makefile b/Makefile index b2a31c3a..994e8a4a 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts INSTALL = install SRCLIBDIR = $(shell pwd)/lib -TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/efm32tg +TARGETS = stm32/f1 stm32/f2 stm32/f4 lpc13xx lpc17xx lpc43xx lm3s efm32/efm32tg efm32/efm32g efm32/efm32lg efm32/efm32gg # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) diff --git a/lib/efm32/efm32g/Makefile b/lib/efm32/efm32g/Makefile new file mode 100644 index 00000000..923be478 --- /dev/null +++ b/lib/efm32/efm32g/Makefile @@ -0,0 +1,38 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +LIBNAME = libopencm3_efm32g +FAMILY = EFM32G + +PREFIX ?= arm-none-eabi +#PREFIX ?= arm-elf +CC = $(PREFIX)-gcc +AR = $(PREFIX)-ar +CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ + -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ + -ffunction-sections -fdata-sections -MD -D$(FAMILY) +# ARFLAGS = rcsv +ARFLAGS = rcs +OBJS = vector.o + +VPATH += ../:../../cm3 + +include ../../Makefile.include + diff --git a/lib/efm32/efm32gg/Makefile b/lib/efm32/efm32gg/Makefile new file mode 100644 index 00000000..0d9d0bdc --- /dev/null +++ b/lib/efm32/efm32gg/Makefile @@ -0,0 +1,38 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +LIBNAME = libopencm3_efm32gg +FAMILY = EFM32GG + +PREFIX ?= arm-none-eabi +#PREFIX ?= arm-elf +CC = $(PREFIX)-gcc +AR = $(PREFIX)-ar +CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ + -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ + -ffunction-sections -fdata-sections -MD -D$(FAMILY) +# ARFLAGS = rcsv +ARFLAGS = rcs +OBJS = vector.o + +VPATH += ../:../../cm3 + +include ../../Makefile.include + diff --git a/lib/efm32/efm32lg/Makefile b/lib/efm32/efm32lg/Makefile new file mode 100644 index 00000000..c76323e7 --- /dev/null +++ b/lib/efm32/efm32lg/Makefile @@ -0,0 +1,38 @@ +## +## This file is part of the libopencm3 project. +## +## Copyright (C) 2009 Uwe Hermann +## Copyright (C) 2012 chrysn +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +LIBNAME = libopencm3_efm32lg +FAMILY = EFM32LG + +PREFIX ?= arm-none-eabi +#PREFIX ?= arm-elf +CC = $(PREFIX)-gcc +AR = $(PREFIX)-ar +CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ + -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ + -ffunction-sections -fdata-sections -MD -D$(FAMILY) +# ARFLAGS = rcsv +ARFLAGS = rcs +OBJS = vector.o + +VPATH += ../:../../cm3 + +include ../../Makefile.include + From 843660dbfdb1c2c3e8f7a42b2a302747814a6168 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 14:59:01 +0200 Subject: [PATCH 53/56] copied over linker scripts this will need some generalization too... --- lib/efm32/efm32g/libopencm3_efm32g.ld | 79 +++++++++++++++++++ lib/efm32/efm32g/libopencm3_efm32g880f128.ld | 15 ++++ lib/efm32/efm32gg/libopencm3_efm32gg.ld | 79 +++++++++++++++++++ lib/efm32/efm32lg/libopencm3_efm32lg.ld | 79 +++++++++++++++++++ ...G840F32.ld => libopencm3_efm32tg840f32.ld} | 2 +- 5 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 lib/efm32/efm32g/libopencm3_efm32g.ld create mode 100644 lib/efm32/efm32g/libopencm3_efm32g880f128.ld create mode 100644 lib/efm32/efm32gg/libopencm3_efm32gg.ld create mode 100644 lib/efm32/efm32lg/libopencm3_efm32lg.ld rename lib/efm32/efm32tg/{EFM32TG840F32.ld => libopencm3_efm32tg840f32.ld} (92%) diff --git a/lib/efm32/efm32g/libopencm3_efm32g.ld b/lib/efm32/efm32g/libopencm3_efm32g.ld new file mode 100644 index 00000000..8ef5e426 --- /dev/null +++ b/lib/efm32/efm32g/libopencm3_efm32g.ld @@ -0,0 +1,79 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann , + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/* Generic linker script for EFM32 targets using libopencm3. */ + +/* Memory regions must be defined in the ld script which includes this one. */ + +/* Enforce emmition of the vector table. */ +EXTERN (vector_table) + +/* Define the entry point of the output file. */ +ENTRY(reset_handler) + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(rom); + + .text : { + *(.vectors) /* Vector table */ + *(.text*) /* Program code */ + . = ALIGN(4); + *(.rodata*) /* Read-only data */ + . = ALIGN(4); + _etext = .; + } >rom + + . = ORIGIN(ram); + + .data : AT(_etext) { + _data = .; + *(.data*) /* Read-write initialized data */ + . = ALIGN(4); + _edata = .; + } >ram + + .bss : { + *(.bss*) /* Read-write zero initialized data */ + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >ram AT >rom + _data_loadaddr = LOADADDR(.data); + + /* + * The .eh_frame section appears to be used for C++ exception handling. + * You may need to fix this if you're using C++. + */ + /DISCARD/ : { *(.eh_frame) } + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ + /DISCARD/ : { *(.ARM.exidx) } + + . = ALIGN(4); + end = .; +} + +PROVIDE(_stack = ORIGIN(ram) + LENGTH(ram)); + diff --git a/lib/efm32/efm32g/libopencm3_efm32g880f128.ld b/lib/efm32/efm32g/libopencm3_efm32g880f128.ld new file mode 100644 index 00000000..09c6fb0f --- /dev/null +++ b/lib/efm32/efm32g/libopencm3_efm32g880f128.ld @@ -0,0 +1,15 @@ +/* lengths from d011_efm32tg840_datasheet.pdf table 1.1, offset from + * d0034_efm32tg_reference_manual.pdf figure 5.2. + * + * the origins and memory structure are constant over all tinygeckos, but the + * MEMORY section requires the use of constants, and has thus to be duplicated + * over the chip variants. + * */ + +MEMORY +{ + rom (rx) : ORIGIN = 0, LENGTH = 128k + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 16k +} + +INCLUDE libopencm3_efm32g.ld; diff --git a/lib/efm32/efm32gg/libopencm3_efm32gg.ld b/lib/efm32/efm32gg/libopencm3_efm32gg.ld new file mode 100644 index 00000000..8ef5e426 --- /dev/null +++ b/lib/efm32/efm32gg/libopencm3_efm32gg.ld @@ -0,0 +1,79 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann , + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/* Generic linker script for EFM32 targets using libopencm3. */ + +/* Memory regions must be defined in the ld script which includes this one. */ + +/* Enforce emmition of the vector table. */ +EXTERN (vector_table) + +/* Define the entry point of the output file. */ +ENTRY(reset_handler) + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(rom); + + .text : { + *(.vectors) /* Vector table */ + *(.text*) /* Program code */ + . = ALIGN(4); + *(.rodata*) /* Read-only data */ + . = ALIGN(4); + _etext = .; + } >rom + + . = ORIGIN(ram); + + .data : AT(_etext) { + _data = .; + *(.data*) /* Read-write initialized data */ + . = ALIGN(4); + _edata = .; + } >ram + + .bss : { + *(.bss*) /* Read-write zero initialized data */ + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >ram AT >rom + _data_loadaddr = LOADADDR(.data); + + /* + * The .eh_frame section appears to be used for C++ exception handling. + * You may need to fix this if you're using C++. + */ + /DISCARD/ : { *(.eh_frame) } + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ + /DISCARD/ : { *(.ARM.exidx) } + + . = ALIGN(4); + end = .; +} + +PROVIDE(_stack = ORIGIN(ram) + LENGTH(ram)); + diff --git a/lib/efm32/efm32lg/libopencm3_efm32lg.ld b/lib/efm32/efm32lg/libopencm3_efm32lg.ld new file mode 100644 index 00000000..8ef5e426 --- /dev/null +++ b/lib/efm32/efm32lg/libopencm3_efm32lg.ld @@ -0,0 +1,79 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann , + * Copyright (C) 2012 chrysn + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/* Generic linker script for EFM32 targets using libopencm3. */ + +/* Memory regions must be defined in the ld script which includes this one. */ + +/* Enforce emmition of the vector table. */ +EXTERN (vector_table) + +/* Define the entry point of the output file. */ +ENTRY(reset_handler) + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(rom); + + .text : { + *(.vectors) /* Vector table */ + *(.text*) /* Program code */ + . = ALIGN(4); + *(.rodata*) /* Read-only data */ + . = ALIGN(4); + _etext = .; + } >rom + + . = ORIGIN(ram); + + .data : AT(_etext) { + _data = .; + *(.data*) /* Read-write initialized data */ + . = ALIGN(4); + _edata = .; + } >ram + + .bss : { + *(.bss*) /* Read-write zero initialized data */ + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >ram AT >rom + _data_loadaddr = LOADADDR(.data); + + /* + * The .eh_frame section appears to be used for C++ exception handling. + * You may need to fix this if you're using C++. + */ + /DISCARD/ : { *(.eh_frame) } + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ + /DISCARD/ : { *(.ARM.exidx) } + + . = ALIGN(4); + end = .; +} + +PROVIDE(_stack = ORIGIN(ram) + LENGTH(ram)); + diff --git a/lib/efm32/efm32tg/EFM32TG840F32.ld b/lib/efm32/efm32tg/libopencm3_efm32tg840f32.ld similarity index 92% rename from lib/efm32/efm32tg/EFM32TG840F32.ld rename to lib/efm32/efm32tg/libopencm3_efm32tg840f32.ld index f7baa904..2cb8daf0 100644 --- a/lib/efm32/efm32tg/EFM32TG840F32.ld +++ b/lib/efm32/efm32tg/libopencm3_efm32tg840f32.ld @@ -12,4 +12,4 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4k } -INCLUDE tinygecko.ld; +INCLUDE libopencm3_efm32tg.ld; From cece71ba2fbb750f8c6cfe57121748a9ab626205 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 16:13:34 +0200 Subject: [PATCH 54/56] install *all* efm32 linker scripts this will install the per-family linker scripts twice (doesn't hurt, gets overwritten), but more importantly intalls the per-chip scripts too. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 994e8a4a..32c39254 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ install: lib $(Q)$(INSTALL) -m 0644 lib/*.a $(LIBDIR) @printf " INSTALL ldscripts\n" $(Q)$(INSTALL) -m 0644 lib/*.ld $(LIBDIR) + $(Q)$(INSTALL) -m 0644 lib/efm32/*/*.ld $(LIBDIR) @printf " INSTALL scripts\n" $(Q)$(INSTALL) -m 0644 scripts/* $(SHAREDIR) From 12107388451e1af87f1efd6ddea2bc41f01945a1 Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 17:03:23 +0200 Subject: [PATCH 55/56] add generic OBJS to efm32 libraries better fixes would be adding them to the generic (included) Makefile or building the really device independent stuff in a _generic library --- lib/efm32/efm32g/Makefile | 2 +- lib/efm32/efm32gg/Makefile | 2 +- lib/efm32/efm32lg/Makefile | 2 +- lib/efm32/efm32tg/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efm32/efm32g/Makefile b/lib/efm32/efm32g/Makefile index 923be478..c3687941 100644 --- a/lib/efm32/efm32g/Makefile +++ b/lib/efm32/efm32g/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o +OBJS = vector.o systick.o scb.o nvic.o assert.o VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32gg/Makefile b/lib/efm32/efm32gg/Makefile index 0d9d0bdc..27e2235e 100644 --- a/lib/efm32/efm32gg/Makefile +++ b/lib/efm32/efm32gg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o +OBJS = vector.o systick.o scb.o nvic.o assert.o VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32lg/Makefile b/lib/efm32/efm32lg/Makefile index c76323e7..73dd6f64 100644 --- a/lib/efm32/efm32lg/Makefile +++ b/lib/efm32/efm32lg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o +OBJS = vector.o systick.o scb.o nvic.o assert.o VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32tg/Makefile b/lib/efm32/efm32tg/Makefile index 65f8d025..a065b6d5 100644 --- a/lib/efm32/efm32tg/Makefile +++ b/lib/efm32/efm32tg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o +OBJS = vector.o systick.o scb.o nvic.o assert.o VPATH += ../:../../cm3 From 1e88ad186fe362aeb8a6994d6d88775dc689ddfb Mon Sep 17 00:00:00 2001 From: chrysn Date: Fri, 19 Oct 2012 19:30:25 +0200 Subject: [PATCH 56/56] remove common modules from efm32*'s explicit build list this is 75c216582 for the efm32 branch, see there for details --- lib/efm32/efm32g/Makefile | 2 +- lib/efm32/efm32gg/Makefile | 2 +- lib/efm32/efm32lg/Makefile | 2 +- lib/efm32/efm32tg/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efm32/efm32g/Makefile b/lib/efm32/efm32g/Makefile index c3687941..1dd44850 100644 --- a/lib/efm32/efm32g/Makefile +++ b/lib/efm32/efm32g/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o systick.o scb.o nvic.o assert.o +OBJS = VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32gg/Makefile b/lib/efm32/efm32gg/Makefile index 27e2235e..24078592 100644 --- a/lib/efm32/efm32gg/Makefile +++ b/lib/efm32/efm32gg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o systick.o scb.o nvic.o assert.o +OBJS = VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32lg/Makefile b/lib/efm32/efm32lg/Makefile index 73dd6f64..9b6343c0 100644 --- a/lib/efm32/efm32lg/Makefile +++ b/lib/efm32/efm32lg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o systick.o scb.o nvic.o assert.o +OBJS = VPATH += ../:../../cm3 diff --git a/lib/efm32/efm32tg/Makefile b/lib/efm32/efm32tg/Makefile index a065b6d5..605438a0 100644 --- a/lib/efm32/efm32tg/Makefile +++ b/lib/efm32/efm32tg/Makefile @@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \ -ffunction-sections -fdata-sections -MD -D$(FAMILY) # ARFLAGS = rcsv ARFLAGS = rcs -OBJS = vector.o systick.o scb.o nvic.o assert.o +OBJS = VPATH += ../:../../cm3