Skip to content

Commit b8d6071

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 632221e + 63c12fd commit b8d6071

File tree

2,109 files changed

+791950
-686727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,109 files changed

+791950
-686727
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
/*----------------------------------------------------------------------------
2-
* Copyright (c) <2013-2015>, <Huawei Technologies Co., Ltd>
3-
* All rights reserved.
4-
* Redistribution and use in source and binary forms, with or without modification,
5-
* are permitted provided that the following conditions are met:
6-
* 1. Redistributions of source code must retain the above copyright notice, this list of
7-
* conditions and the following disclaimer.
8-
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
9-
* of conditions and the following disclaimer in the documentation and/or other materials
10-
* provided with the distribution.
11-
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
12-
* to endorse or promote products derived from this software without specific prior written
13-
* permission.
14-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
15-
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
16-
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17-
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
18-
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19-
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20-
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
21-
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
22-
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24-
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25-
*---------------------------------------------------------------------------*/
26-
/*----------------------------------------------------------------------------
27-
* Notice of Export Control Law
28-
* ===============================================
29-
* Huawei LiteOS may be subject to applicable export control laws and regulations, which might
30-
* include those applicable to Huawei LiteOS of U.S. and the country in which you are located.
31-
* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance with such
32-
* applicable export control laws and regulations.
33-
*---------------------------------------------------------------------------*/
34-
35-
#ifndef _LOS_SYS_INC
36-
#define _LOS_SYS_INC
37-
38-
#include "los_sys.ph"
39-
40-
#ifdef __cplusplus
41-
#if __cplusplus
42-
extern "C" {
43-
#endif /* __cplusplus */
44-
#endif /* __cplusplus */
45-
46-
47-
/**
48-
* @ingroup los_sys
49-
*Number of operable bits of a 32-bit operand
50-
*/
51-
#define OS_SYS_MV_32_BIT 32
52-
53-
/**
54-
* @ingroup los_sys
55-
*Number of milliseconds in one second.
56-
*/
57-
#define OS_SYS_MS_PER_SECOND 1000
58-
59-
/**
60-
* @ingroup los_sys
61-
*Number of microseconds in one second.
62-
*/
63-
#define OS_SYS_US_PER_SECOND 1000000
64-
65-
/**
66-
* @ingroup los_sys
67-
*The maximum length of name.
68-
*/
69-
#define OS_SYS_APPVER_NAME_MAX 64
70-
71-
/**
72-
* @ingroup los_sys
73-
*The magic word.
74-
*/
75-
#define OS_SYS_MAGIC_WORD 0xAAAAAAAA
76-
77-
/**
78-
* @ingroup los_sys
79-
*The initialization value of stack space.
80-
*/
81-
#define OS_SYS_EMPTY_STACK 0xCACACACA
82-
83-
84-
#ifdef __cplusplus
85-
#if __cplusplus
86-
}
87-
#endif /* __cplusplus */
88-
#endif /* __cplusplus */
89-
90-
#endif /* _LOS_SYS_INC */
1+
/*----------------------------------------------------------------------------
2+
* Copyright (c) <2013-2015>, <Huawei Technologies Co., Ltd>
3+
* All rights reserved.
4+
* Redistribution and use in source and binary forms, with or without modification,
5+
* are permitted provided that the following conditions are met:
6+
* 1. Redistributions of source code must retain the above copyright notice, this list of
7+
* conditions and the following disclaimer.
8+
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
9+
* of conditions and the following disclaimer in the documentation and/or other materials
10+
* provided with the distribution.
11+
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
12+
* to endorse or promote products derived from this software without specific prior written
13+
* permission.
14+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
15+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
16+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
18+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
21+
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
22+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23+
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24+
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
*---------------------------------------------------------------------------*/
26+
/*----------------------------------------------------------------------------
27+
* Notice of Export Control Law
28+
* ===============================================
29+
* Huawei LiteOS may be subject to applicable export control laws and regulations, which might
30+
* include those applicable to Huawei LiteOS of U.S. and the country in which you are located.
31+
* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance with such
32+
* applicable export control laws and regulations.
33+
*---------------------------------------------------------------------------*/
34+
35+
#ifndef _LOS_SYS_INC
36+
#define _LOS_SYS_INC
37+
38+
#include "los_sys.ph"
39+
40+
#ifdef __cplusplus
41+
#if __cplusplus
42+
extern "C" {
43+
#endif /* __cplusplus */
44+
#endif /* __cplusplus */
45+
46+
47+
/**
48+
* @ingroup los_sys
49+
*Number of operable bits of a 32-bit operand
50+
*/
51+
#define OS_SYS_MV_32_BIT 32
52+
53+
/**
54+
* @ingroup los_sys
55+
*Number of milliseconds in one second.
56+
*/
57+
#define OS_SYS_MS_PER_SECOND 1000
58+
59+
/**
60+
* @ingroup los_sys
61+
*Number of microseconds in one second.
62+
*/
63+
#define OS_SYS_US_PER_SECOND 1000000
64+
65+
/**
66+
* @ingroup los_sys
67+
*The maximum length of name.
68+
*/
69+
#define OS_SYS_APPVER_NAME_MAX 64
70+
71+
/**
72+
* @ingroup los_sys
73+
*The magic word.
74+
*/
75+
#define OS_SYS_MAGIC_WORD 0xAAAAAAAA
76+
77+
/**
78+
* @ingroup los_sys
79+
*The initialization value of stack space.
80+
*/
81+
#define OS_SYS_EMPTY_STACK 0xCACACACA
82+
83+
84+
#ifdef __cplusplus
85+
#if __cplusplus
86+
}
87+
#endif /* __cplusplus */
88+
#endif /* __cplusplus */
89+
90+
#endif /* _LOS_SYS_INC */

0 commit comments

Comments
 (0)