English

Revision 13:a71705c5e6fd, committed 2013-04-21

Comitter:

nyatla

Date:

Sun Apr 21 01:21:41 2013 +0000

Parent:

12:efe841863fc8

Child:

14:4618692ec239

Commit message:

a lot changes.; add format text reader. ;

Changed in this revision

--- a/core/NyLPC_stdlib.c	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/NyLPC_stdlib.c	Sun Apr 21 01:21:41 2013 +0000
@@ -119,26 +119,37 @@
 
 
 
-
 /**
  * same as itoa
  */
 void NyLPC_itoa(int i_n,char* o_out,int i_digit)
 {
-     int i, sign;
+     int i, sign,v;
      if ((sign = i_n) < 0){
          i_n = -i_n;
      }
      i = 0;
      do{
-         o_out[i++] = i_n % 10 + '0';
-     }while ((i_n /= 10) > 0);
+         v=i_n % i_digit;
+         o_out[i++] = v<10?(v+'0'):(v+'a'-10);
+     }while ((i_n /= i_digit) > 0);
      if (sign < 0){
          o_out[i++] = '-';
      }
      o_out[i] = '\0';
      NyLPC_reverse(o_out);
 }
+void NyLPC_uitoa(int i_n,char* o_out,unsigned int i_digit)
+{
+     int i = 0;
+     int v;
+     do{
+         v=i_n % i_digit;
+         o_out[i++] = v<10?(v+'0'):(v+'a'-10);
+     }while ((i_n /= i_digit) > 0);
+     o_out[i] = '\0';
+     NyLPC_reverse(o_out);
+}
 
 void NyLPC_reverse(char* s)
 {

--- a/core/http/NyLPC_cHttpBodyWriter.c	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/http/NyLPC_cHttpBodyWriter.c	Sun Apr 21 01:21:41 2013 +0000
@@ -198,7 +198,7 @@
                     NyLPC_cHttpBodyWriter_write((NyLPC_TcHttpBodyWriter_t*)i_inst,wk,ol);
                     ol=0;
                 }
-                NyLPC_itoa((va_arg(args,int)),wk,16);
+                NyLPC_uitoa((va_arg(args,int)),wk,16);
                 //強制コミット
                 NyLPC_cHttpBodyWriter_write((NyLPC_TcHttpBodyWriter_t*)i_inst,wk,strlen(wk));
                 rp++;

--- a/core/include/NyLPC_stdlib.h	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/include/NyLPC_stdlib.h	Sun Apr 21 01:21:41 2013 +0000
@@ -469,6 +469,10 @@
  */
 void NyLPC_itoa(int i_n,char* o_out,int i_digit);
 
+
+void NyLPC_uitoa(int i_n,char* o_out,unsigned int i_digit);
+
+
 /**
  * Same as reverse
  */
@@ -515,4 +519,6 @@
 
 
 
+
+
 #endif

--- a/core/net/NyLPC_cNetConfig.c	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/net/NyLPC_cNetConfig.c	Sun Apr 21 01:21:41 2013 +0000
@@ -35,8 +35,6 @@
     }else{
         update(i_inst,NyLPC_cMiMicConfiglation_loadFromFlash());
     }
-
-
 }
 
 /**

--- a/core/net/NyLPC_cNetConfig.h	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/net/NyLPC_cNetConfig.h	Sun Apr 21 01:21:41 2013 +0000
@@ -23,7 +23,7 @@
 {
     /** Must be 1*/
     NyLPC_TUInt16 version;
-    /** 配列の最大サイズ*/
+    /** インタフェイスタイプ*/
     NyLPC_TUInt16 interface_type;
     /** インタフェイス層の設定*/
     union{
@@ -34,18 +34,15 @@
 //          struct NyLPC_TEthAddr mac_addr;
 //      }ethernet2;
     }interface_setting;
