openharmony/vendor_asrmicro
1
0
Fork 0
mirror of https://github.com/openharmony/vendor_asrmicro.git synced 2026-07-01 22:04:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

!21 FIX:删除hal_sys_param.c多余接口

Browse Source 
Merge pull request !21 from cheng_jinsong/0913_param
This commit is contained in:
openharmony_ci
2022-11-09 02:32:38 +00:00
committed by Gitee
parent d74ab14899 7b09a88e9f
commit 22ef1e4100
5 changed files with 2 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wifi_demo/config.json
-4
View File
@@ -76,10 +76,6 @@
"component" : "bootstrap_lite",
"features" : []
},
{
"component" : "syspara_lite",
"features" : []
},
{
"component" : "init_lite",
"features":["enable_ohos_startup_init_feature_begetctl_liteos = true"]
wifi_demo/hals/utils/sys_param/hal_sys_param.c
+1 -108
View File
@@ -15,68 +15,6 @@
#include "hal_sys_param.h"
static const char OHOS_DEVICE_TYPE[] = {"****"};
static const char OHOS_DISPLAY_VERSION[] = {"OpenHarmony 1.0.1"};
static const char OHOS_MANUFACTURE[] = {"****"};
static const char OHOS_BRAND[] = {"****"};
static const char OHOS_MARKET_NAME[] = {"****"};
static const char OHOS_PRODUCT_SERIES[] = {"****"};
static const char OHOS_PRODUCT_MODEL[] = {"****"};
static const char OHOS_SOFTWARE_MODEL[] = {"****"};
static const char OHOS_HARDWARE_MODEL[] = {"****"};
static const char OHOS_HARDWARE_PROFILE[] = {"aout:true,display:true"};
static const char OHOS_BOOTLOADER_VERSION[] = {"bootloader"};
static const char OHOS_ABI_LIST[] = {"****"};
static const char OHOS_SERIAL[] = {"1234567890"}; // provided by OEM.
static const int OHOS_FIRST_API_VERSION = 1;
static const char EMPTY_STR[] = {""};
const char *HalGetDeviceType(void)
{
return OHOS_DEVICE_TYPE;
}
const char *HalGetManufacture(void)
{
return OHOS_MANUFACTURE;
}
const char *HalGetBrand(void)
{
return OHOS_BRAND;
}
const char *HalGetMarketName(void)
{
return OHOS_MARKET_NAME;
}
const char *HalGetProductSeries(void)
{
return OHOS_PRODUCT_SERIES;
}
const char *HalGetProductModel(void)
{
return OHOS_PRODUCT_MODEL;
}
const char *HalGetSoftwareModel(void)
{
return OHOS_SOFTWARE_MODEL;
}
const char *HalGetHardwareModel(void)
{
return OHOS_HARDWARE_MODEL;
}
const char *HalGetHardwareProfile(void)
{
return OHOS_HARDWARE_PROFILE;
}
const char *HalGetSerial(void)
{
unsigned char macAddr[6] = {0x00};
@@ -90,49 +28,4 @@ const char *HalGetSerial(void)
printf("snprintf ret fail!\n");
}
return serialNumber;
}
const char *HalGetBootloaderVersion(void)
{
return OHOS_BOOTLOADER_VERSION;
}
const char *HalGetAbiList(void)
{
return OHOS_ABI_LIST;
}
const char *HalGetDisplayVersion(void)
{
return OHOS_DISPLAY_VERSION;
}
const char *HalGetIncrementalVersion(void)
{
return INCREMENTAL_VERSION;
}
const char *HalGetBuildType(void)
{
return BUILD_TYPE;
}
const char *HalGetBuildUser(void)
{
return BUILD_USER;
}
const char *HalGetBuildHost(void)
{
return BUILD_HOST;
}
const char *HalGetBuildTime(void)
{
return BUILD_TIME;
}
int HalGetFirstApiVersion(void)
{
return OHOS_FIRST_API_VERSION;
}
}
xts_demo/config.json
+1 -2
View File
@@ -50,8 +50,7 @@
"subsystem": "startup",
"components": [
{ "component": "bootstrap_lite", "features":[] },
{ "component": "init_lite", "features":["enable_ohos_startup_init_feature_begetctl_liteos = true"] },
{ "component": "syspara_lite", "features":[] }
{ "component": "init_lite", "features":["enable_ohos_startup_init_feature_begetctl_liteos = true"] }
]
},
{
xts_demo/hals/utils/sys_param/BUILD.gn
-2
View File
@@ -12,8 +12,6 @@
# limitations under the License.
static_library("hal_sysparam") {
sources = [ "hal_sys_param.c" ]
include_dirs = [ "//base/startup/init/interfaces/hals" ]
defines = [
"INCREMENTAL_VERSION=\"${ohos_version}\"",
"BUILD_TYPE=\"${ohos_build_type}\"",
xts_demo/hals/utils/sys_param/hal_sys_param.c
-128
View File
@@ -1,128 +0,0 @@
/*
* Copyright (c) 2020 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "hal_sys_param.h"
static const char OHOS_DEVICE_TYPE[] = {"****"};
static const char OHOS_DISPLAY_VERSION[] = {"OpenHarmony 1.0.1"};
static const char OHOS_MANUFACTURE[] = {"****"};
static const char OHOS_BRAND[] = {"****"};
static const char OHOS_MARKET_NAME[] = {"****"};
static const char OHOS_PRODUCT_SERIES[] = {"****"};
static const char OHOS_PRODUCT_MODEL[] = {"****"};
static const char OHOS_SOFTWARE_MODEL[] = {"****"};
static const char OHOS_HARDWARE_MODEL[] = {"****"};
static const char OHOS_HARDWARE_PROFILE[] = {"aout:true,display:true"};
static const char OHOS_BOOTLOADER_VERSION[] = {"bootloader"};
static const char OHOS_ABI_LIST[] = {"****"};
static const char OHOS_SERIAL[] = {"1234567890"}; // provided by OEM.
static const int OHOS_FIRST_API_VERSION = 1;
static const char EMPTY_STR[] = {""};
const char *HalGetDeviceType(void)
{
return OHOS_DEVICE_TYPE;
}
const char *HalGetManufacture(void)
{
return OHOS_MANUFACTURE;
}
const char *HalGetBrand(void)
{
return OHOS_BRAND;
}
const char *HalGetMarketName(void)
{
return OHOS_MARKET_NAME;
}
const char *HalGetProductSeries(void)
{
return OHOS_PRODUCT_SERIES;
}
const char *HalGetProductModel(void)
{
return OHOS_PRODUCT_MODEL;
}
const char *HalGetSoftwareModel(void)
{
return OHOS_SOFTWARE_MODEL;
}
const char *HalGetHardwareModel(void)
{
return OHOS_HARDWARE_MODEL;
}
const char *HalGetHardwareProfile(void)
{
return OHOS_HARDWARE_PROFILE;
}
const char *HalGetSerial(void)
{
return OHOS_SERIAL;
}
const char *HalGetBootloaderVersion(void)
{
return OHOS_BOOTLOADER_VERSION;
}
const char *HalGetAbiList(void)
{
return OHOS_ABI_LIST;
}
const char *HalGetDisplayVersion(void)
{
return OHOS_DISPLAY_VERSION;
}
const char *HalGetIncrementalVersion(void)
{
return INCREMENTAL_VERSION;
}
const char *HalGetBuildType(void)
{
return BUILD_TYPE;
}
const char *HalGetBuildUser(void)
{
return BUILD_USER;
}
const char *HalGetBuildHost(void)
{
return BUILD_HOST;
}
const char *HalGetBuildTime(void)
{
return BUILD_TIME;
}
int HalGetFirstApiVersion(void)
{
return OHOS_FIRST_API_VERSION;
}