Patchwork [05/12] ide: create ide/pci.h for common ide pci definitions

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 2:56 p.m.
Message ID <bfb1bc2eb5e700f3149a57b5b54d53ce3fb9b116.1254927186.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35299/
State Under Review
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 2:56 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/ide/pci.c |   14 +-------------
 hw/ide/pci.h |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 hw/ide/pci.h

Patch

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 9d7fdd4..3e1f53b 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -31,7 +31,7 @@ 
 #include "sysemu.h"
 #include "dma.h"

-#include <hw/ide/internal.h>
+#include <hw/ide/pci.h>

 /***********************************************************/
 /* PCI IDE definitions */
@@ -45,18 +45,6 @@ 
 #define UDIDETCR0	0x73
 #define UDIDETCR1	0x7B

-#define IDE_TYPE_PIIX3   0
-#define IDE_TYPE_CMD646  1
-#define IDE_TYPE_PIIX4   2
-
-typedef struct PCIIDEState {
-    PCIDevice dev;
-    IDEBus bus[2];
-    BMDMAState bmdma[2];
-    int type; /* see IDE_TYPE_xxx */
-    uint32_t secondary;
-} PCIIDEState;
-
 static void cmd646_update_irq(PCIIDEState *d);

 static void ide_map(PCIDevice *pci_dev, int region_num,
diff --git a/hw/ide/pci.h b/hw/ide/pci.h
new file mode 100644
index 0000000..7f3f297
--- /dev/null
+++ b/hw/ide/pci.h
@@ -0,0 +1,18 @@ 
+#ifndef HW_IDE_PCI_H
+#define HW_IDE_PCI_H
+
+#include <hw/ide/internal.h>
+
+#define IDE_TYPE_PIIX3   0
+#define IDE_TYPE_CMD646  1
+#define IDE_TYPE_PIIX4   2
+
+typedef struct PCIIDEState {
+    PCIDevice dev;
+    IDEBus bus[2];
+    BMDMAState bmdma[2];
+    int type; /* see IDE_TYPE_xxx */
+    uint32_t secondary;
+} PCIIDEState;
+
+#endif