-//  /** ip addressの設定*/
-//  struct{
-//      struct NyLPC_TIPv4Addr ip;
-//      struct NyLPC_TIPv4Addr mask;
-//      struct NyLPC_TIPv4Addr gateway;
-//  }ipv4;
 };
 
 /**
  * インスタンスを初期化します。
  */
 void NyLPC_cNetConfig_initialize(NyLPC_TcNetConfig_t* i_inst,NyLPC_TBool i_is_factory_default);
+
+
+
 /**
  * インスタンスを終期化します。
  */

--- a/core/uip/NyLPC_cIPv4Config.h	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/uip/NyLPC_cIPv4Config.h	Sun Apr 21 01:21:41 2013 +0000
@@ -79,6 +79,7 @@
  */
 void NyLPC_cIPv4Config_initialzeForEthernet(NyLPC_TcIPv4Config_t* i_inst,const struct NyLPC_TEthAddr* i_ether_addr,NyLPC_TUInt16 i_ether_frame_len);
 
+
 /**
  * デストラクタです。インスタンスを破棄して、確保している動的リソースを元に戻します。
  * @param i_inst

--- a/core/utils/NyLPC_cFormatTextReader.c	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/utils/NyLPC_cFormatTextReader.c	Sun Apr 21 01:21:41 2013 +0000
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "NyLPC_cFormatTextReader.h"
+
 /**
  * [a-zA-Z0-9_-]で構成されるワードを取得します。
  * This function peek a word from string.
@@ -61,6 +62,7 @@
  */
 NyLPC_TInt32 NyLPC_cFormatTextReader_readMacAddr(const NyLPC_TChar* buf,NyLPC_TUInt8 v[6])
 {
+
     NyLPC_TInt32 t,i;
     const NyLPC_TChar* p=buf;
     for(i=0;i<6;i++){
@@ -68,17 +70,17 @@
         for(;isxdigit(*p);p++){
             t=t*16+NyLPC_ctox(*p);
             if(t>255){
-                return 0;
+                return -1;
             }
         }
         v[i]=t;
         if(i<5){
             if(*p!=':'){
-                return 0;
+                return -2;
             }
             p++;
         }else if(!isspace(*p) && *p!='\0'){
-            return 0;
+            return -3;
         }
     }
     return (p-buf);

--- a/core/utils/NyLPC_cFormatTextReader.h	Sat Apr 20 05:03:57 2013 +0000
+++ b/core/utils/NyLPC_cFormatTextReader.h	Sun Apr 21 01:21:41 2013 +0000
@@ -9,7 +9,9 @@
 
 #ifndef NYLPC_CFORMATTEXTREADER_H_
 #define NYLPC_CFORMATTEXTREADER_H_
-
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /**
  * [a-zA-Z0-9_-]で構成されるワードを取得します。
@@ -40,6 +42,8 @@
  * 読み飛ばしたスペース
  */
 NyLPC_TInt32 NyLPC_cFormatTextReader_seekSpace(const NyLPC_TChar* s);
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* NYLPC_CFORMATTEXTREADER_H_ */

--- a/cpp/ModLocalFileSystem.cpp	Sat Apr 20 05:03:57 2013 +0000
+++ b/cpp/ModLocalFileSystem.cpp	Sun Apr 21 01:21:41 2013 +0000
@@ -2,6 +2,7 @@
 #include "HttpdConnection.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include "mbed.h"
 #define ModLocalFile_SIZE_OF_BUF 256
 #define SIZE_OF_FILENAME (32)
 static char buf[ModLocalFile_SIZE_OF_BUF];
@@ -48,7 +49,19 @@
                 return true;
             }
             NyLPC_cModUrl_finalize(&mod);
