From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 14/31] usb/ehci: add sysbus variant
Date: Thu, 1 Nov 2012 16:54:27 +0100 [thread overview]
Message-ID: <1351785284-15384-15-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1351785284-15384-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/Makefile.objs | 2 +-
hw/usb/hcd-ehci-sysbus.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletions(-)
create mode 100644 hw/usb/hcd-ehci-sysbus.c
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 5c7b024..7669938 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -1,6 +1,6 @@
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
-common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
+common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
common-obj-y += libhw.o
diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
new file mode 100644
index 0000000..1584079
--- /dev/null
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -0,0 +1,77 @@
+/*
+ * QEMU USB EHCI Emulation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or(at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hw/usb/hcd-ehci.h"
+#include "hw/sysbus.h"
+
+typedef struct EHCISysBusState {
+ SysBusDevice busdev;
+ EHCIState ehci;
+} EHCISysBusState;
+
+static const VMStateDescription vmstate_ehci_sysbus = {
+ .name = "ehci-sysbus",
+ .version_id = 2,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT(ehci, EHCISysBusState, 2, vmstate_ehci, EHCIState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static Property ehci_sysbus_properties[] = {
+ DEFINE_PROP_UINT32("maxframes", EHCISysBusState, ehci.maxframes, 128),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static int usb_ehci_sysbus_initfn(SysBusDevice *dev)
+{
+ EHCISysBusState *i = FROM_SYSBUS(EHCISysBusState, dev);
+ EHCIState *s = &i->ehci;
+
+ s->capsbase = 0x100;
+ s->opregbase = 0x140;
+
+ usb_ehci_initfn(s, DEVICE(dev));
+ sysbus_init_irq(dev, &s->irq);
+ sysbus_init_mmio(dev, &s->mem);
+ return 0;
+}
+
+static void ehci_sysbus_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+ k->init = usb_ehci_sysbus_initfn;
+ dc->vmsd = &vmstate_ehci_sysbus;
+ dc->props = ehci_sysbus_properties;
+}
+
+TypeInfo ehci_xlnx_type_info = {
+ .name = "xlnx,ps7-usb",
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(EHCISysBusState),
+ .class_init = ehci_sysbus_class_init,
+};
+
+static void ehci_sysbus_register_types(void)
+{
+ type_register_static(&ehci_xlnx_type_info);
+}
+
+type_init(ehci_sysbus_register_types)
--
1.7.1
next prev parent reply other threads:[~2012-11-01 15:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 15:54 [Qemu-devel] [PULL 00/31] usb patch queue Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 01/31] xhci: add {get, set}_field macros & enum for pls Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 02/31] xhci: s/xhci_update_port/xhci_port_update/ Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 03/31] xhci: add xhci_port_have_device Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 05/31] xhci: add xhci_port_reset Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 06/31] xhci: set pls in xhci_port_update & xhci_port_reset Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 07/31] xhci: add port trace points Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multiple times Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 09/31] usb/ehci: parameterise the register region offsets Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 10/31] usb/ehci: Abstract away PCI DMA API Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 11/31] usb/ehci: seperate out PCIisms Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 12/31] usb/ehci: Guard definition of EHCI_DEBUG Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 13/31] usb/ehci: split into multiple source files Gerd Hoffmann
2012-11-01 15:54 ` Gerd Hoffmann [this message]
2012-11-01 15:54 ` [Qemu-devel] [PATCH 15/31] xilinx_zynq: add USB controllers Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 16/31] uhci: dynamic type generation Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 17/31] uhci: stick irq routing info into UHCIInfo too Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 18/31] uhci: add ich9 00:1a.* variants Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 19/31] usb/ehci-pci: dynamic type generation Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 20/31] usb/ehci-pci: add ich9 00:1a.* variant Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 21/31] usb/ehci-pci: add helper to create ich9 usb controllers Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 22/31] uhci: Add a uhci_handle_td_error() helper function Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 23/31] uhci: Don't crash on device disconnect Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 24/31] usb: Add packet combining functions Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 25/31] combined-packet: Add a workaround for Linux usbfs + live migration Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 26/31] usb-redir: Add support for 32 bits bulk packet length Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 27/31] usb-redir: Add support for input pipelining Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 28/31] usb-redir: Add an usbredir_setup_usb_eps() helper function Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 29/31] usb-redir: Use reject rather the disconnect on bad ep info Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 30/31] usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 31/31] usb-redir: Allow redirecting super speed devices to high speed controllers Gerd Hoffmann
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=1351785284-15384-15-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.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).