aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-09-08 00:54:44 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-09-08 01:51:19 -0400
commit0c1619918435d0934faf7b155c56fdfa53fe9605 (patch)
tree56a18872e592ee288c0a410ae67cda5899a661ae
parent8b56515e76646ec1f8e87c59cdab5f2af9abe1a7 (diff)
downloadlibrambutan-0c1619918435d0934faf7b155c56fdfa53fe9605.tar.gz
librambutan-0c1619918435d0934faf7b155c56fdfa53fe9605.zip
Add better refs to some systick.h functions.
-rw-r--r--source/libmaple/api/systick.rst8
-rw-r--r--source/timers.rst4
2 files changed, 4 insertions, 8 deletions
diff --git a/source/libmaple/api/systick.rst b/source/libmaple/api/systick.rst
index 8dab417..45b6d63 100644
--- a/source/libmaple/api/systick.rst
+++ b/source/libmaple/api/systick.rst
@@ -1,11 +1,5 @@
.. highlight:: c
-.. FIXME [0.0.10] move these to the right places:
-
-.. _libmaple-systick_disable:
-
-.. _libmaple-systick_resume:
-
.. _libmaple-systick:
``systick.h``
@@ -30,7 +24,9 @@ Functions
---------
.. doxygenfunction:: systick_init
+.. _libmaple-systick-enable:
.. doxygenfunction:: systick_enable
+.. _libmaple-systick-disable:
.. doxygenfunction:: systick_disable
.. doxygenfunction:: systick_uptime
.. doxygenfunction:: systick_get_count
diff --git a/source/timers.rst b/source/timers.rst
index b6c0886..ce33f7f 100644
--- a/source/timers.rst
+++ b/source/timers.rst
@@ -118,7 +118,7 @@ periodic or delayed events. Its separate timer does not conflict with
any other peripherals, but the associated 1 kHz interrupt can jitter
the general purpose timer interrupts. The SysTick peripheral can be
disabled by calling :ref:`systick_disable()
-<libmaple-systick_disable>`, and re-enabled using
-:ref:`systick_resume() <libmaple-systick_resume>`. However, be aware
+<libmaple-systick-disable>`, and re-enabled using
+:ref:`systick_enable() <libmaple-systick-enable>`. However, be aware
that calling ``systick_disable()`` will stop the values coming from
:ref:`lang-micros` and :ref:`lang-millis` from increasing.