Patchwork [04/25] pci: use the symbolic constant, PCI_ROM_ADDRESS_ENABLE instead of 1.

login
register
mail settings
Submitter Isaku Yamahata
Date Oct. 2, 2009, 8:15 p.m.
Message ID <1254514577-11896-5-git-send-email-yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/34897/
State Superseded
Headers show

Comments

Isaku Yamahata - Oct. 2, 2009, 8:15 p.m.
use the symbolic constant, PCI_ROM_ADDRESS_ENABLE instead of 1.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pci.c |    2 +-
 hw/pci.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
Michael S. Tsirkin - Oct. 4, 2009, 10:06 a.m.
On Sat, Oct 03, 2009 at 05:15:56AM +0900, Isaku Yamahata wrote:
> use the symbolic constant, PCI_ROM_ADDRESS_ENABLE instead of 1.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/pci.c |    2 +-
>  hw/pci.h |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 40035e6..1016893 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -422,7 +422,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
>      if (region_num == PCI_ROM_SLOT) {
>          addr = 0x30;
>          /* ROM enable bit is writeable */
> -        wmask |= 1;
> +        wmask |= PCI_ROM_ADDRESS_ENABLE;
>      } else {
>          addr = 0x10 + region_num * 4;
>      }
> diff --git a/hw/pci.h b/hw/pci.h
> index aa3090e..def45ae 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -131,6 +131,8 @@ typedef struct PCIIORegion {
>  #define PCI_SUBVENDOR_ID        0x2c    /* obsolete, use PCI_SUBSYSTEM_VENDOR_ID */
>  #define PCI_SUBDEVICE_ID        0x2e    /* obsolete, use PCI_SUBSYSTEM_ID */
>  
> +#define  PCI_ROM_ADDRESS_ENABLE 0x01
> +

Please put this just after PCI_ROM_ADDRESS just like it appears in
pci_regs.h, to make it easier to find:

#define PCI_ROM_ADDRESS		0x30	/* Bits 31..11 are address, 10..1 reserved */
#define  PCI_ROM_ADDRESS_ENABLE	0x01

>  /* Bits in the PCI Status Register (PCI 2.3 spec) */
>  #define PCI_STATUS_RESERVED1	0x007
>  #define PCI_STATUS_INT_STATUS	0x008
> -- 
> 1.6.0.2
> 
>

Patch

diff --git a/hw/pci.c b/hw/pci.c
index 40035e6..1016893 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -422,7 +422,7 @@  void pci_register_bar(PCIDevice *pci_dev, int region_num,
     if (region_num == PCI_ROM_SLOT) {
         addr = 0x30;
         /* ROM enable bit is writeable */
-        wmask |= 1;
+        wmask |= PCI_ROM_ADDRESS_ENABLE;
     } else {
         addr = 0x10 + region_num * 4;
     }
diff --git a/hw/pci.h b/hw/pci.h
index aa3090e..def45ae 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -131,6 +131,8 @@  typedef struct PCIIORegion {
 #define PCI_SUBVENDOR_ID        0x2c    /* obsolete, use PCI_SUBSYSTEM_VENDOR_ID */
 #define PCI_SUBDEVICE_ID        0x2e    /* obsolete, use PCI_SUBSYSTEM_ID */
 
+#define  PCI_ROM_ADDRESS_ENABLE 0x01
+
 /* Bits in the PCI Status Register (PCI 2.3 spec) */
 #define PCI_STATUS_RESERVED1	0x007
 #define PCI_STATUS_INT_STATUS	0x008