X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fide.h;fp=palacios%2Finclude%2Fdevices%2Fide.h;h=b43d4a66e783efa173389815811002849341db00;hp=03d8a48086a132b621fab8ec021e13d840a7a53e;hb=387359b88c5e65d79278c16c0848440e64c63417;hpb=4bc3ee757b44d3e466fd89e348106c47fa5511ee

diff --git a/palacios/include/devices/ide.h b/palacios/include/devices/ide.h
index 03d8a48..b43d4a6 100644
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@ -56,48 +56,48 @@ typedef uint64_t Bit64u;
 #define MAX_ATA_CHANNEL 4
 
 typedef enum _sense {
-      SENSE_NONE = 0, 
-      SENSE_NOT_READY = 2, 
-      SENSE_ILLEGAL_REQUEST = 5,
-      SENSE_UNIT_ATTENTION = 6
+    SENSE_NONE = 0, 
+    SENSE_NOT_READY = 2, 
+    SENSE_ILLEGAL_REQUEST = 5,
+    SENSE_UNIT_ATTENTION = 6
 } sense_t ;
 
 typedef enum _asc {
-      ASC_INV_FIELD_IN_CMD_PACKET = 0x24,
-      ASC_MEDIUM_NOT_PRESENT = 0x3a,
-      ASC_SAVING_PARAMETERS_NOT_SUPPORTED = 0x39,
-      ASC_LOGICAL_BLOCK_OOR = 0x21
+    ASC_INV_FIELD_IN_CMD_PACKET = 0x24,
+    ASC_MEDIUM_NOT_PRESENT = 0x3a,
+    ASC_SAVING_PARAMETERS_NOT_SUPPORTED = 0x39,
+    ASC_LOGICAL_BLOCK_OOR = 0x21
 } asc_t ;
 
 
 
 typedef struct  {
-  unsigned cylinders;
-  unsigned heads;
-  unsigned sectors;
+    unsigned cylinders;
+    unsigned heads;
+    unsigned sectors;
 } device_image_t;
 
 
 
 
 struct interrupt_reason_t {
-  unsigned  c_d : 1; 
-  unsigned  i_o : 1; 
-  unsigned  rel : 1; 
-  unsigned  tag : 5; 
+    unsigned  c_d : 1; 
+    unsigned  i_o : 1; 
+    unsigned  rel : 1; 
+    unsigned  tag : 5; 
 };
 
 
 struct controller_status {
-  rd_bool busy;
-  rd_bool drive_ready;
-  rd_bool write_fault;
-  rd_bool seek_complete;
-  rd_bool drq;
-  rd_bool corrected_data;
-  rd_bool index_pulse;
-  unsigned int index_pulse_count;
-  rd_bool err;
+    rd_bool busy;
+    rd_bool drive_ready;
+    rd_bool write_fault;
+    rd_bool seek_complete;
+    rd_bool drq;
+    rd_bool corrected_data;
+    rd_bool index_pulse;
+    unsigned int index_pulse_count;
+    rd_bool err;
 };
 
 
