Patchwork [5/6] ahci pci ids into pci_ids.h, add warning messages.

login
register
mail settings
Submitter 乔崇
Date May 10, 2010, 11:19 p.m.
Message ID <1273533547-21789-6-git-send-email-qiaochong@loongson.cn>
Download mbox | patch
Permalink /patch/52251/
State New
Headers show

Comments

乔崇 - May 10, 2010, 11:19 p.m.
move ahci pci device id define into pci_ids.h,add warning messages for
unsupported features.

Signed-off-by: QiaoChong <qiaochong@loongson.cn>
---
 hw/ahci.c    |   10 +++++-----
 hw/pci_ids.h |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/ahci.c b/hw/ahci.c
index cb4a851..e1aed4a 100644
--- a/hw/ahci.c
+++ b/hw/ahci.c
@@ -662,7 +662,9 @@  static void handle_cmd(AHCIState *s,int port,int slot)
 
 	if(fis[1]==0)
 	{
-
+#ifdef DEBUG_AHCI
+			printf("now,just ignore command fis[0]=%02x fis[1]=%02x fis[2]=%02x\n",fis[0],fis[1],fis[2]);
+#endif
 	}
 
 	if(fis[1]==(1<<7))
@@ -755,15 +757,13 @@  static void ahci_pci_map(PCIDevice *pci_dev, int region_num,
 	cpu_register_physical_memory(addr, size, s->mem);
 }
 
-#define PCI_VENDOR_MYDEVICE  0x8086
-#define PCI_PRODUCT_MYDEVICE 0x2652
 
 static int pci_ahci_init(PCIDevice *dev)
 {
 	struct ahci_pci_state *d;
 	d = DO_UPCAST(struct ahci_pci_state, card, dev);
-	pci_config_set_vendor_id(d->card.config,PCI_VENDOR_MYDEVICE);
-	pci_config_set_device_id(d->card.config,PCI_PRODUCT_MYDEVICE);
+	pci_config_set_vendor_id(d->card.config,PCI_VENDOR_ID_INTEL);
+	pci_config_set_device_id(d->card.config,PCI_DEVICE_ID_INTEL_ICH6R_AHCI);
 	d->card.config[PCI_COMMAND]		= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
 	d->card.config[PCI_CLASS_DEVICE]	= 0;
 	d->card.config[0x0b]		= 1;//storage
diff --git a/hw/pci_ids.h b/hw/pci_ids.h
index fe7a121..4d4de93 100644
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@ -97,3 +97,4 @@ 
 #define PCI_DEVICE_ID_INTEL_82371AB      0x7111
 #define PCI_DEVICE_ID_INTEL_82371AB_2    0x7112
 #define PCI_DEVICE_ID_INTEL_82371AB_3    0x7113
+#define PCI_DEVICE_ID_INTEL_ICH6R_AHCI    0x2652