aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Otto2010-03-26 10:17:00 +0100
committerThomas Otto2010-03-26 10:17:00 +0100
commit2bada0dacd561a2e36a90667ff51054af7a7cf62 (patch)
treea8be2b8a54b86fbd5f2678fb20b7f3bf4368f264
parentbd725f59aecf645135d9602d28bc8a758daff748 (diff)
parent3518301870be7e2ef1083bea6c170f28fa574d78 (diff)
Merge branch 'master' of tommi@viadmin.org:/opt/git/libopenstm32
-rw-r--r--examples/other/adc_temperature_sensor/Makefile4
-rw-r--r--include/libopenstm32.h1
-rw-r--r--include/libopenstm32/systick.h70
-rw-r--r--lib/Makefile2
-rw-r--r--lib/systick.c22
5 files changed, 96 insertions, 3 deletions
diff --git a/examples/other/adc_temperature_sensor/Makefile b/examples/other/adc_temperature_sensor/Makefile
index b968dbc..a708bcb 100644
--- a/examples/other/adc_temperature_sensor/Makefile
+++ b/examples/other/adc_temperature_sensor/Makefile
@@ -26,8 +26,8 @@ LD = $(PREFIX)-ld
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
# Uncomment this line if you want to use the installed (not local) library.
-TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
-#TOOLCHAIN_DIR = ../../..
+#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/..
+TOOLCHAIN_DIR = ../../..
CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld
diff --git a/include/libopenstm32.h b/include/libopenstm32.h
index 5991b24..03d488a 100644
--- a/include/libopenstm32.h
+++ b/include/libopenstm32.h
@@ -37,5 +37,6 @@
#include <libopenstm32/i2c.h>
#include <libopenstm32/dma.h>
#include <libopenstm32/scb.h>
+#include <libopenstm32/systick.h>
#endif
diff --git a/include/libopenstm32/systick.h b/include/libopenstm32/systick.h
new file mode 100644
index 0000000..a4e426c
--- /dev/null
+++ b/include/libopenstm32/systick.h
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the libopenstm32 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENSTM32_SYSTICK_H
+#define LIBOPENSTM32_SYSTICK_H
+
+#include <libopenstm32/memorymap.h>
+#include <libopenstm32/common.h>
+
+/* --- SYSTICK registers --------------------------------------------------- */
+
+/* Control and status register (STK_CTRL) */
+#define STK_CTRL MMIO32(SYSTICK_BASE + 0x00)
+
+/* reload value register (STK_LOAD) */
+#define STK_LOAD MMIO32(SYSTICK_BASE + 0x04)
+
+/* current value register (STK_VAL) */
+#define STK_VAL MMIO32(SYSTICK_BASE + 0x08)
+
+/* calibration value register (STK_CALIB) */
+#define STK_CALIB MMIO32(SYSTICK_BASE + 0x0C)
+
+/* --- STK_CTRL values ----------------------------------------------------- */
+/* Bits [31:17] Reserved, must be kept cleared. */
+/* COUNTFLAG: */
+#define STK_CTRL_COUNTFLAG (1 << 16)
+/* Bits [15:3] Reserved, must be kept cleared. */
+/* CLKSOURCE: Clock source selection */
+#define STK_CTRL_CLKSOURCE (1 << 2)
+/* TICKINT: SysTick exception request enable */
+#define STK_CTRL_TICKINT (1 << 1)
+/* ENABLE: Counter enable */
+#define STK_CTRL_ENABLE (1 << 0)
+
+/* --- STK_LOAD values ----------------------------------------------------- */
+/* Bits [31:24] Reserved, must be kept cleared. */
+/* RELOAD[23:0]: RELOAD value */
+
+/* --- STK_VAL values ------------------------------------------------------ */
+/* Bits [31:24] Reserved, must be kept cleared. */
+/* CURRENT[23:0]: Current counter value */
+
+/* --- STK_CALIB values ---------------------------------------------------- */
+/* NOREF: NOREF flag */
+#define STK_CALIB_NOREF (1 << 31)
+/* SKEW: SKEW flag */
+#define STK_CALIB_SKEW (1 << 30)
+/* Bits [29:24] Reserved, must be kept cleared. */
+/* TENMS[23:0]: Calibration value */
+
+/* --- Function Prototypes ------------------------------------------------- */
+
+#endif
diff --git a/lib/Makefile b/lib/Makefile
index b23762a..d85afee 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../include -fno-common \
# ARFLAGS = rcsv
ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
- rtc.o i2c.o dma.o
+ rtc.o i2c.o dma.o systick.o
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
diff --git a/lib/systick.c b/lib/systick.c
new file mode 100644
index 0000000..3298ee6
--- /dev/null
+++ b/lib/systick.c
@@ -0,0 +1,22 @@
+/*
+ * This file is part of the libopenstm32 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopenstm32/systick.h>
+
+