Fixed bug in keyboard driver on real hardware (aux p/s2 port code)

[tpg/acess2.git] / Kernel / binary.c

diff --git a/Kernel/binary.c b/Kernel/binary.c
index a98e192..77309f3 100644 (file)
--- a/Kernel/binary.c
+++ b/Kernel/binary.c
@@ -24,7 +24,6 @@ typedef struct sKernelBin {
 \r
 // === IMPORTS ===\r
 extern int     Proc_Clone(Uint *Err, Uint Flags);\r
-extern void    Threads_SetName(char *Name);\r
 extern char    *Threads_GetName(int ID);\r
 extern void    Threads_Exit(int, int);\r
 extern Uint    MM_ClearUser();\r
@@ -43,7 +42,7 @@ tBinary *Binary_DoLoad(char *truePath);
 void   Binary_Dereference(tBinary *Info);\r
 Uint   Binary_Relocate(void *Base);\r
 Uint   Binary_GetSymbolEx(char *Name, Uint *Value);\r
-Uint   Binary_FindSymbol(void *Base, char *Name, Uint *val);\r
+Uint   Binary_FindSymbol(void *Base, char *Name, Uint *Val);\r
 \r
 // === GLOBALS ===\r
  int   glBinListLock = 0;\r
@@ -190,7 +189,7 @@ Uint Binary_Load(char *file, Uint *entryPoint)
        sTruePath = VFS_GetTruePath(file);\r
        \r
        if(sTruePath == NULL) {\r
-               Warning("[BIN ] '%s' does not exist.", file);\r
+               Warning("[BIN  ] '%s' does not exist.", file);\r
                LEAVE('x', 0);\r
                return 0;\r
        }\r
@@ -245,17 +244,16 @@ Uint Binary_Load(char *file, Uint *entryPoint)
 }\r
 \r
 /**\r
- \fn tBinary *Binary_GetInfo(char *truePath)\r
- \brief Finds a matching binary entry\r
- \param truePath       File Identifier (True path name)\r
-*/\r
-tBinary *Binary_GetInfo(char *truePath)\r
+ * \brief Finds a matching binary entry\r
+ * \param TruePath     File Identifier (True path name)\r
+ */\r
+tBinary *Binary_GetInfo(char *TruePath)\r
 {\r
        tBinary *pBinary;\r
        pBinary = glLoadedBinaries;\r
        while(pBinary)\r
        {\r
-               if(strcmp(pBinary->TruePath, truePath) == 0)\r
+               if(strcmp(pBinary->TruePath, TruePath) == 0)\r
                        return pBinary;\r
                pBinary = pBinary->Next;\r
        }\r
@@ -548,37 +546,37 @@ void Binary_Dereference(tBinary *Info)
 }\r
 \r
 /**\r
- \fn char *Binary_RegInterp(char *path)\r
- \brief Registers an Interpreter\r
- \param path   Path to interpreter provided by executable\r
-*/\r
-char *Binary_RegInterp(char *path)\r
+ * \fn char *Binary_RegInterp(char *Path)\r
+ * \brief Registers an Interpreter\r
+ * \param Path Path to interpreter provided by executable\r
+ */\r
+char *Binary_RegInterp(char *Path)\r
 {\r
         int    i;\r
        // NULL Check Argument\r
-       if(path == NULL)        return NULL;\r
+       if(Path == NULL)        return NULL;\r
        // NULL Check the array\r
        if(gsaRegInterps == NULL)\r
        {\r
                giRegInterps = 1;\r
                gsaRegInterps = malloc( sizeof(char*) );\r
-               gsaRegInterps[0] = malloc( strlen(path) );\r
-               strcpy(gsaRegInterps[0], path);\r
+               gsaRegInterps[0] = malloc( strlen(Path) );\r
+               strcpy(gsaRegInterps[0], Path);\r
                return gsaRegInterps[0];\r
        }\r
        \r
        // Scan Array\r
        for( i = 0; i < giRegInterps; i++ )\r
        {\r
-               if(strcmp(gsaRegInterps[i], path) == 0)\r
+               if(strcmp(gsaRegInterps[i], Path) == 0)\r
                        return gsaRegInterps[i];\r
        }\r
        \r
        // Interpreter is not in list\r
        giRegInterps ++;\r
        gsaRegInterps = malloc( sizeof(char*)*giRegInterps );\r
-       gsaRegInterps[i] = malloc( strlen(path) );\r
-       strcpy(gsaRegInterps[i], path);\r
+       gsaRegInterps[i] = malloc( strlen(Path) );\r
+       strcpy(gsaRegInterps[i], Path);\r
        return gsaRegInterps[i];\r
 }\r
 \r
@@ -586,11 +584,12 @@ char *Binary_RegInterp(char *path)
 // Kernel Binary Handling\r
 // ============\r
 /**\r
- * \fn void *Binary_LoadKernel(char *path)\r
+ * \fn void *Binary_LoadKernel(char *File)\r
  * \brief Load a binary into kernel space\r
  * \note This function shares much with #Binary_Load, but does it's own mapping\r
+ * \param File File to load into the kernel\r
  */\r
-void *Binary_LoadKernel(char *file)\r
+void *Binary_LoadKernel(char *File)\r
 {\r
        char    *sTruePath;\r
        tBinary *pBinary;\r
@@ -599,16 +598,16 @@ void *Binary_LoadKernel(char *file)
        Uint    addr;\r
         int    i;\r
 \r
-       ENTER("sfile", file);\r
+       ENTER("sfile", File);\r
        \r
        // Sanity Check Argument\r
-       if(file == NULL) {\r
+       if(File == NULL) {\r
                LEAVE('n');\r
                return 0;\r
        }\r
 \r
        // Get True File Path\r
-       sTruePath = VFS_GetTruePath(file);\r
+       sTruePath = VFS_GetTruePath(File);\r
        if(sTruePath == NULL) {\r
                LEAVE('n');\r
                return 0;\r
@@ -805,13 +804,13 @@ Uint Binary_GetSymbolEx(char *Name, Uint *Value)
 }\r
 \r
 /**\r
- * \fn Uint Binary_GetSymbolBin(void *Base, char *Name, Uint *val)\r
+ * \fn Uint Binary_FindSymbol(void *Base, char *Name, Uint *Val)\r
  * \brief Get a symbol from the specified library\r
  * \param Base Base address\r
  * \param Name Name of symbol to find\r
- * \param val  Pointer to place final value\r
+ * \param Val  Pointer to place final value\r
  */\r
-Uint Binary_FindSymbol(void *Base, char *Name, Uint *val)\r
+Uint Binary_FindSymbol(void *Base, char *Name, Uint *Val)\r
 {\r
        Uint32  ident = *(Uint32*) Base;\r
        tBinaryType     *bt = gRegBinTypes;\r
@@ -819,7 +818,7 @@ Uint Binary_FindSymbol(void *Base, char *Name, Uint *val)
        for(; bt; bt = bt->Next)\r
        {\r
                if( (ident & bt->Mask) == (Uint)bt->Ident )\r
-                       return bt->GetSymbol(Base, Name, val);\r
+                       return bt->GetSymbol(Base, Name, Val);\r
        }\r
        \r
        Warning("[BIN ] 0x%x is an unknown file type. (0x%x 0x%x 0x%x 0x%x)",\r