diff --git a/src/sys/devfs/devfs.c b/src/sys/devfs/devfs.c
index 2a3380a..0e71823 100644
--- a/src/sys/devfs/devfs.c
+++ b/src/sys/devfs/devfs.c
@@ -24,6 +24,9 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  $Log$
+ Revision 1.7  2004/05/19 04:07:42  reddawg
+ kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
+
  Revision 1.6  2004/04/28 21:10:40  reddawg
  Lots Of changes to make it work with existing os
 
@@ -130,7 +133,7 @@
   diff    = (offset - ((offset/512)*512));
 
   for (i=0x0;i<sectors;i++) {
-    device->read(device->info,fd->buffer,i + (offset/512),1);
+    device->devInfo->read(device->devInfo->info,fd->buffer,i + (offset/512),1);
     for (x=0x0;x<(size - (i*512));x++) {
       if (diff > 0) {
         data[x] = fd->buffer[x + diff];
@@ -160,11 +163,11 @@
 
   device = deviceFind(tmpDev->devMajor,tmpDev->devMinor);
   for (i=0x0;i<((size+511)/512);i++) {
-    device->read(device->info,fd->buffer,i + (offset/512),1);
+    device->devInfo->read(device->devInfo->info,fd->buffer,i + (offset/512),1);
     for (x=0x0;((x < 512) && ((x + (i * 512))  < size));x++) {
       fd->buffer[x] = data[x];
       }
-    device->write(device->info,fd->buffer,i + (offset/512),1);
+    device->devInfo->write(device->devInfo->info,fd->buffer,i + (offset/512),1);
     data += 512;
     }
   return(size);
diff --git a/src/sys/include/sys/device.h b/src/sys/include/sys/device.h
index 9da2818..c0db4ae 100644
--- a/src/sys/include/sys/device.h
+++ b/src/sys/include/sys/device.h
@@ -47,7 +47,7 @@
   void (*read)(void *,void *,uInt32,uInt32);
   void (*write)(void *,void *,uInt32,uInt32);
   void (*reset)(void *);
-  void (*init)(void *);
+  int (*init)(void *);
   void (*ioctl)(void *);
   void (*stop)(void *);
   void (*start)(void *);
diff --git a/src/sys/isa/fdc.c b/src/sys/isa/fdc.c
index b09f1f6..f39fbd3 100644
--- a/src/sys/isa/fdc.c
+++ b/src/sys/isa/fdc.c
@@ -37,6 +37,7 @@
 #include <sys/dma.h>
 #include <sys/device.h>
 #include <lib/kprintf.h>
+#include <lib/kmalloc.h>
 #include <devfs/devfs.h>
 
 static volatile bool done = FALSE;
@@ -65,7 +66,7 @@
   devInfo->init  = fdcInit2;
   devInfo->read  = fdcRead;
   devInfo->write = fdcWrite;
-  devInfo->reset = fdcReset;
+  devInfo->reset = reset;
   
   deviceAdd(0,'c',devInfo);
   devFsMkNod("fd0",'b',0x0,0x0);
@@ -305,6 +306,9 @@
 /***
 
  $Log$
+ Revision 1.8  2004/05/19 15:26:33  reddawg
+ Fixed reference issues due to changes in driver subsystem
+
  Revision 1.7  2004/05/10 02:23:24  reddawg
  Minor Changes To Source Code To Prepare It For Open Source Release
 
diff --git a/src/sys/sys/device.c b/src/sys/sys/device.c
index 651ea9e..713238f 100644
--- a/src/sys/sys/device.c
+++ b/src/sys/sys/device.c
@@ -52,7 +52,7 @@
   tmpDev->devInfo = devInfo;
   tmpDev->next    = devices;
   devices         = tmpDev;
-  tmpDev->init(tmpDev);
+  return(tmpDev->devInfo->init(tmpDev));
   }
 
 /*****************************************************************************************
@@ -78,6 +78,9 @@
 /***
 
  $Log$
+ Revision 1.5  2004/05/19 15:06:48  reddawg
+ Fixing Device Driver System Changed Interface
+
  Revision 1.4  2004/05/19 14:57:25  reddawg
  Changed The Device Interface