X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fide.h;h=b778f1efa334ebabf4bf431308f943684d9a139f;hb=3cf3fcc643f04aaa516da88a8ef3726cddfbbc0b;hp=d299827f031e632b70d0047b6d9252ea4a93364b;hpb=326a9425e1dc7a9f7afafe2951b55f35d9ff2422;p=palacios.git

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index d299827..b778f1e 100644
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -21,26 +21,12 @@
 #define __DEVICES_IDE_H__
 
 #ifdef __V3VEE__
-#include <palacios/vm_dev.h>
 
+#include <devices/block_dev.h>
 
-#define ATAPI_BLOCK_SIZE 2048
-#define IDE_SECTOR_SIZE 512
-
-typedef enum {IDE_NONE, IDE_DISK, IDE_CDROM} v3_ide_dev_type_t;
-
-struct v3_ide_cd_ops {
-    uint32_t (*get_capacity)(void * private_data);
-    // Reads always operate on 2048 byte blocks
-    int (*read)(uint8_t * buf, int block_count, uint64_t lba, void * private_data);
-};
-
-
-struct v3_ide_hd_ops {
-    uint64_t (*get_capacity)(void * private_data);
-    // Reads always operate on 2048 byte blocks
-    int (*read)(uint8_t * buf, int sector_count, uint64_t lba, void * private_data);
-    int (*write)(uint8_t * buf, int sector_count, uint64_t lba, void * private_data);
+struct ide_cfg {
+    char pci[32];
+    char southbridge[32];
 };
 
 
@@ -48,20 +34,18 @@ int v3_ide_register_cdrom(struct vm_device * ide,
 			  uint_t bus_num, 
 			  uint_t drive_num, 
 			  char * drive_name,
-			  struct v3_ide_cd_ops * ops, 
+			  struct v3_cd_ops * ops, 
 			  void * private_data);
 
 int v3_ide_register_harddisk(struct vm_device * ide, 
 			     uint_t bus_num, 
 			     uint_t drive_num, 
 			     char * drive_name,
-			     struct v3_ide_hd_ops * ops, 
+			     struct v3_hd_ops * ops, 
 			     void * private_data);
 
 
 
-struct vm_device * v3_create_ide();
-
 
 
 int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_num,