summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2014-08-08 17:23:32 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-08-15 18:03:13 +0100
commit58f16a7b47e0e8418b1222b6adc08d2b7079a4c0 (patch)
treeaa19073560b2caa8a7f0d3ea53e6fb2085d72715
parente42de189e8eaf3dc93f22e88beca4f5b62ef336c (diff)
downloadqemu-58f16a7b47e0e8418b1222b6adc08d2b7079a4c0.tar.gz
cmd646: add constants for CNTRL register access
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--hw/ide/cmd646.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index a8e35fe38f..d8395ef248 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -33,6 +33,9 @@
#include <hw/ide/pci.h>
/* CMD646 specific */
+#define CNTRL 0x51
+#define CNTRL_EN_CH0 0x04
+#define CNTRL_EN_CH1 0x08
#define MRDMODE 0x71
#define MRDMODE_INTR_CH0 0x04
#define MRDMODE_INTR_CH1 0x08
@@ -269,10 +272,10 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
pci_conf[PCI_CLASS_PROG] = 0x8f;
- pci_conf[0x51] = 0x04; // enable IDE0
+ pci_conf[CNTRL] = CNTRL_EN_CH0; // enable IDE0
if (d->secondary) {
/* XXX: if not enabled, really disable the seconday IDE controller */
- pci_conf[0x51] |= 0x08; /* enable IDE1 */
+ pci_conf[CNTRL] |= CNTRL_EN_CH1; /* enable IDE1 */
}
setup_cmd646_bar(d, 0);