Changeset 1495 for branches/reyalp-flt

Timestamp:

12/21/11 20:56:32 (17 months ago)

Author:

tsv

Message:

Quick fix flat module branch:

• Remove obsolete scripts from /Makefile
• Reconcile module_inspector to new import check

Location:

branches/reyalp-flt

Files:

• Makefile (modified) (1 diff)
• core/modules/module_inspector.c (modified) (2 diffs)

branches/reyalp-flt/Makefile

@@ -121 +121 @@
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EXAM/*     > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/TEST/*     > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/*    > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/Lua/*        > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/4Pack/uBasic/* > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EDITOR/*   > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/syscurves.CVF      > $(DEVNULL)

branches/reyalp-flt/core/modules/module_inspector.c

@@ -9 +9 @@
 
 extern int basic_module_init();
-void* _getmeminfo=0;
+void (*_getmeminfo)(void*) = 0;
 
 /***************** BEGIN OF AUXILARY PART *********************
@@ -175 +175 @@
                 if (_getmeminfo) {
 
-                        extern void GetMemInfo(cam_meminfo*);
-
                 cam_meminfo meminfo;
                         memset(&meminfo,sizeof(meminfo),0);
-                GetMemInfo(&meminfo);
+                _getmeminfo(&meminfo);
 
                         char txt[50];