From nobody Tue Jan 24 22:10:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h3y54Ghz3bdsh; Tue, 24 Jan 2023 22:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h3y4W9fz4JhK; Tue, 24 Jan 2023 22:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2T9zWR/7hpOIZcqu49VCvbvBo8pE7Aepnz4yqCgR2U=; b=Ec0eE0JblQpR5BUiuqE05ll4GuiZNYTjMpiuGBVxW0nxFBpmSJFUBBb1zrD0o+N1lxjlP6 mrqBUZeI9DX7VAKfItlUKo+EKDCUVb5Bwj6Fm/YY90PE6v0qJemhZvWtx8nITK7UHVwzav cyVj4xj/ArxddqZxTPd4wZdw9CAwk2DiEhQVFqb9hB/zdhUVWNq7dz/b5fWJ+ZoppPgIg0 N6cjw+rtWq+OSfCqYpyBJvzczTJe+PaibBszUJbEbjKs7qLAW9rcCrUChv+4n6JSne2lkR 8Npj9ysEyTjTJVlY5bN/c9gh3gUUMGrmYRGTdH2ThGxMCbcw4LHmF8Wow2noQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2T9zWR/7hpOIZcqu49VCvbvBo8pE7Aepnz4yqCgR2U=; b=YdBqkW3YVKFMdLINvDSj87lAzl2tuxG1RJ0vhz2oE+00v4COcyrcFxjtGoVT+ACmAV4xQd tmkxRvUUmTi9x3e7+WI1EOk7v+KLb6GSSubdEpqdTETnHc6blEPIcD20zFlSpWEDiU/hn9 Ap6E3irC2SMe5+51REaSsId0RTaYAC6R7W/RkT0oCD/43vP0yrgyPDMxjP9BAAVoX0ZO8H zF2nCKBz2nTKooc06CJcHsqtGzxtHs8ybGdVRaL6v917RVo7XGQD9PbvptyO/uo22xnfth cSS72w+hwHt5SdlIQc9BekNYmQwU+rEbHppyJirQmKb4EqWk+1h62CimT1QzJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598222; a=rsa-sha256; cv=none; b=d4GJzeY9Jh6R33bukBPhYk6WQf9FOJUwldyTngX0osviBiOjx5BFz2P3djxgDxLMWfduAD BA15uJedPe5jxpB0rKnCcEew4idgtWqD0svY99mMtts5vXNlgRYBmSTBxK3DD+enMKdUQA UUgdOlU+/fh+xpZxuoajHHA8uzxWPfFQ9cTzoSjQXkTih7ip8wQ0+PImLYAtjRPmCe3wSS 2xNSxzREPKctOBhFCQFMY02iaScCXL1bJqIgDnBKXYWQUGgVDm3U36fhC28oOgLud7quV7 B/EjDXcNm9uaXwORQRpCS+DU41hDwqfjyXN01rSYT8MQ7T7aqrOzcDUvkZF8uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h3y3cq3zQ1H; Tue, 24 Jan 2023 22:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMAMHV079961; Tue, 24 Jan 2023 22:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAM2U079960; Tue, 24 Jan 2023 22:10:22 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:22 GMT Message-Id: <202301242210.30OMAM2U079960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 60674a084382 - stable/13 - stand/usb: Fix build by declaring missing functions and types. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60674a0843826151cfc71b9a22ada77a6fd51d9f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=60674a0843826151cfc71b9a22ada77a6fd51d9f commit 60674a0843826151cfc71b9a22ada77a6fd51d9f Author: Hans Petter Selasky AuthorDate: 2022-03-17 14:14:17 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 stand/usb: Fix build by declaring missing functions and types. MFC after: 1 week Sponsored by: NVIDIA Networking (cherry picked from commit a85ff2114ccb751546f81ceb6b6d3244235363a1) --- stand/kshim/bsd_kernel.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h index 808b1b078db5..a5653667da53 100644 --- a/stand/kshim/bsd_kernel.h +++ b/stand/kshim/bsd_kernel.h @@ -366,6 +366,7 @@ struct devclass; struct device; struct module; struct module_data; +struct sbuf; typedef struct driver driver_t; typedef struct devclass *devclass_t; @@ -387,6 +388,12 @@ typedef int gpio_pin_setflags_t (device_t dev, uint32_t, uint32_t); typedef int bus_child_location_str_t (device_t parent, device_t child, char *buf, size_t buflen); typedef int bus_child_pnpinfo_str_t (device_t parent, device_t child, char *buf, size_t buflen); +typedef int bus_child_location_t (device_t parent, device_t child, struct sbuf *); +typedef int bus_child_pnpinfo_t (device_t parent, device_t child, struct sbuf *); +typedef int bus_get_device_path_t (device_t bus, device_t child, const char *locator, struct sbuf *sb); + +#define bus_generic_get_device_path(...) EOPNOTSUPP + typedef void bus_driver_added_t (device_t dev, driver_t *driver); struct device_method { @@ -472,7 +479,10 @@ int devclass_get_maxunit(devclass_t dc); device_t devclass_get_device(devclass_t dc, int unit); devclass_t devclass_find(const char *classname); +#define BUS_LOCATOR_UEFI "UEFI" #define bus_get_dma_tag(...) (NULL) +#define bus_topo_lock(...) mtx_lock(&Giant) +#define bus_topo_unlock(...) mtx_unlock(&Giant) int bus_generic_detach(device_t dev); int bus_generic_resume(device_t dev); int bus_generic_shutdown(device_t dev); @@ -517,6 +527,7 @@ int memcmp(const void *, const void *, size_t len); int printf(const char *,...) __printflike(1, 2); int snprintf(char *restrict str, size_t size, const char *restrict format,...) __printflike(3, 4); size_t strlen(const char *s); +int strcmp(const char *, const char *); /* MALLOC API */ @@ -701,4 +712,7 @@ int bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *buf, void bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); void bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int flags); +/* SBUF */ +#define sbuf_printf(...) do { } while (0) + #endif /* _BSD_KERNEL_H_ */