Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into ch438

APP_Framework/Framework/transform_layer/xizi/transform.c

@@ -171,6 +171,7 @@ int PrivIoctl(int fd, int cmd, void *args)
         break;
     case ADC_TYPE:
     case DAC_TYPE:
+    case WDT_TYPE:
         ret = ioctl(fd, cmd, ioctl_cfg->args);
         break;
     default:

APP_Framework/Framework/transform_layer/xizi/transform.h

@@ -35,6 +35,9 @@ extern "C" {
 #define OPE_INT                 0x0000
 #define OPE_CFG                 0x0001
 
+#define OPER_WDT_SET_TIMEOUT    0x0002
+#define OPER_WDT_KEEPALIVE      0x0003
+
 #define NAME_NUM_MAX            32
 
 /*********************GPIO define*********************/
@@ -142,6 +145,7 @@ enum IoctlDriverType
     LCD_TYPE,
     ADC_TYPE,
     DAC_TYPE,
+    WDT_TYPE,
     DEFAULT_TYPE,
 };