Changeset 1078

Timestamp:

10/03/08 12:43:55 (3 months ago)

Author:

mwhitworth

Message:

Build the misc or Special devices as part of the kernel.

Location:

Whitix/branches/keobject/devices

Files:

• Makefile (modified) (1 diff)
• misc/Makefile (modified) (1 diff)
• misc/misc.c (modified) (3 diffs)

Whitix/branches/keobject/devices/Makefile

@@ -10 +10 @@
 modules_install:
         $(MAKE) -C input modules_install
-        $(MAKE) -C misc modules_install
         $(MAKE) -C net modules_install
         $(MAKE) -C pci modules_install

Whitix/branches/keobject/devices/misc/Makefile

@@ -1 +1 @@
 DEPTH=../../
-MODULES = misc.sys
+OBJS = misc.o
 
-build: $(MODULES)
-
-modules_install:
-        cp misc.sys ../../CdRoot/System/Modules/Core
+build: $(OBJS)
 
 include $(DEPTH)make.inc

Whitix/branches/keobject/devices/misc/misc.c

@@ -23 +23 @@
 #include <i386/i386.h>
 #include <i386/virtual.h>
+#include <keobject.h>
+#include <devices/class.h>
 
 #define MISC_MAJOR 2
@@ -45 +47 @@
 static int MemMemoryMap(struct VNode* vNode, DWORD address, DWORD offset)
 {
-//      printf("Mapping %#X to %#X\n", address, offset);
         VirtMemMapPage(address, offset, PAGE_USER | PAGE_RW | PAGE_PRESENT);
         return 0;
@@ -63 +64 @@
 };
 
+struct DevClass specialClass;
+static struct KeDevice nullDev, zeroDev, memDev;
+
 int MiscInit()
 {
-#if 0
-        DevAddDevice("Special/Null",MISC_MAJOR,0,DEVICE_CHAR,&nullOps);
-        DevAddDevice("Special/Zero",MISC_MAJOR,1,DEVICE_CHAR,&zeroOps);
-        DevAddDevice("Special/Memory",MISC_MAJOR,2,DEVICE_CHAR,&memOps);
-#endif
+        DevClassCreate(&specialClass, NULL, "Special");
+        
+        KeDeviceCreate(&nullDev, &specialClass.set, DEV_ID_MAKE(MISC_MAJOR, 0), &nullOps,
+                DEVICE_CHAR, "Null");
+        KeDeviceCreate(&zeroDev, &specialClass.set, DEV_ID_MAKE(MISC_MAJOR, 1), &zeroOps,
+                DEVICE_CHAR, "Zero");
+        KeDeviceCreate(&memDev, &specialClass.set, DEV_ID_MAKE(MISC_MAJOR, 2), &memOps,
+                DEVICE_CHAR, "Memory");
 
         return 0;
 }
-
-ModuleInit(MiscInit);