@@ -105,110 +105,110 @@ struct controller_status {
 
 
 struct  sense_info_t {
-  sense_t sense_key;
+    sense_t sense_key;
 
-  struct  {
-    Bit8u arr[4];
-  } information;
+    struct  {
+	Bit8u arr[4];
+    } information;
 
-  struct  {
-    Bit8u arr[4];
-  } specific_inf;
+    struct  {
+	Bit8u arr[4];
+    } specific_inf;
 
-  struct  {
-    Bit8u arr[3];
-  } key_spec;
+    struct  {
+	Bit8u arr[3];
+    } key_spec;
 
-  Bit8u fruc;
-  Bit8u asc;
-  Bit8u ascq;
+    Bit8u fruc;
+    Bit8u asc;
+    Bit8u ascq;
 };
 
 
 struct  error_recovery_t {
-  unsigned char data[8];
+    unsigned char data[8];
 };
 
 struct  cdrom_t {
-  rd_bool ready;
-  rd_bool locked;
+    rd_bool ready;
+    rd_bool locked;
 
-  struct cdrom_ops * cd;
+    struct cdrom_ops * cd;
 
-  uint32_t capacity;
-  int next_lba;
-  int remaining_blocks;
+    uint32_t capacity;
+    int next_lba;
+    int remaining_blocks;
 
-  struct  currentStruct {
-    struct error_recovery_t error_recovery;
-  } current;
+    struct  currentStruct {
+	struct error_recovery_t error_recovery;
+    } current;
 
 };
 
 struct  atapi_t {
-  uint8_t command;
-  int drq_bytes;
-  int total_bytes_remaining;
+    uint8_t command;
+    int drq_bytes;
+    int total_bytes_remaining;
 };
 
 
 typedef enum { IDE_NONE, IDE_DISK, IDE_CDROM } device_type_t;
 
 struct controller_t  {
-  struct controller_status status;
-  Bit8u    error_register;
-  Bit8u    head_no;
+    struct controller_status status;
+    Bit8u    error_register;
+    Bit8u    head_no;
 
-  union {
-    Bit8u    sector_count;
-    struct interrupt_reason_t interrupt_reason;
-  };
+    union {
+	Bit8u    sector_count;
+	struct interrupt_reason_t interrupt_reason;
+    };
 
 
-  Bit8u    sector_no;
+    Bit8u    sector_no;
 
-  union  {
-    Bit16u   cylinder_no;
-    Bit16u   byte_count;
-  };
+    union  {
+	Bit16u   cylinder_no;
+	Bit16u   byte_count;
+    };
 
-  Bit8u    buffer[2048]; 
-  Bit32u   buffer_index;
-  Bit32u   drq_index;
-  Bit8u    current_command;
-  Bit8u    sectors_per_block;
-  Bit8u    lba_mode;
+    Bit8u    buffer[2048]; 
+    Bit32u   buffer_index;
+    Bit32u   drq_index;
+    Bit8u    current_command;
+    Bit8u    sectors_per_block;
+    Bit8u    lba_mode;
 
-  struct  {
-    rd_bool reset;       // 0=normal, 1=reset controller
-    rd_bool disable_irq;     // 0=allow irq, 1=disable irq
-  } control;
+    struct  {
+	rd_bool reset;       // 0=normal, 1=reset controller
+	rd_bool disable_irq;     // 0=allow irq, 1=disable irq
+    } control;
 
-  Bit8u    reset_in_progress;
-  Bit8u    features;
+    Bit8u    reset_in_progress;
+    Bit8u    features;
 };
 
 
 
 
 struct  drive_t {
-  device_image_t  hard_drive;
-  device_type_t device_type;
-  // 512 byte buffer for ID drive command
-  // These words are stored in native word endian format, as
-  // they are fetched and returned via a return(), so
-  // there's no need to keep them in x86 endian format.
-  Bit16u id_drive[256];
+    device_image_t  hard_drive;
+    device_type_t device_type;
+    // 512 byte buffer for ID drive command
+    // These words are stored in native word endian format, as
+    // they are fetched and returned via a return(), so
+    // there's no need to keep them in x86 endian format.
+    Bit16u id_drive[256];
   
-  struct controller_t controller;
-  struct cdrom_t cdrom;
-  struct sense_info_t sense;
-  struct atapi_t atapi;
+    struct controller_t controller;
+    struct cdrom_t cdrom;
+    struct sense_info_t sense;
+    struct atapi_t atapi;
   
-  /* JRL */
-  void * private_data;
+    /* JRL */
+    void * private_data;
 
-  Bit8u model_no[41];
+    Bit8u model_no[41];
 };
 
 
@@ -216,18 +216,18 @@ struct  drive_t {
 // For each ATA channel we should have one controller struct
 // and an array of two drive structs
 struct  channel_t {
-  struct drive_t drives[2];
-  unsigned drive_select;
+    struct drive_t drives[2];
+    unsigned drive_select;
   
-  Bit16u ioaddr1;
-  Bit16u ioaddr2;
-  Bit8u  irq;
+    Bit16u ioaddr1;
+    Bit16u ioaddr2;
+    Bit8u  irq;
 };
 
 
 
 struct  ramdisk_t {
-  struct channel_t channels[MAX_ATA_CHANNEL];
+    struct channel_t channels[MAX_ATA_CHANNEL];
 };