(none)

diff --git a/aplfw/sample/h8/ae-3069-lan/sample.c b/aplfw/sample/h8/ae-3069-lan/sample.c
index 65e70d9..9b9e88d 100755 (executable)
--- a/aplfw/sample/h8/ae-3069-lan/sample.c
+++ b/aplfw/sample/h8/ae-3069-lan/sample.c
@@ -113,7 +113,7 @@ int System_Boot(VPARAM Param)
        StdIo_PutString("\r\nHOS Application Platform  Ver 0.01\r\n");
        
        /* シェル起動 */
-       return Command_Execute("hsh");
+       return Command_Execute("hsh", NULL);
 }
 
 

diff --git a/aplfw/sample/sh/cq7144a/sample.c b/aplfw/sample/sh/cq7144a/sample.c
index 3e400b1..e989a25 100755 (executable)
--- a/aplfw/sample/sh/cq7144a/sample.c
+++ b/aplfw/sample/sh/cq7144a/sample.c
@@ -15,6 +15,7 @@
 #include "kernel_id.h"
 #include "system/sysapi/sysapi.h"
 #include "system/file/filesys.h"
+#include "system/file/confile.h"
 #include "system/sysapi/sysapi.h"
 #include "system/process/process.h"
 #include "system/command/command.h"
@@ -34,9 +35,10 @@ int System_Boot(VPARAM Param);
 
 void Sample_Task(VP_INT exinf)
 {
-       T_SYSFILE_DEVINF devinf;
+       T_SYSFILE_DEVINF DevInf;
        T_PROCESS_INFO   ProcInfo;
-       HANDLE           hFile;
+       HANDLE           hTty;
+       HANDLE           hCon;
        
        /*************************/
        /*    固有初期設定       */
@@ -61,18 +63,18 @@ void Sample_Task(VP_INT exinf)
        SciDrv_Create(&g_SciDrv[3], (void *)REG_SCI3_SMR, 172, 24000000L, 64);  /* SCI3 */
        
        /* SCI0 を /dev/com0 に登録 */
-       strcpy(devinf.szName, "com0");
-       devinf.pfncCreate = SciFile_Create;
-       devinf.ObjSize    = sizeof(C_SCIFILE);
-       devinf.pParam     = &g_SciDrv[0];
-       SysFile_AddDevice("/dev", &devinf);
+       strcpy(DevInf.szName, "com0");
+       DevInf.pfncCreate = SciFile_Create;
+       DevInf.ObjSize    = sizeof(C_SCIFILE);
+       DevInf.pParam     = &g_SciDrv[0];
+       SysFile_AddDevice("/dev", &DevInf);
        
        /* SCI1 を /dev/com1 に登録 */
-       strcpy(devinf.szName, "com1");
-       devinf.pfncCreate = SciFile_Create;
-       devinf.ObjSize    = sizeof(C_SCIFILE);
-       devinf.pParam     = &g_SciDrv[1];
-       SysFile_AddDevice("/dev", &devinf);
+       strcpy(DevInf.szName, "com1");
+       DevInf.pfncCreate = SciFile_Create;
+       DevInf.ObjSize    = sizeof(C_SCIFILE);
+       DevInf.pParam     = &g_SciDrv[1];
+       SysFile_AddDevice("/dev", &DevInf);
        
        /*************************/
        /*     コマンド登録      */
@@ -84,13 +86,19 @@ void Sample_Task(VP_INT exinf)
        /*************************/
        /*  システムプロセス起動 */
        /*************************/
+       hTty = File_Open("/dev/com1", FILE_MODE_READ | FILE_MODE_WRITE);
        
-       hFile = File_Open("/dev/com1", FILE_MODE_READ | FILE_MODE_WRITE);
+       strcpy(DevInf.szName, "con1");
+       DevInf.pfncCreate = ConsoleFile_Create;
+       DevInf.ObjSize    = sizeof(C_CONSOLEFILE);
+       DevInf.pParam     = hTty;
+       SysFile_AddDevice("/dev", &DevInf);
+       hCon = File_Open("/dev/con1", FILE_MODE_READ | FILE_MODE_WRITE);
        
-       ProcInfo.hTty    = hFile;
-       ProcInfo.hStdIn  = hFile;
-       ProcInfo.hStdOut = hFile;
-       ProcInfo.hStdErr = hFile;
+       ProcInfo.hTty    = hTty;
+       ProcInfo.hStdIn  = hCon;
+       ProcInfo.hStdOut = hCon;
+       ProcInfo.hStdErr = hCon;
        Process_CreateEx(System_Boot, 0, 1024, PROCESS_PRIORITY_NORMAL, &ProcInfo);
        
        return;
@@ -101,7 +109,7 @@ void Sample_Task(VP_INT exinf)
 int System_Boot(VPARAM Param)
 {
        /* シェル起動 */
-       return Command_Execute("hsh");
+       return Command_Execute("hsh", NULL);
 }
 
 

diff --git a/aplfw/sample/sh/cq7144a/shc/gmake.mak b/aplfw/sample/sh/cq7144a/shc/gmake.mak
index f93dc76..19cbf6d 100755 (executable)
--- a/aplfw/sample/sh/cq7144a/shc/gmake.mak
+++ b/aplfw/sample/sh/cq7144a/shc/gmake.mak
@@ -78,7 +78,7 @@ $(TARGET).abs: $(OBJS) $(STD_LIBS) $(OS_LIBS)
        $(LINK) -SU=$(OBJS_DIR)/subcmd.txt
 
 $(STD_LIBS):
-       lbgsh -OUTPut=$(STD_LIBS) $(CFLAGS) -REent 
+       lbgsh -OUTPut=$(STD_LIBS) -CP=sh2 -REent 
 
 mk_kernel:
        make -C $(KERNEL_BUILD_DIR) -f gmake.mak

diff --git a/aplfw/system/file/filefmt.c b/aplfw/system/file/filefmt.c
index 29fd10c..98cbafc 100755 (executable)
--- a/aplfw/system/file/filefmt.c
+++ b/aplfw/system/file/filefmt.c
@@ -26,7 +26,7 @@ int File_PrintFormatV(HANDLE hFile, const char *pszFormat, va_list argptr)
        pBuf = (char *)Memory_Alloc(128);
        if ( pBuf != NULL )
        {
-               iRet = vsprintf(pBuf, pszFormat, argptr);               /* 肥大化するのでちと保留 */
+       /*      iRet = vsprintf(pBuf, pszFormat, argptr);       */      /* 肥大化するのでちと保留 */
                if ( iRet > 0 )
                {
                        iRet = File_Write(hFile, pBuf, iRet);

diff --git a/aplfw/system/file/stdfile.c b/aplfw/system/file/stdfile.c
index 02af32a..612a066 100755 (executable)
--- a/aplfw/system/file/stdfile.c
+++ b/aplfw/system/file/stdfile.c
@@ -6,7 +6,7 @@ int StdIo_PrintFormat(const char *pszFormat, ...)
        int iRet;
 
        va_start(argptr, pszFormat);
-       iRet = File_PrintFormatV(Process_GetStdOut(), pszFormat, argptr);
+       iRet = File_PrintFormatVL(Process_GetStdOut(), pszFormat, argptr);
        va_end(argptr);
 
        return iRet;