(none)

diff --git a/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd.h b/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd.h
new file mode 100755 (executable)
index 0000000..2fd06e7
--- /dev/null
+++ b/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd.h
@@ -0,0 +1,30 @@
+/** 
+ *  Hyper Operating System  Application Framework
+ *
+ * @file  whiteboardcmd.h
+ * @brief %jp{ホワイトボード設定コマンド}
+ *
+ * Copyright (C) 2009 by Project HOS
+ * http://sourceforge.jp/projects/hos/
+ */
+
+
+#ifndef __HOS__whiteboardcmd_h__
+#define __HOS__whiteboardcmd_h__
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int WhiteboardCmd_Main(int argc, char *argv[]);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __HOS__whiteboardcmd_h__ */
+
+
+/* end of file */

diff --git a/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd_main.c b/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd_main.c
new file mode 100755 (executable)
index 0000000..5cf992a
--- /dev/null
+++ b/aplfw/application/syscmd/whiteboardcmd/whiteboardcmd_main.c
@@ -0,0 +1,48 @@
+/** 
+ *  Hyper Operating System  Application Framework
+ *
+ * @file  whiteboardcmd_main.c
+ * @brief %jp{ホワイトボード設定コマンド}
+ *
+ * Copyright (C) 2009 by Project HOS
+ * http://sourceforge.jp/projects/hos/
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include "hosaplfw.h"
+#include "whiteboardcmd.h"
+
+
+int WhiteboardCmd_Main(int argc, char *argv[])
+{
+       char    szBuf[64];
+
+       if ( argc < 3 )
+       {
+               return 1;
+       }
+       
+       if ( strcmp(argv[1], "setstr") == 0 )
+       {
+               if ( argc >= 4 )
+               {
+                       Whiteboard_SetString(argv[2], argv[3]);
+               }
+       }
+       else if ( strcmp(argv[1], "getstr") == 0 )
+       {
+               Whiteboard_GetString(argv[2], szBuf, sizeof(szBuf), "");
+               StdIo_PrintFormat("%s\n", szBuf);
+       }
+       else
+       {
+               return 1;
+       }
+               
+       return 0;
+}
+
+
+/* end of file */

diff --git a/aplfw/build/common/gmake/aplfwdep.inc b/aplfw/build/common/gmake/aplfwdep.inc
index dba2de3..ca95e13 100755 (executable)
--- a/aplfw/build/common/gmake/aplfwdep.inc
+++ b/aplfw/build/common/gmake/aplfwdep.inc
@@ -13,6 +13,10 @@ $(OBJS_DIR)/system_requestproc.$(EXT_OBJ):   $(SYSTEM_DIR)/system_requestproc.c      $(
 $(OBJS_DIR)/system_process.$(EXT_OBJ): $(SYSTEM_DIR)/system_process.c  $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/system_getnextprocess.$(EXT_OBJ):  $(SYSTEM_DIR)/system_getnextprocess.c   $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/system_getsystemprocess.$(EXT_OBJ):        $(SYSTEM_DIR)/system_getsystemprocess.c $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)/system_lock.$(EXT_OBJ):    $(SYSTEM_DIR)/system_lock.c     $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)/system_unlock.$(EXT_OBJ):  $(SYSTEM_DIR)/system_unlock.c   $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)/whiteboard_setstring.$(EXT_OBJ):   $(SYSTEM_DIR)/whiteboard_setstring.c    $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)/whiteboard_getstring.$(EXT_OBJ):   $(SYSTEM_DIR)/whiteboard_getstring.c    $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/sysapi_initialize.$(EXT_OBJ):      $(SYSAPI_DIR)/sysapi_initialize.c       $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/sysctx_isisr.$(EXT_OBJ):   $(SYSAPI_DIR)/sysctx_isisr.c    $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/sysloc_lock.$(EXT_OBJ):    $(SYSAPI_DIR)/sysloc_lock.c     $(COMMON_HEADERS) $(SYSTEM_HEADERS)
