[PATCH 2/2] add microwindows patches

YANG QIAO yangqiao0505 at me.com
Mon Aug 10 12:48:58 UTC 2015


From: YANG Qiao <yangqiao0505 at me.com>

---
 .../microwindows-0.93-dev-without-keyboard.diff    | 14 ++++++
 tools/4.11/microwindows/microwindows-0.93-dev.diff | 54 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 tools/4.11/microwindows/microwindows-0.93-dev-without-keyboard.diff
 create mode 100644 tools/4.11/microwindows/microwindows-0.93-dev.diff

diff --git a/tools/4.11/microwindows/microwindows-0.93-dev-without-keyboard.diff b/tools/4.11/microwindows/microwindows-0.93-dev-without-keyboard.diff
new file mode 100644
index 0000000..c04e524
--- /dev/null
+++ b/tools/4.11/microwindows/microwindows-0.93-dev-without-keyboard.diff
@@ -0,0 +1,14 @@
+diff --git a/src/drivers/Objects.rules b/src/drivers/Objects.rules
+--- a/src/drivers/Objects.rules
++++ b/src/drivers/Objects.rules
+@@ -253,8 +253,8 @@ MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_pipe.o
+ endif
+ 
+ ifeq ($(ARCH), RTEMS)
+-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_rtems.o
+-MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_rtems.o
++MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/kbd_null.o
++MW_CORE_OBJS += $(MW_DIR_OBJ)/drivers/mou_null.o
+ endif # RTEMS architecture
+ 
+ ifeq ($(LIRCKBD2), Y)
diff --git a/tools/4.11/microwindows/microwindows-0.93-dev.diff b/tools/4.11/microwindows/microwindows-0.93-dev.diff
new file mode 100644
index 0000000..68114cc
--- /dev/null
+++ b/tools/4.11/microwindows/microwindows-0.93-dev.diff
@@ -0,0 +1,54 @@
+diff --git a/src/drivers/kbd_rtems.c b/src/drivers/kbd_rtems.c
+--- a/src/drivers/kbd_rtems.c
++++ b/src/drivers/kbd_rtems.c
+@@ -30,9 +30,12 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ #include <rtems/mw_uid.h>
++#include <bsp/keyboard.h>
+ #include "device.h"
++#include "keymap_standard.h"
+ 
+ extern int close (int fd); /* RTEMS does not include close() in stdio.h */
+ 
+@@ -45,6 +48,9 @@ void    MWKbd_Close (void);
+ void MWKbd_GetModifierInfo (MWKEYMOD *modifiers, MWKEYMOD *curmodifiers);
+ int  MWKbd_Read (MWKEY *buf, MWKEYMOD *modifiers, MWSCANCODE *scancode);
+ 
++static MWKEY TranslateScancode(int scancode, MWKEYMOD modstate);
++static void LoadKernelKeymaps(int fd);
++
+ KBDDEVICE kbddev = {
+         MWKbd_Open,
+  MWKbd_Close,
+diff --git a/src/Configs/config.rtems b/src/Configs/config.rtems
+index 129860f..0872d8c 100644
+--- a/src/Configs/config.rtems
++++ b/src/Configs/config.rtems
+@@ -67,8 +67,8 @@ OBJFRAMEWORK             = N
+ # Demos to build
+ #
+ ####################################################################
+-MICROWINDEMO             = Y
+-NANOXDEMO                = Y
++MICROWINDEMO             = N
++NANOXDEMO                = N
+ 
+ ####################################################################
+ #
+diff --git a/src/rtems/rtems_init.c b/src/rtems/rtems_init.c
+index 70a4639..1a4f8f2 100644
+--- a/src/rtems/rtems_init.c
++++ b/src/rtems/rtems_init.c
+@@ -38,7 +38,7 @@
+ /* TBD: Find better way than this to deal with BSPs which do not have
+  *      these driver entries.  This is a hacky cover up.
+  */
+-#if 0
++#if 1
+ 
+ #ifndef PAUX_DRIVER_TABLE_ENTRY
+   #define PAUX_DRIVER_TABLE_ENTRY NULL_DRIVER_TABLE_ENTRY
-- 
2.1.0




More information about the devel mailing list