Commit: 3f7a1d1af8b789619505d97d4757b34083bc3a1b - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

Commit MetaInfo

• Révision: 3f7a1d1af8b789619505d97d4757b34083bc3a1b (tree)
• l'heure: 2021-01-02 13:34:00
• Auteur: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Message de Log

kbdlayout: regist old version(2020/06/14-v5:rebase src tree)
qemuextkey: regist old versin(2020/06/14-v5:fix scancode tbl)

Change Summary

• modified: kbdlayout_option/bhyve_kbdlayout_option_fbsd121r.patch
• modified: kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
• modified: qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd121r.patch
• modified: qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch

Modification

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd121r.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd121r.patch
@@ -1,6 +1,6 @@
 diff -upN bhyve_base/Makefile bhyve/Makefile
---- bhyve_base/Makefile	2020-06-02 20:16:51.532368000 +0900
-+++ bhyve/Makefile	2020-06-02 20:35:48.179160000 +0900
+--- bhyve_base/Makefile	2020-06-13 15:59:44.503811000 +0900
++++ bhyve/Makefile	2020-06-13 15:58:02.502118000 +0900
 @@ -95,4 +95,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -9,8 +9,8 @@ diff -upN bhyve_base/Makefile bhyve/Makefile
 +
  .include <bsd.prog.mk>
 diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
---- bhyve_base/bhyve.8	2020-06-02 20:16:51.487013000 +0900
-+++ bhyve/bhyve.8	2020-06-02 20:35:48.180745000 +0900
+--- bhyve_base/bhyve.8	2020-06-13 15:59:44.500093000 +0900
++++ bhyve/bhyve.8	2020-06-13 15:58:02.502950000 +0900
 @@ -44,6 +44,7 @@
  .Op Ar ,threads=n
  .Oc
@@ -34,8 +34,8 @@ diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
  Allow devices behind the LPC PCI-ISA bridge to be configured.
  The only supported devices are the TTY-class devices
 diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
---- bhyve_base/bhyverun.c	2020-06-02 20:16:51.456344000 +0900
-+++ bhyve/bhyverun.c	2020-06-02 20:35:48.181837000 +0900
+--- bhyve_base/bhyverun.c	2020-06-13 15:59:44.497748000 +0900
++++ bhyve/bhyverun.c	2020-06-13 15:58:02.504048000 +0900
 @@ -165,6 +165,8 @@ char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
@@ -84,8 +84,8 @@ diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
  		case 'l':
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
 diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
---- bhyve_base/bhyverun.h	2020-06-02 20:16:51.511202000 +0900
-+++ bhyve/bhyverun.h	2020-06-02 20:35:48.182282000 +0900
+--- bhyve_base/bhyverun.h	2020-06-13 15:59:44.501972000 +0900
++++ bhyve/bhyverun.h	2020-06-13 15:58:02.504455000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -94,9 +94,10 @@ diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
  
  void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
  
+Common subdirectories: bhyve_base/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_base/ps2kbd.c	2020-06-02 20:29:26.881702000 +0900
-+++ bhyve/ps2kbd.c	2020-06-02 20:35:48.184181000 +0900
+--- bhyve_base/ps2kbd.c	2020-06-13 15:59:52.769007000 +0900
++++ bhyve/ps2kbd.c	2020-06-13 15:58:02.505301000 +0900
 @@ -31,15 +31,20 @@
  __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.c 341757 2018-12-09 06:41:57Z araujo $");
  
