summary refs log tree commit diff stats
path: root/hw/ide/internal.h
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-05-28 13:32:45 +0200
committerKevin Wolf <kwolf@redhat.com>2010-07-06 17:05:49 +0200
commitcd8722bb22ed41586ef489b3521173f1a80c9357 (patch)
tree366c0d832a47d035ee6c18d62aebc7bc24c9815b /hw/ide/internal.h
parentf597627ff5eb683501d65cf169f467bb4e894626 (diff)
downloadfocaccia-qemu-cd8722bb22ed41586ef489b3521173f1a80c9357.tar.gz
focaccia-qemu-cd8722bb22ed41586ef489b3521173f1a80c9357.zip
ide: Replace IDEState members is_cdrom, is_cf by drive_kind
The two aren't independent variables.  Make that obvious.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/internal.h')
-rw-r--r--hw/ide/internal.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 0125a9f0b9..bd5366066c 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -362,6 +362,8 @@ typedef struct BMDMAState BMDMAState;
 #define SMART_DISABLE         0xd9
 #define SMART_STATUS          0xda
 
+typedef enum { IDE_HD, IDE_CD, IDE_CFATA } IDEDriveKind;
+
 typedef void EndTransferFunc(IDEState *);
 
 /* NOTE: IDEState represents in fact one drive */
@@ -369,8 +371,7 @@ struct IDEState {
     IDEBus *bus;
     uint8_t unit;
     /* ide config */
-    int is_cdrom;
-    int is_cf;
+    IDEDriveKind drive_kind;
     int cylinders, heads, sectors;
     int64_t nb_sectors;
     int mult_sectors;