@@ -526,6 +530,7 @@ $(OBJS_DIR)/shell_putchar.$(EXT_OBJ):       $(SHELL_DIR)/shell_putchar.c    $(COMMON_HEAD
 $(OBJS_DIR)/shell_curright.$(EXT_OBJ): $(SHELL_DIR)/shell_curright.c   $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/shell_curleft.$(EXT_OBJ):  $(SHELL_DIR)/shell_curleft.c    $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)/shell_replaceline.$(EXT_OBJ):      $(SHELL_DIR)/shell_replaceline.c        $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)/whiteboardcmd_main.$(EXT_OBJ):     $(WHITEBOARDCMD_DIR)/whiteboardcmd_main.c       $(COMMON_HEADERS)
 $(OBJS_DIR)/processlist_main.$(EXT_OBJ):       $(PROCESSLIST_DIR)/processlist_main.c   $(COMMON_HEADERS)
 $(OBJS_DIR)/processsignal_main.$(EXT_OBJ):     $(PROCESSSIGNAL_DIR)/processsignal_main.c       $(COMMON_HEADERS)
 $(OBJS_DIR)/commandlist_main.$(EXT_OBJ):       $(COMMANDLIST_DIR)/commandlist_main.c   $(COMMON_HEADERS)

diff --git a/aplfw/build/common/gmake/aplfwsrc.inc b/aplfw/build/common/gmake/aplfwsrc.inc
index abd7aae..49977f7 100755 (executable)
--- a/aplfw/build/common/gmake/aplfwsrc.inc
+++ b/aplfw/build/common/gmake/aplfwsrc.inc
@@ -57,6 +57,7 @@ LINK_MEMDRV           ?= Yes
 
 # Applications
 LINK_SHELL            ?= Yes
+LINK_WHITEBOARDCMD    ?= Yes
 LINK_PROCESSLIST      ?= Yes
 LINK_PROCESSSIGNAL    ?= Yes
 LINK_COMMANDLIST      ?= Yes
@@ -102,6 +103,10 @@ CSRCS += $(SYSTEM_DIR)/system_requestproc.c
 CSRCS += $(SYSTEM_DIR)/system_process.c
 CSRCS += $(SYSTEM_DIR)/system_getnextprocess.c
 CSRCS += $(SYSTEM_DIR)/system_getsystemprocess.c
+CSRCS += $(SYSTEM_DIR)/system_lock.c
+CSRCS += $(SYSTEM_DIR)/system_unlock.c
+CSRCS += $(SYSTEM_DIR)/whiteboard_setstring.c
+CSRCS += $(SYSTEM_DIR)/whiteboard_getstring.c
 endif
 
 
@@ -892,6 +897,14 @@ CSRCS += $(SHELL_DIR)/shell_replaceline.c
 endif
 
 
+# Whitboard
+ifeq ($(LINK_WHITEBOARDCMD),Yes)
+WHITEBOARDCMD_DIR = $(HOSAPLFW_DIR)/application/syscmd/whiteboardcmd
+SRC_DIRS += $(WHITEBOARDCMD_DIR)
+CSRCS += $(WHITEBOARDCMD_DIR)/whiteboardcmd_main.c
+endif
+
+
 # Process List
 ifeq ($(LINK_PROCESSLIST),Yes)
 PROCESSLIST_DIR = $(HOSAPLFW_DIR)/application/syscmd/processlist

diff --git a/aplfw/build/common/nmake/aplfwdep.inc b/aplfw/build/common/nmake/aplfwdep.inc
index 30f6619..eea8a72 100755 (executable)
--- a/aplfw/build/common/nmake/aplfwdep.inc
+++ b/aplfw/build/common/nmake/aplfwdep.inc
@@ -35,6 +35,18 @@ $(OBJS_DIR)\system_getnextprocess.c : $(SYSTEM_DIR)\system_getnextprocess.c
 $(OBJS_DIR)\system_getsystemprocess.c : $(SYSTEM_DIR)\system_getsystemprocess.c
        $(CMD_CP) $(SYSTEM_DIR)\system_getsystemprocess.c $(OBJS_DIR)\
 
+$(OBJS_DIR)\system_lock.c : $(SYSTEM_DIR)\system_lock.c
+       $(CMD_CP) $(SYSTEM_DIR)\system_lock.c $(OBJS_DIR)\
+
+$(OBJS_DIR)\system_unlock.c : $(SYSTEM_DIR)\system_unlock.c
+       $(CMD_CP) $(SYSTEM_DIR)\system_unlock.c $(OBJS_DIR)\
+
+$(OBJS_DIR)\whiteboard_setstring.c : $(SYSTEM_DIR)\whiteboard_setstring.c
+       $(CMD_CP) $(SYSTEM_DIR)\whiteboard_setstring.c $(OBJS_DIR)\
+
+$(OBJS_DIR)\whiteboard_getstring.c : $(SYSTEM_DIR)\whiteboard_getstring.c
+       $(CMD_CP) $(SYSTEM_DIR)\whiteboard_getstring.c $(OBJS_DIR)\
+
 
 $(OBJS_DIR)\sysapi.h : $(SYSAPI_DIR)\sysapi.h
        $(CMD_CP) $(SYSAPI_DIR)\sysapi.h $(OBJS_DIR)\
