2010-09-27 06:40:44 +02:00
|
|
|
/******************************************************************************
|
2010-04-01 04:22:29 +02:00
|
|
|
* The MIT License
|
2009-12-19 11:53:07 +01:00
|
|
|
*
|
2010-04-01 04:22:29 +02:00
|
|
|
* Copyright (c) 2010 Perry Hung.
|
2012-09-04 07:33:08 +02:00
|
|
|
* Copyright (c) 2010, 2011 LeafLabs, LLC.
|
2009-12-19 11:53:07 +01:00
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* Permission is hereby granted, free of charge, to any person
|
|
|
|
* obtaining a copy of this software and associated documentation
|
|
|
|
* files (the "Software"), to deal in the Software without
|
|
|
|
* restriction, including without limitation the rights to use, copy,
|
|
|
|
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
|
|
* of the Software, and to permit persons to whom the Software is
|
2010-04-01 04:22:29 +02:00
|
|
|
* furnished to do so, subject to the following conditions:
|
2009-12-19 11:53:07 +01:00
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* The above copyright notice and this permission notice shall be
|
|
|
|
* included in all copies or substantial portions of the Software.
|
2009-12-19 11:53:07 +01:00
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
2010-09-27 06:40:44 +02:00
|
|
|
*****************************************************************************/
|
2009-12-19 11:53:07 +01:00
|
|
|
|
|
|
|
/**
|
2012-05-08 22:22:41 +02:00
|
|
|
* @file libmaple/systick.c
|
|
|
|
* @brief System timer (SysTick).
|
2009-12-19 11:53:07 +01:00
|
|
|
*/
|
|
|
|
|
Move public headers to include directories; related cleanups.
Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:
#include <libmaple/foo.h>
This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).
Similarly for Wirish.
The old include style (#include "header.h") is now deprecated.
libmaple/*.h:
- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
(they aren't always necessary, but we might was well do it against
the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines
Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.
libmaple/*.c:
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
Makefile:
- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows
for users (including Wirish) to migrate their code, but should go
away ASAP, since it slows down compilation.
Wirish:
- Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores
the USB headers, which, as usual, are getting handled after
everything else.
- Similarly generify wirish/boards/ structure. For each supported
board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
wirish/boards/foo/include/board/board.h and
wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
hacks around the .cpp files.
- wirish/rules.mk: put wirish/boards/foo/include in the include path
(and add wirish/boards/foo/board.cpp to the list of sources to be
compiled). This allows saying:
#include <board/board.h>
instead of the hack currently in place. We can allow the user to
override this setting later to make adding custom board definitions
easier.
- Disable -Werror in libmaple/rules.mk, as the current USB warnings
don't let the olimex_stm32_h103 board compile. We can re-enable
-Werror once we've moved the board-specific bits out of libmaple
proper.
libraries, examples:
- Update includes accordingly.
- Miscellaneous cosmetic fixups.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2011-11-15 18:45:43 +01:00
|
|
|
#include <libmaple/systick.h>
|
2009-12-17 03:37:07 +01:00
|
|
|
|
2011-04-20 04:03:42 +02:00
|
|
|
volatile uint32 systick_uptime_millis;
|
2011-06-21 17:02:06 +02:00
|
|
|
static void (*systick_user_callback)(void);
|
2009-12-17 03:37:07 +01:00
|
|
|
|
2011-04-01 09:15:27 +02:00
|
|
|
/**
|
|
|
|
* @brief Initialize and enable SysTick.
|
|
|
|
*
|
|
|
|
* Clocks the system timer with the core clock, turns it on, and
|
|
|
|
* enables interrupts.
|
|
|
|
*
|
|
|
|
* @param reload_val Appropriate reload counter to tick every 1 ms.
|
|
|
|
*/
|
2010-08-04 14:52:30 +02:00
|
|
|
void systick_init(uint32 reload_val) {
|
2011-04-01 09:15:27 +02:00
|
|
|
SYSTICK_BASE->RVR = reload_val;
|
|
|
|
systick_enable();
|
2009-12-17 03:37:07 +01:00
|
|
|
}
|
|
|
|
|
2011-04-01 09:15:27 +02:00
|
|
|
/**
|
|
|
|
* Clock the system timer with the core clock, but don't turn it
|
|
|
|
* on or enable interrupt.
|
|
|
|
*/
|
2010-09-01 00:28:07 +02:00
|
|
|
void systick_disable() {
|
2011-04-01 09:15:27 +02:00
|
|
|
SYSTICK_BASE->CSR = SYSTICK_CSR_CLKSOURCE_CORE;
|
2010-09-01 00:28:07 +02:00
|
|
|
}
|
|
|
|
|
2011-04-01 09:15:27 +02:00
|
|
|
/**
|
|
|
|
* Clock the system timer with the core clock and turn it on;
|
|
|
|
* interrupt every 1 ms, for systick_timer_millis.
|
|
|
|
*/
|
|
|
|
void systick_enable() {
|
|
|
|
/* re-enables init registers without changing reload val */
|
|
|
|
SYSTICK_BASE->CSR = (SYSTICK_CSR_CLKSOURCE_CORE |
|
|
|
|
SYSTICK_CSR_ENABLE |
|
|
|
|
SYSTICK_CSR_TICKINT_PEND);
|
2010-09-06 05:48:31 +02:00
|
|
|
}
|
|
|
|
|
2011-06-21 17:02:06 +02:00
|
|
|
/**
|
2011-06-24 20:37:54 +02:00
|
|
|
* @brief Attach a callback to be called from the SysTick exception handler.
|
|
|
|
*
|
|
|
|
* To detach a callback, call this function again with a null argument.
|
2011-06-21 17:02:06 +02:00
|
|
|
*/
|
|
|
|
void systick_attach_callback(void (*callback)(void)) {
|
|
|
|
systick_user_callback = callback;
|
|
|
|
}
|
|
|
|
|
2011-04-01 09:15:27 +02:00
|
|
|
/*
|
|
|
|
* SysTick ISR
|
|
|
|
*/
|
|
|
|
|
2011-02-27 21:49:51 +01:00
|
|
|
void __exc_systick(void) {
|
2011-06-24 20:45:24 +02:00
|
|
|
systick_uptime_millis++;
|
2011-06-24 20:37:54 +02:00
|
|
|
if (systick_user_callback) {
|
2011-06-21 17:02:06 +02:00
|
|
|
systick_user_callback();
|
|
|
|
}
|
2009-12-17 03:37:07 +01:00
|
|
|
}
|