Changeset 1488

Timestamp:

12/15/11 13:19:56 (18 months ago)

Author:

tsv

Message:

Flat branch update. Collection of fixes and small improvements, required for futher module.

• Fixed Makefiles to correct clean/create modules
• Make menu title possible to have non langid values
• Make load_from_file() much more universal
• variable names enhahcements

Location:

branches/reyalp-flt

Files:

• CHDK/Makefile (modified) (1 diff)
• Makefile (modified) (1 diff)
• core/gui_menu.h (modified) (1 diff)
• core/module_load.c (modified) (1 diff)
• core/module_load.h (modified) (3 diffs)
• core/modules/Makefile (modified) (1 diff)
• include/lang.h (modified) (1 diff)
• lib/lang/lang.c (modified) (4 diffs)
• tools/elf2flt/elfflt.c (modified) (1 diff)
• tools/elf2flt/flt.h (modified) (1 diff)
• tools/elf2flt/fltdump.c (modified) (1 diff)

branches/reyalp-flt/CHDK/Makefile

@@ -28 +28 @@
 clean:
         rm -f $(GENLUA)
+        rm -f MODULES/*.flt
 
 include $(topdir)bottom.inc

branches/reyalp-flt/Makefile

@@ -11 +11 @@
 firsub: all
         mkdir -p  $(topdir)bin
+        mkdir -p  $(topdir)CHDK/MODULES
         cp $(topdir)loader/$(PLATFORM)/main.bin  $(topdir)bin/main.bin
 ifndef NOZERO100K

branches/reyalp-flt/core/gui_menu.h

@@ -50 +50 @@
 typedef struct {
     char                symbol;
-    short               title;
+    int                 title;
     void                (*on_change)(unsigned int item);
     const CMenuItem     *menu;

branches/reyalp-flt/core/module_load.c

@@ -109 +109 @@
                 strcpy(tgt,name);
         else
-   sprintf(tgt,"A/CHDK/MODULES/%s",name);
+   sprintf(tgt,"%s/%s",MODULES_PATH,name);
 }
 

branches/reyalp-flt/core/module_load.h

@@ -8 +8 @@
 // This is main CHDK trunk
 #define CURRENT_CHDK_BRANCH 1
+
+#define MODULES_PATH "A/CHDK/MODULES"
+
+
+// Base typedefs
+//-------------------
 
 #define EXPORTLIST_MAGIC_NUMBER  0x43215678
@@ -22 +28 @@
 };
 
+
+// Common module functions
+//-------------------------
+
 int module_check_is_exist(char* name);
 int module_find(char * name );
@@ -32 +42 @@
 void module_set_flags(unsigned int idx, char value);
 
+void* module_get_adr(unsigned int idx);
+
+
+// Asynchronous unloading
+//-------------------------
 void module_async_unload(unsigned int idx);
 void module_async_unload_allrunned(int enforce);
 void module_tick_unloader();
 
-void* module_get_adr(unsigned int idx);
-
-
+// In-module binding to conf.
+//---------------------------
 #define CONF_BIND_INT(idConf,var)  if ( conf_getValue(idConf, &configVal) == CONF_VALUE ) {     var = configVal.pInt; } else { return 1;}
 #define CONF_BIND_COLOR(idConf,var)  if ( conf_getValue(idConf, &configVal) == CONF_VALUE ) {   var = (color*)configVal.pInt; } else { return 1;}

branches/reyalp-flt/core/modules/Makefile

@@ -134 +134 @@
 
 clean:
-        rm -f *.o *.elf.syms *.elf $(OBJS) $(OPT_OBJS)
+        rm -f *.o *.elf.syms *.elf *.flt $(OBJS) $(OPT_OBJS)
 
 distclean: clean

branches/reyalp-flt/include/lang.h

@@ -5 +5 @@
 extern void lang_init(int num);
 
-extern void lang_parse_from_mem(char *buf);
 extern void lang_load_from_file(const char *filename);
 extern void lang_map_preparsed_from_mem( char* gui_lang_default, int num );
 
-typedef void (*callback_process_file)(char* buf);
-extern void load_from_file(const char *filename, callback_process_file callback) ;
+typedef int (*callback_process_file)(char* buf, int size);
+extern int load_from_file(const char *filename, callback_process_file callback) ;
 
 extern char* lang_str(int str);

branches/reyalp-flt/lib/lang/lang.c

@@ -69 +69 @@
 // buf - source array (content of file.lng )
 //-------------------------------------------------------------------
-void lang_parse_from_mem(char *buf) {
+int lang_parse_from_mem(char *buf, int size) {
     char *p, *s, *e;
     int i;
+
+        if  ( size <= 0 )
+          return 0;
 
     e = buf-1;
@@ -95 +98 @@
         }
     }
+        return 1;
 }
 
@@ -116 +120 @@
 }
 
-
+// PURPOSE:
 // Universal file processor
 // Load file, process by callback, unalloc/close file
+// RETURN:
+//       Transfer return value from callback
+// NOTE:
+//       Call callback even if fail to load/malloc (size=-1 if no file, size=0 if empty) 
 //-------------------------------------------------------------------
-void load_from_file(const char *filename, callback_process_file callback)
+int load_from_file(const char *filename, callback_process_file callback)
 {
     int f, size;
@@ -126 +134 @@
     char *buf;
 
+        buf = 0;
+    size = -1;
+
     f = open(filename, O_RDONLY, 0777);
-    if (f>=0) {
+    if (f>=0)
         size = (stat((char*)filename, &st)==0)?st.st_size:0;
-        if (size) {
+    if (size>0 )
             buf = umalloc(size+1);
             if (buf) {
                 size = read(f, buf, size);
                 buf[size]=0;
-                callback(buf);
+        }
+
+        size = callback( buf, size);
+
+        if ( buf )
                 ufree(buf);
-            }
-        }
+    if (f>=0)
         close(f);
-    }
+
+        return size;
 }
 

branches/reyalp-flt/tools/elf2flt/elfflt.c

@@ -698 +698 @@
             printf("\n");
         }
-        printf("->Module Info: %s\n", get_flat_string(_module_info->ModuleInfo) );
+        printf("->Module Info: %s\n", get_flat_string(_module_info->description) );
   }
 

branches/reyalp-flt/tools/elf2flt/flt.h

@@ -96 +96 @@
         int32_t moduleName;                     // pointer to string with module name or -LANG_ID
         uint16_t major_ver, minor_ver;
-        int32_t ModuleInfo;
+        int32_t description;            // pointer to string with module description
 };
 

branches/reyalp-flt/tools/elf2flt/fltdump.c

@@ -159 +159 @@
                     printf("\n");
                 }
-                printf("->Module Info: %s\n", get_flat_string(_module_info->ModuleInfo) );
+                printf("->Module Info: %s\n", get_flat_string(_module_info->description) );
         }