From c0bb70345d65f94271d02f684f9042084aa6b0ea Mon Sep 17 00:00:00 2001
From: wuchengwen <wuchengwen4@huawei.com>
Date: Tue, 27 Dec 2022 06:45:16 +0000
Subject: [PATCH 1/2] fixed 5a4271d from
 https://gitee.com/wu-chengwen/usb_manager/pulls/1 change subclass to subClass

Signed-off-by: wuchengwen <wuchengwen4@huawei.com>
---
 interfaces/kits/js/napi/src/usb_info.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/interfaces/kits/js/napi/src/usb_info.cpp b/interfaces/kits/js/napi/src/usb_info.cpp
index be72322..cd6f858 100644
--- a/interfaces/kits/js/napi/src/usb_info.cpp
+++ b/interfaces/kits/js/napi/src/usb_info.cpp
@@ -97,7 +97,7 @@ static void CtoJSUsbInterface(const napi_env &env, napi_value &obj, const UsbInt
     NapiUtil::SetValueInt32(env, "id", usbInterface.GetId(), obj);
     NapiUtil::SetValueInt32(env, "protocol", usbInterface.GetProtocol(), obj);
     NapiUtil::SetValueInt32(env, "clazz", usbInterface.GetClass(), obj);
-    NapiUtil::SetValueInt32(env, "subclass", usbInterface.GetSubClass(), obj);
+    NapiUtil::SetValueInt32(env, "subClass", usbInterface.GetSubClass(), obj);
     NapiUtil::SetValueInt32(env, "alternateSetting", usbInterface.GetAlternateSetting(), obj);
     NapiUtil::SetValueUtf8String(env, "name", usbInterface.GetName(), obj);
     napi_value arr;
@@ -144,7 +144,7 @@ static void CtoJSUsbDevice(const napi_env &env, napi_value &obj, const UsbDevice
     NapiUtil::SetValueInt32(env, "vendorId", usbDevice.GetVendorId(), obj);
     NapiUtil::SetValueInt32(env, "productId", usbDevice.GetProductId(), obj);
     NapiUtil::SetValueInt32(env, "clazz", usbDevice.GetClass(), obj);
-    NapiUtil::SetValueInt32(env, "subclass", usbDevice.GetSubclass(), obj);
+    NapiUtil::SetValueInt32(env, "subClass", usbDevice.GetSubclass(), obj);
     NapiUtil::SetValueInt32(env, "protocol", usbDevice.GetProtocol(), obj);
     NapiUtil::SetValueInt32(env, "devAddress", usbDevice.GetDevAddr(), obj);
     NapiUtil::SetValueInt32(env, "busNum", usbDevice.GetBusNum(), obj);
@@ -258,7 +258,7 @@ static void ParseInterfaceObj(const napi_env env, const napi_value interfaceObj,
     int32_t clzz = 0;
     NapiUtil::JsObjectToInt(env, interfaceObj, "clazz", clzz);
     int32_t subClass = 0;
-    NapiUtil::JsObjectToInt(env, interfaceObj, "subclass", subClass);
+    NapiUtil::JsObjectToInt(env, interfaceObj, "subClass", subClass);
     int32_t alternateSetting = 0;
     NapiUtil::JsObjectToInt(env, interfaceObj, "alternateSetting", alternateSetting);
     std::string name;
@@ -351,7 +351,7 @@ static void ParseDeviceObj(const napi_env env, const napi_value deviceObj, UsbDe
     int32_t clazz = 0;
     NapiUtil::JsObjectToInt(env, deviceObj, "clazz", clazz);
     int32_t subclass = 0;
-    NapiUtil::JsObjectToInt(env, deviceObj, "subclass", subclass);
+    NapiUtil::JsObjectToInt(env, deviceObj, "subClass", subclass);
     int32_t protocol = 0;
     NapiUtil::JsObjectToInt(env, deviceObj, "protocol", protocol);
     std::vector<USBConfig> configs;
-- 
Gitee


From b723cdfb6c52200d89cb6edba20e56343faabe36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=88=90=E6=96=87?= <wuchengwen4@huawei.com>
Date: Thu, 29 Dec 2022 13:34:35 +0000
Subject: [PATCH 2/2] change subclass to subClass change subclass to subClass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 吴成文 <wuchengwen4@huawei.com>
---
 interfaces/kits/js/napi/src/usb_info.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/interfaces/kits/js/napi/src/usb_info.cpp b/interfaces/kits/js/napi/src/usb_info.cpp
index cd6f858..e2d28fe 100644
--- a/interfaces/kits/js/napi/src/usb_info.cpp
+++ b/interfaces/kits/js/napi/src/usb_info.cpp
@@ -350,13 +350,13 @@ static void ParseDeviceObj(const napi_env env, const napi_value deviceObj, UsbDe
     NapiUtil::JsObjectToInt(env, deviceObj, "productId", productId);
     int32_t clazz = 0;
     NapiUtil::JsObjectToInt(env, deviceObj, "clazz", clazz);
-    int32_t subclass = 0;
-    NapiUtil::JsObjectToInt(env, deviceObj, "subClass", subclass);
+    int32_t subClass = 0;
+    NapiUtil::JsObjectToInt(env, deviceObj, "subClass", subClass);
     int32_t protocol = 0;
     NapiUtil::JsObjectToInt(env, deviceObj, "protocol", protocol);
     std::vector<USBConfig> configs;
     ParseConfigsObjs(env, deviceObj, configs);
-    dev = UsbDevice(name, manufacturerName, productName, version, devAddr, busNum, vendorId, productId, clazz, subclass,
+    dev = UsbDevice(name, manufacturerName, productName, version, devAddr, busNum, vendorId, productId, clazz, subClass,
                     protocol, configs);
 }
 
-- 
Gitee