From b0293a148fecb4d9ffbc64233857d8a58bf70d30 Mon Sep 17 00:00:00 2001
From: YOUR_NAME <guowen24@huawei.com>
Date: Fri, 15 Oct 2021 06:39:52 +0000
Subject: [PATCH] Fix Input C90 Warnings

Signed-off-by: YOUR_NAME <guowen24@huawei.com>
---
 model/input/driver/hdf_input_device_manager.c | 33 +++++++++----------
 model/input/driver/touchscreen/touch_gt911.c  |  3 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/model/input/driver/hdf_input_device_manager.c b/model/input/driver/hdf_input_device_manager.c
index c9fcaa95a..3f3714006 100644
--- a/model/input/driver/hdf_input_device_manager.c
+++ b/model/input/driver/hdf_input_device_manager.c
@@ -14,14 +14,22 @@
 #include "event_hub.h"
 #include "hdf_input_device_manager.h"
 
-#define NODE_MODE            0660
-#define SERVICE_NAME_LEN     24
-#define INPUT_DEV_EXIST      1
-#define INPUT_DEV_NOT_EXIST  0
-#define INPUTDEV_FIRST_ID    1
-#define FILLER_FLAG          1
-#define PLACEHOLDER_LENGTH   2
-#define PLACEHOLDER_LIMIT    10
+#define NODE_MODE                      0660
+#define SERVICE_NAME_LEN               24
+#define INPUT_DEV_EXIST                1
+#define INPUT_DEV_NOT_EXIST            0
+#define INPUTDEV_FIRST_ID              1
+#define FILLER_FLAG                    1
+#define PLACEHOLDER_LENGTH             2
+#define PLACEHOLDER_LIMIT              10
+#define DEFAULT_TOUCH_BUF_PKG_NUM      50
+#define DEFAULT_KEY_BUF_PKG_NUM        10
+#define DEFAULT_MOUSE_BUF_PKG_NUM      30
+#define DEFAULT_KEYBOARD_BUF_PKG_NUM   20
+#define DEFAULT_CROWN_BUF_PKG_NUM      20
+#define DEFAULT_ENCODER_BUF_PKG_NUM    20
+#define DEFAULT_ROCKER_BUF_PKG_NUM     40
+#define DEFAULT_TRACKBALL_BUF_PKG_NUM  30
 
 static InputManager *g_inputManager;
 
@@ -190,15 +198,6 @@ EXIT:
     return HDF_SUCCESS;
 }
 
-#define DEFAULT_TOUCH_BUF_PKG_NUM      50
-#define DEFAULT_KEY_BUF_PKG_NUM        10
-#define DEFAULT_MOUSE_BUF_PKG_NUM      30
-#define DEFAULT_KEYBOARD_BUF_PKG_NUM   20
-#define DEFAULT_CROWN_BUF_PKG_NUM      20
-#define DEFAULT_ENCODER_BUF_PKG_NUM    20
-#define DEFAULT_ROCKER_BUF_PKG_NUM     40
-#define DEFAULT_TRACKBALL_BUF_PKG_NUM  30
-
 static int32_t AllocPackageBuffer(InputDevice *inputDev)
 {
     uint16_t pkgNum;
diff --git a/model/input/driver/touchscreen/touch_gt911.c b/model/input/driver/touchscreen/touch_gt911.c
index fb3f5e96f..2421858f1 100644
--- a/model/input/driver/touchscreen/touch_gt911.c
+++ b/model/input/driver/touchscreen/touch_gt911.c
@@ -15,6 +15,7 @@
 #include "touch_gt911.h"
 
 #define MAX_POINT 5
+#define X_OFFSET  1
 
 static int32_t ChipInit(ChipDevice *device)
 {
@@ -82,8 +83,6 @@ static int ChipCleanBuffer(InputI2cClient *i2cClient)
     return ret;
 }
 
-#define X_OFFSET    1
-
 static void ParsePointData(ChipDevice *device, FrameData *frame, uint8_t *buf, uint8_t pointNum)
 {
     int32_t chipVer = device->chipCfg->chipVersion;
-- 
Gitee