Date: Wed, 16 Nov 2022 03:23:13 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fd104a6ebc35 - main - bhyve: Use XHCI_PORTREG_PTR in one place that open-coded it. Message-ID: <202211160323.2AG3NDc1055819@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fd104a6ebc35cfc9cadeb981b23200e805a88b3f commit fd104a6ebc35cfc9cadeb981b23200e805a88b3f Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-11-16 03:19:35 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-11-16 03:19:35 +0000 bhyve: Use XHCI_PORTREG_PTR in one place that open-coded it. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D36888 --- usr.sbin/bhyve/pci_xhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 0d8122ee8c90..1f3d78a4cfea 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -2130,6 +2130,7 @@ pci_xhci_rtsregs_write(struct pci_xhci_softc *sc, uint64_t offset, static uint64_t pci_xhci_portregs_read(struct pci_xhci_softc *sc, uint64_t offset) { + struct pci_xhci_portregs *portregs; int port; uint32_t *p; @@ -2148,7 +2149,8 @@ pci_xhci_portregs_read(struct pci_xhci_softc *sc, uint64_t offset) offset = (offset - 0x3F0) % 0x10; - p = &sc->portregs[port].portsc; + portregs = XHCI_PORTREG_PTR(sc, port); + p = &portregs->portsc; p += offset / sizeof(uint32_t); DPRINTF(("pci_xhci: portregs read offset 0x%lx port %u -> 0x%x",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211160323.2AG3NDc1055819>