X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Ffifo.c;h=4d3595b767b6d8afc0cb3540c2cc5669d6870434;hb=ceae45d80582dcb433cd26dcd6aad1c17229779d;hp=005705311c9cf44f6a85f9db52a2e265f6915d90;hpb=635bc78017d8a4a16314a973e39c849b2afac795;p=tpg%2Facess2.git

diff --git a/Kernel/drv/fifo.c b/Kernel/drv/fifo.c
index 00570531..4d3595b7 100644
--- a/Kernel/drv/fifo.c
+++ b/Kernel/drv/fifo.c
@@ -20,7 +20,6 @@ typedef struct sPipe {
 	 int	WritePos;
 	 int	BufSize;
 	char	*Buffer;
-	tSemaphore	Semaphore;
 } tPipe;
 
 // === PROTOTYPES ===
@@ -32,11 +31,25 @@ tVFS_Node	*FIFO_FindDir(tVFS_Node *Node, const char *Filename);
 void	FIFO_Close(tVFS_Node *Node);
  int	FIFO_Relink(tVFS_Node *Node, const char *OldName, const char *NewName);
 Uint64	FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-Uint64	FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-tPipe	*FIFO_Int_NewPipe(int Size, char *Name);
+Uint64	FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer);
+tPipe	*FIFO_Int_NewPipe(int Size, const char *Name);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0032, FIFO, FIFO_Install, NULL, NULL);
+tVFS_NodeType	gFIFO_DirNodeType = {
+	.TypeName = "FIFO Dir Node",
+	.ReadDir = FIFO_ReadDir,
+	.FindDir = FIFO_FindDir,
+	.MkNod = FIFO_MkNod,
+	.Relink = FIFO_Relink,
+	.IOCtl = FIFO_IOCtl
+};
+tVFS_NodeType	gFIFO_PipeNodeType = {
+	.TypeName = "FIFO Pipe Node",
+	.Read = FIFO_Read,
+	.Write = FIFO_Write,
+	.Close = FIFO_Close
+};
 tDevFS_Driver	gFIFO_DriverInfo = {
 	NULL, "fifo",
 	{
@@ -44,11 +57,7 @@ tDevFS_Driver	gFIFO_DriverInfo = {
 	.NumACLs = 1,
 	.ACLs = &gVFS_ACL_EveryoneRW,
 	.Flags = VFS_FFLAG_DIRECTORY,
-	.ReadDir = FIFO_ReadDir,
-	.FindDir = FIFO_FindDir,
-	.MkNod = FIFO_MkNod,
-	.Relink = FIFO_Relink,
-	.IOCtl = FIFO_IOCtl
+	.Type = &gFIFO_DirNodeType
 	}
 };
 tVFS_Node	gFIFO_AnonNode = {
@@ -220,8 +229,19 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	while(remaining)
 	{
 		// Wait for buffer to fill
-		if(pipe->Flags & PF_BLOCKING) {
+		if(pipe->Flags & PF_BLOCKING)
+		{
+			#if 0
 			len = Semaphore_Wait( &pipe->Semaphore, remaining );
+			#else
+			VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "FIFO_Read");
+			// Read buffer
+			// TODO: Rethink this, it might not work on buffer overflow
+			if(pipe->WritePos - pipe->ReadPos < remaining)
+				len = pipe->WritePos - pipe->ReadPos;
+			else
+				len = remaining;
+			#endif
 		}
 		else
 		{
@@ -239,7 +259,7 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		{
 			int ofs = pipe->BufSize - pipe->ReadPos;
 			memcpy(Buffer, &pipe->Buffer[pipe->ReadPos], ofs);
-			memcpy(Buffer + ofs, &pipe->Buffer, len-ofs);
+			memcpy((Uint8*)Buffer + ofs, &pipe->Buffer, len-ofs);
 		}
 		else
 		{
@@ -250,10 +270,16 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		pipe->ReadPos += len;
 		pipe->ReadPos %= pipe->BufSize;
 		
+		// Mark some flags
+		if( pipe->ReadPos == pipe->WritePos ) {
+			VFS_MarkAvaliable(Node, 0);
+		}
+		VFS_MarkFull(Node, 0);	// Buffer can't still be full
+		
 		// Decrement Remaining Bytes
 		remaining -= len;
 		// Increment Buffer address
-		Buffer += len;
+		Buffer = (Uint8*)Buffer + len;
 	}
 
 	return Length;
@@ -264,7 +290,7 @@ Uint64 FIFO_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \fn Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  * \brief Write to a fifo pipe
  */
-Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
 {
 	tPipe	*pipe = Node->ImplPtr;
 	Uint	len;
@@ -276,7 +302,15 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	{
 		// Wait for buffer to empty
 		if(pipe->Flags & PF_BLOCKING) {
+			#if 0
 			len = Semaphore_Signal( &pipe->Semaphore, remaining );
+			#else
+			VFS_SelectNode(Node, VFS_SELECT_WRITE, NULL, "FIFO_Write");
+			if(pipe->ReadPos - pipe->WritePos < remaining)
+				len = pipe->ReadPos - pipe->WritePos;
+			else
+				len = remaining;
+			#endif
 		}
 		else
 		{
@@ -294,7 +328,7 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		{
 			int ofs = pipe->BufSize - pipe->WritePos;
 			memcpy(&pipe->Buffer[pipe->WritePos], Buffer, ofs);
-			memcpy(&pipe->Buffer, Buffer + ofs, len-ofs);
+			memcpy(&pipe->Buffer, (Uint8*)Buffer + ofs, len-ofs);
 		}
 		else
 		{
@@ -305,10 +339,16 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 		pipe->WritePos += len;
 		pipe->WritePos %= pipe->BufSize;
 		
+		// Mark some flags
+		if( pipe->ReadPos == pipe->WritePos ) {
+			VFS_MarkFull(Node, 1);	// Buffer full
+		}
+		VFS_MarkAvaliable(Node, 1);
+		
 		// Decrement Remaining Bytes
 		remaining -= len;
 		// Increment Buffer address
-		Buffer += len;
+		Buffer = (Uint8*)Buffer + len;
 	}
 
 	return Length;
@@ -316,10 +356,10 @@ Uint64 FIFO_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 
 // --- HELPERS ---
 /**
- * \fn tPipe *FIFO_Int_NewPipe(int Size, char *Name)
+ * \fn tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
  * \brief Create a new pipe
  */
-tPipe *FIFO_Int_NewPipe(int Size, char *Name)
+tPipe *FIFO_Int_NewPipe(int Size, const char *Name)
 {
 	tPipe	*ret;
 	 int	namelen = strlen(Name) + 1;
@@ -340,7 +380,7 @@ tPipe *FIFO_Int_NewPipe(int Size, char *Name)
 	ret->Name = ret->Buffer + Size;
 	strcpy(ret->Name, Name);
 	// - Start empty, max of `Size`
-	Semaphore_Init( &ret->Semaphore, 0, Size, "FIFO", ret->Name );
+	//Semaphore_Init( &ret->Semaphore, 0, Size, "FIFO", ret->Name );
 	
 	// Set Node
 	ret->Node.Size = 0;
@@ -356,9 +396,7 @@ tPipe *FIFO_Int_NewPipe(int Size, char *Name)
 	ret->Node.CTime
 		= ret->Node.MTime
 		= ret->Node.ATime = now();
-	ret->Node.Read = FIFO_Read;
-	ret->Node.Write = FIFO_Write;
-	ret->Node.Close = FIFO_Close;
+	ret->Node.Type = &gFIFO_PipeNodeType;
 	
 	return ret;
 }