Re: [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs.

[Gerd Hoffmann]

On 05/07/10 17:32, Blue Swirl wrote:
> On 5/7/10, Gerd Hoffmann<address@hidden>  wrote:
> > This patch allows to set PCI vendor and device IDs using defines
> >   (PCI_VID and PCI_DID).  Use it for vgabios.bin.
> >
> >   Signed-off-by: Gerd Hoffmann<address@hidden>
> >   ---
> >    Makefile  |    4 ++--
> >    vbe.c     |    6 +++++-
> >    vgabios.c |    5 +++++
> >    3 files changed, 12 insertions(+), 3 deletions(-)
> >
> >   diff --git a/Makefile b/Makefile
> >   index c3c744c..d440b93 100644
> >   --- a/Makefile
> >   +++ b/Makefile
> >   @@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
> >    VBE_FILES := vbe.h vbe.c vbetables.h
> >
> >    # build flags
> >   -vgabios.bin              : VGAFLAGS := -DVBE
> >   -vgabios.debug.bin        : VGAFLAGS := -DVBE -DDEBUG
> >   +vgabios.bin              : VGAFLAGS := -DVBE -DPCI_VID=0x1234
> >   +vgabios.debug.bin        : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
>
> -DPCI_DID missing...

Not needed here.

> >   @@ -210,8 +210,13 @@ vgabios_pci_data:
> >    .word 0x1013
> >    .word 0x00b8 // CLGD5446
> >    #else
> >   +#ifdef PCI_VID
> >   +.word PCI_VID
> >   +.word PCI_DID
>
> ... so this generates:
>   .word 0x1234
>   .word PCI_DID

The whole construct is wrapped into a #ifdef PCIBIOS (not visible in the 
patch as it would have needed more context).

cheers,
  Gerd