Fixes to x86 error and interrupt handling

[tpg/acess2.git] / Kernel / drv / vterm.c

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 76b7f1e..ff116f3 100644 (file)
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -157,8 +157,8 @@ int VT_Install(char **Arguments)
        if(!gsVT_OutputDevice)  gsVT_OutputDevice = "/Devices/"DEFAULT_OUTPUT;
        if(!gsVT_InputDevice)   gsVT_InputDevice = "/Devices/"DEFAULT_INPUT;
        
-       LOG("Using '%s' as output", gsVT_OutputDevice);
-       LOG("Using '%s' as input", gsVT_InputDevice);
+       Log_Log("VTerm", "Using '%s' as output", gsVT_OutputDevice);
+       Log_Log("VTerm", "Using '%s' as input", gsVT_InputDevice);
        
        // Create Nodes
        for( i = 0; i < NUM_VTS; i++ )
@@ -190,7 +190,7 @@ int VT_Install(char **Arguments)
        // Set kernel output to VT0
        Debug_SetKTerminal("/Devices/VTerm/0");
        
-       return MODULE_INIT_SUCCESS;
+       return MODULE_ERR_OK;
 }
 
 /**
@@ -348,6 +348,28 @@ Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
        case TERM_MODE_TEXT:
                VT_int_PutString(term, Buffer, Length);
                break;
+       case TERM_MODE_FB:
+               if( term->RealWidth > term->Width || term->RealHeight > term->Height )
+               {
+                       #if 0
+                        int    x, y, h;
+                       x = Offset/4;   y = x / term->Width;    x %= term->Width;
+                       w = Length/4+x; h = w / term->Width;    w %= term->Width;
+                       while(h--)
+                       {
+                               VFS_WriteAt( giVT_OutputDevHandle,
+                                       (x+y*term->RealWidth)*4,
+                                       term->Width * 4,
+                                       Buffer
+                                       );
+                               Buffer = (void*)( (Uint)Buffer + term->Width*term->Height*4 );
+                       }
+                       #endif
+                       return 0;
+               }
+               else {
+                       return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
+               }
        }
        
        //LEAVE('i', 0);
@@ -364,6 +386,10 @@ int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data)
        tVTerm  *term = Node->ImplPtr;
        ENTER("pNode iId pData", Node, Id, Data);
        
+       if(Id >= DRV_IOCTL_LOOKUP) {
+               if( Threads_GetUID() != 0 )     return -1;
+       }
+       
        switch(Id)
        {
        case DRV_IOCTL_TYPE:
@@ -407,6 +433,11 @@ int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data)
                Log("VT_Terminal_IOCtl - RETURN term->Height = %i", term->Height);
                LEAVE('i', term->Height);
                return term->Height;
+       
+       case TERM_IOCTL_FORCESHOW:
+               VT_SetTerminal( Node->Inode );
+               LEAVE('i', 1);
+               return 1;
        }
        LEAVE('i', -1);
        return -1;
@@ -443,7 +474,7 @@ void VT_SetTerminal(int ID)
        VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_GETSETMODE, &modeNum );
        
        // Update current terminal ID
-       Log("Changed terminal from %i to %i", giVT_CurrentTerminal, ID);
+       Log_Log("VTerm", "Changed terminal from %i to %i", giVT_CurrentTerminal, ID);
        giVT_CurrentTerminal = ID;
        
        // Update the screen
@@ -453,6 +484,11 @@ void VT_SetTerminal(int ID)
 /**
  * \fn void VT_KBCallBack(Uint32 Codepoint)
  * \brief Called on keyboard interrupt
+ * \param Codepoint    Pseudo-UTF32 character
+ * 
+ * Handles a key press and sends the key code to the user's buffer.
+ * If the code creates a kernel-magic sequence, it is not passed to the
+ * user and is handled in-kernel.
  */
 void VT_KBCallBack(Uint32 Codepoint)
 {