English

Revision 3:0a94993be1f6, committed 2013-04-04

Comitter:

nyatla

Date:

Thu Apr 04 08:22:57 2013 +0000

Parent:

2:b96c1e90d120

Child:

4:909dc70956e7

Commit message:

add modules;

Changed in this revision

--- a/core/net/NyLPC_cNet.h	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/net/NyLPC_cNet.h	Thu Apr 04 08:22:57 2013 +0000
@@ -25,6 +25,9 @@
  * ネットワークを初期化する。
  */
 void NyLPC_cNet_initialize(NyLPC_TcNet_t* i_inst);
+
+#define NyLPC_cNet_finalize(inst) 
+
 /**
  * 関数は、ネットワークアダプタの値を元にNyLPC_cMiMicEnv_PlatformName変数の値を更新します。
  * @param i_ref_config

--- a/core/net/httpd/NyLPC_cHttpd.h	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/net/httpd/NyLPC_cHttpd.h	Thu Apr 04 08:22:57 2013 +0000
@@ -26,7 +26,7 @@
 struct NyLPC_TcHttpd
 {
     struct{
-        NyLPC_TcHttpd_onRequest _handler;
+        NyLPC_TcHttpd_onRequest onRequest;
     }function;
     NyLPC_TcMutex_t _mutex;
     NyLPC_TcTcpListener_t _listener;

--- a/core/net/httpd/NyLPC_cHttpdThread.cpp	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/net/httpd/NyLPC_cHttpdThread.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -59,7 +59,7 @@
         NyLPC_cHttpdConnection_setConnectionMode(inst,NyLPC_TcHttpdConnection_CONNECTION_MODE_CLOSE);
 
         {//handler
-            (inst->_parent_httpd->function._handler)(inst);
+            (inst->_parent_httpd->function.onRequest)(inst);
         }
         //コネクションが増えすぎたら持続性接続を停止するためにCLOSEDにする。
         if(NyLPC_cHttpd_getNumOfConnection(inst->_parent_httpd)>LIMIT_OF_PERSISTENT_CONNECTION){

--- a/core/os/NyLPC_cThread.h	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/os/NyLPC_cThread.h	Thu Apr 04 08:22:57 2013 +0000
@@ -119,4 +119,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* NYLPC_CTHREAD_H_ */
\ No newline at end of file
+#endif /* NYLPC_CTHREAD_H_ */

--- a/core/os/mbedrtos/NyLPC_cThread.cpp	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/os/mbedrtos/NyLPC_cThread.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -42,11 +42,18 @@
 }
 
 
+
 void NyLPC_cThread_initialize(NyLPC_TcThread_t* i_inst,NyLPC_TInt32 i_stack,NyLPC_TInt32 i_prio)
 {
     i_inst->_sbit=NyLPC_TcThread_BIT_IS_TERMINATED;
     i_inst->_thread=new Thread(proc,i_inst,prio_table[i_prio],i_stack);
 }
+void NyLPC_cThread_finalize(NyLPC_TcThread_t* i_inst)
+{
+    NyLPC_cThread_join(i_inst);
+    delete i_inst->_thread;
+}
+
 
 void NyLPC_cThread_start(NyLPC_TcThread_t* i_inst,NyLPC_TcThread_ThreadFunc i_func,void* i_param)
 {

--- a/core/uip/NyLPC_cIPv4Payload.cpp	Wed Mar 27 12:07:47 2013 +0000
+++ b/core/uip/NyLPC_cIPv4Payload.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -257,7 +257,7 @@
     i_inst->payload.tcp->tcpchksum=~(NyLPC_TIPv4Header_makeTcpChecksum(i_inst->header));
     i_inst->header->ipchksum = ~(NyLPC_TIPv4Header_makeIpChecksum(i_inst->header));
 }
-
+/* なんだっけっこれ？
 //1の補数v1にv2を加算する。
 static NyLPC_TUInt16 add16c(NyLPC_TUInt16 i_v1,NyLPC_TUInt16 i_v2)
 {
@@ -272,6 +272,7 @@
     t=i_v1-i_v2;
     return (t<i_v1)?t:t-1;
 }
+*/
 /**
  * o_instに、同一なバッファを参照するインスタンスを生成します。
  */
