From 155a27ff59233f6b2725470d18564bb351a86a16 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Thu, 7 Feb 2008 15:53:43 +0000 Subject: [PATCH] Switched from (now obsolete) 'process_load' to 'autostart_processes'. --- core/loader/dlloader.c | 8 ++++---- core/loader/elfloader_compat.c | 4 ++-- platform/win32/loader/dll-loader.c | 8 ++++---- platform/win32/loader/dll-loader.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/loader/dlloader.c b/core/loader/dlloader.c index 7c325581a..5a1957697 100644 --- a/core/loader/dlloader.c +++ b/core/loader/dlloader.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: dlloader.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $ + * @(#)$Id: dlloader.c,v 1.2 2008/02/07 15:53:43 oliverschmidt Exp $ */ #include #include @@ -53,10 +53,10 @@ dlloader_load(char *path, char *arg) return LOADER_ERR_FMT; } - /* Find the main process of the loaded program. */ - p = dlsym(handle, "process_load"); + /* Find the processes to be started from the loaded program. */ + p = dlsym(handle, "autostart_processes"); if(p == NULL) { - printf("dlloader_load: could not find process startpoint 'process_load'\n"); + printf("dlloader_load: could not find symbol 'autostart_processes'\n"); return LOADER_ERR_FMT; } diff --git a/core/loader/elfloader_compat.c b/core/loader/elfloader_compat.c index 3445eb6bf..bbc0a88b9 100644 --- a/core/loader/elfloader_compat.c +++ b/core/loader/elfloader_compat.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: elfloader_compat.c,v 1.6 2007/06/04 17:51:41 bg- Exp $ + * @(#)$Id: elfloader_compat.c,v 1.7 2008/02/07 15:53:43 oliverschmidt Exp $ */ /* @@ -165,7 +165,7 @@ elfloader_load(off_t eepromaddr) /* Find _init, _fini, and loaded_process. */ elfloader_loaded_process = cle_lookup(&h, xmem_pread, eepromaddr, - "process_load"); + "autostart_processes"); elfloader_fini = cle_lookup(&h, xmem_pread, eepromaddr, "_fini"); elfloader_init = cle_lookup(&h, xmem_pread, eepromaddr, "_init"); diff --git a/platform/win32/loader/dll-loader.c b/platform/win32/loader/dll-loader.c index 9589e652a..d581fa077 100644 --- a/platform/win32/loader/dll-loader.c +++ b/platform/win32/loader/dll-loader.c @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: dll-loader.c,v 1.3 2007/11/18 13:24:34 oliverschmidt Exp $ + * $Id: dll-loader.c,v 1.4 2008/02/07 15:54:50 oliverschmidt Exp $ */ #define WIN32_LEAN_AND_MEAN @@ -54,10 +54,10 @@ dll_loader_load(char *name, char *arg) return LOADER_ERR_OPEN; } - /* Find the main process of the loaded program. */ - p = GetProcAddress(handle, "process_load"); + /* Find the processes to be started from the loaded program. */ + p = GetProcAddress(handle, "autostart_processes"); if(p == NULL) { - debug_printf("dll_loader_load: could not find process startpoint 'process_load'\n"); + debug_printf("dll_loader_load: could not find symbol 'autostart_processes'\n"); return LOADER_ERR_READ; } diff --git a/platform/win32/loader/dll-loader.h b/platform/win32/loader/dll-loader.h index 8682019a3..9693cfeb5 100644 --- a/platform/win32/loader/dll-loader.h +++ b/platform/win32/loader/dll-loader.h @@ -30,13 +30,13 @@ * * Author: Oliver Schmidt * - * $Id: dll-loader.h,v 1.3 2006/08/15 14:50:13 oliverschmidt Exp $ + * $Id: dll-loader.h,v 1.4 2008/02/07 15:54:50 oliverschmidt Exp $ */ #ifndef __DLL_LOADER_H__ #define __DLL_LOADER_H__ #define LOADER_LOAD(name, arg) dll_loader_load(name, arg); -#define LOADER_UNLOAD() dll_loader_unload((void *)process_load) +#define LOADER_UNLOAD() dll_loader_unload((void *)autostart_processes) #define LOADER_LOAD_DSC(name) dll_loader_load_dsc(name) #define LOADER_UNLOAD_DSC(dsc) dll_loader_unload_dsc(dsc)