From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49309 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDbjI-0002qS-Rd for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:42:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDbjH-0006Kc-R1 for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:42:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDbjH-0006KA-Iu for qemu-devel@nongnu.org; Wed, 03 Nov 2010 07:42:11 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA3BgAR0002428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Nov 2010 07:42:10 -0400 Received: from rincewind.home.kraxel.org (vpn1-4-71.ams2.redhat.com [10.36.4.71]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA3Bg7MQ021527 for ; Wed, 3 Nov 2010 07:42:09 -0400 From: Gerd Hoffmann Date: Wed, 3 Nov 2010 12:41:52 +0100 Message-Id: <1288784516-15637-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1288784516-15637-1-git-send-email-kraxel@redhat.com> References: <1288784516-15637-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [vgabios patch v2 07/11] Add defines for PCI IDs. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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 vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG diff --git a/vbe.c b/vbe.c index ecff90d..1fab2f9 100644 --- a/vbe.c +++ b/vbe.c @@ -925,7 +925,11 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI; if (using_lfb) { info.NumberOfBanks = 1; } - lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor +#ifdef PCI_VID + lfb_addr = pci_get_lfb_addr(PCI_VID); +#else + lfb_addr = 0; +#endif if (lfb_addr > 0) { info.PhysBasePtr = ((Bit32u)lfb_addr << 16); } diff --git a/vgabios.c b/vgabios.c index ea3aae8..2e8b5d7 100644 --- a/vgabios.c +++ b/vgabios.c @@ -210,8 +210,13 @@ vgabios_pci_data: .word 0x1013 .word 0x00b8 // CLGD5446 #else +#ifdef PCI_VID +.word PCI_VID +.word PCI_DID +#else #error "Unknown PCI vendor and device id" #endif +#endif .word 0 // reserved .word 0x18 // dlen .byte 0 // revision -- 1.7.1