Changeset 1476

Timestamp:

12/11/11 22:18:26 (18 months ago)

Author:

reyalp

Message:

reconcile with tsv 7

Location:

branches/reyalp-flt

Files:

• core/module_load.c (modified) (1 diff)
• tools/elf2flt/flt.h (modified) (2 diffs)

branches/reyalp-flt/core/module_load.c

@@ -330 +330 @@
    // store runtime params
    flat_module_name_make(modules[idx]->modulename, name);
-   modules[idx]->runtime_bind_callback = callback;     //@tsv reuse unneeded entry to store valuable
+   modules[idx]->runtime_bind_callback = (uint32_t) callback;     //@tsv reuse unneeded entry to store valuable
 
    int bind_err=0;

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

@@ -3 +3 @@
 
 typedef unsigned short uint16_t;
-
 typedef short int16_t;
 typedef unsigned int uint32_t;
@@ -23 +22 @@
     union {
         uint32_t rev;                           /* version (as above) */
-// ensure this is only a pointer on the target, not on (possibly 64 bit) hosts
-#ifdef HDK_VERSION
-        void * runtime_bind_callback; // while loaded: callback to chdk binder function 
-#else
         uint32_t runtime_bind_callback; // while loaded: callback to chdk binder function 
-#endif
     };
     uint32_t entry;        /* Offset of first executable instruction