summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJun Wako <wakojun@gmail.com>2015-01-04 17:03:47 +0900
committerJun Wako <wakojun@gmail.com>2015-01-04 17:21:43 +0900
commitd0fefb76f8a1430c749e67bc72b4dba00c7143c9 (patch)
tree2cf2fe560e83fef19c9a99adcc5d2b2300145bfc /common
parentc6e533ce83d6ae4393e6cdf1f6d39ffefc790115 (diff)
infinity: Add initial files for keyboard support
Diffstat (limited to 'common')
-rw-r--r--common/matrix.h9
-rw-r--r--common/mbed/xprintf.cpp5
2 files changed, 13 insertions, 1 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