同步官方源码

    鸿蒙研究站 | http://weharmonyos.com (国内)
              | https://weharmony.github.io (国外)
    论坛 | http://bbs.weharmonyos.com
    文档中心 | http://open.weharmonyos.com
    参考手册 | http://doxygen.weharmonyos.com
上级 3d2d8775
......@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
include $(LITEOSTOPDIR)/config.mk
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
MODULE_NAME := usb_base
......@@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c
endif
ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y)
LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/framework/model/input/driver \
-I$(LITEOSTOPDIR)/../../drivers/framework/include/core \
-I$(LITEOSTOPDIR)/../../drivers/framework/core/common/include/host \
-I$(LITEOSTOPDIR)/../../drivers/framework/utils \
-I$(LITEOSTOPDIR)/../../drivers/framework/osal \
-I$(LITEOSTOPDIR)/../../drivers/framework/ability/sbuf/include \
-I$(LITEOSTOPDIR)/../../drivers/framework/include/osal \
LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/model/input/driver \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/core \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/core/common/include/host \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/utils \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/osal \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/ability/sbuf/include \
-I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/osal \
-I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev
LOCAL_SRCS += $(INPUT_SRC)/uhid.c \
......
......@@ -5,7 +5,7 @@ config DRIVERS
Answer Y to enable LiteOS support driver.
source "bsd/dev/usb/Kconfig"
source "../../drivers/adapter/khdf/liteos/Kconfig"
source "../../drivers/hdf_core/adapter/khdf/liteos/Kconfig"
# Device driver Kconfig import
source "$(DEVICE_PATH)/drivers/Kconfig"
......@@ -17,5 +17,4 @@ source "drivers/char/video/Kconfig"
source "drivers/char/trace/Kconfig"
source "drivers/char/perf/Kconfig"
source "../../drivers/liteos/tzdriver/Kconfig"
source "../../drivers/liteos/hievent/Kconfig"
......@@ -90,8 +90,13 @@ kernel_module(module_name) {
}
public_configs = [ ":public" ]
configs += [ ":private" ]
}
config("public") {
include_dirs = [ "include" ]
}
config("private") {
cflags = [ "-Wno-frame-address" ]
}
......@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
include $(LITEOSTOPDIR)/config.mk
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
MODULE_NAME := $(notdir $(shell pwd))
......@@ -40,6 +40,6 @@ LOCAL_SRCS := $(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
$(wildcard sched/*.c) \
$(wildcard vm/*.c)
LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) -Wno-frame-address
include $(MODULE)
......@@ -190,11 +190,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
{
UINT32 intSave;
enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
#ifdef LOSCFG_COMPILER_CLANG_LLVM
VOID *requestAddr = (VOID *)__builtin_return_address(1);
#else
VOID *requestAddr = (VOID *)__builtin_return_address(0);
#endif
LosTaskCB *current = OsCurrTaskGet();
LockDep *lockDep = &current->lockDep;
LosTaskCB *lockOwner = NULL;
......@@ -276,11 +272,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
UINT32 intSave;
INT32 depth;
enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
#ifdef LOSCFG_COMPILER_CLANG_LLVM
VOID *requestAddr = (VOID *)__builtin_return_address(1);
#else
VOID *requestAddr = (VOID *)__builtin_return_address(0);
#endif
LosTaskCB *current = OsCurrTaskGet();
LosTaskCB *owner = NULL;
LockDep *lockDep = NULL;
......
......@@ -103,13 +103,13 @@ config("private") {
if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
cflags = [
"-Wno-char-subscripts",
"-Wno-unknown-pragmas",
"-Wno-ignored-pragmas",
"-Wno-strict-prototypes",
]
} else {
cflags = [
"-frounding-math",
"-Wno-unused-but-set-variable",
"-Wno-unknown-pragmas",
]
}
......@@ -117,5 +117,6 @@ config("private") {
"-Wno-shift-op-parentheses",
"-Wno-logical-op-parentheses",
"-Wno-bitwise-op-parentheses",
"-Wno-unknown-pragmas",
]
}
......@@ -59,10 +59,10 @@ LOCAL_INCLUDE += $(addprefix -I$(MUSLPORTINGDIR)/, src/include src/internal)
LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LOCAL_CMACRO)
ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
LOCAL_FLAGS +=-Wno-char-subscripts -Wno-unknown-pragmas
LOCAL_FLAGS +=-Wno-char-subscripts -Wno-ignored-pragmas -Wno-strict-prototypes
else
LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable -Wno-unknown-pragmas
LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable
endif
LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses
LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses -Wno-unknown-pragmas
include $(MODULE)
......@@ -31,7 +31,7 @@ import("$root_out_dir/config.gni")
LITEOSTOPDIR = "//kernel/liteos_a"
LITEOSTHIRDPARTY = "//third_party"
HDFTOPDIR = "//drivers/adapter/khdf/liteos"
HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
ARCH = ""
if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
......
......@@ -454,7 +454,7 @@ VOID TestTaskEntry(VOID)
#if (TEST_MODULE_CHECK == 1)
for (int i = 0; i < g_modelNum - 1; i++) {
if (g_executModelNum[i] != 0) {
dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , sucess_count :%d",
dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , success_count :%d",
g_strModule[i], g_executModelNum[i], g_failModelResult[i], g_passModelResult[i]);
}
for (int j = 0; j < g_failResult && j < 50; j++) { // 50
......
......@@ -35,7 +35,7 @@ static int g_sigCount = 0;
static void SigPrint(int signum)
{
g_sigCount++;
printf("signal receive sucess\n");
printf("signal receive success\n");
}
static UINT32 TestCase(VOID)
......@@ -101,7 +101,7 @@ static UINT32 TestCase(VOID)
sleep(1);
ret = kill(pid, SIGUSR1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
printf("kill sucess\n");
printf("kill success\n");
ret = waitpid(pid, &status, 0);
ICUNIT_ASSERT_EQUAL(ret, pid, ret);
ICUNIT_ASSERT_EQUAL(WEXITSTATUS(status), LOS_OK, WEXITSTATUS(status));
......
......@@ -35,7 +35,7 @@ static int g_sigCount = 0;
static void SigPrint(int sig)
{
g_sigCount++;
printf("signal receive sucess\n");
printf("signal receive success\n");
}
static UINT32 TestCase(VOID)
......@@ -68,7 +68,7 @@ static UINT32 TestCase(VOID)
sleep(1);
ret = kill(pid, SIGUSR1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
printf("kill sucess\n");
printf("kill success\n");
wait(&ret);
ICUNIT_ASSERT_EQUAL(WEXITSTATUS(ret), LOS_OK, WEXITSTATUS(ret));
return LOS_OK;
......
......@@ -36,13 +36,13 @@ static int g_sigCount1 = 0;
static void SigPrint(int sig)
{
g_sigCount++;
printf("signal receive sucess\n");
printf("signal receive success\n");
}
static void SigPrint1(int sig)
{
g_sigCount1++;
printf("signal receive sucess\n");
printf("signal receive success\n");
}
static UINT32 TestCase(VOID)
......
......@@ -37,7 +37,7 @@ static void SigPrint(int sig)
{
(void)sig;
g_sigCount++;
printf("signal receive sucess\n");
printf("signal receive success\cn");
}
static UINT32 TestCase(VOID)
......
......@@ -36,7 +36,7 @@ static void SigPrint(int sig)
{
(void)sig;
g_sigCount++;
printf("signal receive sucess\n");
printf("signal receive success\n");
}
static UINT32 TestCase(VOID)
......
......@@ -32,18 +32,36 @@
#include <libintl.h>
#include <locale.h>
const int domain_name_length = 10;
const int buffer_size = 50;
static UINT32 testcase(VOID)
{
char *s = "";
char domain[buffer_size], tmp[domain_name_length];
srand(time(NULL));
for (int i = 0, r = 0; i < domain_name_length; i++) {
r = rand() % 36; // 36: 0-9 and a-z
if (r < 10) { // 10: 0-9
tmp[i] = '0' + r;
} else {
tmp[i] = 'a' + r;
}
}
int ret = sprintf_s(domain, sizeof(domain), "www.%s.com", tmp);
if (ret == 0) {
printf("sprinf_s failed\n");
return LOS_NOK;
}
setlocale(LC_ALL, "");
textdomain("gettext_demo");
bindtextdomain("gettext_demo", ".");
bind_textdomain_codeset("gettext_demo", "UTF-8");
printf(dcgettext("www.huawei.com", "TestString1\n", LC_MESSAGES));
printf(dcgettext(domain, "TestString1\n", LC_MESSAGES));
s = dcgettext("www.huawei.com", "TestString1\n", LC_MESSAGES);
s = dcgettext(domain, "TestString1\n", LC_MESSAGES);
printf("[INFO]%s:%d,%s,s=%s\n", __FILE__, __LINE__, __func__, s);
ICUNIT_ASSERT_STRING_EQUAL(s, "TestString1\n", s);
setlocale(LC_ALL, "C");
......
......@@ -30,7 +30,7 @@
*/
#include "It_test_sys.h"
#define TEST_PASSWORD (char *)"test1234"
const int password_length = 10;
static UINT32 TestCase(VOID)
{
......@@ -39,14 +39,24 @@ static UINT32 TestCase(VOID)
char *key = NULL;
char slat[2];
int ret;
char test_password[password_length];
srand(time(NULL));
for (int i = 0, r = 0; i < password_length; i++) {
r = rand() % 36; // 36: 0-9 and a-z
if (r < 10) { // 10: 0-9
test_password[i] = '0' + r;
} else {
test_password[i] = 'a' + r;
}
}
key = TEST_PASSWORD;
key = test_password;
slat[0] = key[0];
slat[1] = key[1];
passwd1 = crypt(key, slat);
ICUNIT_GOTO_NOT_EQUAL(passwd1, NULL, passwd1, EXIT);
key = TEST_PASSWORD;
key = test_password;
slat[0] = passwd1[0];
slat[1] = passwd1[1];
passwd2 = crypt(key, slat);
......
......@@ -32,21 +32,31 @@
#include <lt_net_resolv.h>
const int buffer_size = 20;
static int EtherAtonTest(void)
{
struct ether_addr *eaddr = ether_aton("01::EF");
ICUNIT_ASSERT_EQUAL(eaddr, NULL, -1);
eaddr = ether_aton("2C:9D:1E:4A:41:55");
char mac_addr[buffer_size], *tmp = mac_addr;
int r[ETH_ALEN];
srand(time(NULL));
for (int i = 0; i < ETH_ALEN; i++) {
r[i] = rand() % 0xff;
}
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(mac_addr, sizeof(mac_addr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
eaddr = ether_aton(mac_addr);
ICUNIT_ASSERT_NOT_EQUAL(eaddr, NULL, -1);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], 0x2C, eaddr->ether_addr_octet[0]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], 0x9D, eaddr->ether_addr_octet[1]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], 0x1E, eaddr->ether_addr_octet[2]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], 0x4A, eaddr->ether_addr_octet[3]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], 0x41, eaddr->ether_addr_octet[4]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], 0x55, eaddr->ether_addr_octet[5]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], r[0], eaddr->ether_addr_octet[0]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], r[1], eaddr->ether_addr_octet[1]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], r[2], eaddr->ether_addr_octet[2]); // 2: compare r[2] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], r[3], eaddr->ether_addr_octet[3]); // 3: compare r[3] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], r[4], eaddr->ether_addr_octet[4]); // 4: compare r[4] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], r[5], eaddr->ether_addr_octet[5]); // 5: compare r[5] with eaddr
return ICUNIT_SUCCESS;
}
......
......@@ -32,6 +32,8 @@
#include <lt_net_resolv.h>
const int buffer_size = 20;
static int EtherAtonrTest(void)
{
struct ether_addr addr;
......@@ -39,15 +41,23 @@ static int EtherAtonrTest(void)
ICUNIT_ASSERT_EQUAL(eaddr, NULL, -1);
eaddr = ether_aton_r("2c:9d:1e:4A:41:55", &addr);
char mac_addr[buffer_size], *tmp = mac_addr;
int r[ETH_ALEN];
srand(time(NULL));
for (int i = 0; i < ETH_ALEN; i++) {
r[i] = rand() % 0xff;
}
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(mac_addr, sizeof(mac_addr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
eaddr = ether_aton_r(mac_addr, &addr);
ICUNIT_ASSERT_EQUAL(eaddr, &addr, -1);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], 0x2c, eaddr->ether_addr_octet[0]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], 0x9d, eaddr->ether_addr_octet[1]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], 0x1e, eaddr->ether_addr_octet[2]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], 0x4a, eaddr->ether_addr_octet[3]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], 0x41, eaddr->ether_addr_octet[4]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], 0x55, eaddr->ether_addr_octet[5]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], r[0], eaddr->ether_addr_octet[0]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], r[1], eaddr->ether_addr_octet[1]);
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], r[2], eaddr->ether_addr_octet[2]); // 2: compare r[2] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], r[3], eaddr->ether_addr_octet[3]); // 3: compare r[3] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], r[4], eaddr->ether_addr_octet[4]); // 4: compare r[4] with eaddr
ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], r[5], eaddr->ether_addr_octet[5]); // 5: compare r[5] with eaddr
return ICUNIT_SUCCESS;
}
......
......@@ -32,13 +32,26 @@
#include <lt_net_resolv.h>
const int buffer_size = 20;
static int EtherNtoaTest(void)
{
struct ether_addr addr = {{11,12,13,14,15,16}}, *eaddr = &addr;
struct ether_addr addr, *eaddr = &addr;
srand(time(NULL));
int r[ETH_ALEN];
for (int i = 0; i < ETH_ALEN; i++) {
r[i] = rand() % 16; // 16: 0x0-0xf
eaddr->ether_addr_octet[i] = r[i];
}
char *buf = ether_ntoa(eaddr);
char str1[buffer_size], str2[buffer_size];
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(str1, sizeof(str1), "%x:%x:%x:%x:%x:%x", r[0], r[1], r[2], r[3], r[4], r[5]);
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(str2, sizeof(str2), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
ICUNIT_ASSERT_NOT_EQUAL(buf, 0, -1);
ICUNIT_ASSERT_EQUAL((stricmp("b:c:d:e:f:10", buf) == 0 || stricmp("0b:0c:0d:0e:0f:10", buf) == 0), 1, printf("%s\n", buf));
ICUNIT_ASSERT_EQUAL((stricmp(str1, buf) == 0 || stricmp(str2, buf) == 0), 1, printf("%s\n", buf));
return ICUNIT_SUCCESS;
}
......
......@@ -31,13 +31,27 @@
#include <lt_net_resolv.h>
const int buffer_size = 20;
static int EtherNtoarTest(void)
{
struct ether_addr addr = {{11,12,13,4,15,16}}, *eaddr = &addr;
struct ether_addr addr, *eaddr = &addr;
srand(time(NULL));
int r[ETH_ALEN];
for (int i = 0; i < ETH_ALEN; i++) {
r[i] = rand() % 16; // 16: 0x0-0xf
eaddr->ether_addr_octet[i] = r[i];
}
char buf[100], *p = ether_ntoa_r(eaddr, buf);
char str1[buffer_size], str2[buffer_size];
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(str1, sizeof(str1), "%x:%x:%x:%x:%x:%x", r[0], r[1], r[2], r[3], r[4], r[5]);
// 0, 1, 2, 3, 4, 5: 6 elements of mac address.
(void)sprintf_s(str2, sizeof(str2), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
ICUNIT_ASSERT_EQUAL(p, buf, (intptr_t)p);
ICUNIT_ASSERT_EQUAL((stricmp("b:c:d:4:f:10", buf) == 0 || stricmp("0b:0c:0d:04:0f:10", buf) == 0), 1, printf("%s\n", p));
ICUNIT_ASSERT_EQUAL((stricmp(str1, buf) == 0 || stricmp(str2, buf) == 0), 1, printf("%s\n", p));
return ICUNIT_SUCCESS;
}
......
......@@ -355,7 +355,7 @@ endif
LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos
################################## Driver Option Begin #################################
ifeq ($(LOSCFG_DRIVERS_HDF), y)
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/hdf_lite.mk
include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/hdf_lite.mk
endif
ifeq ($(LOSCFG_DRIVERS_HIEVENT), y)
......
git add -A
git commit -m ' 感谢这十二位小伙伴的赞助!
git commit -m ' 同步官方源码
鸿蒙研究站 | http://weharmonyos.com (国内)
| https://weharmony.github.io (国外)
论坛 | http://bbs.weharmonyos.com
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册