Modules/UDI - Working on UDI support

[tpg/acess2.git] / KernelLand / Modules / Interfaces / UDI / main.c

diff --git a/KernelLand/Modules/Interfaces/UDI/main.c b/KernelLand/Modules/Interfaces/UDI/main.c
index a4a1504..05aa566 100644 (file)
--- a/KernelLand/Modules/Interfaces/UDI/main.c
+++ b/KernelLand/Modules/Interfaces/UDI/main.c
@@ -48,29 +48,28 @@ int UDI_LoadDriver(void *Base)
 {
        udi_init_t      *info;
        char    *udiprops = NULL;
-        int    udiprops_size = 0;
+       Uint    udiprops_size = 0;
         int    i;
        // int  j;
        
-       Log_Debug("UDI", "UDI_LoadDriver: (Base=%p)", Base);
+       ENTER("pBase", Base);
        
        if( Binary_FindSymbol(Base, "udi_init_info", (Uint*)&info) == 0) {
                Binary_Unload(Base);
+               LEAVE('i', 0);
                return 0;
        }
        
        if( Binary_FindSymbol(Base, "_udiprops", (Uint*)&udiprops) == 0 ) {
                Log_Warning("UDI", "_udiprops is not defined, this is usually bad");
        }
+       else if( Binary_FindSymbol(Base, "_udiprops_size", &udiprops_size) == 0) {
+               Log_Warning("UDI", "_udiprops_size is not defined");
+       }
        else {
-               Uint    udiprops_end = 0;
                 int    i, j, nLines;
                char    **udipropsptrs;
                
-               if( Binary_FindSymbol(Base, "_udiprops_end", (Uint*)&udiprops_end) == 0)
-                       Log_Warning("UDI", "_udiprops_end is not defined");
-               Log_Debug("UDI", "udiprops_end = %p", udiprops_end);
-               udiprops_size = udiprops_end - (Uint)udiprops;
                Log_Debug("UDI", "udiprops = %p, udiprops_size = 0x%x", udiprops, udiprops_size);
                
                Debug_HexDump("UDI_LoadDriver", udiprops, udiprops_size);