+        }/*
+        DIR *d;
+        struct dirent *p;
+        d = opendir(buf);
+        if ( d != NULL )
+        {
+            if(i_connection.sendHeader(200,"text/plain",NULL)){
+            while ( (p = readdir(d)) != NULL )
+            {
+               i_connection.sendBodyF( p->d_name,strlen(p->d_name));
+            }
         }
+        closedir(d);*/
         {        
             //Httpd lock
             i_connection.lockHttpd();            

--- a/cpp/NetConfig.cpp	Sat Apr 20 05:03:57 2013 +0000
+++ b/cpp/NetConfig.cpp	Sun Apr 21 01:21:41 2013 +0000
@@ -1,6 +1,9 @@
 #include "NetConfig.h"
 #include "NyLPC_uip.h"
 #include "NyLPC_uip_ethernet.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "mbed.h"
 namespace MiMic
 {
 
@@ -40,6 +43,60 @@
     {
         NyLPC_TEthAddr_set(&(this->_inst.interface_setting.ethernet.eth_mac),a1,a2,a3,a4,a5,a6);
     }
-    
+    bool NetConfig::loadFromFile(const char* i_file)
+    {
+        const static char* tbl[]={"macaddr","ipaddr","netmask","gateway"};
+        char tmp[32];
+        unsigned char v[6];
+        const char* p;
+        const char* key;
+        int l;
+        FILE* fp = fopen(i_file,"r");
+        if(fp==NULL){
+            return false;
+        }
+        //read from values
+        while(fgets(tmp,31,fp)){
+            p=NyLPC_cFormatTextReader_seekSpace(tmp)+tmp;//skip space
+            l=NyLPC_cFormatTextReader_readWord(p,&key);
+            for(int i=0;i<4;i++){
+                if(l>=0 && NyLPC_strnicmp(key,tbl[i],l)==0){
+                    p+=l;//skip keyname
+                    p=NyLPC_cFormatTextReader_seekSpace(p)+p;//skip space
+                    if(*p!='='){
+                        break;//check equal
+                    }
+                    p++;
+                    p=NyLPC_cFormatTextReader_seekSpace(p)+p;//skip space
+                    switch(i){
+                    case 0:
+                        if(NyLPC_cFormatTextReader_readMacAddr(p,v)!=0){
+                            this->setEmac(v[0],v[1],v[2],v[3],v[4],v[5]);
+                        }
+                        break;
+                    case 1:
+                        if(NyLPC_cFormatTextReader_readIpAddr(p,v)!=0){
+                            this->setIpAddr(v[0],v[1],v[2],v[3]);
+                        }
+                        break;
+                    case 2:
+                        if(NyLPC_cFormatTextReader_readIpAddr(p,v)!=0){
+                            this->setNetMask(v[0],v[1],v[2],v[3]);
+                        }
+                        break;
+                    case 3:
+                        if(NyLPC_cFormatTextReader_readIpAddr(p,v)!=0){
+                            this->setGateway(v[0],v[1],v[2],v[3]);
+                        }
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+        fclose(fp);
+        return true;
+    }   
 
 };
\ No newline at end of file

--- a/cpp/NetConfig.h	Sat Apr 20 05:03:57 2013 +0000
+++ b/cpp/NetConfig.h	Sun Apr 21 01:21:41 2013 +0000
@@ -45,5 +45,30 @@
          * Set ethernet mac address to instance.
          */
         void setEmac(unsigned char ip6,unsigned char ip5,unsigned char ip4,unsigned char ip3,unsigned char ip2,unsigned char ip1);
-    };
-   }
\ No newline at end of file
+        /**
+         * Load configulation from text file.
+         * <p>File format example
+         * <pre>
+         * macaddr=00:00:00:00:00:00
+         * ipaddr=192.168.0.1
+         * netmask=255.255.255.0
+         * gateway=192.168.0.254
+         * </pre>
+         * <p>Keys
+         * <ul>
+         * <li>macaddr=[:macaddr:] - 48bit ethernet mac address that are separated by ':'</li>
+         * <li>ipaddr=[:ip:] - 32 bit IP address</li>
+         * <li>netmask=[:ip:]- 32 bit network mask value.</li>
+         * <li>gateway=[:ip:] - 32 bit default gateway address.</li>
+         * </ul>
+         * </p>
+         * Maximum line length is 31.
+         * Specified values are override on-chip setting value.
+         * If the same value appeared, then the last one is enabled.
+         * </p>
+         * @return
+         * true if file read. false is not read.
+         */
+         bool NetConfig::loadFromFile(const char* i_file);
+   };
+}
\ No newline at end of file