IDE hard drive works past grub

[palacios.git] / palacios / include / devices / ide.h

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index e0356b2..98c91ce 100644 (file)
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -27,20 +27,20 @@
 #define ATAPI_BLOCK_SIZE 2048
 #define IDE_SECTOR_SIZE 512
 
-typedef enum {IDE_DISK, IDE_CDROM, IDE_NONE} v3_ide_dev_type_t;
+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 count, int lba, void * private_data);
+    int (*read)(uint8_t * buf, int block_count, uint64_t lba, void * private_data);
 
 };
 
 
 struct v3_ide_hd_ops {
-    uint32_t (*get_capacity)(void * private_data);
+    uint64_t (*get_capacity)(void * private_data);
     // Reads always operate on 2048 byte blocks
-    int (*read)(uint8_t * buf, int count, int lba, void * private_data);    
+    int (*read)(uint8_t * buf, int sector_count, uint64_t lba, void * private_data);
 
 };