[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
From: |
BALATON Zoltan |
Subject: |
[PATCH v2] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h |
Date: |
Mon, 16 Mar 2020 13:55:05 +0100 |
We can move this define now that less files use it to internal.h to
further reduce dependency on hw/ide.h.
Signed-off-by: BALATON Zoltan <address@hidden>
---
v2: Alternative version of patch 7 that applies without
[PATCH 4/8] hw/ide: Move MAX_IDE_BUS define to one header
include/hw/ide.h | 2 --
include/hw/ide/internal.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/hw/ide.h b/include/hw/ide.h
index d52c211f32..c5ce5da4f4 100644
--- a/include/hw/ide.h
+++ b/include/hw/ide.h
@@ -4,8 +4,6 @@
#include "hw/isa/isa.h"
#include "exec/memory.h"
-#define MAX_IDE_DEVS 2
-
/* ide-isa.c */
ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
DriveInfo *hd0, DriveInfo *hd1);
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index 1bc1fc73e5..55da35d768 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -27,6 +27,8 @@ typedef struct IDEDMAOps IDEDMAOps;
#define TYPE_IDE_BUS "IDE"
#define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS)
+#define MAX_IDE_DEVS 2
+
/* Bits of HD_STATUS */
#define ERR_STAT 0x01
#define INDEX_STAT 0x02
--
2.21.1
- Re: [PATCH 6/8] hw/ide: Do ide_drive_get() within pci_ide_create_devs(), (continued)
Re: [PATCH 0/8] Misc hw/ide legacy clean up, Mark Cave-Ayland, 2020/03/14
Re: [PATCH 0/8] Misc hw/ide legacy clean up, Markus Armbruster, 2020/03/16
[PATCH v2] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h,
BALATON Zoltan <=
[PATCH v2] hw/ide: Do ide_drive_get() within pci_ide_create_devs(), BALATON Zoltan, 2020/03/16