954f9e5065
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>
123 lines
2.9 KiB
C++
123 lines
2.9 KiB
C++
#include <stddef.h> // for ptrdiff_t
|
|
|
|
#include <wirish/wirish.h>
|
|
#include <libmaple/fsmc.h>
|
|
|
|
#ifndef BOARD_maple_native
|
|
#error "Sorry, this example only works on Maple Native."
|
|
#endif
|
|
|
|
// Start of FSMC SRAM bank 1
|
|
static uint16 *const sram_start = (uint16*)0x60000000;
|
|
// End of Maple Native SRAM chip address space (512K 16-bit words)
|
|
static uint16 *const sram_end = (uint16*)0x60100000;
|
|
|
|
void test_single_write(void);
|
|
void test_all_addresses(void);
|
|
|
|
void setup() {
|
|
pinMode(BOARD_LED_PIN, OUTPUT);
|
|
digitalWrite(BOARD_LED_PIN, HIGH);
|
|
|
|
SerialUSB.read();
|
|
SerialUSB.println("*** Beginning RAM chip test");
|
|
|
|
test_single_write();
|
|
test_all_addresses();
|
|
|
|
SerialUSB.println("Tests pass, finished.");
|
|
SerialUSB.println("***\n");
|
|
}
|
|
|
|
void loop() {
|
|
}
|
|
|
|
void test_single_write() {
|
|
uint16 *ptr = sram_start;
|
|
uint16 tmp;
|
|
|
|
SerialUSB.print("Writing 0x1234... ");
|
|
*ptr = 0x1234;
|
|
SerialUSB.println("Done.");
|
|
|
|
SerialUSB.print("Reading... ");
|
|
tmp = *ptr;
|
|
SerialUSB.print("Done: 0x");
|
|
SerialUSB.println(tmp, HEX);
|
|
|
|
if (tmp != 0x1234) {
|
|
SerialUSB.println("Mismatch; abort.");
|
|
ASSERT(0);
|
|
}
|
|
}
|
|
|
|
void test_all_addresses() {
|
|
uint32 start, end;
|
|
uint16 count = 0;
|
|
uint16 *ptr;
|
|
|
|
SerialUSB.println("Now writing all memory addresses (unrolled loop)");
|
|
start = micros();
|
|
for (ptr = sram_start; ptr < sram_end;) {
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
*ptr++ = count++;
|
|
}
|
|
end = micros();
|
|
SerialUSB.print("Done. Elapsed time (us): ");
|
|
SerialUSB.println(end - start);
|
|
|
|
SerialUSB.println("Validating writes.");
|
|
for (ptr = sram_start, count = 0; ptr < sram_end; ptr++, count++) {
|
|
uint16 value = *ptr;
|
|
if (value != count) {
|
|
SerialUSB.print("mismatch: 0x");
|
|
SerialUSB.print((uint32)ptr);
|
|
SerialUSB.print(" = 0x");
|
|
SerialUSB.print(value, HEX);
|
|
SerialUSB.print(", should be 0x");
|
|
SerialUSB.print(count, HEX);
|
|
SerialUSB.println(".");
|
|
ASSERT(0);
|
|
}
|
|
}
|
|
SerialUSB.println("Done; all writes seem valid.");
|
|
|
|
ptrdiff_t nwrites = sram_end - sram_start;
|
|
double us_per_write = double(end-start) / double(nwrites);
|
|
SerialUSB.print("Number of writes = ");
|
|
SerialUSB.print(nwrites);
|
|
SerialUSB.print("; avg. time per write = ");
|
|
SerialUSB.print(us_per_write);
|
|
SerialUSB.print(" us (");
|
|
SerialUSB.print(1 / us_per_write);
|
|
SerialUSB.println(" MHz)");
|
|
}
|
|
|
|
__attribute__((constructor)) void premain() {
|
|
init();
|
|
}
|
|
|
|
int main(void) {
|
|
setup();
|
|
|
|
while (true) {
|
|
loop();
|
|
}
|
|
|
|
return 0;
|
|
}
|