@@ -1909,6 +1921,13 @@ $(OBJS_DIR)\shell_replaceline.c : $(SHELL_DIR)\shell_replaceline.c
        $(CMD_CP) $(SHELL_DIR)\shell_replaceline.c $(OBJS_DIR)\
 
 
+$(OBJS_DIR)\whiteboardcmd.h : $(WHITEBOARDCMD_DIR)\whiteboardcmd.h
+       $(CMD_CP) $(WHITEBOARDCMD_DIR)\whiteboardcmd.h $(OBJS_DIR)\
+
+$(OBJS_DIR)\whiteboardcmd_main.c : $(WHITEBOARDCMD_DIR)\whiteboardcmd_main.c
+       $(CMD_CP) $(WHITEBOARDCMD_DIR)\whiteboardcmd_main.c $(OBJS_DIR)\
+
+
 $(OBJS_DIR)\processlist.h : $(PROCESSLIST_DIR)\processlist.h
        $(CMD_CP) $(PROCESSLIST_DIR)\processlist.h $(OBJS_DIR)\
 
@@ -2060,6 +2079,10 @@ $(OBJS_DIR)\system_requestproc.$(EXT_OBJ):       $(OBJS_DIR)\system_requestproc.c        $(CO
 $(OBJS_DIR)\system_process.$(EXT_OBJ): $(OBJS_DIR)\system_process.c    $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)\system_getnextprocess.$(EXT_OBJ):  $(OBJS_DIR)\system_getnextprocess.c     $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)\system_getsystemprocess.$(EXT_OBJ):        $(OBJS_DIR)\system_getsystemprocess.c   $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)\system_lock.$(EXT_OBJ):    $(OBJS_DIR)\system_lock.c       $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)\system_unlock.$(EXT_OBJ):  $(OBJS_DIR)\system_unlock.c     $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)\whiteboard_setstring.$(EXT_OBJ):   $(OBJS_DIR)\whiteboard_setstring.c      $(COMMON_HEADERS) $(SYSTEM_HEADERS)
+$(OBJS_DIR)\whiteboard_getstring.$(EXT_OBJ):   $(OBJS_DIR)\whiteboard_getstring.c      $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 
 $(OBJS_DIR)\sysapi_initialize.$(EXT_OBJ):      $(OBJS_DIR)\sysapi_initialize.c $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)\sysctx_isisr.$(EXT_OBJ):   $(OBJS_DIR)\sysctx_isisr.c      $(COMMON_HEADERS) $(SYSTEM_HEADERS)
