Commit graph

27 commits

Author SHA1 Message Date
Marti Bolivar 50448497f8 Add some missing LeafLabs copyright notices.
Sigh; Emacs's elide-head feature makes it easy to forget to update
these.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-09-04 01:36:48 -04:00
Marti Bolivar 306e19cb9f Fix a bunch of Doxygen file-level comments.
Fix @file in many places. Also fix up the descriptions where it's
appropriate. This standardizes the @file formatting across the library
to explicitly include any parent directories up to the repository
root.

Besides being nice, this will hopefully let us manage Doxygen's XML
output so as to make extracting series-specific pieces via Breathe in
the leaflabs-docs repo possible.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-05-08 16:22:41 -04:00
Marti Bolivar cb8243bc20 libmaple/nvic.c: Cosmetics.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-04-11 16:56:51 -04:00
Marti Bolivar 954f9e5065 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>
2012-04-11 16:56:50 -04:00
Marti Bolivar 04b72e6fdb nvic: Add nvic_sys_reset().
This uses the SCB_AIRCR register to force a system reset.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2011-09-24 16:02:26 -04:00
Michael Hope b9be2450f0 Added more doxygen file level headers. Documented a few more functions.
Signed-off-by: Michael Hope <michaelh@juju.net.nz>
2011-09-13 19:35:12 +12:00
Marti Bolivar aad2377ae3 Update outdated stm32.h usages.
stm32.h has been updated to prefix its definitions.  Update the rest
of libmaple to take this into account.
2011-09-07 23:34:23 -04:00
Marti Bolivar 450e1c6e17 Keep it 80-column clean.
Go through overlong source code lines and convert as many of them as
appropriate to be 80-column clean.  This mostly affects license
headers.  Overlong lines are determined by running following from the
libmaple base directory:

$ ack-grep --nocolor --nogroup --cpp --cc --ignore-dir=usb -- '.{80}'

Note that this excludes libmaple's usb subdirectory, which is still
full of ST code that doesn't follow the libmaple source code
guidelines.

Contents of ~/.ackrc (these won't matter, but are included for
completeness):

--ignore-dir=docs
--ignore-dir=build
--type-set
ld=.ld
--type-set
rst=.rst
--type-set
txt=.txt
--type-set
mk=.mk
2011-06-07 14:44:39 -04:00
Marti Bolivar 7d7476daaf Doxygen syntax bugfixes. 2011-05-05 04:34:56 -04:00
Marti Bolivar 6661d006e6 NVIC and SCB refactor 2011-04-05 13:59:33 -04:00
Perry Hung 443953ac94 checkpoint 2011-02-26 22:30:22 -05:00
Marti Bolivar 2e7fa60e43 nvic bugfix; removed unnecessary volatile usage 2011-01-31 00:19:36 -05:00
Marti Bolivar f1b64e707d [WIP] Code review picked up some bugs/issues. 2011-01-26 22:05:41 -05:00
Marti Bolivar 8e973f3d1e Changed nzmichaelh's initial DMA interface to be more flexible.
Some bugfixes in the external interrupt code were found along the way.
Defines for nonexistent registers removed from nvic interface.
2010-12-30 02:40:16 -05:00
Marti Bolivar 753f89de35 whitespace cleanups 2010-09-27 00:40:44 -04:00
Perry Hung 89cd6296ea Fix improper interrupt clearing
Interrupts should be cleared by writing to the interrupt clear-enable
register (ICER). This commit fixes an improper read-modify-write on
NVIC_ICER[n] that incorrectly cleared interrupt-enable bits on
non-designated channels.
2010-09-22 02:59:26 -04:00
bnewbold 0ccec95446 Portability fixes
Still not working but fixed a lot of merge errors
2010-08-31 22:05:39 -04:00
bnewbold 12c351d056 inital portability work 2010-08-25 22:57:46 -04:00
Perry Hung d249461115 Cleaned up wirish/time, some interrupt handling refactoring:
Fixed millis(), it was just wrong, before.
Added micros(), not extensively tested.
New implementation of delayMicroseconds(). Should be more consistent
now.
Added a handful of nvic routines to enable/disable interrupts.
Cleaned up systick
2010-08-04 08:52:30 -04:00
bnewbold f23dcac7b9 nvic_disable_interrupt 2010-07-18 23:23:26 -04:00
Perry Hung 5b9c5d9c93 libcs3 refactor merge
Removed dependency on libcs3.a because Codesourcery does not provide the
source for it.

We now link against a modified libcs3-lanchon-stm32.a built from parts
in public domain from Lanchon, and a start_c.c from Codesourcery that is
licensed under a permissive license.

Also removed all of the extra linker cruft from the stm32conf directory.

The linker files now live in support/ld
The openocd scripts now live in support/openocd
The udev rules and copy-to-ide scripts now live in support/scripts
The source lives in support/ld/libcs3-lanchon-stm32.tar.gz
2010-05-28 03:06:03 -04:00
Perry Hung a881d0d735 trivial: new cscope rule and warning fix
Fixed nvic.c warning
2010-04-30 01:07:55 -04:00
Perry Hung 62552a6f3f Refactoring:
The 'core' directory has now been renamed to 'wirish.' Wirish is our
version of the Arduino Wiring language.
2010-04-25 18:08:56 -04:00
Perry Hung 87c85a6449 Licensing: Relicensed libmaple under the MIT License.
Relicensed the bulk of libmaple under the more permissive MIT License,
from GPLv3. Files that were largely or entirely derived from
the Arduino, STM, or Lanchon retain their original licenses.
2010-03-31 22:43:27 -04:00
Perry Hung 25c7ba0ed7 Removed inttypes.h
Removed inttypes.h from libmaple. Will have another pass through to use
the standard libmaple types, but will come in another commit.
2010-03-31 21:29:29 -04:00
Perry Hung 869ed39e4c Removed STM32 flash code, replaced with barebones hacks for now.
At this point, there shouldn't be any STM code being compiled and linked
against. There are still a bunch of STM header includes, though.
2010-03-30 22:51:28 -04:00
bnewbold 1d3861ef93 Major hierarchy reorganization; see README.
copy-to-ide and Makefile updated to conform; .gitignore added;
LICENSE added
2010-03-31 09:43:10 +08:00
Renamed from src/lib/nvic.c (Browse further)