!448 fix: Ctrl-C move out of LOS_MAGIC_KEY_ENABLE

Merge pull request !448 from MGY917/Ctrl-C_support

platform/los_magickey.c

@@ -66,12 +66,6 @@ STATIC MagicKeyOp g_magicHelpOp = {
     .magicKey = 0x1a /* ctrl + z */
 };
 
-STATIC MagicKeyOp g_magicKillPgrp = {
-    .opHandler = KillPgrp,
-    .helpMsg = "Show all magic op key(ctrl+c) ",
-    .magicKey = 0x03 /* ctrl + c */
-};
-
 /*
  * NOTICE:Suggest don't use
  * ctrl+h/backspace=0x8,
@@ -87,7 +81,7 @@ STATIC MagicKeyOp *g_magicOpTable[MAGIC_KEY_NUM] = {
     &g_magicPanicOp,    /* ctrl + p */
     &g_magicTaskShowOp, /* ctrl + t */
     &g_magicHelpOp,     /* ctrl + z */
-    &g_magicKillPgrp    /* ctrl + c */
+    NULL
 };
 
 STATIC VOID OsMagicHelp(VOID)
@@ -129,7 +123,11 @@ INT32 CheckMagicKey(CHAR key)
 #ifdef LOSCFG_ENABLE_MAGICKEY
     INT32 i;
     STATIC UINT32 magicKeySwitch = 0;
-    if (key == 0x12) { /* ctrl + r */
+
+    if (key == 0x03) { /* ctrl + c */
+        KillPgrp();
+        return 0;
+    } else if (key == 0x12) { /* ctrl + r */
         magicKeySwitch = ~magicKeySwitch;
         if (magicKeySwitch != 0) {
             PRINTK("Magic key on\n");
@@ -137,11 +135,7 @@ INT32 CheckMagicKey(CHAR key)
             PRINTK("Magic key off\n");
         }
         return 1;
-    } else if (key == 0x03) { /* ctrl + c */
-        KillPgrp();
-        return 0;
     }
-
     if (magicKeySwitch != 0) {
         for (i = 0; i < MAGIC_KEY_NUM; i++) {
             if (g_magicOpTable[i] != NULL && key == g_magicOpTable[i]->magicKey) {