Bernard Xiong
|
9c255e7d2f
|
Merge pull request #1899 from hichard/master
修复iar dlib时间映射函数的函数声明,适应不同版本的iar
|
2018-10-18 00:35:22 +08:00 |
armink
|
e2b5fcd074
|
[component][at] Add some #ifdef on source code.
|
2018-10-16 10:31:21 +08:00 |
armink
|
8cae067452
|
[component][sal] Add some #ifdef on source code.
|
2018-10-16 10:31:06 +08:00 |
hichard
|
61656e23f2
|
修复iar dlib时间映射函数的函数声明,适应不同版本的iar
|
2018-10-15 19:45:16 +08:00 |
eddylin83
|
65340e46e3
|
fix at socket issue,online AT package might be fixed too(at_socket_device_register spell mistake)
|
2018-10-15 13:02:33 +08:00 |
Bernard Xiong
|
070248bb04
|
Update spi_flash_w25qxx.c
|
2018-10-15 09:23:58 +08:00 |
Bernard Xiong
|
b5e9927b85
|
[license] Change the license of FS/DFS to Apache.
|
2018-10-15 01:46:07 +08:00 |
Bernard Xiong
|
e320de70b6
|
[license] Change the license of SAL to Apache.
|
2018-10-15 01:23:33 +08:00 |
Bernard Xiong
|
4bbfaf9333
|
[license] Change the license of VBUS to Apache.
|
2018-10-15 01:20:56 +08:00 |
Bernard Xiong
|
e158d48de0
|
[license] Fix the bad license replace.
|
2018-10-15 00:50:04 +08:00 |
Bernard Xiong
|
2c0640a178
|
[license] Change license to Apache.
|
2018-10-14 19:37:18 +08:00 |
Bernard Xiong
|
9064b28c2a
|
[license] Change license to Apache.
|
2018-10-14 19:28:18 +08:00 |
Bernard Xiong
|
cc883ad29a
|
Merge pull request #1891 from qgyhd1234/dfs
[dfs] fix ioctl getflag/setflag issue.
|
2018-10-14 10:21:54 +08:00 |
Bernard Xiong
|
aa4d0903c5
|
Merge pull request #1884 from linuxhan/master
sal框架,使用at设备,UDP通讯数据无法获得
|
2018-10-13 13:42:47 +08:00 |
zylx
|
8431c05635
|
[dfs] fix ioctl getflag/setflag issue.
|
2018-10-13 10:23:47 +08:00 |
armink
|
4e578b0042
|
[component][at] Change the license to Apache-2.0.
|
2018-10-12 16:02:20 +08:00 |
armink
|
405fce917a
|
[component][at] Move at log from at.h to at_log.h .
|
2018-10-12 15:54:09 +08:00 |
armink
|
e9ffd2b2ef
|
[component][at] Move at module version number definition to Kconfig file.
|
2018-10-12 15:48:40 +08:00 |
ZYH
|
e00364c5e4
|
[Components][SDIO]修复脏值调用
|
2018-10-12 11:22:05 +08:00 |
linuxhan
|
b6968d2999
|
Update at_socket.c
|
2018-10-11 22:41:13 +08:00 |
linuxhan
|
13a8afa2d4
|
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
|
2018-10-11 22:34:40 +08:00 |
linuxhan
|
f93fb14a12
|
修复SAL框架下AT设备UDP通讯无法接收到数据问题
|
2018-10-11 22:31:30 +08:00 |
chenyong
|
d154c3e936
|
[net][sal] Add WIZnet chips TCP/IP address family support
Signed-off-by: chenyong <1521761801@qq.com>
|
2018-10-11 13:47:13 +08:00 |
SASANO Takayoshi
|
777554bb86
|
Fixed undefined reference to 'dlmodule_relocate'
This is caused by #ifdef __x86__
For x86(32bit) gcc, pre-defined macro is __i386__ not __x86__.
|
2018-10-10 15:38:24 +09:00 |
Bernard Xiong
|
65fc7421e0
|
Merge pull request #1871 from uestczyh222/master
[Components][USB]增加健壮性
|
2018-10-09 19:54:10 +08:00 |
Bernard Xiong
|
05101c4bba
|
Merge pull request #1789 from liruncong/dev-usb
修正drivers下一处bug,并修正armclang编译时该目录下的错误或警告
|
2018-10-09 13:49:52 +08:00 |
ZYH
|
2b7488ca85
|
[Components][USB]更新license
|
2018-10-09 11:43:35 +08:00 |
ZYH
|
f73e4c3fc4
|
[Compoments][USB]增加对class的非法注册的判断
|
2018-10-09 11:41:38 +08:00 |
ZYH
|
294223c80b
|
[Components][USB]修复当未开启复合设备时HID编译失败
|
2018-10-09 11:32:41 +08:00 |
hichard
|
3b957d7516
|
修复IAR的dlib时间映射,支持64bit的时间。
|
2018-10-08 22:13:38 +08:00 |
xuzhuoyi
|
472ca31d50
|
[libc] Remove redefinition in minilibc/errno.h
|
2018-10-06 15:44:10 +08:00 |
Bernard Xiong
|
0cd2c10627
|
Merge pull request #1833 from uestczyh222/sdio
Fix some bugs for sdio
|
2018-09-30 12:01:06 +08:00 |
ZYH
|
2e74539130
|
[Components][SDIO]fix 'rocr' declared without an initial value
|
2018-09-30 11:01:06 +08:00 |
Bernard Xiong
|
fcb62b80da
|
[libc] Add _EXFUN judgement
|
2018-09-30 09:41:43 +08:00 |
weety
|
84ffe47bb5
|
Fixed Kconfig spelling mistake.
|
2018-09-29 22:54:28 +08:00 |
guozhanxin
|
12b7634c62
|
[components][drivers][pwm] Add rt_pwm_disable function and API Interface
|
2018-09-26 17:29:39 +08:00 |
Bernard Xiong
|
32939be90c
|
[libc] Fix the fputc issue when enable microlib.
|
2018-09-25 11:04:02 +08:00 |
Bernard Xiong
|
b49859582a
|
[libc] Fix the fputc issue when use microlib.
|
2018-09-23 14:43:21 +08:00 |
Bernard Xiong
|
b98a0ba804
|
[Kernel] Add ARMCC 6.x support.
|
2018-09-23 12:08:44 +08:00 |
ZYH
|
780f538525
|
[Components][SDIO][MMC] fix null point check
|
2018-09-22 15:02:48 +08:00 |
ZYH
|
3d69c44ab8
|
[Components][SDIO]fix Null point access
|
2018-09-22 14:56:55 +08:00 |
ZYH
|
f6be7abb2d
|
[Components][SDIO]block 'err' declared without an initial value
|
2018-09-22 14:53:08 +08:00 |
ZYH
|
f260f7effd
|
[Components][SDIO]fix Assigned value is garbage or undefined
|
2018-09-22 14:49:47 +08:00 |
Bernard Xiong
|
b5202d17fb
|
Merge branch 'master' into dev
|
2018-09-21 17:09:46 +08:00 |
Bernard Xiong
|
a13565ce26
|
Merge pull request #1825 from heyuanjie87/mtd-kenghuo-cla
添加新的mtd接口
|
2018-09-20 18:16:21 +08:00 |
guozhanxin
|
42d181307e
|
[components][dfs][ramfs] add RT_Object_Class_MemHeap flag for ramfs->memheap
|
2018-09-20 12:03:29 +08:00 |
heyuanjie87
|
b620c10014
|
更改许可
|
2018-09-20 09:41:05 +08:00 |
luofanlu
|
d65424a51b
|
Update at_client.c
correct a spelling mistake
|
2018-09-19 22:53:22 +08:00 |
tangyuxin
|
f7423741f2
|
[DeviceDriver][wlan] 已知问题修复
1.Kconfig添加DEBUG选项
2.函数入参检查
3.修复拼写错误及逻辑错误
4.低功耗可以设定等级
5.移除残留中文注释
|
2018-09-19 15:06:24 +08:00 |
heyuanjie87
|
3e71dc88f3
|
更改许可信息
|
2018-09-19 10:09:38 +08:00 |
heyuanjie87
|
bc5a5f89e9
|
添加新的mtd接口
|
2018-09-18 18:41:33 +08:00 |
Bernard Xiong
|
ef4f904096
|
Merge pull request #1824 from yangfasheng/master
update armlibc/stdio.c
|
2018-09-18 18:38:57 +08:00 |
yangfasheng
|
f31b11de78
|
update armlibc/stdio.c
Signed-off-by: yangfasheng <yangfasheng@rt-thread.com>
|
2018-09-18 17:53:28 +08:00 |
ZYH
|
9a666099aa
|
[Components][Drivers][hwtimer]fix 'index' declared without an initial value
|
2018-09-18 15:30:52 +08:00 |
chenyong
|
e2706c14b1
|
[net][at] Fix AT Socket select send data issue.
|
2018-09-17 18:07:26 +08:00 |
ZYH
|
cc8ab15472
|
[Components][Drivers][SPI]fix "Value stored to 'result' is never read"
|
2018-09-17 10:06:54 +08:00 |
Bernard Xiong
|
277e0bc177
|
Merge pull request #1814 from parai/master
bring up dlmoudle on x86
|
2018-09-15 15:53:31 +08:00 |
parai.wang
|
133a42fbb7
|
bring up dlmoudle on x86
|
2018-09-15 13:32:42 +08:00 |
tangyuxin
|
324bfc5897
|
[DeviceDriver][wlan] add new wlan framework
|
2018-09-15 10:16:04 +08:00 |
Bluebear233
|
ad1d6600b8
|
Update libc.c
修复没有使用RT_USING_CONSOLE时,libc.c编译报错
|
2018-09-15 00:32:36 +08:00 |
chenyong
|
3302ef9d65
|
[net][at] Add at_client_recv function receive data timeout
|
2018-09-14 19:31:43 +08:00 |
chenyong
|
8f95b78da2
|
[net][at] fix at select receive event change issue.
|
2018-09-14 19:25:45 +08:00 |
Bernard Xiong
|
6e3e9cc076
|
Merge pull request #1796 from armink/rbb
[DeviceDriver] Add rbb (ring block buffer) data structure.
|
2018-09-12 21:32:25 +08:00 |
Bernard Xiong
|
e59aa648b3
|
Merge pull request #1798 from HubertXie/master
Update sal_socket.c
|
2018-09-12 15:37:59 +08:00 |
HubretXie
|
e14330daf9
|
Update sal_socket.c
|
2018-09-12 10:26:46 +08:00 |
HubretXie
|
8edb978c9a
|
Update at_client.c
修复LOG_X修改引起的编译错误
|
2018-09-12 10:22:31 +08:00 |
HubretXie
|
e045c656f0
|
Update at_socket.c
修复LOG_X修改引起的编译错误
|
2018-09-12 10:22:00 +08:00 |
armink
|
dff8a2c513
|
[DeviceDriver] Add rbb (ring block buffer) data structure.
|
2018-09-12 08:59:58 +08:00 |
liruncong
|
ba20a00e19
|
_sys_command_string返回值错误,no support时cmd为随机数据,可能导致c库初始化时在此函数返回处死循环或跑飞.
|
2018-09-11 23:36:01 +08:00 |
HubretXie
|
8a9646b613
|
Update sal_socket.c
修复关闭socket时的Bug
|
2018-09-11 22:26:17 +08:00 |
Bernard Xiong
|
b1bbf434a6
|
Merge pull request #1795 from liruncong/armlibc
armlibc下malloc/realloc/calloc函数声明同一更正
|
2018-09-11 20:52:08 +08:00 |
liruncong
|
f61c2fb882
|
armlibc下malloc/realloc/calloc声明同一更正
|
2018-09-11 19:46:08 +08:00 |
Bernard Xiong
|
7d3f38e4f6
|
Merge pull request #1790 from liruncong/dev-dfs
dfs_uffs_getdents函数声明问题修正
|
2018-09-11 19:08:47 +08:00 |
Bernard Xiong
|
651d895391
|
Merge pull request #1788 from liruncong/dev
修正打开"Support C++ features"后gcc编译失败问题
|
2018-09-11 19:03:41 +08:00 |
Bernard Xiong
|
8c2448a4d4
|
Merge pull request #1774 from EvalZero/sdio_dev
[DeviceDriver][SDIO] Update sdio debug log.
|
2018-09-11 19:03:10 +08:00 |
liruncong
|
b8b711d0a7
|
修正参数类型不匹配问题. uint32_t为unsigned int, 而rt_uint32_t为unsigned long
注: armclang编译器报错
|
2018-09-10 19:51:15 +08:00 |
liruncong
|
7b788014f7
|
修正drivers下,armclang编译时的警告或错误 注:vcom_tx_thread_entry下, if(!res & CDC_TX_HAS_DATE)应为bug.
|
2018-09-10 19:40:08 +08:00 |
liruncong
|
4496437a91
|
8. _init/_fini加入RT_WEAK,与库中定义重复,以便通过通过travis ci的gcc自定编译.
|
2018-09-10 19:20:38 +08:00 |
weety
|
799c5e4ea2
|
[sdio] Fixed merge error.
|
2018-09-09 22:07:06 +08:00 |
weety
|
e19cfd4571
|
[sdio] Fixed issue for requset size calculation.
|
2018-09-09 21:20:08 +08:00 |
weety
|
02a2b78943
|
[sdio] Fixed error for dma size calculation.
|
2018-09-09 14:05:45 +08:00 |
weety
|
618e185cd3
|
[sdio] Limit the data size per request based on the sdio controller driver configuration parameters.
|
2018-09-08 23:21:13 +08:00 |
Bernard Xiong
|
6fcc5c5504
|
Merge pull request #1777 from zhaojuntao/ymodem-0906
[components][ymodem] 修复 ymodem 不支持 secureCRT 下 1024字节传输的问题
|
2018-09-07 06:41:24 +08:00 |
MurphyZhao
|
dcbbb05f50
|
[components][ymodem] 修复 ymodem 不支持 secureCRT 下 1024字节传输的问题
Signed-off-by: MurphyZhao <d2014zjt@163.com>
|
2018-09-06 11:02:49 +08:00 |
Bernard Xiong
|
c125c711a3
|
Merge pull request #1773 from weety/pyconfig
Pyconfig
|
2018-09-05 21:26:30 +08:00 |
weety
|
ae6f47e274
|
Solve the problem of RT_USING_DFS cyclic dependency.
|
2018-09-05 20:52:16 +08:00 |
shauew
|
eda579a156
|
修改源文件中的断言指令
避免编译报错!
|
2018-09-05 17:19:59 +08:00 |
EvalZero
|
2c01189114
|
[DeviceDriver][SDIO] Update sdio debug log.
|
2018-09-05 14:50:43 +08:00 |
Bernard Xiong
|
6abe7e4ebd
|
Merge pull request #1771 from Lawlieta/chenyong
[net][sal] Fix close/shutdown memory leak issue.
|
2018-09-05 11:18:51 +08:00 |
weety
|
d344ff5a9e
|
Merge branch 'pyconfig' of https://github.com/weety/rt-thread into pyconfig
|
2018-09-05 09:40:12 +08:00 |
weety
|
5e7c56add2
|
Fix dependency loop issue.
|
2018-09-05 09:35:34 +08:00 |
chenyong
|
1571ef5acf
|
[net][sal] Fix close/shutdown memory leak issue.
|
2018-09-04 11:02:48 +08:00 |
Bernard Xiong
|
10de75faf2
|
Merge pull request #1744 from liruncong/master
消除usb结构体gcc编译时的相关警告
|
2018-09-03 14:00:45 +08:00 |
liruncong
|
d3c08afd75
|
1. 保留目前未用到的rt_usbd_ep_unassign函数,暂时移除static属性,消除警告.
2. 修改一处存在多余括号问题. armclang有警告发出.
|
2018-09-02 22:39:51 +08:00 |
Bernard Xiong
|
3632693141
|
Merge pull request #1759 from Lawlieta/chenyong
[net][sal] Fix accept create new socket failed issue.
|
2018-09-02 12:47:05 +08:00 |
chenyong
|
39f3f93ec1
|
[net][sal] Fix accept create new socket failed issue.
|
2018-09-01 19:42:33 +08:00 |
Bernard Xiong
|
11479e53bd
|
[lwIP] Fix the wait queue initialization issue.
|
2018-09-01 13:32:03 +08:00 |
Bernard Xiong
|
ab1a220eae
|
[components] Remove lwP from v3.1.0
|
2018-09-01 12:03:32 +08:00 |
Bernard Xiong
|
ba5c1bea44
|
[dlmodule] Add cache ops in dlmodule.
|
2018-09-01 11:00:42 +08:00 |
Bernard Xiong
|
d203e3820b
|
Merge pull request #1753 from Lawlieta/chenyong
[net][at] Modify 'AT+CLOSE' processing method
|
2018-08-31 18:41:55 +08:00 |
Bernard Xiong
|
07ec7e686d
|
Merge pull request #1754 from liangyongxiang/rt-used
add RT_USED to component init and finsh shell
|
2018-08-31 18:41:44 +08:00 |
Bernard Xiong
|
d74d5801c8
|
Merge pull request #1751 from RT-Thread/feature_libdl
[Kernel] move module to libc/libdl.
|
2018-08-31 18:41:16 +08:00 |
chenyong
|
02c1f0c621
|
[net][at] Add AT Client Error LOG for multiple clients
|
2018-08-31 17:24:26 +08:00 |
Bernard Xiong
|
75c8515f1a
|
[dlmodule] Add priority and stack size option for dlmodule.
|
2018-08-31 15:02:48 +08:00 |
liang yongxiang
|
7c0c1c1b4a
|
[finsh] add RT_USED to macro FINSH_FUNCTION_EXPORT_CMD and FINSH_VAR_EXPORT
|
2018-08-31 15:02:01 +08:00 |
chenyong
|
33a5cf15ee
|
[net][at] Modify AT socket object release judgment
|
2018-08-31 14:45:40 +08:00 |
chenyong
|
a3ea0565cf
|
Merge remote-tracking branch 'remotes/rtt/master' into chenyong
|
2018-08-31 14:09:08 +08:00 |
chenyong
|
a8c9b2fee3
|
[net][at] Modify 'AT+CLOSE' processing method
|
2018-08-31 14:08:04 +08:00 |
Bernard Xiong
|
efe4523132
|
[Kernel] move module tolibc/libdl.
|
2018-08-30 20:27:45 +08:00 |
Bernard Xiong
|
f7d19319ab
|
Merge pull request #1749 from chenyong111/chenyong
Add AT multiple client support
|
2018-08-30 12:59:42 +08:00 |
shauew
|
4fb344e759
|
Update portserial_m.c
sorry, miss out other two parts.
|
2018-08-30 09:10:52 +08:00 |
chenyong
|
87c35d4e2f
|
[net][at] Add AT Socket select SAL
|
2018-08-29 20:40:07 +08:00 |
chenyong
|
cf96dfcbdb
|
Merge branch 'master' into chenyong
|
2018-08-29 19:41:29 +08:00 |
shauew
|
eea0b9ebf2
|
Update portserial_m.c
add macro to aviod compile error with:
rt_pin_mode(MODBUS_MASTER_RT_CONTROL_PIN_INDEX, PIN_MODE_OUTPUT);
|
2018-08-29 18:31:32 +08:00 |
Bernard Xiong
|
7bba75753c
|
Merge pull request #1742 from jesven/master
Move configs of VBUS to Kconfig, delete related head files in the bsp…
|
2018-08-28 17:21:57 +08:00 |
chenyong
|
ed7f0cad8b
|
[net][at] Add AT multiple client support
|
2018-08-28 11:59:30 +08:00 |
liruncong
|
923d6fe33d
|
消除usb结构体gcc编译时的相关警告
|
2018-08-28 03:18:39 +08:00 |
chenyong
|
6d702e579f
|
[net][sal] Remove DFS dependencies in the SAL
|
2018-08-27 19:50:37 +08:00 |
chenyong
|
2d894b4102
|
[net][at] Modify AT Socket object callback name
|
2018-08-27 19:44:04 +08:00 |
shaojinchun
|
03cd2c005d
|
Add the definition of RT_VBUS_USING_FLOW_CONTROL to vbus_api.h
|
2018-08-27 18:33:03 +08:00 |
shaojinchun
|
84e8c65683
|
RT_VMM_RB_BLK_NR now is calculated from _RT_VBUS_RING_SZ
|
2018-08-27 18:15:38 +08:00 |
shaojinchun
|
000887795f
|
Move configs of VBUS to Kconfig, delete related head files in the bsp directory
|
2018-08-27 15:37:08 +08:00 |
chenyong
|
fc73538153
|
[net][sal/at] Add components C++ support
|
2018-08-27 09:56:41 +08:00 |
chenyong
|
192b177518
|
[at][sal] Add query and unregistered protocol family functions
|
2018-08-25 16:01:31 +08:00 |
chenyong
|
0d737de882
|
[net][at] Modify AT Socket log information, fix at_freeaddrinfo() implement
|
2018-08-24 20:32:14 +08:00 |
MurphyZhao
|
3b161b58f2
|
[component][ymodem] Fix compilation warning in MDK
Signed-off-by: MurphyZhao <d2014zjt@163.com>
|
2018-08-23 17:23:03 +08:00 |
armink
|
9ef9e4b0f8
|
[DeviceDriver][SFUD] Update sfud to v1.0.6 latest version.
|
2018-08-22 16:48:17 +08:00 |
armink
|
bc7a43bdaf
|
[DeviceDriver][SFUD] Replace the vsnprintf to rt_vsnprintf.
|
2018-08-22 16:41:56 +08:00 |
chenyong
|
366fea22dc
|
[net][at] Delete AT Client port function
|
2018-08-21 14:12:28 +08:00 |
chenyong
|
c2e6f20caf
|
[net][at] Modify the AT client initialization process, delete AT socket automatic initialization.
|
2018-08-21 12:05:09 +08:00 |
chenyong
|
622fa0e7ce
|
[net][at] Fix receive error data when AT CLI exits.
|
2018-08-21 09:35:21 +08:00 |
MurphyZhao
|
651149fcbb
|
[components/drivers/spi] 增加 sfud flash 设备查找接口
Signed-off-by: MurphyZhao <d2014zjt@163.com>
|
2018-08-16 14:48:46 +08:00 |
heyuanjie87
|
18510fa80f
|
Update select.c
|
2018-08-14 09:33:22 +08:00 |
heyuanjie87
|
c90b449dac
|
Update select.c
|
2018-08-13 22:42:09 +08:00 |
heyuanjie87
|
d948dba42a
|
update select.c
|
2018-08-12 20:41:56 +08:00 |
heyuanjie
|
fd209cb880
|
[lwp]添加select系统调用
|
2018-08-12 20:26:16 +08:00 |
neverxie
|
3a83e5524f
|
[components][pipe] Fix 'pipe' command close bug when open failed.
|
2018-08-11 18:45:18 +08:00 |
zylx
|
f3bce48502
|
[net][at] add at_client_wait_connect
|
2018-08-08 18:18:03 +08:00 |
chenyong
|
05c3af1ee1
|
[net][sal] Add shutdown type options.
|
2018-08-06 15:06:29 +08:00 |
guochuangjian
|
3de51fe256
|
fix usRcvBufferPos == MB_SER_PDU_SIZE_MAX bug
|
2018-08-05 15:08:50 +08:00 |
zylx
|
f166ac946b
|
[net][at] fix server repeated enter issue
|
2018-08-04 18:47:01 +08:00 |
zylx
|
e5d9bb9013
|
[net][at] fix repeated enter issue
|
2018-08-04 17:44:12 +08:00 |
朱天龙 (Armink)
|
5902e9a64d
|
Merge pull request #1693 from chenyong111/master
[net][at] Add AT serial device receive data length judgment.
|
2018-08-03 20:01:43 +08:00 |
chenyong
|
2e8d994485
|
[net][at] Modify the AT commands response ERROR judgment method.
|
2018-08-03 19:10:35 +08:00 |
chenyong
|
f5d9276434
|
[net][at] Add AT serial device receive data length judgment.
|
2018-08-03 16:11:31 +08:00 |
Bernard Xiong
|
f68bb0ec90
|
[pthreads] Fix the object check issue.
|
2018-08-03 14:28:45 +08:00 |
chenyong
|
c2add5cb4e
|
[net][at] Add AT Socket select LIBC configure.
|
2018-08-02 17:55:01 +08:00 |
chenyong
|
a8d27156a3
|
[net][sal] Modify SAL configure judgment.
|
2018-08-02 17:53:02 +08:00 |
朱天龙 (Armink)
|
ba1aedd1a5
|
Merge pull request #1687 from chenyong111/master
[net][sal] add socket set multicast group support.
|
2018-08-02 17:46:38 +08:00 |
chenyong
|
dabf8efce4
|
[net][sal] add socket set multicast group support and format code.
|
2018-08-02 16:57:23 +08:00 |