Seperated LOADER_LOAD_DSC/LOADER_UNLOAD_DSC from LOADER_LOAD/LOADER_UNLOAD as the later is only used by the directory app. This saves 20 bytes of resident code space.
diff --git a/contiki-cc65/loader/loader-arch-dsc.c b/contiki-cc65/loader/loader-arch-dsc.c
new file mode 100644
index 0000000..b142e18
--- /dev/null
+++ b/contiki-cc65/loader/loader-arch-dsc.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003, Adam Dunkels.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This file is part of the Contiki desktop OS
+ *
+ * $Id: loader-arch-dsc.c,v 1.1 2005/05/07 14:24:37 oliverschmidt Exp $
+ *
+ */
+
+#include <modload.h>
+
+#include "loader.h"
+
+extern struct mod_ctrl ctrl;
+
+unsigned char load(const char *name);
+
+/*-----------------------------------------------------------------------------------*/
+struct dsc *
+loader_arch_load_dsc(const char *name)
+{
+ unsigned char r;
+
+ r = load(name);
+ if(r == MLOAD_OK) {
+ return (struct dsc *)ctrl.module;
+ }
+ return NULL;
+}
+/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-cc65/loader/loader-arch-dsc.h b/contiki-cc65/loader/loader-arch-dsc.h
new file mode 100644
index 0000000..56bf735
--- /dev/null
+++ b/contiki-cc65/loader/loader-arch-dsc.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2003, Adam Dunkels.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This file is part of the Contiki desktop OS
+ *
+ * $Id: loader-arch-dsc.h,v 1.1 2005/05/07 14:24:38 oliverschmidt Exp $
+ *
+ */
+#ifndef __LOADER_ARCH_DSC_H__
+#define __LOADER_ARCH_DSC_H__
+
+#include "dsc.h"
+#include <modload.h>
+
+struct dsc *loader_arch_load_dsc(const char *name);
+
+#define LOADER_LOAD_DSC(name) loader_arch_load_dsc(name)
+#define LOADER_UNLOAD_DSC(dsc) mod_free(dsc)
+
+#endif /* __LOADER_ARCH_DSC_H__ */
diff --git a/contiki-cc65/loader/loader-arch.c b/contiki-cc65/loader/loader-arch.c
index 0a5091f..95be07e 100644
--- a/contiki-cc65/loader/loader-arch.c
+++ b/contiki-cc65/loader/loader-arch.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop OS
*
- * $Id: loader-arch.c,v 1.7 2005/05/06 22:54:57 oliverschmidt Exp $
+ * $Id: loader-arch.c,v 1.8 2005/05/07 14:24:38 oliverschmidt Exp $
*
*/
@@ -40,9 +40,7 @@
#include "loader.h"
-#include "loader-arch.h"
-
-static struct mod_ctrl ctrl = {
+struct mod_ctrl ctrl = {
read /* Read from disk */
};
@@ -60,7 +58,7 @@
* Ullrich von Bassewitz.
*/
/*-----------------------------------------------------------------------------------*/
-static unsigned char
+unsigned char
load(const char *name)
{
unsigned char res;
@@ -115,15 +113,3 @@
return LOADER_OK;
}
/*-----------------------------------------------------------------------------------*/
-struct dsc *
-loader_arch_load_dsc(const char *name)
-{
- unsigned char r;
-
- r = load(name);
- if(r == MLOAD_OK) {
- return (struct dsc *)ctrl.module;
- }
- return NULL;
-}
-/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-cc65/loader/loader-arch.h b/contiki-cc65/loader/loader-arch.h
index 6aa7607..dbc31eb 100644
--- a/contiki-cc65/loader/loader-arch.h
+++ b/contiki-cc65/loader/loader-arch.h
@@ -29,23 +29,19 @@
*
* This file is part of the Contiki desktop OS
*
- * $Id: loader-arch.h,v 1.4 2005/05/06 22:54:57 oliverschmidt Exp $
+ * $Id: loader-arch.h,v 1.5 2005/05/07 14:24:38 oliverschmidt Exp $
*
*/
#ifndef __LOADER_ARCH_H__
#define __LOADER_ARCH_H__
-#include "dsc.h"
#include <modload.h>
unsigned char loader_arch_load(const char *name, char *arg);
-struct dsc *loader_arch_load_dsc(const char *name);
extern void *loader_arch_loadaddr;
#define LOADER_LOAD(name, arg) loader_arch_load(name, arg)
-#define LOADER_LOAD_DSC(name) loader_arch_load_dsc(name)
#define LOADER_UNLOAD() mod_free(&loader_arch_loadaddr)
-#define LOADER_UNLOAD_DSC(dsc) mod_free(dsc)
#endif /* __LOADER_ARCH_H__ */