Skip to content

various fixes #7

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
xiaoxiang781216 merged 4 commits into from
Jan 8, 2020
Merged

various fixes #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2fd628
system: zmodem: Fix debug assert condition
jerpelea Dec 30, 2019
fa36007
system: zmodem: Fix compile error in zmodem host tool
jerpelea Dec 31, 2019
b79e54d
system: zmodem: Improve zmodem send performance
jerpelea Dec 31, 2019
424b1c9
system: readline: Improve security
jerpelea Dec 31, 2019
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
Prev Previous commit
Next Next commit
system: zmodem: Fix compile error in zmodem host tool
  • Loading branch information
@jerpelea
jerpelea committed Jan 8, 2020
commit fa36007d65d15a1766ebdced607f9281a6bfbab3
6 changes: 3 additions & 3 deletions system/zmodem/Makefile.host
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# make -f Makefile.host TOPDIR=/home/me/projects/nuttx
# APPDIR=/home/me/projects/apps
#
# 2. Add CONFIG_DEBUG_FEATURES=1 to the make command line to enable debug output
# 2. Add CONFIG_DEBUG_FEATURES=y to the make command line to enable debug output
# 3. Make sure to clean old target .o files before making new host .o
# files.
#
Expand All @@ -62,14 +62,14 @@ HOSTAPPS = $(ZMODEM)/host/apps
HOSTCFLAGS += -isystem $(HOSTDIR) -I $(ZMODEM) -I $(HOSTAPPS)
HOSTCFLAGS += -Dsz_main=main -Drz_main=main
ifeq ($(CONFIG_DEBUG_FEATURES),y)
HOSTCFLAGS += -DCONFIG_DEBUG_ZMODEM=1 -DCONFIG_SYSTEM_ZMODEM_DUMPBUFFER=1
HOSTCFLAGS += -DCONFIG_DEBUG_ZMODEM=1
endif

# Zmodem sz and rz commands

SZSRCS = sz_main.c zm_send.c
RZSRCS = rz_main.c zm_receive.c
CMNSRCS = zm_state.c zm_proto.c zm_watchdog.c zm_utils.c zm_dumpbuffer.c
CMNSRCS = zm_state.c zm_proto.c zm_watchdog.c zm_utils.c
CMNSRCS += crc16.c crc32.c
SRCS = $(SZSRCS) $(RZSRCS) $(CMNSRCS)

Expand Down
1 change: 1 addition & 0 deletions system/zmodem/zm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

#include <stdint.h>
#include <debug.h>
#include <syslog.h>

#include <nuttx/compiler.h>
#include <nuttx/ascii.h>
Expand Down