@@ -2611,6 +2634,8 @@ $(OBJS_DIR)\shell_curright.$(EXT_OBJ):    $(OBJS_DIR)\shell_curright.c    $(COMMON_HEA
 $(OBJS_DIR)\shell_curleft.$(EXT_OBJ):  $(OBJS_DIR)\shell_curleft.c     $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 $(OBJS_DIR)\shell_replaceline.$(EXT_OBJ):      $(OBJS_DIR)\shell_replaceline.c $(COMMON_HEADERS) $(SYSTEM_HEADERS)
 
+$(OBJS_DIR)\whiteboardcmd_main.$(EXT_OBJ):     $(OBJS_DIR)\whiteboardcmd_main.c        $(COMMON_HEADERS)
+
 $(OBJS_DIR)\processlist_main.$(EXT_OBJ):       $(OBJS_DIR)\processlist_main.c  $(COMMON_HEADERS)
 
 $(OBJS_DIR)\processsignal_main.$(EXT_OBJ):     $(OBJS_DIR)\processsignal_main.c        $(COMMON_HEADERS)

diff --git a/aplfw/build/common/nmake/aplfwsrc.inc b/aplfw/build/common/nmake/aplfwsrc.inc
index c7d7006..ba2b8e2 100755 (executable)
--- a/aplfw/build/common/nmake/aplfwsrc.inc
+++ b/aplfw/build/common/nmake/aplfwsrc.inc
@@ -133,6 +133,9 @@ LINK_MEMDRV           = Yes
 !ifndef LINK_SHELL
 LINK_SHELL            = Yes
 !endif
+!ifndef LINK_WHITEBOARDCMD
+LINK_WHITEBOARDCMD    = Yes
+!endif
 !ifndef LINK_PROCESSLIST
 LINK_PROCESSLIST      = Yes
 !endif
@@ -224,6 +227,14 @@ CSRCS = $(CSRCS) $(SYSTEM_DIR)\system_getnextprocess.c
 OBJS  = $(OBJS)  $(OBJS_DIR)\system_getnextprocess.$(EXT_OBJ)
 CSRCS = $(CSRCS) $(SYSTEM_DIR)\system_getsystemprocess.c
 OBJS  = $(OBJS)  $(OBJS_DIR)\system_getsystemprocess.$(EXT_OBJ)
+CSRCS = $(CSRCS) $(SYSTEM_DIR)\system_lock.c
+OBJS  = $(OBJS)  $(OBJS_DIR)\system_lock.$(EXT_OBJ)
+CSRCS = $(CSRCS) $(SYSTEM_DIR)\system_unlock.c
+OBJS  = $(OBJS)  $(OBJS_DIR)\system_unlock.$(EXT_OBJ)
+CSRCS = $(CSRCS) $(SYSTEM_DIR)\whiteboard_setstring.c
+OBJS  = $(OBJS)  $(OBJS_DIR)\whiteboard_setstring.$(EXT_OBJ)
+CSRCS = $(CSRCS) $(SYSTEM_DIR)\whiteboard_getstring.c
+OBJS  = $(OBJS)  $(OBJS_DIR)\whiteboard_getstring.$(EXT_OBJ)
 !endif
 
 
@@ -1589,6 +1600,15 @@ OBJS  = $(OBJS)  $(OBJS_DIR)\shell_replaceline.$(EXT_OBJ)
 !endif
 
 
+# Whitboard
+!if "$(LINK_WHITEBOARDCMD)" == "Yes"
+WHITEBOARDCMD_DIR = $(HOSAPLFW_DIR)\application\syscmd\whiteboardcmd
+HEADERS = $(HEADERS) $(OBJS_DIR)\whiteboardcmd.h
+CSRCS = $(CSRCS) $(WHITEBOARDCMD_DIR)\whiteboardcmd_main.c
+OBJS  = $(OBJS)  $(OBJS_DIR)\whiteboardcmd_main.$(EXT_OBJ)
+!endif
+
+
 # Process List
 !if "$(LINK_PROCESSLIST)" == "Yes"
 PROCESSLIST_DIR = $(HOSAPLFW_DIR)\application\syscmd\processlist

diff --git a/aplfw/build/common/tmp_mkinc/mk_inc.pl b/aplfw/build/common/tmp_mkinc/mk_inc.pl
index 4854baf..eb119d6 100755 (executable)
--- a/aplfw/build/common/tmp_mkinc/mk_inc.pl
+++ b/aplfw/build/common/tmp_mkinc/mk_inc.pl
@@ -22,6 +22,10 @@
                                "system_process.c",
                                "system_getnextprocess.c",
                                "system_getsystemprocess.c",
+                               "system_lock.c",
+                               "system_unlock.c",
+                               "whiteboard_setstring.c",
+                               "whiteboard_getstring.c",
                        ],
                ],
                [
@@ -1053,6 +1057,19 @@
                        ]
                ],
                [
+                       "Whitboard",
+                       "\$(COMMON_HEADERS)",
+                       "\$(HOSAPLFW_DIR)/application/syscmd/whiteboardcmd",
+                       "WHITEBOARDCMD",
+                       "Yes",
+                       [
+                               "whiteboardcmd.h",
+                       ],
+                       [
+                               "whiteboardcmd_main.c",
+                       ],
+               ],
+               [
                        "Process List",
                        "\$(COMMON_HEADERS)",
                        "\$(HOSAPLFW_DIR)/application/syscmd/processlist",

diff --git a/aplfw/build/win/win32/vc2008/hosaplfw.vcproj b/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
index 9ce6f24..106d960 100755 (executable)
--- a/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
+++ b/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
@@ -1079,6 +1079,22 @@
                                        </File>
                                </Filter>
                        </Filter>
+                       <Filter
+                               Name="syscmd"
+                               >
+                               <Filter
+                                       Name="whiteboardcmd"
+                                       >
+                                       <File
+                                               RelativePath="..\..\..\..\application\syscmd\whiteboardcmd\whiteboardcmd.h"
+                                               >
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\..\application\syscmd\whiteboardcmd\whiteboardcmd_main.c"
+                                               >
+                                       </File>
+                               </Filter>
+                       </Filter>
                </Filter>
                <Filter
                        Name="library"

diff --git a/aplfw/sample/arm/ez_arm7/boot.c b/aplfw/sample/arm/ez_arm7/boot.c
index 8d4a7e0..c973480 100755 (executable)
--- a/aplfw/sample/arm/ez_arm7/boot.c
+++ b/aplfw/sample/arm/ez_arm7/boot.c
@@ -24,6 +24,7 @@
 #include "application//syscmd/shell/shell.h"
 #include "application//syscmd/commandlist/commandlist.h"
 #include "application//syscmd/processlist/processlist.h"
+#include "application//syscmd/whiteboardcmd/whiteboardcmd.h"
 #include "application/filecmd/filelist/filelist.h"
 #include "application/filecmd/filecopy/filecopy.h"
 #include "application/filecmd/filedump/filedump.h"
@@ -147,19 +148,21 @@ int Boot_Process(VPARAM Param)
        /*     コマンド登録      */
        /*************************/
        
-       Command_AddCommand("sh",       Shell_Main);
-       Command_AddCommand("ps",       ProcessList_Main);
-       Command_AddCommand("help",     CommandList_Main);
-       Command_AddCommand("time",     TimeCmd_Main);
-       Command_AddCommand("memdump",  MemDump_Main);
-       Command_AddCommand("memwrite", MemWrite_Main);
-       Command_AddCommand("memtest",  MemTest_Main);
-       Command_AddCommand("keytest",  KeyTest_Main);
-       Command_AddCommand("ls",       FileList_Main);
-       Command_AddCommand("cp",       FileCopy_Main);
-       Command_AddCommand("cat",      FileCat_Main);
-       Command_AddCommand("fatmount", FatMount_Main);
-       Command_AddCommand("hello",    Hello_Main);
+       Command_AddCommand("sh",         Shell_Main);
+       Command_AddCommand("ps",         ProcessList_Main);
+       Command_AddCommand("whiteboard", WhiteboardCmd_Main);
+       Command_AddCommand("help",       CommandList_Main);
+       Command_AddCommand("time",       TimeCmd_Main);
+       Command_AddCommand("memdump",    MemDump_Main);
+       Command_AddCommand("memwrite",   MemWrite_Main);
+       Command_AddCommand("memtest",    MemTest_Main);
+       Command_AddCommand("keytest",    KeyTest_Main);
+       Command_AddCommand("ls",         FileList_Main);
+       Command_AddCommand("cp",         FileCopy_Main);
+       Command_AddCommand("cat",        FileCat_Main);
+       Command_AddCommand("fatmount",   FatMount_Main);
+       Command_AddCommand("hello",      Hello_Main);
+       
        
        
        /*************************/
@@ -176,11 +179,11 @@ int Boot_Process(VPARAM Param)
                        "================================================================\n"
                        "\n");
        
