Kernel - Cleaned up a little (re-enabled cursor too)
authorJohn Hodge <[email protected]>
Sun, 20 Nov 2011 07:20:12 +0000 (15:20 +0800)
committerJohn Hodge <[email protected]>
Sun, 20 Nov 2011 07:20:12 +0000 (15:20 +0800)
Kernel/binary.c
Kernel/drv/vterm.c
Kernel/syscalls.c

index c676e55..20da5c4 100644 (file)
@@ -452,8 +452,6 @@ tBinary *Binary_DoLoad(tMount MountID, tInode Inode, const char *Path)
                break;
        }
 
-       LOG("pBinary = %p", pBinary);
-       
        // Close File
        VFS_Close(fp);
        
@@ -465,6 +463,8 @@ tBinary *Binary_DoLoad(tMount MountID, tInode Inode, const char *Path)
                return NULL;
        }
        
+       LOG("pBinary = %p", pBinary);
+       
        // Error Check
        if(pBinary == NULL) {
                LEAVE('n');
index 9488b3e..05d8090 100644 (file)
@@ -236,8 +236,8 @@ int VT_Install(char **Arguments)
        for( i = 0; i < NUM_VTS; i++ )
        {
                gVT_Terminals[i].Mode = TERM_MODE_TEXT;
-//             gVT_Terminals[i].Flags = 0;
-               gVT_Terminals[i].Flags = VT_FLAG_HIDECSR;       //HACK - Stop all those memcpy calls
+               gVT_Terminals[i].Flags = 0;
+//             gVT_Terminals[i].Flags = VT_FLAG_HIDECSR;       //HACK - Stop all those memcpy calls
                gVT_Terminals[i].CurColour = DEFAULT_COLOUR;
                gVT_Terminals[i].WritePos = 0;
                gVT_Terminals[i].AltWritePos = 0;
@@ -462,14 +462,13 @@ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
        
        Mutex_Acquire( &term->ReadingLock );
        
-       // Update cursor
-       VT_int_UpdateCursor(term, 1);
-       
        // Check current mode
        switch(term->Mode)
        {
        // Text Mode (UTF-8)
        case TERM_MODE_TEXT:
+               VT_int_UpdateCursor(term, 1);
+       
                VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "VT_Read (UTF-8)");
                
                avail = term->InputWrite - term->InputRead;
index 174daef..35e4890 100644 (file)
@@ -163,7 +163,6 @@ void SyscallHandler(tSyscallRegs *Regs)
                        {
                                tmp = (char**)Regs->Arg3;
                                CHECK_NUM_NONULL(tmp, sizeof(char**));
-                               Log("tmp = %p", tmp);
                                for(i=0;tmp[i];i++) {
                                        CHECK_NUM_NONULL( &tmp[i], sizeof(char*) );
                                        CHECK_STR_NONULL( tmp[i] );

UCC git Repository :: git.ucc.asn.au