@@ -126,8 +127,8 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
 +
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
- 	uint8_t	trans[PS2KBD_FIFOSZ];
-@@ -87,7 +94,7 @@ struct extended_translation {
+ 	int	rindex;		/* index to read from */
+@@ -86,7 +93,7 @@ struct extended_translation {
  /*
   * FIXME: Pause/break and Print Screen/SysRq require special handling.
   */
@@ -136,7 +137,7 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  		{0xff08, 0x66},		/* Back space */
  		{0xff09, 0x0d},		/* Tab */
  		{0xff0d, 0x5a},		/* Return */
-@@ -159,7 +166,7 @@ static const struct extended_translation extended_tran
+@@ -158,7 +165,7 @@ static const struct extended_translation extended_tran
  };
  
  /* ASCII to type 2 scancode lookup table */
@@ -145,7 +146,7 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-@@ -319,7 +326,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -336,7 +343,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
@@ -153,8 +154,8 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
 +	struct extended_translation *trans;
  
  	if (keycode) {
- 		code = (uint8_t)(keycode & 0x7f);
-@@ -375,10 +382,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
+ 		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
+@@ -392,10 +399,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
  		atkbdc_event(sc->atkbdc_sc, 1);
  }
  

--- a/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_option_fbsd13c.patch
@@ -1,6 +1,6 @@
 diff -upN bhyve_base/Makefile bhyve/Makefile
---- bhyve_base/Makefile	2020-06-03 10:29:29.352291000 +0900
-+++ bhyve/Makefile	2020-06-03 18:14:34.462454000 +0900
+--- bhyve_base/Makefile	2020-06-14 16:06:21.223455000 +0900
++++ bhyve/Makefile	2020-06-14 16:12:32.408499000 +0900
 @@ -121,4 +121,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -9,8 +9,8 @@ diff -upN bhyve_base/Makefile bhyve/Makefile
 +
  .include <bsd.prog.mk>
 diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
---- bhyve_base/bhyve.8	2020-06-03 10:29:29.331537000 +0900
-+++ bhyve/bhyve.8	2020-06-03 18:14:34.464867000 +0900
+--- bhyve_base/bhyve.8	2020-06-14 16:06:21.236090000 +0900
++++ bhyve/bhyve.8	2020-06-14 16:12:32.409488000 +0900
 @@ -47,6 +47,7 @@
  .Sm on
  .Op Fl G Ar port
@@ -34,8 +34,8 @@ diff -upN bhyve_base/bhyve.8 bhyve/bhyve.8
  Allow devices behind the LPC PCI-ISA bridge to be configured.
  The only supported devices are the TTY-class devices
 diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
---- bhyve_base/bhyverun.c	2020-06-03 10:29:29.370019000 +0900
-+++ bhyve/bhyverun.c	2020-06-03 18:19:50.608647000 +0900
+--- bhyve_base/bhyverun.c	2020-06-14 16:06:21.267122000 +0900
++++ bhyve/bhyverun.c	2020-06-14 16:12:32.410678000 +0900
 @@ -188,6 +188,8 @@ const char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
@@ -88,8 +88,8 @@ diff -upN bhyve_base/bhyverun.c bhyve/bhyverun.c
  		case 'l':
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
 diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
---- bhyve_base/bhyverun.h	2020-06-03 10:29:29.289487000 +0900
-+++ bhyve/bhyverun.h	2020-06-03 18:18:13.198204000 +0900
+--- bhyve_base/bhyverun.h	2020-06-14 16:06:21.236876000 +0900
++++ bhyve/bhyverun.h	2020-06-14 16:12:32.410831000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -100,8 +100,8 @@ diff -upN bhyve_base/bhyverun.h bhyve/bhyverun.h
  #ifdef BHYVE_SNAPSHOT
 Common subdirectories: bhyve_base/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_base/ps2kbd.c	2020-06-03 10:31:37.339319000 +0900
-+++ bhyve/ps2kbd.c	2020-06-03 18:17:01.983386000 +0900
+--- bhyve_base/ps2kbd.c	2020-06-14 16:06:49.476779000 +0900
++++ bhyve/ps2kbd.c	2020-06-14 16:12:32.411172000 +0900
 @@ -31,6 +31,7 @@
  __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 360648 2020-05-05 00:02:04Z jhb $");
  
@@ -129,8 +129,8 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
 +
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
- 	uint8_t	trans[PS2KBD_FIFOSZ];
-@@ -91,7 +97,7 @@ struct extended_translation {
+ 	int	rindex;		/* index to read from */
+@@ -90,7 +96,7 @@ struct extended_translation {
  /*
   * FIXME: Pause/break and Print Screen/SysRq require special handling.
   */
@@ -139,7 +139,7 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  		{0xff08, 0x66},		/* Back space */
  		{0xff09, 0x0d},		/* Tab */
  		{0xff0d, 0x5a},		/* Return */
-@@ -163,7 +169,7 @@ static const struct extended_translation extended_tran
+@@ -162,7 +168,7 @@ static const struct extended_translation extended_tran
  };
  
  /* ASCII to type 2 scancode lookup table */
@@ -148,7 +148,7 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-@@ -323,7 +329,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -340,7 +346,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
@@ -156,8 +156,8 @@ diff -upN bhyve_base/ps2kbd.c bhyve/ps2kbd.c
 +	struct extended_translation *trans;
  
  	if (keycode) {
- 		code = (uint8_t)(keycode & 0x7f);
-@@ -379,10 +385,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
+ 		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
+@@ -396,10 +402,91 @@ ps2kbd_event(int down, uint32_t keysym, uint32_t keyco
  		atkbdc_event(sc->atkbdc_sc, 1);
  }
  

--- a/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd121r.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd121r.patch
@@ -1,38 +1,6 @@
-diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
---- bhyve_orig/atkbdc.c	2020-05-01 11:25:57.441270000 +0900
-+++ bhyve/atkbdc.c	2020-06-02 20:27:26.516809000 +0900
-@@ -211,24 +211,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
- 		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
- 	};
- 	uint8_t val;
-+	uint8_t trans;
- 	uint8_t release = 0;
- 
- 	assert(pthread_mutex_isowned_np(&sc->mtx));
- 
- 	if (sc->ram[0] & KBD_TRANSLATION) {
--		while (ps2kbd_read(sc->ps2kbd_sc, &val) != -1) {
-+		while (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1) {
- 			if (val == 0xf0) {
- 				release = 0x80;
- 				continue;
- 			} else {
--				val = translation[val] | release;
-+				val = ((trans) ? translation[val] : val) | release;
- 			}
- 			atkbdc_kbd_queue_data(sc, val);
- 			break;
- 		}
- 	} else {
- 		while (sc->kbd.bcnt < FIFOSZ) {
--			if (ps2kbd_read(sc->ps2kbd_sc, &val) != -1)
-+			if (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1)
- 				atkbdc_kbd_queue_data(sc, val);
- 			else
- 				break;
 diff -upN bhyve_orig/console.c bhyve/console.c
 --- bhyve_orig/console.c	2020-05-01 11:25:57.441001000 +0900
-+++ bhyve/console.c	2020-06-02 20:27:26.517334000 +0900
++++ bhyve/console.c	2020-06-13 14:02:26.514285000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -48,7 +16,7 @@ diff -upN bhyve_orig/console.c bhyve/console.c
  void
 diff -upN bhyve_orig/console.h bhyve/console.h
 --- bhyve_orig/console.h	2020-05-01 11:25:57.446732000 +0900
-+++ bhyve/console.h	2020-06-02 20:27:26.517796000 +0900
++++ bhyve/console.h	2020-06-13 14:02:26.514771000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -69,133 +37,35 @@ diff -upN bhyve_orig/console.h bhyve/console.h
  void console_ptr_event(uint8_t button, int x, int y);
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 --- bhyve_orig/ps2kbd.c	2020-05-01 11:25:57.446548000 +0900
-+++ bhyve/ps2kbd.c	2020-06-02 20:29:26.881702000 +0900
-@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
- 
- struct fifo {
- 	uint8_t	buf[PS2KBD_FIFOSZ];
-+	uint8_t	trans[PS2KBD_FIFOSZ];
- 	int	rindex;		/* index to read from */
- 	int	windex;		/* index to write to */
- 	int	num;		/* number of bytes in the fifo */
-@@ -197,26 +198,28 @@ fifo_reset(struct ps2kbd_softc *sc)
- }
++++ bhyve/ps2kbd.c	2020-06-13 14:17:21.587358000 +0900
+@@ -177,6 +177,26 @@ static const uint8_t ascii_translations[128] = {
+ 		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
+ };
  
++/* ScanCode set1 to set2 lookup table */
++const uint8_t keyset1to2_translations[128] = {
++		   0, 0x76, 0x16, 0x1E, 0x26, 0x25, 0x2e, 0x36,
++		0x3d, 0x3e, 0x46, 0x45, 0x4e, 0x55, 0x66, 0x0d,
++		0x15, 0x1d, 0x24, 0x2d, 0x2c, 0x35, 0x3c, 0x43,
++		0x44, 0x4d, 0x54, 0x5b, 0x5a, 0x14, 0x1c, 0x1b,
++		0x23, 0x2b, 0x34, 0x33, 0x3b, 0x42, 0x4b, 0x4c,
++		0x52, 0x0e, 0x12, 0x5d, 0x1a, 0x22, 0x21, 0x2a,
++		0x32, 0x31, 0x3a, 0x41, 0x49, 0x4a, 0x59, 0x7c,
++		0x11, 0x29, 0x58, 0x05, 0x06, 0x04, 0x0c, 0x03,
++		0x0b, 0x83, 0x0a, 0x01, 0x09, 0x77, 0x7e, 0x6c,
++		0x75, 0x7d, 0x7b, 0x6b, 0x73, 0x74, 0x79, 0x69,
++		0x72, 0x7a, 0x70, 0x71, 0x84, 0x60, 0x61, 0x78,
++		0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37, 0x3f,
++		0x47, 0x4f, 0x56, 0x5e, 0x08, 0x10, 0x18, 0x20,
++		0x28, 0x30, 0x38, 0x40, 0x48, 0x50, 0x57, 0x6f,
++		0x13, 0x19, 0x39, 0x51, 0x53, 0x5c, 0x5f, 0x62,
++		0x63, 0x64, 0x65, 0x67, 0x68, 0x6a, 0x6d, 0x6e,
++};
++
  static void
--fifo_put(struct ps2kbd_softc *sc, uint8_t val)
-+fifo_put(struct ps2kbd_softc *sc, uint8_t val, uint8_t trans)
- {
- 	struct fifo *fifo;
- 
- 	fifo = &sc->fifo;
- 	if (fifo->num < fifo->size) {
- 		fifo->buf[fifo->windex] = val;
-+		fifo->trans[fifo->windex] = trans;
- 		fifo->windex = (fifo->windex + 1) % fifo->size;
- 		fifo->num++;
- 	}
- }
- 
- static int
--fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
-+fifo_get(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ fifo_init(struct ps2kbd_softc *sc)
  {
- 	struct fifo *fifo;
- 
- 	fifo = &sc->fifo;
- 	if (fifo->num > 0) {
- 		*val = fifo->buf[fifo->rindex];
-+		*trans = fifo->trans[fifo->rindex];
- 		fifo->rindex = (fifo->rindex + 1) % fifo->size;
- 		fifo->num--;
- 		return (0);
-@@ -226,12 +229,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
- }
- 
- int
--ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val)
-+ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
- {
- 	int retval;
- 
- 	pthread_mutex_lock(&sc->mtx);
--	retval = fifo_get(sc, val);
-+	retval = fifo_get(sc, val, trans);
- 	pthread_mutex_unlock(&sc->mtx);
- 
- 	return (retval);
-@@ -244,13 +247,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
- 	if (sc->curcmd) {
- 		switch (sc->curcmd) {
- 		case PS2KC_SET_TYPEMATIC:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_SCANCODE_SET:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_LEDS:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		default:
- 			fprintf(stderr, "Unhandled ps2 keyboard current "
-@@ -261,41 +264,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
- 	} else {
- 		switch (val) {
- 		case 0x00:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_RESET_DEV:
- 			fifo_reset(sc);
--			fifo_put(sc, PS2KC_ACK);
--			fifo_put(sc, PS2KC_BAT_SUCCESS);
-+			fifo_put(sc, PS2KC_ACK, 0);
-+			fifo_put(sc, PS2KC_BAT_SUCCESS, 0);
- 			break;
- 		case PS2KC_DISABLE:
- 			sc->enabled = false;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_ENABLE:
- 			sc->enabled = true;
- 			fifo_reset(sc);
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_TYPEMATIC:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SEND_DEV_ID:
--			fifo_put(sc, PS2KC_ACK);
--			fifo_put(sc, 0xab);
--			fifo_put(sc, 0x83);
-+			fifo_put(sc, PS2KC_ACK, 0);
-+			fifo_put(sc, 0xab, 0);
-+			fifo_put(sc, 0x83, 0);
- 			break;
- 		case PS2KC_SET_SCANCODE_SET:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_ECHO:
--			fifo_put(sc, PS2KC_ECHO);
-+			fifo_put(sc, PS2KC_ECHO, 0);
- 			break;
- 		case PS2KC_SET_LEDS:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		default:
- 			fprintf(stderr, "Unhandled ps2 keyboard command "
-@@ -311,26 +314,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -311,26 +331,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
   */
  static void
  ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
@@ -212,7 +82,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 -		code = ascii_translations[keysym];
 -		e0_prefix = 0;
 +	if (keycode) {
-+		code = (uint8_t)(keycode & 0x7f);
++		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
 +		e0_prefix = ((keycode & 0x80) ?  SCANCODE_E0_PREFIX : 0);
  		found = 1;
  	} else {
@@ -240,17 +110,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			}
  		}
  	}
-@@ -341,14 +350,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
- 	}
- 
- 	if (e0_prefix)
--		fifo_put(sc, 0xe0);
-+		fifo_put(sc, 0xe0, 0);
- 	if (!down)
--		fifo_put(sc, 0xf0);
--	fifo_put(sc, code);
-+		fifo_put(sc, 0xf0, 0);
-+	fifo_put(sc, code, (keycode ? 0 : 1));
+@@ -348,7 +374,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  }
  
  static void
@@ -259,7 +119,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  {
  	struct ps2kbd_softc *sc = arg;
  	int fifo_full;
-@@ -359,7 +368,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+@@ -359,7 +385,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
  		return;
  	}
  	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
@@ -268,21 +128,9 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	if (!fifo_full)
-diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
---- bhyve_orig/ps2kbd.h	2020-05-01 11:25:57.441775000 +0900
-+++ bhyve/ps2kbd.h	2020-06-02 20:27:26.519082000 +0900
-@@ -35,7 +35,7 @@ struct atkbdc_softc;
- 
- struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
- 
--int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val);
-+int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans);
- void ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val);
- 
- #endif /* _PS2KBD_H_ */
 diff -upN bhyve_orig/rfb.c bhyve/rfb.c
 --- bhyve_orig/rfb.c	2020-05-01 11:25:57.446856000 +0900
-+++ bhyve/rfb.c	2020-06-02 20:27:26.520216000 +0900
++++ bhyve/rfb.c	2020-06-13 14:02:26.516609000 +0900
 @@ -97,7 +97,10 @@ struct rfb_softc {
  	bool	enc_raw_ok;
  	bool	enc_zlib_ok;

--- a/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
+++ b/qemu_ext_keyevent_msg/bhyve_qemu_ext_key_event_msg_fbsd13c.patch
@@ -1,38 +1,6 @@
-diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
---- bhyve_orig/atkbdc.c	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/atkbdc.c	2020-06-03 10:31:37.337347000 +0900
-@@ -216,24 +216,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
- 		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
- 	};
- 	uint8_t val;
-+	uint8_t trans;
- 	uint8_t release = 0;
- 
- 	assert(pthread_mutex_isowned_np(&sc->mtx));
- 
- 	if (sc->ram[0] & KBD_TRANSLATION) {
--		while (ps2kbd_read(sc->ps2kbd_sc, &val) != -1) {
-+		while (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1) {
- 			if (val == 0xf0) {
- 				release = 0x80;
- 				continue;
- 			} else {
--				val = translation[val] | release;
-+				val = ((trans) ? translation[val] : val) | release;
- 			}
- 			atkbdc_kbd_queue_data(sc, val);
- 			break;
- 		}
- 	} else {
- 		while (sc->kbd.bcnt < FIFOSZ) {
--			if (ps2kbd_read(sc->ps2kbd_sc, &val) != -1)
-+			if (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1)
- 				atkbdc_kbd_queue_data(sc, val);
- 			else
- 				break;
 diff -upN bhyve_orig/console.c bhyve/console.c
---- bhyve_orig/console.c	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/console.c	2020-06-03 10:31:37.338047000 +0900
+--- bhyve_orig/console.c	2020-06-14 10:25:23.470371000 +0900
++++ bhyve/console.c	2020-06-14 16:06:49.475147000 +0900
 @@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
  }
  
@@ -47,8 +15,8 @@ diff -upN bhyve_orig/console.c bhyve/console.c
  
  void
 diff -upN bhyve_orig/console.h bhyve/console.h
---- bhyve_orig/console.h	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/console.h	2020-06-03 10:31:37.338668000 +0900
+--- bhyve_orig/console.h	2020-06-14 10:25:23.454420000 +0900
++++ bhyve/console.h	2020-06-14 16:06:49.475771000 +0900
 @@ -34,7 +34,7 @@
  struct bhyvegc;
  
@@ -68,134 +36,36 @@ diff -upN bhyve_orig/console.h bhyve/console.h
  void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
  void console_ptr_event(uint8_t button, int x, int y);
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
---- bhyve_orig/ps2kbd.c	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/ps2kbd.c	2020-06-03 10:31:37.339319000 +0900
-@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 36064
- 
- struct fifo {
- 	uint8_t	buf[PS2KBD_FIFOSZ];
-+	uint8_t	trans[PS2KBD_FIFOSZ];
- 	int	rindex;		/* index to read from */
- 	int	windex;		/* index to write to */
- 	int	num;		/* number of bytes in the fifo */
-@@ -201,26 +202,28 @@ fifo_reset(struct ps2kbd_softc *sc)
- }
+--- bhyve_orig/ps2kbd.c	2020-06-14 10:25:24.140690000 +0900
++++ bhyve/ps2kbd.c	2020-06-14 16:06:49.476779000 +0900
+@@ -181,6 +181,26 @@ static const uint8_t ascii_translations[128] = {
+ 		0x22, 0x35, 0x1a, 0x54, 0x5d, 0x5b, 0x0e, 0x00,
+ };
  
++/* ScanCode set1 to set2 lookup table */
++const uint8_t keyset1to2_translations[128] = {
++		   0, 0x76, 0x16, 0x1E, 0x26, 0x25, 0x2e, 0x36,
++		0x3d, 0x3e, 0x46, 0x45, 0x4e, 0x55, 0x66, 0x0d,
++		0x15, 0x1d, 0x24, 0x2d, 0x2c, 0x35, 0x3c, 0x43,
++		0x44, 0x4d, 0x54, 0x5b, 0x5a, 0x14, 0x1c, 0x1b,
++		0x23, 0x2b, 0x34, 0x33, 0x3b, 0x42, 0x4b, 0x4c,
++		0x52, 0x0e, 0x12, 0x5d, 0x1a, 0x22, 0x21, 0x2a,
++		0x32, 0x31, 0x3a, 0x41, 0x49, 0x4a, 0x59, 0x7c,
++		0x11, 0x29, 0x58, 0x05, 0x06, 0x04, 0x0c, 0x03,
++		0x0b, 0x83, 0x0a, 0x01, 0x09, 0x77, 0x7e, 0x6c,
++		0x75, 0x7d, 0x7b, 0x6b, 0x73, 0x74, 0x79, 0x69,
++		0x72, 0x7a, 0x70, 0x71, 0x84, 0x60, 0x61, 0x78,
++		0x07, 0x0f, 0x17, 0x1f, 0x27, 0x2f, 0x37, 0x3f,
++		0x47, 0x4f, 0x56, 0x5e, 0x08, 0x10, 0x18, 0x20,
++		0x28, 0x30, 0x38, 0x40, 0x48, 0x50, 0x57, 0x6f,
++		0x13, 0x19, 0x39, 0x51, 0x53, 0x5c, 0x5f, 0x62,
++		0x63, 0x64, 0x65, 0x67, 0x68, 0x6a, 0x6d, 0x6e,
++};
++
  static void
--fifo_put(struct ps2kbd_softc *sc, uint8_t val)
-+fifo_put(struct ps2kbd_softc *sc, uint8_t val, uint8_t trans)
- {
- 	struct fifo *fifo;
- 
- 	fifo = &sc->fifo;
- 	if (fifo->num < fifo->size) {
- 		fifo->buf[fifo->windex] = val;
-+		fifo->trans[fifo->windex] = trans;
- 		fifo->windex = (fifo->windex + 1) % fifo->size;
- 		fifo->num++;
- 	}
- }
- 
- static int
--fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
-+fifo_get(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ fifo_init(struct ps2kbd_softc *sc)
  {
- 	struct fifo *fifo;
- 
- 	fifo = &sc->fifo;
- 	if (fifo->num > 0) {
- 		*val = fifo->buf[fifo->rindex];
-+		*trans = fifo->trans[fifo->rindex];
- 		fifo->rindex = (fifo->rindex + 1) % fifo->size;
- 		fifo->num--;
- 		return (0);
-@@ -230,12 +233,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
- }
- 
- int
--ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val)
-+ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
- {
- 	int retval;
- 
- 	pthread_mutex_lock(&sc->mtx);
--	retval = fifo_get(sc, val);
-+	retval = fifo_get(sc, val, trans);
- 	pthread_mutex_unlock(&sc->mtx);
- 
- 	return (retval);
-@@ -248,13 +251,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
- 	if (sc->curcmd) {
- 		switch (sc->curcmd) {
- 		case PS2KC_SET_TYPEMATIC:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_SCANCODE_SET:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_LEDS:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		default:
- 			EPRINTLN("Unhandled ps2 keyboard current "
-@@ -265,41 +268,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
- 	} else {
- 		switch (val) {
- 		case 0x00:
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_RESET_DEV:
- 			fifo_reset(sc);
--			fifo_put(sc, PS2KC_ACK);
--			fifo_put(sc, PS2KC_BAT_SUCCESS);
-+			fifo_put(sc, PS2KC_ACK, 0);
-+			fifo_put(sc, PS2KC_BAT_SUCCESS, 0);
- 			break;
- 		case PS2KC_DISABLE:
- 			sc->enabled = false;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_ENABLE:
- 			sc->enabled = true;
- 			fifo_reset(sc);
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SET_TYPEMATIC:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_SEND_DEV_ID:
--			fifo_put(sc, PS2KC_ACK);
--			fifo_put(sc, 0xab);
--			fifo_put(sc, 0x83);
-+			fifo_put(sc, PS2KC_ACK, 0);
-+			fifo_put(sc, 0xab, 0);
-+			fifo_put(sc, 0x83, 0);
- 			break;
- 		case PS2KC_SET_SCANCODE_SET:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		case PS2KC_ECHO:
--			fifo_put(sc, PS2KC_ECHO);
-+			fifo_put(sc, PS2KC_ECHO, 0);
- 			break;
- 		case PS2KC_SET_LEDS:
- 			sc->curcmd = val;
--			fifo_put(sc, PS2KC_ACK);
-+			fifo_put(sc, PS2KC_ACK, 0);
- 			break;
- 		default:
- 			EPRINTLN("Unhandled ps2 keyboard command "
-@@ -315,26 +318,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+@@ -315,26 +335,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
   */
  static void
  ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
@@ -212,7 +82,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 -		code = ascii_translations[keysym];
 -		e0_prefix = 0;
 +	if (keycode) {
-+		code = (uint8_t)(keycode & 0x7f);
++		code =  keyset1to2_translations[(uint8_t)(keycode & 0x7f)];
 +		e0_prefix = ((keycode & 0x80) ?  SCANCODE_E0_PREFIX : 0);
  		found = 1;
  	} else {
@@ -240,17 +110,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  			}
  		}
  	}
-@@ -345,14 +354,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
- 	}
- 
- 	if (e0_prefix)
--		fifo_put(sc, 0xe0);
-+		fifo_put(sc, 0xe0, 0);
- 	if (!down)
--		fifo_put(sc, 0xf0);
--	fifo_put(sc, code);
-+		fifo_put(sc, 0xf0, 0);
-+	fifo_put(sc, code, (keycode ? 0 : 1));
+@@ -352,7 +378,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
  }
  
  static void
@@ -259,7 +119,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  {
  	struct ps2kbd_softc *sc = arg;
  	int fifo_full;
-@@ -363,7 +372,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+@@ -363,7 +389,7 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
  		return;
  	}
  	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
@@ -268,21 +128,9 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  	pthread_mutex_unlock(&sc->mtx);
  
  	if (!fifo_full)
-diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
---- bhyve_orig/ps2kbd.h	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/ps2kbd.h	2020-06-03 10:31:37.339486000 +0900
-@@ -36,7 +36,7 @@ struct vm_snapshot_meta;
- 
- struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
- 
--int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val);
-+int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans);
- void ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val);
- 
- #ifdef BHYVE_SNAPSHOT
 diff -upN bhyve_orig/rfb.c bhyve/rfb.c
---- bhyve_orig/rfb.c	2020-05-28 09:02:50.000000000 +0900
-+++ bhyve/rfb.c	2020-06-03 10:31:37.339898000 +0900
+--- bhyve_orig/rfb.c	2020-06-14 10:25:24.141562000 +0900
++++ bhyve/rfb.c	2020-06-14 16:06:49.477815000 +0900
 @@ -99,7 +99,10 @@ struct rfb_softc {
  	bool	enc_raw_ok;
  	bool	enc_zlib_ok;