kbd-led: Get the led from the guest and forward to the input daemon.

diff --git a/master/kbd-led b/master/kbd-led
new file mode 100644 (file)
index 0000000..a68c5b8
--- /dev/null
+++ b/master/kbd-led
@@ -0,0 +1,102 @@
+diff --git a/hw/pckbd.c b/hw/pckbd.c
+index 3a004f7..73045ea 100644
+--- a/hw/pckbd.c
++++ b/hw/pckbd.c
+@@ -130,6 +130,8 @@ typedef struct KBDState {
+ 
+ static KBDState kbd_state;
+ 
++static int wait_for_led_code = 0;
++
+ /* update irq and KBD_STAT_[MOUSE_]OBF */
+ /* XXX: not generating the irqs if KBD_MODE_DISABLE_KBD is set may be
+    incorrect, but it avoids having to simulate exact delays */
+@@ -185,7 +187,7 @@ static uint32_t kbd_read_status(void *opaque, uint32_t addr)
+     int val;
+     val = s->status;
+ #if defined(DEBUG_KBD)
+-    printf("kbd: read status=0x%02x\n", val);
++    fprintf(stderr, "kbd: read status=0x%02x\n", val);
+ #endif
+     return val;
+ }
+@@ -203,7 +205,7 @@ static void kbd_write_command(void *opaque, uint32_t addr, uint32_t val)
+     KBDState *s = opaque;
+ 
+ #ifdef DEBUG_KBD
+-    printf("kbd: write cmd=0x%02x\n", val);
++    fprintf(stderr, "kbd: write cmd=0x%02x\n", val);
+ #endif
+     switch(val) {
+     case KBD_CCMD_READ_MODE:
+@@ -287,7 +289,7 @@ static uint32_t kbd_read_data(void *opaque, uint32_t addr)
+         val = ps2_read_data(s->kbd);
+ 
+ #if defined(DEBUG_KBD)
+-    printf("kbd: read data=0x%02x\n", val);
++    fprintf(stderr, "kbd: read data=0x%02x\n", val);
+ #endif
+     return val;
+ }
+@@ -297,11 +299,25 @@ static void kbd_write_data(void *opaque, uint32_t addr, uint32_t val)
+     KBDState *s = opaque;
+ 
+ #ifdef DEBUG_KBD
+-    printf("kbd: write data=0x%02x\n", val);
++    fprintf(stderr, "kbd: write data=0x%02x write_cmd=0x%02x\n", val, s->write_cmd);
+ #endif
+ 
+     switch(s->write_cmd) {
+     case 0:
++        if (wait_for_led_code == 1)
++        {
++#ifdef DEBUG_KBD
++            fprintf(stderr, "kbd: sending led code=%d\n", val);
++#endif
++            switcher_send_led_code(val);
++            wait_for_led_code = 0;
++        }
++
++        if (val == KBD_CMD_SET_LEDS)
++        {
++            wait_for_led_code = 1;
++        }
++
+         ps2_write_keyboard(s->kbd, val);
+         break;
+     case KBD_CCMD_WRITE_MODE:
+diff --git a/switcher.c b/switcher.c
+index b89f206..7948ab3 100644
+--- a/switcher.c
++++ b/switcher.c
+@@ -47,6 +47,7 @@ extern int vga_passthrough;
+ #define DOM0_INPUT_DOMID          'I'
+ #define DOM0_INPUT_OPT            'O'
+ #define DOM0_INPUT_SHUTDOWN       'S'
++#define DOM0_INPUT_LEDS           'L'
+ 
+ #define DOM0_INPUT_SOCKET       "/tmp/input.socket"
+ 
+@@ -225,6 +226,11 @@ void switcher_shutdown(int reason)
+     }
+ }
+ 
++void switcher_send_led_code(int led_code)
++{
++    switcher_send("%c%d", DOM0_INPUT_LEDS, led_code);
++}
++
+ static void switcher_connect(void *opaque)
+ {
+     struct stat st;
+diff --git a/switcher.h b/switcher.h
+index 3a89d55..cf0f5b9 100644
+--- a/switcher.h
++++ b/switcher.h
+@@ -32,4 +32,6 @@
+ 
+ void switcher_shutdown(int reason);
+ 
++void switcher_send_led_code(int led_code);
++
+ #endif

diff --git a/master/series b/master/series
index 9abe27c21011cebb295689cf5e38336ee98653e0..2a4772839fe9af2477894bd6f2484aa2f6410498 100644 (file)
--- a/master/series
+++ b/master/series
@@ -33,3 +33,4 @@ hide-msi-capability-for-igfx
 vga-edid
 tidy-muticies-in-ata-pt
 alsa-fix-resume
+kbd-led