X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fide.h;h=b778f1efa334ebabf4bf431308f943684d9a139f;hb=942df9bb1e2570764d24c74f797247536639502e;hp=88c593ee679b54a744d6d91c4974c767194bbb1f;hpb=57164c930523141c4ef53782de214d2a9f468269;p=palacios.git

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index 88c593e..b778f1e 100644
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -22,6 +22,7 @@
 
 #ifdef __V3VEE__
 
+#include <devices/block_dev.h>
 
 struct ide_cfg {
     char pci[32];
@@ -29,38 +30,18 @@ struct ide_cfg {
 };
 
 
-#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);
-};
-
-
 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);