From owner-svn-src-all@freebsd.org Wed Nov 18 13:22:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D04732EF857; Wed, 18 Nov 2020 13:22:23 +0000 (UTC) (envelope-from hselasky@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cbk4b5Kd6z3P8y; Wed, 18 Nov 2020 13:22:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A82DC12858; Wed, 18 Nov 2020 13:22:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AIDMN2v066713; Wed, 18 Nov 2020 13:22:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AIDMMWC066709; Wed, 18 Nov 2020 13:22:22 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202011181322.0AIDMMWC066709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 18 Nov 2020 13:22:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367787 - in head: stand/kshim sys/dev/usb X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head: stand/kshim sys/dev/usb X-SVN-Commit-Revision: 367787 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2020 13:22:23 -0000 Author: hselasky Date: Wed Nov 18 13:22:22 2020 New Revision: 367787 URL: https://svnweb.freebsd.org/changeset/base/367787 Log: Fix build of USB bootloader code by adding checks for _STANDALONE being defined. Currently the USB bootloader code is not part of buildworld. MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/stand/kshim/bsd_kernel.h head/sys/dev/usb/usb.h head/sys/dev/usb/usb_pf.h head/sys/dev/usb/usbdi.h head/sys/dev/usb/usbhid.h Modified: head/stand/kshim/bsd_kernel.h ============================================================================== --- head/stand/kshim/bsd_kernel.h Wed Nov 18 09:00:05 2020 (r367786) +++ head/stand/kshim/bsd_kernel.h Wed Nov 18 13:22:22 2020 (r367787) @@ -27,9 +27,12 @@ #ifndef _BSD_KERNEL_H_ #define _BSD_KERNEL_H_ -#define _KERNEL +#if !defined(_STANDALONE) +#error "_STANDALONE is not defined!" +#endif + #undef __FreeBSD_version -#define __FreeBSD_version 1100000 +#define __FreeBSD_version 1300000 #include #include Modified: head/sys/dev/usb/usb.h ============================================================================== --- head/sys/dev/usb/usb.h Wed Nov 18 09:00:05 2020 (r367786) +++ head/sys/dev/usb/usb.h Wed Nov 18 13:22:22 2020 (r367787) @@ -41,7 +41,7 @@ #ifndef _USB_STANDARD_H_ #define _USB_STANDARD_H_ -#if defined(_KERNEL) +#if defined(_KERNEL) || defined(_STANDALONE) #ifndef USB_GLOBAL_INCLUDE_FILE #include "opt_usb.h" #endif @@ -57,7 +57,7 @@ SYSCTL_DECL(_hw_usb); MALLOC_DECLARE(M_USB); MALLOC_DECLARE(M_USBDEV); -#endif /* _KERNEL */ +#endif /* _KERNEL || _STANDALONE */ #ifndef USB_GLOBAL_INCLUDE_FILE #include Modified: head/sys/dev/usb/usb_pf.h ============================================================================== --- head/sys/dev/usb/usb_pf.h Wed Nov 18 09:00:05 2020 (r367786) +++ head/sys/dev/usb/usb_pf.h Wed Nov 18 13:22:22 2020 (r367787) @@ -113,10 +113,10 @@ extern uint8_t usbpf_framehdr_size_ok[ #define USBPF_XFERTAP_SUBMIT 0 #define USBPF_XFERTAP_DONE 1 -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_STANDALONE) void usbpf_attach(struct usb_bus *); void usbpf_detach(struct usb_bus *); void usbpf_xfertap(struct usb_xfer *, int); -#endif +#endif /* _KERNEL || _STANDALONE */ +#endif /* _DEV_USB_PF_H */ -#endif Modified: head/sys/dev/usb/usbdi.h ============================================================================== --- head/sys/dev/usb/usbdi.h Wed Nov 18 09:00:05 2020 (r367786) +++ head/sys/dev/usb/usbdi.h Wed Nov 18 13:22:22 2020 (r367787) @@ -88,7 +88,7 @@ typedef enum { /* keep in sync with usb_errstr_table * #define USB_NO_TIMEOUT 0 #define USB_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ -#if defined(_KERNEL) +#if defined(_KERNEL) || defined(_STANDALONE) /* typedefs */ typedef void (usb_callback_t)(struct usb_xfer *, usb_error_t); @@ -709,5 +709,5 @@ void *usb_fifo_softc(struct usb_fifo *fifo); void usb_fifo_set_close_zlp(struct usb_fifo *, uint8_t); void usb_fifo_set_write_defrag(struct usb_fifo *, uint8_t); void usb_fifo_free(struct usb_fifo *f); -#endif /* _KERNEL */ -#endif /* _USB_USBDI_H_ */ +#endif /* _KERNEL || _STANDALONE */ +#endif /* _USB_USBDI_H_ */ Modified: head/sys/dev/usb/usbhid.h ============================================================================== --- head/sys/dev/usb/usbhid.h Wed Nov 18 09:00:05 2020 (r367786) +++ head/sys/dev/usb/usbhid.h Wed Nov 18 13:22:22 2020 (r367787) @@ -205,7 +205,7 @@ struct usb_hid_descriptor { #define HUM_INCH 0x13 #define HUM_DEGREE 0x14 -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_STANDALONE) struct usb_config_descriptor; enum hid_kind { @@ -274,5 +274,5 @@ usb_error_t usbd_req_get_hid_desc(struct usb_device *u int32_t hid_item_resolution(struct hid_item *hi); int hid_is_mouse(const void *d_ptr, uint16_t d_len); int hid_is_keyboard(const void *d_ptr, uint16_t d_len); -#endif /* _KERNEL */ -#endif /* _USB_HID_H_ */ +#endif /* _KERNEL || _STANDALONE */ +#endif /* _USB_HID_H_ */