diff options
| author | Jun Wako <wakojun@gmail.com> | 2015-01-04 17:22:06 +0900 |
|---|---|---|
| committer | Jun Wako <wakojun@gmail.com> | 2015-01-04 17:22:06 +0900 |
| commit | 3dbb762dcc5b1d340cb145fc4ca60748ccf7c890 (patch) | |
| tree | 2cf2fe560e83fef19c9a99adcc5d2b2300145bfc /common | |
| parent | 06527bde4f873ffc6eb8e359fb3b150e880b89ba (diff) | |
| parent | d0fefb76f8a1430c749e67bc72b4dba00c7143c9 (diff) | |
Merge branch 'mbed_infinity'
Diffstat (limited to 'common')
| -rw-r--r-- | common/matrix.h | 9 | ||||
| -rw-r--r-- | common/mbed/xprintf.cpp | 5 | ||||
| -rw-r--r-- | common/print.c | 12 |
3 files changed, 23 insertions, 3 deletions
diff --git a/common/matrix.h b/common/matrix.h index 23fef78f74..107ee72653 100644 --- a/common/matrix.h +++ b/common/matrix.h @@ -35,6 +35,10 @@ typedef uint32_t matrix_row_t; #define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) +#ifdef __cplusplus +extern "C" { +#endif + /* number of matrix rows */ uint8_t matrix_rows(void); /* number of matrix columns */ @@ -48,7 +52,7 @@ bool matrix_is_modified(void) __attribute__ ((deprecated)); /* whether a swtich is on */ bool matrix_is_on(uint8_t row, uint8_t col); /* matrix state on row */ -matrix_row_t matrix_get_row(uint8_t row); +matrix_row_t matrix_get_row(uint8_t row); /* print matrix for debug */ void matrix_print(void); @@ -57,5 +61,8 @@ void matrix_print(void); void matrix_power_up(void); void matrix_power_down(void); +#ifdef __cplusplus +} +#endif #endif diff --git a/common/mbed/xprintf.cpp b/common/mbed/xprintf.cpp index 4342b79f80..3647ece751 100644 --- a/common/mbed/xprintf.cpp +++ b/common/mbed/xprintf.cpp @@ -6,6 +6,10 @@ #define STRING_STACK_LIMIT 120 +//TODO +int xprintf(const char* format, ...) { return 0; } + +#if 0 /* mbed Serial */ Serial ser(UART_TX, UART_RX); @@ -44,3 +48,4 @@ int xprintf(const char* format, ...) return r; */ } +#endif diff --git a/common/print.c b/common/print.c index c13a29f317..ca94e1e5d6 100644 --- a/common/print.c +++ b/common/print.c @@ -22,13 +22,14 @@ * THE SOFTWARE. */ -#include <avr/io.h> -#include <avr/pgmspace.h> +#include <stdint.h> #include "print.h" #ifndef NO_PRINT +#if defined(__AVR__) + #define sendchar(c) xputc(c) @@ -37,4 +38,11 @@ void print_set_sendchar(int8_t (*sendchar_func)(uint8_t)) xdev_out(sendchar_func); } +#elif defined(__arm__) + +// TODO +//void print_set_sendchar(int8_t (*sendchar_func)(uint8_t)) { } + +#endif + #endif |