Property changes on: branches/azimutz/Cleancut/i386/libsaio/smbios.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/i386/libsaio/smbios.h:r885-961

Index: branches/azimutz/Cleancut/i386/boot2/modules.c
===================================================================
--- branches/azimutz/Cleancut/i386/boot2/modules.c	(revision 961)
+++ branches/azimutz/Cleancut/i386/boot2/modules.c	(revision 962)
@@ -11,6 +11,7 @@
 #include "bootstruct.h"
 #include "modules.h"
 #include "boot_modules.h"
+#include <vers.h>
 
 
 #if CONFIG_MODULE_DEBUG
@@ -58,7 +59,7 @@
 		if(module_start && module_start != (void*)0xFFFFFFFF)
 		{
 			// Notify the system that it was laoded
-			module_loaded(SYMBOLS_MODULE /*moduleName, moduleVersion, moduleCompat*/);
+			module_loaded(SYMBOLS_MODULE, SYMBOLS_AUTHOR, SYMBOLS_DESCRIPTION, SYMBOLS_VERSION, SYMBOLS_COMPAT);
 			
 			(*module_start)();	// Start the module. This will point to load_all_modules due to the way the dylib was constructed.
 			execute_hook("ModulesLoaded", NULL, NULL, NULL, NULL);
@@ -74,7 +75,7 @@
             if(module_start && module_start != (void*)0xFFFFFFFF)
             {
                 // Notify the system that it was laoded
-                module_loaded(SYMBOLS_MODULE /*moduleName, moduleVersion, moduleCompat*/);
+                module_loaded(SYMBOLS_MODULE, SYMBOLS_AUTHOR, SYMBOLS_DESCRIPTION, SYMBOLS_VERSION, SYMBOLS_COMPAT);
                 
                 (*module_start)();	// Start the module. This will point to load_all_modules due to the way the dylib was constructed.
                 execute_hook("ModulesLoaded", NULL, NULL, NULL, NULL);
@@ -92,11 +93,16 @@
 	return retVal;
 }
 
-void start_built_in_module(char* name, void(*start_function)(void))
+void start_built_in_module(const char* name, 
+                           const char* author, 
+                           const char* description,
+                           UInt32 version,
+                           UInt32 compat,
+                           void(*start_function)(void))
 {
     start_function();
     // Notify the module system that this module really exists, specificaly, let other module link with it
-    module_loaded(name /*, moduleName, moduleVersion, moduleCompat*/);
+    module_loaded(name, author, description, version, compat);
 }
 
 
@@ -171,7 +177,7 @@
 		if(module_start && module_start != (void*)0xFFFFFFFF)
 		{
 			// Notify the system that it was laoded
-			module_loaded(module/*moduleName, moduleVersion, moduleCompat*/);
+			module_loaded(module, NULL, NULL, 0, 0 /*moduleName, moduleVersion, moduleCompat*/);
 			(*module_start)();	// Start the module
 			DBG("Module %s Loaded.\n", module); DBGPAUSE();
 		}
@@ -231,16 +237,27 @@
 /*
  * print out the information about the loaded module
  */
-void module_loaded(const char* name/*, UInt32 version, UInt32 compat*/)
+void module_loaded(const char* name, const char* author, const char* description, UInt32 version, UInt32 compat)
 {
 	moduleList_t* new_entry = malloc(sizeof(moduleList_t));
 	new_entry->next = loadedModules;
 
 	loadedModules = new_entry;
 	
-	new_entry->name = (char*)name;
-//	new_entry->version = version;
-//	new_entry->compat = compat;
+    if(!name) name = "Unknown";
+    if(!author) author = "Unknown";
+    if(!description) description = "";
+    
+	new_entry->name = name;
+    new_entry->author = author;
+    new_entry->description = description;
+	new_entry->version = version;
+    new_entry->compat = compat;
+    
+    msglog("Module '%s' by '%s' Loaded.\n", name, author);
+    msglog("\tDescription: %s\n", description);
+    msglog("\tVersion: %d\n", version); // todo: sperate to major.minor.bugfix
+    msglog("\tCompat:  %d\n", compat);  // todo: ^^^ major.minor.bugfix
 }
 
 int is_module_loaded(const char* name)
Index: branches/azimutz/Cleancut/i386/boot2/modules.h
===================================================================
--- branches/azimutz/Cleancut/i386/boot2/modules.h	(revision 961)
+++ branches/azimutz/Cleancut/i386/boot2/modules.h	(revision 962)
@@ -13,7 +13,13 @@
 #define __BOOT_MODULES_H
 
 #define MODULE_PATH		"/Extra/modules/"
+
 #define SYMBOLS_MODULE "Symbols.dylib"
+#define SYMBOLS_AUTHOR "Chameleon"
+#define SYMBOLS_DESCRIPTION "Chameleon symbols for linking"
+#define SYMBOLS_VERSION     0
+#define SYMBOLS_COMPAT      0
+
 #define VOID_SYMBOL		"dyld_void_start"
 extern UInt64 textAddress;
 extern UInt64 textSection;
@@ -43,9 +49,11 @@
 
 typedef struct moduleList_t //Azi: modules or module? see modules/include/modules
 {
-	char*					name;
-//	UInt32					version;
-//	UInt32					compat;
+	const char*				name;
+    const char*             author;
+    const char*             description;
+	UInt32					version;
+	UInt32					compat;
 	struct moduleList_t*	next;
 } moduleList_t;
 
@@ -54,12 +62,16 @@
 int init_module_system();
 void load_all_modules();
 
-void start_built_in_module(char* name, void(*start_function)(void));
+void start_built_in_module(const char* name, 
+                           const char* author, 
+                           const char* description,
+                           UInt32 version,
+                           UInt32 compat,
+                           void(*start_function)(void));
 
-
 int load_module(char* module);
 int is_module_loaded(const char* name);
-void module_loaded(const char* name/*, UInt32 version, UInt32 compat*/);
+void module_loaded(const char* name, const char* author, const char* description, UInt32 version, UInt32 compat);
 
 
 
Index: branches/azimutz/Cleancut/i386/modules/Resolution/Makefile
===================================================================
--- branches/azimutz/Cleancut/i386/modules/Resolution/Makefile	(revision 961)
+++ branches/azimutz/Cleancut/i386/modules/Resolution/Makefile	(revision 962)
@@ -1,4 +1,6 @@
 MODULE_NAME = Resolution
+MODULE_AUTHOR = Chameleon
+MODULE_DESCRIPTION = This module reads the edid information from the monitor attached to the main display. The module will also patch the vesa modes available in pre intel hd graphics cards to provide proper resolution while booting.
 MODULE_VERSION = "1.0.0"
 MODULE_COMPAT_VERSION = "1.0.0"
 MODULE_START = $(MODULE_NAME)_start
Index: branches/azimutz/Cleancut/i386/modules/MakeInc.dir
===================================================================
--- branches/azimutz/Cleancut/i386/modules/MakeInc.dir	(revision 961)
+++ branches/azimutz/Cleancut/i386/modules/MakeInc.dir	(revision 962)
@@ -165,15 +165,15 @@
 .PHONY: $(SRCROOT)/sym/i386/boot_modules.c
 
 $(SRCROOT)/sym/i386/boot_modules.c: 
-	@echo "\tstart_built_in_module(\"$(MODULE_NAME)\", &$(MODULE_START));" >> $@
+	@echo "\tstart_built_in_module(\"$(MODULE_NAME)\", \"$(MODULE_AUTHOR)\", \"$(MODULE_DESCRIPTION)\", 0, 0, &$(MODULE_START));" >> $@
 	
 $(SRCROOT)/sym/i386/boot_modules.h:
 	@echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@
 	
-$(OBJROOT)/$(MODULE_NAME).desc: Makefile
+$(OBJROOT)/$(MODULE_NAME).author: Makefile
 	@echo "$(MODULE_AUTHOR)" > $@
 	
-$(OBJROOT)/$(MODULE_NAME).author: Makefile
+$(OBJROOT)/$(MODULE_NAME).desc: Makefile
 	@echo "$(MODULE_DESCRIPTION)" > $@
 
 #dependencies

Property changes on: branches/azimutz/Cleancut
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r948-961