Changes needed for clean ez80 compile with ZDS toolchain

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5147 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2012-09-13 19:33:47 +00:00
parent 2aa4af7139
commit 0fb57027de
6 changed files with 8 additions and 5 deletions

View File

@ -97,9 +97,10 @@
int nsh_consolemain(int argc, char *argv[]) int nsh_consolemain(int argc, char *argv[])
{ {
FAR struct console_stdio_s *pstate = nsh_newconsole(); FAR struct console_stdio_s *pstate = nsh_newconsole();
DEBUGASSERT(pstate);
int ret; int ret;
DEBUGASSERT(pstate);
/* If we are using a USB serial console, then we will have to wait for the /* If we are using a USB serial console, then we will have to wait for the
* USB to be connected to the host. * USB to be connected to the host.
*/ */

View File

@ -199,6 +199,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
FAR char *target; FAR char *target;
FAR char *filesystem = NULL; FAR char *filesystem = NULL;
bool badarg = false; bool badarg = false;
int option;
int ret; int ret;
/* The mount command behaves differently if no parameters are provided */ /* The mount command behaves differently if no parameters are provided */
@ -214,7 +215,6 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
* logic just sets 'badarg' and continues. * logic just sets 'badarg' and continues.
*/ */
int option;
while ((option = getopt(argc, argv, ":t:")) != ERROR) while ((option = getopt(argc, argv, ":t:")) != ERROR)
{ {
switch (option) switch (option)

View File

@ -49,6 +49,7 @@ Version 5.1.1
Windows 7 system. Windows 7 system.
Other Versions Other Versions
If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II If you use any version of ZDS-II other than 4.11.0 or if you install ZDS-II
at any location other than the default location, you will have to modify at any location other than the default location, you will have to modify
two files: (1) configs/ez80f910200zco/*/setenv.sh and (2) two files: (1) configs/ez80f910200zco/*/setenv.sh and (2)

View File

@ -105,7 +105,7 @@
#define VT100_CURSORPOS(v,h) {ASCII_ESC, '[', (v), ';', (h), 'H'} /* Move cursor to screen location v,h */ #define VT100_CURSORPOS(v,h) {ASCII_ESC, '[', (v), ';', (h), 'H'} /* Move cursor to screen location v,h */
#define VT100_HVHOME {ASCII_ESC, '[', 'f'} /* Move cursor to upper left corner */ #define VT100_HVHOME {ASCII_ESC, '[', 'f'} /* Move cursor to upper left corner */
#define VT100_HVHOME_ {ASCII_ESC, '[', ;', 'f'} /* Move cursor to upper left corner */ #define VT100_HVHOME_ {ASCII_ESC, '[', ';', 'f'} /* Move cursor to upper left corner */
#define VT100_HVPOS(v,h) {ASCII_ESC, '[', (v), ';', (h), 'f'} /* Move cursor to screen location v,h */ #define VT100_HVPOS(v,h) {ASCII_ESC, '[', (v), ';', (h), 'f'} /* Move cursor to screen location v,h */
#define VT100_INDEX {ASCII_ESC, 'D'} /* Move/scroll window up one line */ #define VT100_INDEX {ASCII_ESC, 'D'} /* Move/scroll window up one line */
#define VT100_REVINDEX {ASCII_ESC, 'M'} /* Move/scroll window down one line */ #define VT100_REVINDEX {ASCII_ESC, 'M'} /* Move/scroll window down one line */
@ -138,7 +138,7 @@
#define VT100_TERMNOK {ASCII_ESC, '3', 'n'} /* Response: terminal is not OK */ #define VT100_TERMNOK {ASCII_ESC, '3', 'n'} /* Response: terminal is not OK */
#define VT100_GETCURSOR {ASCII_ESC, '6', 'n'} /* Get cursor position */ #define VT100_GETCURSOR {ASCII_ESC, '6', 'n'} /* Get cursor position */
#define VT100_CURSORPOS {ASCII_ESC, (v), ';', (h), 'R'} /* Response: cursor is at v,h */ #define VT100_CURSORPOSAT {ASCII_ESC, (v), ';', (h), 'R'} /* Response: cursor is at v,h */
#define VT100_IDENT {ASCII_ESC, '[', 'c'} /* Identify what terminal type */ #define VT100_IDENT {ASCII_ESC, '[', 'c'} /* Identify what terminal type */
#define VT100_IDENT_ {ASCII_ESC, '[', '0', 'c'} /* Identify what terminal type */ #define VT100_IDENT_ {ASCII_ESC, '[', '0', 'c'} /* Identify what terminal type */

View File

@ -64,7 +64,7 @@ enum open_mode_e
MODE_A, /* "a" or "ab" open for writing, appending to file */ MODE_A, /* "a" or "ab" open for writing, appending to file */
MODE_RPLUS, /* "r+", "rb+", or "r+b" open for update (reading and writing) */ MODE_RPLUS, /* "r+", "rb+", or "r+b" open for update (reading and writing) */
MODE_WPLUS, /* "w+", "wb+", or "w+b" open for update, truncating or creating file */ MODE_WPLUS, /* "w+", "wb+", or "w+b" open for update, truncating or creating file */
MODE_APLUS, /* "a+", "ab+", or "a+b" open for update, appending to file */ MODE_APLUS /* "a+", "ab+", or "a+b" open for update, appending to file */
}; };
/**************************************************************************** /****************************************************************************

View File

@ -44,6 +44,7 @@
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
#include <nuttx/sched.h>
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include "os_internal.h" #include "os_internal.h"