Changeset 3437 for pjproject

Timestamp:

Mar 8, 2011 6:30:34 AM (14 years ago)

Author:

nanang

Message:

Implementation of re #1202 (PJLIB System Information API) on Symbian/S60 platforms.

Location:

pjproject/trunk

Files:

• build.symbian/pjlib.mmp (modified) (1 diff)
• build.symbian/pjlib_test.mmp (modified) (1 diff)
• build.symbian/symbian_ua.mmp (modified) (1 diff)
• pjlib/src/pj/os_info.c (modified) (3 diffs)
• pjlib/src/pj/os_info_symbian.cpp (added)
• pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp (modified) (1 diff)

pjproject/trunk/build.symbian/pjlib.mmp

@@ -44 +44 @@
 SOURCE          string.c
 SOURCE          log.c
+SOURCE          os_info.c
+SOURCE          os_info_symbian.cpp
 SOURCE          os_time_common.c
 SOURCE          pool.c

pjproject/trunk/build.symbian/pjlib_test.mmp

@@ -72 +72 @@
 LIBRARY         esock.lib insock.lib charconv.lib euser.lib estlib.lib 
 LIBRARY         securesocket.lib x509.lib crypto.lib x500.lib 
+LIBRARY         hal.lib efsrv.lib
  
 #ifdef WINSCW

pjproject/trunk/build.symbian/symbian_ua.mmp

@@ -77 +77 @@
 LIBRARY                 esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
 LIBRARY                 securesocket.lib x509.lib crypto.lib x500.lib 
+LIBRARY                 hal.lib efsrv.lib
 
 // The default 8KB seems to be insufficient with all bells and

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -60 +60 @@
     void pj_iphone_os_get_sys_info(pj_sys_info *si, pj_str_t *si_buffer);
 #endif
+    
+#if defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0
+    PJ_BEGIN_DECL
+    unsigned pj_symbianos_get_model_info(char *buf, unsigned buf_size);
+    unsigned pj_symbianos_get_platform_info(char *buf, unsigned buf_size);
+    void pj_symbianos_get_sdk_info(pj_str_t *name, pj_uint32_t *ver);
+    PJ_END_DECL
+#endif
+
 
 static char *ver_info(pj_uint32_t ver, char *buf)
@@ -217 +226 @@
             break;
     #endif      /* PJ_WIN32_WINCE */
+        }
+    }
+#elif defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0
+    {
+        pj_symbianos_get_model_info(si_buffer, sizeof(si_buffer));
+        ALLOC_CP_STR(si_buffer, machine);
+        
+        char *p = si_buffer + sizeof(si_buffer) - left;
+        unsigned plen;
+        plen = pj_symbianos_get_platform_info(p, left);
+        if (plen) {
+            /* Output format will be "Series60vX.X" */
+            si.os_name = pj_str("S60");
+            si.os_ver  = parse_version(p+9);
+        } else {
+            si.os_name = pj_str("Unknown");
         }
     }
@@ -264 +289 @@
                  ((_MSC_VER % 10) << 8);
     si.sdk_name = pj_str("msvc");
+#elif defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0
+    pj_symbianos_get_sdk_info(&si.sdk_name, &si.sdk_ver);
 #endif
 

pjproject/trunk/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp

@@ -46 +46 @@
 LIBRARY                 charconv.lib estlib.lib 
 LIBRARY                 securesocket.lib x509.lib crypto.lib x500.lib
+LIBRARY                 hal.lib
 
 // Ordering static libs based on dependencies, most to least dependent,