@@ -283,8 +284,7 @@
     o_inst->header=i_inst->header;
     o_inst->payload=i_inst->payload;
 }
-static void* logA;
-static void* logB;
+
 /**
  * ACK番号を更新する。
  * @param i_ackno
@@ -295,8 +295,7 @@
     NyLPC_TUInt32 i_ackno)
 {
     NyLPC_Assert(i_inst->header!=NULL);
-    logA=i_inst->header;
-    logB=i_inst->payload.tcp;
+
 
 /*  union{
         NyLPC_TUInt32 l;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/Httpd.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,24 @@
+#include "Httpd.h"
+#include "HttpdConnection.h"
+namespace MiMic
+{
+    void Httpd::onRequestHandler(NyLPC_TcHttpdConnection_t* i_connection)
+    {
+        HttpdConnection c(i_connection);
+        ((struct Httpd2*)(i_connection->_parent_httpd))->_parent->onRequest(c);
+    }
+    Httpd::Httpd(int i_port_number)
+    {
+        NyLPC_cHttpd_initialize((NyLPC_TcHttpd_t*)(&this->_inst),(NyLPC_TUInt16)i_port_number);
+        this->_inst._parent=this;
+        this->_inst.super.function.onRequest=onRequestHandler;
+    }
+    Httpd::~Httpd()
+    {
+        NyLPC_cHttpd_finalize((NyLPC_TcHttpd_t*)(&this->_inst));
+    }
+    void Httpd::loop()
+    {
+        NyLPC_cHttpd_loop((NyLPC_TcHttpd_t*)(&this->_inst));
+    }
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/Httpd.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,25 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// Httpd.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+
+namespace MiMic
+{
+    class HttpdConnection;
+    class Httpd
+    {
+    private:
+        struct Httpd2{
+            NyLPC_TcHttpd_t super;
+            Httpd* _parent;
+        }_inst;
+        static void onRequestHandler(NyLPC_TcHttpdConnection_t* i_connection);
+    public:
+        Httpd(int i_port_number);
+        virtual ~Httpd();
+        void loop();
+        virtual void onRequest(HttpdConnection& i_connection)=0;
+    };
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/HttpdConnection.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,18 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// Net.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+namespace MiMic
+{
+    class HttpdConnection
+    {
+    public:
+        NyLPC_TcHttpdConnection* _ref_inst;
+        HttpdConnection(NyLPC_TcHttpdConnection* i_ref_inst)
+        {
+            this->_ref_inst=i_ref_inst;
+        }
+    };
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModMiMicSetting.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,43 @@
+#include "ModMiMicSetting.h"
+#include "HttpdConnection.h"
+
+namespace MiMic
+{
+    ModMiMicSetting::ModMiMicSetting(const char* i_path)
+    {
+        this->setParam(i_path);
+    }
+    ModMiMicSetting::ModMiMicSetting()
+    {
+        this->_path=NULL;
+    }
+    ModMiMicSetting::~ModMiMicSetting()
+    {
+        if(this->_path!=NULL){
+            free(this->_path);
+        }
+    }
+    void ModMiMicSetting::setParam(const char* i_path)
+    {
+        this->_path=(char*)malloc(strlen(i_path)+1);
+        strcpy(this->_path,i_path);
+    }
+    bool ModMiMicSetting::execute(HttpdConnection& i_connection)
+    {
+        NyLPC_TcModMiMicSetting_t mod;
+
+        //check parametor
+        if(this->_path==NULL){
+            return false;
+        }
+        NyLPC_cModMiMicSetting_initialize(&mod,this->_path);
+        if(NyLPC_cModMiMicSetting_canHandle(&mod,i_connection._ref_inst)){
+            NyLPC_cModMiMicSetting_execute(&mod,i_connection._ref_inst);
+            NyLPC_cModMiMicSetting_finalize(&mod);
+            return true;
+        }
+        NyLPC_cModMiMicSetting_finalize(&mod);
+        return false;
+    }
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModMiMicSetting.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,42 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// ModMiMicSetting.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+
+
+namespace MiMic
+{
+    class HttpdConnection;
+    /**
+     * This class is a module for Httpd.
+     * The class provides an REST-API to set and get the on-chip configuration MiMicHttpd.
+     */
+    class ModMiMicSetting
+    {
+    private:
+        char* _path;
+    public:
+        /**
+         * Constructor with parameter initialization.
+         */
+        ModMiMicSetting(const char* i_path);
+        /**
+         * Default constructor.
+         * Must be call {@link setParam} function after constructed.
+         */
+        ModMiMicSetting();
+        virtual ~ModMiMicSetting();
+        void setParam(const char* i_path);
+        /**
+          * This function processes a request. 
+          * The function checks whether a connection has a target request.
+          * If necessary, it will transmit a response.
+          * @return
+          * TRUE if request was processed. otherwise FALSE.
+          */
+        bool execute(HttpdConnection& i_connection);
+    };
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModRemoteMcu.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,43 @@
+#include "ModRemoteMcu.h"
+#include "HttpdConnection.h"
+
+namespace MiMic
+{
+    ModRemoteMcu::ModRemoteMcu(const char* i_path)
+    {
+        this->setParam(i_path);
+    }
+    ModRemoteMcu::ModRemoteMcu()
+    {
+        this->_path=NULL;
+    }
+    ModRemoteMcu::~ModRemoteMcu()
+    {
+        if(this->_path!=NULL){
+            free(this->_path);
+        }
+    }
+    void ModRemoteMcu::setParam(const char* i_path)
+    {
+        this->_path=(char*)malloc(strlen(i_path)+1);
+        strcpy(this->_path,i_path);
+    }
+    bool ModRemoteMcu::execute(HttpdConnection& i_connection)
+    {
+        NyLPC_TcModRemoteMcu_t mod;
+
+        //check parametor
+        if(this->_path==NULL){
+            return false;
+        }
+        NyLPC_cModRemoteMcu_initialize(&mod,this->_path);
+        if(NyLPC_cModRemoteMcu_canHandle(&mod,i_connection._ref_inst)){
+            NyLPC_cModRemoteMcu_execute(&mod,i_connection._ref_inst);
+            NyLPC_cModRemoteMcu_finalize(&mod);
+            return true;
+        }
+        NyLPC_cModRemoteMcu_finalize(&mod);
+        return false;
+    }
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModRemoteMcu.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,42 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// ModRemoteMcu.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+
+
+namespace MiMic
+{
+    class HttpdConnection;
+    /**
+     * This class is a module for Httpd.
+     * The class provides an REST-API to execute MiMic ByteCode.
+     */
+    class ModRemoteMcu
+    {
+    private:
+        char* _path;
+    public:
+        /**
+         * Constructor with parameter initialization.
+         */
+        ModRemoteMcu(const char* i_path);
+        /**
+         * Default constructor.
+         * Must be call {@link setParam} function after constructed.
+         */
+        ModRemoteMcu();
+        virtual ~ModRemoteMcu();
+        void setParam(const char* i_path);
+        /**
+          * This function processes a request. 
+          * The function checks whether a connection has a target request.
+          * If necessary, it will transmit a response.
+          * @return
+          * TRUE if request was processed. otherwise FALSE.
+          */
+        bool execute(HttpdConnection& i_connection);
+    };
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModRomFiles.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,45 @@
+#include "ModRomFiles.h"
+#include "HttpdConnection.h"
+
+namespace MiMic
+{
+    ModRomFiles::ModRomFiles(const char* i_path,const NyLPC_TRomFileData* i_ref_fsdata,unsigned short i_num)
+    {
+        this->setParam(i_path,i_ref_fsdata,i_num);
+    }
+    ModRomFiles::ModRomFiles()
+    {
+        this->_path=NULL;
+    }
+    ModRomFiles::~ModRomFiles()
+    {
+        if(this->_path!=NULL){
+            free(this->_path);
+        }
+    }
+    void ModRomFiles::setParam(const char* i_path,const NyLPC_TRomFileData* i_ref_fsdata,unsigned short i_num)
+    {
+        this->_path=(char*)malloc(strlen(i_path)+1);
+        strcpy(this->_path,i_path);
+        this->_ref_fsdata=i_ref_fsdata;
+        this->_num=i_num;
+    }
+    bool ModRomFiles::execute(HttpdConnection& i_connection)
+    {
+        NyLPC_TcModRomFiles_t mod;
+
+        //check parametor
+        if(this->_path==NULL){
+            return false;
+        }
+        NyLPC_cModRomFiles_initialize(&mod,this->_path,this->_ref_fsdata,this->_num);
+        if(NyLPC_cModRomFiles_canHandle(&mod,i_connection._ref_inst)){
+            NyLPC_cModRomFiles_execute(&mod,i_connection._ref_inst);
+            NyLPC_cModRomFiles_finalize(&mod);
+            return true;
+        }
+        NyLPC_cModRomFiles_finalize(&mod);
+        return false;
+    }
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/ModRomFiles.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,44 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// ModRomFiles.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+
+
+namespace MiMic
+{
+    class HttpdConnection;
+    /**
+     * This class is a module for Httpd.
+     * The class sends file image which is stored on ROM.
+     */
+    class ModRomFiles
+    {
+    private:
+        char* _path;
+        const NyLPC_TRomFileData* _ref_fsdata;
+        unsigned short _num;
+    public:
+        /**
+         * Constructor with parameter initialization.
+         */
+        ModRomFiles(const char* i_path,const NyLPC_TRomFileData* i_ref_fsdata,unsigned short i_num);
+        /**
+         * Default constructor.
+         * Must be call {@link setParam} function after constructed.
+         */
+        ModRomFiles();
+        virtual ~ModRomFiles();
+        void setParam(const char* i_path,const NyLPC_TRomFileData* i_ref_fsdata,unsigned short i_num);
+        /**
+          * This function processes a request. 
+          * The function checks whether a connection has a target request.
+          * If necessary, it will transmit a response.
+          * @return
+          * TRUE if request was processed. otherwise FALSE.
+          */
+        bool execute(HttpdConnection& i_connection);
+    };
+
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/Net.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,19 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// Net.h
+////////////////////////////////////////////////////////////////////////////////
+#include "Net.h"
+#include "NetConfig.h"
+
+namespace MiMic
+{
+    Net::Net(NetConfig& i_cfg)
+    {
+        NyLPC_cNet_initialize(&(this->_inst));
+        NyLPC_cNet_start(&(this->_inst),&(i_cfg._inst));
+    }
+    Net::~Net()
+    {
+        NyLPC_cNet_finalize(&(this->_inst));
+    }
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/Net.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,23 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// Net.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+namespace MiMic
+{
+    class NetConfig;
+    class Net
+    {
+    public:
+        NyLPC_TcNet_t _inst;
+    public:
+        /**
+         * The constructor.
+         * @param i_cfg
+         * The instance references the object. Must hold until the instance deleted.
+         */
+        Net(NetConfig& i_cfg);
+        virtual ~Net();
+    };
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/NetConfig.cpp	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,15 @@
+#include "NetConfig.h"
+
+namespace MiMic
+{
+
+    NetConfig::NetConfig(bool i_is_factory_default)
+    {
+        NyLPC_cNetConfig_initialize(&(this->_inst));
+    }
+    NetConfig::~NetConfig()
+    {
+        NyLPC_cNetConfig_finalize(&(this->_inst));
+    }
+
+};
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/NetConfig.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,31 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// NetConfig.h
+////////////////////////////////////////////////////////////////////////////////
+
+#include "NyLPC_net.h"
+
+namespace MiMic
+{
+    /**
+     * Network configulation class.
+     */
+    class NetConfig
+    {
+    public:
+        NyLPC_TcNetConfig_t _inst;
+    public:
+        /**
+         * The constructor.
+         * This function initializes instance by onchip configulation data.
+         * @param i_is_factory_default
+          * Factory default flag.
+         * <ul>
+         * <li>true - The function sets factory default setting.
+         * <li>false -The function sets onchip memory configulation (default)
+         * </ul>
+         */
+        NetConfig(bool i_is_factory_default=false);
+        virtual ~NetConfig();
+    };
+   }
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cpp/mimic.h	Thu Apr 04 08:22:57 2013 +0000
@@ -0,0 +1,13 @@
+#pragma once
+////////////////////////////////////////////////////////////////////////////////
+// mimic.h
+////////////////////////////////////////////////////////////////////////////////
+#include "Net.h"
+#include "NetConfig.h"
+#include "Httpd.h"
+#include "HttpdConnection.h"
+#include "ModRomFiles.h"
+#include "ModRemoteMcu.h"
+#include "ModMiMicSetting.h"
+
+using namespace MiMic;
\ No newline at end of file