Import backup from 2004-09-21

kernel/block/ramdisk.c

@@ -0,0 +1,100 @@
+// ramdisk.c
+// Author: Josh Holtrop
+// Date: 08/20/04
+// Modified: 08/22/04
+
+#include "block/ramdisk.h"
+#include "fs/devices.h"
+#include "functions.h"
+#include "mm/vmm.h"
+#include "lang/asmfuncs.h"
+
+ramdisk_t *ramdisks[256];
+
+int	ramdisk_init(major_t major)
+{
+  dev_driver_t *ramdisk_driver;
+  if (( ramdisk_driver = New(dev_driver_t) ))
+    {
+      ramdisk_driver->block_read = ramdisk_block_read;
+      ramdisk_driver->block_write = ramdisk_block_write;
+      devices_register_major('b', major, ramdisk_driver);
+      return 0;
+    }
+  return -1;
+}
+
+minor_t ramdisk_new(u32_t size)
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    {
+      if (!ramdisks[i])
+	{
+	  void *start;
+	  if (( start = kmalloc(size) ))
+	    {
+	      ramdisks[i] = New(ramdisk_t);
+	      ramdisks[i]->start = start;
+	      ramdisks[i]->size = size;
+	      return i;
+	    }
+	  return -2;
+	}
+    }
+  return -1;
+}
+
+minor_t	ramdisk_register(void *ramdisk, u32_t size)
+{
+	int i;
+	for (i = 0; i < 256; i++)
+	{
+		if (!ramdisks[i])
+		{
+		  ramdisks[i] = New(ramdisk_t);
+			ramdisks[i]->start = ramdisk;
+			ramdisks[i]->size = size;
+			return i;
+		}
+	}
+	return -1;
+}
+
+int	ramdisk_remove(minor_t minor)
+{
+	if (ramdisks[minor])
+	  {
+	    kfree(ramdisks[minor]->start);
+	    kfree(ramdisks[minor]);
+	    ramdisks[minor] = NULL;
+	    return 0;
+	  }
+	return -1;
+}
+
+int	ramdisk_block_read(minor_t minor, u32_t blockNum, u32_t count, void *buffer)
+{
+	if (!ramdisks[minor])
+		return -1;
+	if ((blockNum << BLOCK_SIZE_LOG) >= ramdisks[minor]->size)
+		return -2;
+	void *rdAddr = ramdisks[minor]->start + (blockNum << BLOCK_SIZE_LOG);
+	u32_t copyLen = min(count << BLOCK_SIZE_LOG, ramdisks[minor]->size - (u32_t)rdAddr);
+	memcpyd(buffer, rdAddr, copyLen >> 2);
+	return copyLen;
+}
+
+int	ramdisk_block_write(minor_t minor, u32_t blockNum, u32_t count, void *buffer)
+{
+	if (!ramdisks[minor])
+		return -1;
+	if ((blockNum << BLOCK_SIZE_LOG) >= ramdisks[minor]->size)
+		return -2;
+	void *rdAddr = ramdisks[minor]->start + (blockNum << BLOCK_SIZE_LOG);
+	u32_t copyLen = min(count << BLOCK_SIZE_LOG, ramdisks[minor]->size - (u32_t)rdAddr);
+	memcpyd(rdAddr, buffer, copyLen >> 2);
+	return copyLen;
+}
+
+

kernel/block/ramdisk.h

@@ -0,0 +1,25 @@
+// ramdisk.h
+// Author: Josh Holtrop
+// Date: 08/20/04
+// Modified: 08/22/04
+
+#ifndef __HOS_RD_H__
+#define __HOS_RD_H__ __HOS_RD_H__
+
+#include "hos_defines.h"
+#include "fs/devices.h"
+
+typedef struct {
+	void	*start;
+	u32_t	size;
+} ramdisk_t;
+
+int	ramdisk_init(major_t major);
+minor_t ramdisk_new(u32_t size);
+minor_t	ramdisk_register(void *ramdisk, u32_t size);
+int	ramdisk_remove(minor_t minor);
+int	ramdisk_block_read(minor_t minor, u32_t blockNum, u32_t count, void *buffer);
+int	ramdisk_block_write(minor_t minor, u32_t blockNum, u32_t count, void *buffer);
+
+#endif
+

kernel/block/rd.c

@@ -1,53 +0,0 @@
-
-#include "block/rd.h"
-#include "kernel.h"
-
-ramdisk_t ramdisks[256];
-char rd_refs[256];	//number of references to each ramdisk
-
-void	rd_init()
-{
-
-}
-
-int	rd_register(byte *ramdisk, u32_t size)
-{
-	int i;
-	for (i = 0; i < 256; i++)
-	{
-		if (!rd_refs[i])
-		{
-			rd_refs[i]++;
-			ramdisks[i].start = ramdisk;
-			ramdisks[i].size = size;
-			return i;
-		}
-	}
-	return -1;
-}
-
-int	rd_remove(minor_t minor)
-{
-	if (rd_refs[minor] <= 0)
-		return -1;
-	rd_refs[minor]--;
-	if (!rd_refs[minor])
-		free(ramdisks[minor].start);
-}
-
-int	rd_read_block(minor_t minor, u32_t blockNum, u32_t count, byte *buffer)
-{
-	if (rd_refs[minor] <= 0)
-		return -1;
-	byte *copyFrom = ramdisks[minor] + (blockNum << 9);
-	if (copyFrom > ramdisks[minor].start + ramdisks[minor].size)
-		return -1;
-
-}
-
-int	rd_write_block(minor_t minor, u32_t blockNum, u32_t count, byte *buffer)
-{
-
-}
-
-

kernel/block/rd.h

@@ -1,21 +0,0 @@
-
-
-#ifndef __HOS_RD_H__
-#define __HOS_RD_H__ __HOS_RD_H__
-
-#include "kernel.h"
-#include "devices.h"
-
-typedef struct {
-	byte	*start;
-	u32_t	size;
-} ramdisk_t;
-
-void	rd_init();
-int	rd_register(byte *ramdisk, u32_t size);
-int	rd_remove(minor_t minor);
-int	rd_read_block(minor_t minor, u32_t blockNum, u32_t count, byte *buffer);
-int	rd_write_block(minor_t minor, u32_t blockNum, u32_t count, byte *buffer);
-
-#endif
-