Changeset 4 in svn

Timestamp:

Mar 10, 2015 6:08:18 PM (11 years ago)

Author:

jglee

Message:

DSTAR 구분

Location:

trunk/zasc/app_c

Files:

• DST_WinEngineerMenu.c (modified) (1 diff)
• dst_eroum_interface.c (modified) (2 diffs)

trunk/zasc/app_c/DST_WinEngineerMenu.c

@@ -177 +177 @@
                 this->DrawText(this, 2, 22, this->rect.w, 20, strText[0], &(this->font));
 
+#ifdef DSTAR
+#else
                 sprintf(strText[1], "FrontEnd: %s, SNR: %ddB, PowerLevel: %ddBmV", bLock?(char*)"lock":(char*)"unlock", snr/256, ((origin_power_level)/2)-60);
+#endif
                 this->DrawText(this, 2, 42, this->rect.w, 20, strText[1], &(this->font));
 

trunk/zasc/app_c/dst_eroum_interface.c

@@ -1380 +1380 @@
 {
         if (size <= 0) return 0;
+#ifdef DSTAR
+        void *p = malloc(size);
+#else
         void *p = OS_Malloc(size);
+#endif
+
         memset(p, 0, size);
         return p;
@@ -1392 +1397 @@
 void DST_OS_FreeDirect( void *ptr) // free
 {
+#ifdef DSTAR
+        free(ptr);
+#else
         OS_FreeDirect(ptr);
+#endif
 }