Merge branch 'master' into ps2avrGB

1 files changed, 30 insertions, 1 deletions

diff --git a/keyboards/infinity60/led.c b/keyboards/infinity60/led.c
index aed66c7c0..53147a78a 100644
--- a/keyboards/infinity60/led.c
+++ b/keyboards/infinity60/led.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jun Wako <wakojun@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,6 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "led.h"
 
+#include "led_controller.h"
 
+/* WARNING! This function needs to be callable from
+ * both regular threads and ISRs, unlocked (during resume-from-sleep).
+ * In particular, I2C functions (interrupt-driven) should NOT be called from here.
+ */
 void led_set(uint8_t usb_led) {
+    msg_t msg;
+
+    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+        chSysUnconditionalLock();
+        msg=(1 << 8) | TOGGLE_NUM_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
+    } else {
+        chSysUnconditionalLock();
+        msg=(0 << 8) | TOGGLE_NUM_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
+    }
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        chSysUnconditionalLock();
+        msg=(1 << 8) | TOGGLE_CAPS_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
+    } else {
+        chSysUnconditionalLock();
+        msg=(0 << 8) | TOGGLE_CAPS_LOCK;
+        chMBPostI(&led_mailbox, msg);
+        chSysUnconditionalUnlock();
+    }
 }