projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
xyzModem.h
diff --git
a/include/xyzModem.h
b/include/xyzModem.h
index
0eddbbc
..
a8911b6
100644
(file)
--- a/
include/xyzModem.h
+++ b/
include/xyzModem.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: eCos-2.0 */
/*
*==========================================================================
*
/*
*==========================================================================
*
@@
-6,8
+7,6
@@
* RedBoot stream handler for xyzModem protocol
*
*==========================================================================
* RedBoot stream handler for xyzModem protocol
*
*==========================================================================
- * SPDX-License-Identifier: eCos-2.0
- *==========================================================================
*#####DESCRIPTIONBEGIN####
*
* Author(s): gthomas
*#####DESCRIPTIONBEGIN####
*
* Author(s): gthomas
@@
-26,6
+25,8
@@
#ifndef _XYZMODEM_H_
#define _XYZMODEM_H_
#ifndef _XYZMODEM_H_
#define _XYZMODEM_H_
+#include <linux/delay.h>
+
#define xyzModem_xmodem 1
#define xyzModem_ymodem 2
/* Don't define this until the protocol support is in place */
#define xyzModem_xmodem 1
#define xyzModem_ymodem 2
/* Don't define this until the protocol support is in place */
@@
-44,9
+45,6
@@
#define xyzModem_abort 2
#define xyzModem_abort 2
-#ifdef REDBOOT
-extern getc_io_funcs_t xyzModem_io;
-#else
#define CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT
#define CYGACC_CALL_IF_SET_CONSOLE_COMM(x)
#define CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT
#define CYGACC_CALL_IF_SET_CONSOLE_COMM(x)
@@
-60,12
+58,8
@@
typedef struct {
char *filename;
int mode;
int chan;
char *filename;
int mode;
int chan;
-#ifdef CYGPKG_REDBOOT_NETWORKING
- struct sockaddr_in *server;
-#endif
} connection_info_t;
} connection_info_t;
-#endif
int xyzModem_stream_open(connection_info_t *info, int *err);
int xyzModem_stream_open(connection_info_t *info, int *err);