#include <tpl_drv_keyboard.h>
#include <tpl_drv_terminal.h>
#include <errno.h>
+#include <semaphore.h>
#define USE_CTRL_ALT 0
int InputRead; //!< Input buffer read position
int InputWrite; //!< Input buffer write position
char InputBuffer[MAX_INPUT_CHARS8];
+ tSemaphore InputSemaphore;
tVT_Char *Text;
Uint32 *Buffer;
gVT_Terminals[i].Node.Read = VT_Read;
gVT_Terminals[i].Node.Write = VT_Write;
gVT_Terminals[i].Node.IOCtl = VT_Terminal_IOCtl;
+ Semaphore_Init(&gVT_Terminals[i].InputSemaphore, 0, MAX_INPUT_CHARS8, "VTerm", gVT_Terminals[i].Name);
}
// Add to DevFS
tVTerm *term = &gVT_Terminals[ Node->Inode ];
Mutex_Acquire( &term->ReadingLock );
- term->ReadingThread = Threads_GetTID();
// Check current mode
switch(term->Mode)
case TERM_MODE_TEXT:
while(pos < Length)
{
- //TODO: Sleep instead
- while(term->InputRead == term->InputWrite) Threads_Sleep();
+ int avail_bytes;
+ VFS_SelectNode(Node, VFS_SELECT_READ, NULL);
+ avail_bytes = term->InputRead - term->InputWrite;
+
+ if(avail_bytes < 0)
+ avail_bytes += MAX_INPUT_CHARS8;
+ if(avail_bytes > Length - pos)
+ avail_bytes = Length - pos;
- ((char*)Buffer)[pos] = term->InputBuffer[term->InputRead];
- pos ++;
- term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS8;
+ while( avail_bytes -- )
+ {
+ ((char*)Buffer)[pos] = term->InputBuffer[term->InputRead];
+ pos ++;
+ term->InputRead ++;
+ term->InputRead %= MAX_INPUT_CHARS8;
+ }
}
break;
default:
while(pos < Length)
{
- while(term->InputRead == term->InputWrite) Threads_Sleep();
- ((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
- pos ++;
- term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS32;
+ int avail;
+ VFS_SelectNode(Node, VFS_SELECT_READ, NULL);
+
+ avail = term->InputRead - term->InputWrite;
+ if(avail < 0)
+ avail += MAX_INPUT_CHARS32;
+ if(avail > Length - pos)
+ avail = Length/4 - pos;
+
+
+ while( avail -- )
+ {
+ ((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
+ pos ++;
+ term->InputRead ++;
+ term->InputRead %= MAX_INPUT_CHARS32;
+ }
}
+ pos *= 4;
break;
}
+ // Mark none avaliable if buffer empty
+ if( term->InputRead == term->InputWrite )
+ VFS_MarkAvaliable(&term->Node, 0);
+
term->ReadingThread = -1;
+
Mutex_Release( &term->ReadingLock );
- return 0;
+ return pos;
}
/**
term->InputRead = term->InputWrite + 1;
term->InputRead %= MAX_INPUT_CHARS8;
}
-
}
else
{
}
}
+ VFS_MarkAvaliable(&term->Node, 1);
+
// Wake up the thread waiting on us
- if( term->ReadingThread >= 0 ) {
- Threads_WakeTID(term->ReadingThread);
- }
+ //if( term->ReadingThread >= 0 ) {
+ // Threads_WakeTID(term->ReadingThread);
+ //}
}
/**
// Fast returns
if( Depth == 24 ) return VT_Colour12to24(Col12);
if( Depth == 15 ) return VT_Colour12to15(Col12);
+ // - 32 is a special case, it's usually 24-bit colour with an unused byte
+ if( Depth == 32 ) return VT_Colour12to24(Col12);
// Bounds checks
if( Depth < 8 ) return 0;