Working copy of Leaflabs libmaple https://git.suspectdevices.com/suspect-devices/libmaple/atom?h=master 2012-04-11T20:56:50+00:00 2012-04-11T20:56:50+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-11-15T17:45:43+00:00 urn:sha1:954f9e5065b39fe4c683f4d216b54326d876f51b 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-06-07T18:44:39+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-06-07T18:44:39+00:00 urn:sha1:450e1c6e17329525639670855043bb169740702d 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-05-05T19:38:58+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-05-05T19:38:58+00:00 urn:sha1:194084baedd5fd6c8043846f126a34c85d09cecc Done for consistency the rest of the source. Doesn't affect any documented features. 2011-03-11T21:24:44+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-03-07T18:11:54+00:00 urn:sha1:7c5c5bb118fe3eacbfdc0599214bd989d85d9741 2011-02-27T16:42:56+00:00 Marti Bolivar mbolivar@leaflabs.com 2011-02-27T16:42:56+00:00 urn:sha1:d6ef63b47153b73050d497268583a2e224db6a67 Many of the #defines in libmaple.h were board-specific, not MCU-specific. Most of these were only used by code under libmaple/usb/. These were moved into usb_config.h, and are clearly marked as being terrible hacks. I'm going to treat the USB stack as a black box that we'll deal with later. Further, instead of having a variety of #defines like "How many USARTS do I have?", we decide that based on the density of the chip. This is determined by testing for STM32_MEDIUM_DENSITY or STM32_HIGH_DENSITY defines. libmaple currently doesn't support low-density chips, so that suffices. The Makefile will set these automatically based on the MCU. Other offending #defines are ERROR_LED_PORT and ERROR_LED_PIN; these were made optional, but they're set in the Makefile as a hack to keep things working. 2010-12-15T21:16:31+00:00 Marti Bolivar mbolivar@mit.edu 2010-12-15T06:50:56+00:00 urn:sha1:88cb23747ef424d26e6fffc458b5ebfc678e4d9f 2010-12-14T20:41:17+00:00 Marti Bolivar mbolivar@mit.edu 2010-12-14T20:41:17+00:00 urn:sha1:e2a04cb048edc213addcb545376b1409d57bb7aa 2010-12-02T22:15:43+00:00 Marti Bolivar mbolivar@mit.edu 2010-12-02T22:15:43+00:00 urn:sha1:563770c353265ac78e5e02aa766b991459897ec1 2010-11-17T17:44:28+00:00 Marti Bolivar mbolivar@mit.edu 2010-10-26T01:15:28+00:00 urn:sha1:88a16d144fa299ac19240f46ae78f7332779d8f3 2010-10-23T01:13:02+00:00 Marti Bolivar mbolivar@mit.edu 2010-10-23T01:13:02+00:00 urn:sha1:8658f090c27151d5819bc3123251a078c2ed16d6 still need usb descriptors to improve, and also nothing else is tested.