Skip to content

[Util] fix the dependence of file feature in ymodem #3270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2019
Merged

[Util] fix the dependence of file feature in ymodem #3270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions components/utilities/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ menu "Utilities"

config RT_USING_RYM
bool "Enable Ymodem"
depends on RT_USING_DFS = y
default n

if RT_USING_RYM
config YMODEM_DISABLE_CRC_TABLE
bool "Disable CRC Table"
config YMODEM_USING_CRC_TABLE
bool "Enable CRC Table in Ymodem"
default n

config YMODEM_USING_FILE_TRANSFER
bool "Enable file transfer feature"
select RT_USING_DFS
default n
endif

Expand Down
9 changes: 8 additions & 1 deletion components/utilities/ymodem/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
from building import *

cwd = GetCurrentDir()
src = Glob('*.c')
src = Split('''
ymodem.c
''')

CPPPATH = [cwd]

if GetDepend('RT_USING_DFS') and GetDepend('YMODEM_USING_FILE_TRANSFER'):
src += ['ry_sy.c']

group = DefineGroup('Utilities', src, depend = ['RT_USING_RYM'], CPPPATH = CPPPATH)

Return('group')
3 changes: 2 additions & 1 deletion components/utilities/ymodem/ry_sy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
#include <rtthread.h>
#include <ymodem.h>
#include <dfs_posix.h>

#include <stdio.h>
#include <stdlib.h>
#include <board.h>
#include <string.h>

struct custom_ctx
Expand Down
2 changes: 1 addition & 1 deletion components/utilities/ymodem/ymodem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <rthw.h>
#include "ymodem.h"

#ifndef YMODEM_DISABLE_CRC_TABLE
#ifdef YMODEM_USING_CRC_TABLE
static const rt_uint16_t ccitt_table[256] =
{
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
Expand Down