Changeset 1061

Timestamp:

10/03/08 12:18:51 (3 months ago)

Author:

mwhitworth

Message:

Fix sdevice.h includes, use the BYTES_PER_SECTOR define.

Location:

Whitix/branches/keobject/fs/vfs

Files:

• bcache.c (modified) (2 diffs)
• file.c (modified) (3 diffs)
• super.c (modified) (1 diff)
• vcache.c (modified) (2 diffs)
• vnode.c (modified) (1 diff)

Whitix/branches/keobject/fs/vfs/bcache.c

@@ -22 +22 @@
 #include <slab.h>
 #include <llist.h>
-#include <request.h>
-#include <malloc.h>
 #include <sched.h>
 #include <wait.h>
@@ -31 +29 @@
 #include <print.h>
 #include <locks.h>
+#include <request.h>
+#include <devices/sdevice.h>
 
 /* Speed this all up. It's quite a dumb cache at the moment. Readahead? */

Whitix/branches/keobject/fs/vfs/file.c

@@ -25 +25 @@
 #include <print.h>
 #include <module.h>
+#include <devices/sdevice.h>
 #include <spinlock.h>
 
@@ -114 +115 @@
         struct Buffer* buff;
         int res;
-        int bytesPerSec=file->vNode->superBlock->sDevice->softBlockSize;
+        int bytesPerSec=BYTES_PER_SECTOR(file->vNode->superBlock);
         struct VNode* vNode=file->vNode;
 
@@ -291 +292 @@
         if (file->fileOps && file->fileOps->open)
         {
+                ModuleSymbolPrint(file->fileOps->open);
                 err=file->fileOps->open(file);
                 if (err)

Whitix/branches/keobject/fs/vfs/super.c

@@ -22 +22 @@
 #include <module.h>
 #include <error.h>
-#include <sdevice.h>
+#include <devices/sdevice.h>
 #include <task.h>
 #include <fs/devfs.h>

Whitix/branches/keobject/fs/vfs/vcache.c

@@ -33 +33 @@
 #include <print.h>
 #include <task.h>
+#include <devices/sdevice.h>
 
 struct Cache* vNodeCache;
@@ -326 +327 @@
         {
                 KePrint("VNodeRelease: Trying to free free vNode (%#X on %s)\n",
-                        vNode->id, KeDeviceGetName(&superBlock->sDevice->device));
+                        vNode->id, StorageDeviceGetName(superBlock->sDevice));
                 return;
         }

Whitix/branches/keobject/fs/vfs/vnode.c

@@ -304 +304 @@
                 return -ENOTIMPL;
 
-        blockSize=vNode->superBlock->sDevice->softBlockSize;
+        blockSize=BYTES_PER_SECTOR(vNode->superBlock);
 
         IrqSaveFlags(flags);