From: Blue Swirl <blauwirbel@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [6465] Add Simba device ID
Date: Tue, 27 Jan 2009 19:15:32 +0000 [thread overview]
Message-ID: <E1LRtPI-0006IQ-Eh@cvs.savannah.gnu.org> (raw)
Revision: 6465
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6465
Author: blueswir1
Date: 2009-01-27 19:15:31 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
Add Simba device ID
Modified Paths:
--------------
trunk/hw/apb_pci.c
trunk/hw/pci.c
trunk/hw/pci.h
Modified: trunk/hw/apb_pci.c
===================================================================
--- trunk/hw/apb_pci.c 2009-01-27 14:29:15 UTC (rev 6464)
+++ trunk/hw/apb_pci.c 2009-01-27 19:15:31 UTC (rev 6465)
@@ -266,9 +266,11 @@
d->config[0x0E] = 0x00; // header_type
/* APB secondary busses */
- *bus2 = pci_bridge_init(s->bus, 8, 0x108e5000, pci_apb_map_irq,
+ *bus2 = pci_bridge_init(s->bus, 8, PCI_VENDOR_ID_SUN,
+ PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq,
"Advanced PCI Bus secondary bridge 1");
- *bus3 = pci_bridge_init(s->bus, 9, 0x108e5000, pci_apb_map_irq,
+ *bus3 = pci_bridge_init(s->bus, 9, PCI_VENDOR_ID_SUN,
+ PCI_DEVICE_ID_SUN_SIMBA, pci_apb_map_irq,
"Advanced PCI Bus secondary bridge 2");
return s->bus;
}
Modified: trunk/hw/pci.c
===================================================================
--- trunk/hw/pci.c 2009-01-27 14:29:15 UTC (rev 6464)
+++ trunk/hw/pci.c 2009-01-27 19:15:31 UTC (rev 6465)
@@ -713,16 +713,16 @@
pci_default_write_config(d, address, val, len);
}
-PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint32_t id,
+PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,
pci_map_irq_fn map_irq, const char *name)
{
PCIBridge *s;
s = (PCIBridge *)pci_register_device(bus, name, sizeof(PCIBridge),
devfn, NULL, pci_bridge_write_config);
- s->dev.config[0x00] = id >> 16;
- s->dev.config[0x01] = id >> 24;
- s->dev.config[0x02] = id; // device_id
- s->dev.config[0x03] = id >> 8;
+
+ pci_config_set_vendor_id(s->dev.config, vid);
+ pci_config_set_device_id(s->dev.config, did);
+
s->dev.config[0x04] = 0x06; // command = bus master, pci mem
s->dev.config[0x05] = 0x00;
s->dev.config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no error
Modified: trunk/hw/pci.h
===================================================================
--- trunk/hw/pci.h 2009-01-27 14:29:15 UTC (rev 6464)
+++ trunk/hw/pci.h 2009-01-27 19:15:31 UTC (rev 6465)
@@ -31,6 +31,7 @@
#define PCI_VENDOR_ID_SUN 0x108e
#define PCI_DEVICE_ID_SUN_EBUS 0x1000
+#define PCI_DEVICE_ID_SUN_SIMBA 0x5000
#define PCI_DEVICE_ID_SUN_SABRE 0xa000
#define PCI_VENDOR_ID_CMD 0x1095
@@ -183,7 +184,7 @@
void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d));
void pci_info(void);
-PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint32_t id,
+PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,
pci_map_irq_fn map_irq, const char *name);
static inline void
reply other threads:[~2009-01-27 19:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LRtPI-0006IQ-Eh@cvs.savannah.gnu.org \
--to=blauwirbel@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).