| Message ID | 20091210181137.GQ25707@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Sat, Dec 12, 2009 at 04:41:07PM +0100, Juan Quintela wrote: > "Michael S. Tsirkin" <mst@redhat.com> wrote: > > No functional changes. I verified that the generated binary > > does not change. > > s/uhci/ohci/ in subject :) Ugh. Right. Good catch. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > --- > > hw/usb-ohci.c | 6 ++++-- > > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c > > index 7ab3a98..deab7f3 100644 > > --- a/hw/usb-ohci.c > > +++ b/hw/usb-ohci.c > > @@ -1721,14 +1721,16 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) > > pci_config_set_vendor_id(ohci->pci_dev.config, PCI_VENDOR_ID_APPLE); > > pci_config_set_device_id(ohci->pci_dev.config, > > PCI_DEVICE_ID_APPLE_IPID_USB); > > - ohci->pci_dev.config[0x09] = 0x10; /* OHCI */ > > + ohci->pci_dev.config[PCI_CLASS_PROG] = 0x10; /* OHCI */ > > pci_config_set_class(ohci->pci_dev.config, PCI_CLASS_SERIAL_USB); > > - ohci->pci_dev.config[0x3d] = 0x01; /* interrupt pin 1 */ > > + /* TODO: RST# value should be 0. */ > > + ohci->pci_dev.config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin 1 */ > > > > usb_ohci_init(&ohci->state, &dev->qdev, num_ports, > > ohci->pci_dev.devfn, ohci->pci_dev.irq[0], > > OHCI_TYPE_PCI, ohci->pci_dev.name, 0); > > > > + /* TODO: avoid cast below by using dev */ > > pci_register_bar((struct PCIDevice *)ohci, 0, 256, > > PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc); > > return 0;
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 7ab3a98..deab7f3 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -1721,14 +1721,16 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) pci_config_set_vendor_id(ohci->pci_dev.config, PCI_VENDOR_ID_APPLE); pci_config_set_device_id(ohci->pci_dev.config, PCI_DEVICE_ID_APPLE_IPID_USB); - ohci->pci_dev.config[0x09] = 0x10; /* OHCI */ + ohci->pci_dev.config[PCI_CLASS_PROG] = 0x10; /* OHCI */ pci_config_set_class(ohci->pci_dev.config, PCI_CLASS_SERIAL_USB); - ohci->pci_dev.config[0x3d] = 0x01; /* interrupt pin 1 */ + /* TODO: RST# value should be 0. */ + ohci->pci_dev.config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin 1 */ usb_ohci_init(&ohci->state, &dev->qdev, num_ports, ohci->pci_dev.devfn, ohci->pci_dev.irq[0], OHCI_TYPE_PCI, ohci->pci_dev.name, 0); + /* TODO: avoid cast below by using dev */ pci_register_bar((struct PCIDevice *)ohci, 0, 256, PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc); return 0;
No functional changes. I verified that the generated binary does not change. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/usb-ohci.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)