Changeset 1057 for Whitix

Timestamp:

10/03/08 12:12:20 (2 months ago)

Author:

mwhitworth

Message:

Update Makefile, clean the .deps directory as well.

Location:

Whitix/branches/keobject/devices/storage

Files:

• Makefile (modified) (1 diff)
• ata/ata-identify.c (modified) (1 diff)
• ata/ata.c (modified) (7 diffs)
• ata/ata.h (modified) (1 diff)
• ramdisk.c (modified) (6 diffs)

Whitix/branches/keobject/devices/storage/Makefile

@@ -12 +12 @@
 clean:
         $(MAKE) -C ata clean
-        $(RM) *.o *.sys
+        $(RM) *.o *.sys .deps/*.d
 
 include $(DEPTH)make.inc

Whitix/branches/keobject/devices/storage/ata/ata-identify.c

@@ -23 +23 @@
 #include <i386/pit.h>
 #include <typedefs.h>
-#include <sdevice.h>
 #include <i386/irq.h>
 #include <malloc.h>

Whitix/branches/keobject/devices/storage/ata/ata.c

@@ -23 +23 @@
 #include <i386/pit.h>
 #include <typedefs.h>
-#include <sdevice.h>
 #include <i386/irq.h>
 #include <module.h>
@@ -329 +328 @@
 static int AtaAddPartition(int i,int base,struct StorageDevice* parent,struct AtaPartition* part)
 {
-        char buf[32];
         struct Partition* newPart;
         struct StorageDevice* sDevice;
@@ -356 +354 @@
         sDevice->totalSectors=newPart->secLen;
 
+#if 0
         sprintf(buf,"Storage/HardDrive%c%d",'A'+base,i);
 
-        DevAddDevice(buf, 4, (base*64)+i+1, DEVICE_BLOCK, sDevice);
+//      DevAddDevice(buf, 4, (base*64)+i+1, DEVICE_BLOCK, sDevice);
 
         StorageDeviceAdd(sDevice, "HardDrive%c%d", 'A'+base, i);
 
         KePrint("Partition found: %#X, %u, %u\n",(DWORD)part[i].system,part[i].startSectorAbs,part[i].sectorCount);
+#endif
 
         return 0;
@@ -395 +395 @@
 {
         struct StorageDevice* sDevice;
-        char buf[32];
-        int err;
         int controlIndex=drive->parent->index, driveIndex=drive->drive;
-                
+        char* format;
+        int index;      
+
         sDevice=(struct StorageDevice*)MemAlloc(sizeof(struct StorageDevice));
         drive->sDev=sDevice;
@@ -413 +413 @@
                 sDevice->sectors=drive->sectors;
                 
-                sprintf(buf, "AtaDisk%d", hdIndex);
+                format = "AtaDisk%u";
+                index = hdIndex++;
         }else{
                 sDevice->cylinders=sDevice->heads=sDevice->sectors=0;
-                sprintf(buf, "AtaCd%d", cdRomIndex++);
-        }
+                format = "AtaCd%u";
+                index = cdRomIndex++;
+        }
+
+        /* And add the device */
+        StorageDeviceInit(sDevice, DEV_ID_MAKE(ATA_MAJOR, 0));
         
-        KePrint("ATA: Found %s\n", buf);
-
-        /* And add the device */
-        err = StorageDeviceInit(sDevice, DEV_ID_MAKE(ATA_MAJOR, 0));
-        
-        if (err)
-                return err;
-        
-        err = StorageDeviceAdd(sDevice, buf);
-        
-        if (err)
-                return err;
-
+        StorageDeviceAdd(sDevice, format, index);
+
+        KePrint("ATA: Found %s\n", StorageDeviceGetName(sDevice));
 
         if (drive->type & ATA_DISK)
-        {
                 AtaPartitionDevice(drive,(controlIndex*2)+driveIndex);
-                hdIndex++;
-        }
 }
 
@@ -448 +440 @@
 
         /* Create the ATA device set. */
-        err = StorageSetCreate(&ataSet, &ataType, "Ata");
+//      err = StorageSetCreate(&ataSet, &ataType, "Ata");
         
-        if (err)
-                return err;
+//      if (err)
+//              return err;
 
         for (i=0; i<2; i++)
@@ -476 +468 @@
                         err=AtaTryToIdentifyDrive(drive);
                         AtaCtrlEnableInts(controller);
-
+                        
                         if (err)
                         {

Whitix/branches/keobject/devices/storage/ata/ata.h

@@ -21 +21 @@
 
 #include <request.h>
-#include <sdevice.h>
+#include <devices/sdevice.h>
 #include <i386/ioports.h>
 #include <typedefs.h>

Whitix/branches/keobject/devices/storage/ramdisk.c

@@ -1 @@
-#include <sdevice.h>
+#include <devices/sdevice.h>
 #include <llist.h>
 #include <error.h>
@@ -9 +9 @@
 #include <module.h>
 #include <i386/virtual.h>
+#include <devices/class.h>
 
 /* Globals */
@@ -14 +15 @@
 KE_OBJECT_TYPE(ramDiskType, NULL, NULL);
 
-struct KeSet ramDiskSet;
+struct DevClass ramDiskClass;
 
 struct RamDisk
@@ -89 +90 @@
         
         /* Create the ramdisk set */
-        err = KeSetCreate(&ramDiskSet, NULL, &ramDiskType, "RAM");
+        err = DevClassCreate(&ramDiskClass, &ramDiskType, "Ram");
         
         if (err)
@@ -96 +97 @@
         for (i=0; i<MAX_RAMDISKS; i++)
         {
-                char buf[32];
-
-                sprintf(buf,"Storage/RamDisk%d",i);
                 disks[i].sDev=&rdDevices[i];
                 disks[i].data=NULL;
@@ -110 +108 @@
                 StorageDeviceInit(&rdDevices[i], DEV_ID_MAKE(RAMDISK_MAJOR,  i));
                 
-                StorageDeviceAdd(&rdDevices[i], "RamDisk%d");
+                StorageDeviceAdd(&rdDevices[i], "RamDisk%d", i);
         }
 
-        KePrint("%d ramdisks loaded, of size %d\n",MAX_RAMDISKS,RAMDISK_SIZE);
+        KePrint("RAM: %dMB %d ramdisks loaded\n",RAMDISK_SIZE/1024/1024, MAX_RAMDISKS);
 
         return 0;
 }
 
-DeviceInit(RamDiskInit);
+ModuleInit(RamDiskInit);