-
+       
        /*************************/
        /*      シェル起動       */
        /*************************/
-
+       
        /* プロセスの生成*/
        ProcInf.pszCommandLine = "sh -i";                                                               /* 実行コマンド */
        ProcInf.pszCurrentDir  = "/";                                                                   /* 起動ディレクトリ */

diff --git a/aplfw/system/system/whiteboard_getstring.c b/aplfw/system/system/whiteboard_getstring.c
index 3d1e44d..910a066 100755 (executable)
--- a/aplfw/system/system/whiteboard_getstring.c
+++ b/aplfw/system/system/whiteboard_getstring.c
@@ -18,7 +18,7 @@
 const char   *Whiteboard_GetString(const char *pszKey, char *pszBuf, int iBufSize, const char *pszDefault)
 {
        C_SYSTEM        *self;
-       char            *pszValue = NULL;
+       const char      *pszValue = NULL;
        
        self = &g_System;
        
@@ -37,9 +37,10 @@ const char   *Whiteboard_GetString(const char *pszKey, char *pszBuf, int iBufSiz
        if ( pszValue != NULL )
        {
                strncpy(pszBuf, pszValue, iBufSize);
+               pszBuf[iBufSize-1] = '\0';
        }
        
-       System_UnLock();
+       System_Unlock();
        
        return pszBuf;
 }

diff --git a/aplfw/system/system/whiteboard_setstring.c b/aplfw/system/system/whiteboard_setstring.c
index 45b6678..e3d278d 100755 (executable)
--- a/aplfw/system/system/whiteboard_setstring.c
+++ b/aplfw/system/system/whiteboard_setstring.c
@@ -33,7 +33,7 @@ void Whiteboard_SetString(const char *pszKey, const char *pszValue)
                Assoc_Set(self->paWhiteBoard, pszKey, pszValue, strlen(pszValue) + 1);
        }
        
-       System_UnLock();
+       System_Unlock();
 }