X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fadb_usb%2Fmatrix.c;h=966ccf5215f9c27a15777a7729af7587f43750ed;hb=826a10752621762806c5c86bef902e5096651dbc;hp=6190c71a06c8d33bb1f4425628837284e4bb7ab7;hpb=b653b622a623f0e8e2c03af8254e6ac3d29b71c7;p=max%2Ftmk_keyboard.git
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 6190c71a..966ccf52 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -29,46 +29,21 @@ along with this program. If not, see .
#include "matrix.h"
#include "report.h"
#include "host.h"
+#include "led.h"
+#include "timer.h"
-#if (MATRIX_COLS > 16)
-# error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-# error "MATRIX_ROWS must not exceed 255"
-#endif
static bool has_media_keys = false;
static bool is_iso_layout = false;
-static bool is_modified = false;
-static report_mouse_t mouse_report = {};
// matrix state buffer(1:on, 0:off)
-#if (MATRIX_COLS <= 8)
-static uint8_t matrix[MATRIX_ROWS];
-#else
-static uint16_t matrix[MATRIX_ROWS];
-#endif
+static matrix_row_t matrix[MATRIX_ROWS];
-#ifdef MATRIX_HAS_GHOST
-static bool matrix_has_ghost_in_row(uint8_t row);
-#endif
static void register_key(uint8_t key);
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
void matrix_init(void)
{
// LED on
@@ -90,7 +65,7 @@ void matrix_init(void)
// Determine ISO keyboard by handler id
// http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815
- uint16_t handler_id = adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
+ uint8_t handler_id = (uint8_t) adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
switch (handler_id) {
case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:
case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:
@@ -101,6 +76,7 @@ void matrix_init(void)
is_iso_layout = false;
break;
}
+ xprintf("hadler_id: %02X, is_iso_layout: %s\n", handler_id, (is_iso_layout ? "yes" : "no"));
// Adjustable keyboard media keys: address=0x07 and handlerID=0x02
has_media_keys = (0x02 == (adb_host_talk(ADB_ADDR_APPLIANCE, ADB_REG_3) & 0xff));
@@ -127,6 +103,8 @@ void matrix_init(void)
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+ led_set(host_keyboard_leds());
+
debug_enable = true;
//debug_matrix = true;
//debug_keyboard = true;
@@ -145,12 +123,21 @@ void matrix_init(void)
#endif
#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+static report_mouse_t mouse_report = {};
+
void adb_mouse_task(void)
{
uint16_t codes;
int16_t x, y;
static int8_t mouseacc;
- _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
+
+ /* tick of last polling */
+ static uint16_t tick_ms;
+
+ // polling with 12ms interval
+ if (timer_elapsed(tick_ms) < 12) return;
+ tick_ms = timer_read();
+
codes = adb_host_mouse_recv();
// If nothing received reset mouse acceleration, and quit.
if (!codes) {
@@ -208,14 +195,18 @@ uint8_t matrix_scan(void)
uint16_t codes;
uint8_t key0, key1;
- is_modified = false;
+ /* tick of last polling */
+ static uint16_t tick_ms;
codes = extra_key;
extra_key = 0xFFFF;
if ( codes == 0xFFFF )
{
- _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
+ // polling with 12ms interval
+ if (timer_elapsed(tick_ms) < 12) return 0;
+ tick_ms = timer_read();
+
codes = adb_host_kbd_recv(ADB_ADDR_KEYBOARD);
// Adjustable keybaord media keys
@@ -328,93 +319,12 @@ uint8_t matrix_scan(void)
return 1;
}
-bool matrix_is_modified(void)
-{
- return is_modified;
-}
-
inline
-bool matrix_has_ghost(void)
-{
-#ifdef MATRIX_HAS_GHOST
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix_has_ghost_in_row(i))
- return true;
- }
-#endif
- return false;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & (1<