X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Finclude%2Fmodules.h;h=d72813369ea6f0804559ae13449466536dc087d7;hb=dd2491a82880ed9b01b5d66b1814d271921797a4;hp=db3f91ad8a3a437326403b993507b0fd4813d3a0;hpb=efa38e0d56b1b620b6f4e5c4f91abc483a3065e2;p=tpg%2Facess2.git

diff --git a/Kernel/include/modules.h b/Kernel/include/modules.h
index db3f91ad..d7281336 100644
--- a/Kernel/include/modules.h
+++ b/Kernel/include/modules.h
@@ -53,7 +53,7 @@
  *             	Contains the identifiers of the required modules.
  */
 #define MODULE_DEFINE(_flags,_ver,_ident,_entry,_deinit,_deps...) \
-	char *EXPAND_CONCAT(_DriverDeps_,_ident)[]={_deps};\
+	const char *EXPAND_CONCAT(_DriverDeps_,_ident)[]={_deps};\
 	tModule __attribute__ ((section ("KMODULES"),unused))\
 	EXPAND_CONCAT(_DriverInfo_,_ident)=\
 	{MODULE_MAGIC,MODULE_ARCH_ID,_flags,_ver,NULL,EXPAND_STR(_ident),\
@@ -71,10 +71,10 @@ typedef struct sModule
 	Uint8	Flags;	//!< Module Flags
 	Uint16	Version;	//!< Module Version in Major.Minor 8.8 form
 	struct sModule	*Next;	//!< Next module in list (not to be touched by the driver)
-	char	*Name;	//!< Module Name/Identifier
+	const char	*Name;	//!< Module Name/Identifier
 	 int	(*Init)(char **Arguments);	//!< Module initialiser / entrypoint
 	void	(*Deinit)(void);	//!< Cleanup Function
-	char	**Dependencies;	//!< NULL terminated list of dependencies
+	const char	**Dependencies;	//!< NULL terminated list of dependencies
 } PACKED tModule;
 
 /**
@@ -114,10 +114,10 @@ typedef struct sModuleLoader
 extern int	Module_RegisterLoader(tModuleLoader *Loader);
 
 /**
- * \brief Initialise a named builtin module
+ * \brief Initialises (if needed) a named module
  * \param Name	Module name to initialise
  * \return -1 on not existing, 0 if the module initialised (or if it was already initialised)
  */
-extern int	Modules_InitialiseBuiltin(const char *Name);
+extern int	Module_EnsureLoaded(const char *Name);
 
 #endif