X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fide.h;h=03d8a48086a132b621fab8ec021e13d840a7a53e;hb=bd18ee6111c1b75fa0bbd670307d1ec1c622f91f;hp=85c26af624e453ba47cf07bff1d66b7712ed91a4;hpb=5db3136d5331c355c188537c68005db8d2cb4eac;p=palacios.releases.git

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index 85c26af..03d8a48 100644
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -34,11 +34,12 @@
  * 
  */
 
-#ifndef __IDE_H__
-#define __IDE_H__
-
+#ifndef __DEVICES_IDE_H__
+#define __DEVICES_IDE_H__
 
 #ifdef __V3VEE__
+
+
 #include <palacios/vmm_types.h>
 
 
@@ -132,7 +133,7 @@ struct  cdrom_t {
   rd_bool ready;
   rd_bool locked;
 
-  struct cdrom_interface * cd;
+  struct cdrom_ops * cd;
 
   uint32_t capacity;
   int next_lba;
@@ -204,6 +205,9 @@ struct  drive_t {
   struct sense_info_t sense;
   struct atapi_t atapi;
   
+  /* JRL */
+  void * private_data;
+
   Bit8u model_no[41];
 };
 
@@ -239,3 +243,29 @@ struct  ramdisk_t {
 
 #endif
 
+#if 0
+
+// FLAT MODE
+// Open a image. Returns non-negative if successful.
+//int open (const char* pathname);
+
+// Open an image with specific flags. Returns non-negative if successful.
+int rd_open (const char* pathname, int flags);
+
+// Close the image.
+void rd_close ();
+
+// Position ourselves. Return the resulting offset from the
+// beginning of the file.
+off_t rd_lseek (off_t offset, int whence);
+
+// Read count bytes to the buffer buf. Return the number of
+// bytes read (count).
+ssize_t rd_read (void* buf, size_t count);
+
+// Write count bytes from buf. Return the number of bytes
+// written (count).
+ssize_t rd_write (const void* buf, size_t count);
+
+
+#endif