From owner-svn-src-all@FreeBSD.ORG Mon Jun 15 01:09:21 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24C431065672; Mon, 15 Jun 2009 01:09:21 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 116138FC13; Mon, 15 Jun 2009 01:09:21 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5F19Ksr072685; Mon, 15 Jun 2009 01:09:20 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5F19JGt072651; Mon, 15 Jun 2009 01:09:19 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200906150109.n5F19JGt072651@svn.freebsd.org> From: Andrew Thompson Date: Mon, 15 Jun 2009 01:09:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194230 - in head/sys/dev/usb: . net quirk serial X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 15 Jun 2009 01:09:21 -0000 Author: thompsa Date: Mon Jun 15 01:09:19 2009 New Revision: 194230 URL: http://svn.freebsd.org/changeset/base/194230 Log: Fix _USB2_* refernces in the header protection defines. Modified: head/sys/dev/usb/net/usb_ethernet.h head/sys/dev/usb/quirk/usb_quirk.h head/sys/dev/usb/serial/usb_serial.h head/sys/dev/usb/usb.h head/sys/dev/usb/usb_bus.h head/sys/dev/usb/usb_busdma.h head/sys/dev/usb/usb_controller.h head/sys/dev/usb/usb_core.h head/sys/dev/usb/usb_debug.h head/sys/dev/usb/usb_defs.h head/sys/dev/usb/usb_dev.h head/sys/dev/usb/usb_device.h head/sys/dev/usb/usb_dynamic.h head/sys/dev/usb/usb_endian.h head/sys/dev/usb/usb_error.h head/sys/dev/usb/usb_generic.h head/sys/dev/usb/usb_handle_request.h head/sys/dev/usb/usb_hid.h head/sys/dev/usb/usb_hub.h head/sys/dev/usb/usb_ioctl.h head/sys/dev/usb/usb_lookup.h head/sys/dev/usb/usb_mbuf.h head/sys/dev/usb/usb_mfunc.h head/sys/dev/usb/usb_msctest.h head/sys/dev/usb/usb_parse.h head/sys/dev/usb/usb_pci.h head/sys/dev/usb/usb_process.h head/sys/dev/usb/usb_request.h head/sys/dev/usb/usb_revision.h head/sys/dev/usb/usb_transfer.h head/sys/dev/usb/usb_util.h head/sys/dev/usb/usbhid.h Modified: head/sys/dev/usb/net/usb_ethernet.h ============================================================================== --- head/sys/dev/usb/net/usb_ethernet.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/net/usb_ethernet.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_ETHERNET_H_ -#define _USB2_ETHERNET_H_ +#ifndef _USB_ETHERNET_H_ +#define _USB_ETHERNET_H_ #include "opt_inet.h" @@ -119,4 +119,4 @@ int uether_rxbuf(struct usb_ether *, unsigned int, unsigned int); void uether_rxflush(struct usb_ether *); uint8_t uether_is_gone(struct usb_ether *); -#endif /* _USB2_ETHERNET_H_ */ +#endif /* _USB_ETHERNET_H_ */ Modified: head/sys/dev/usb/quirk/usb_quirk.h ============================================================================== --- head/sys/dev/usb/quirk/usb_quirk.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/quirk/usb_quirk.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_QUIRK_H_ -#define _USB2_QUIRK_H_ +#ifndef _USB_QUIRK_H_ +#define _USB_QUIRK_H_ /* NOTE: UQ_NONE is not a valid quirk */ enum { /* keep in sync with usb_quirk_str table */ @@ -56,4 +56,4 @@ enum { /* keep in sync with usb_quirk_st USB_QUIRK_MAX }; -#endif /* _USB2_QUIRK_H_ */ +#endif /* _USB_QUIRK_H_ */ Modified: head/sys/dev/usb/serial/usb_serial.h ============================================================================== --- head/sys/dev/usb/serial/usb_serial.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/serial/usb_serial.h Mon Jun 15 01:09:19 2009 (r194230) @@ -64,8 +64,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _USB2_SERIAL_H_ -#define _USB2_SERIAL_H_ +#ifndef _USB_SERIAL_H_ +#define _USB_SERIAL_H_ #include #include @@ -196,4 +196,4 @@ uint8_t ucom_get_data(struct ucom_softc void ucom_put_data(struct ucom_softc *, struct usb_page_cache *, uint32_t, uint32_t); uint8_t ucom_cfg_is_gone(struct ucom_softc *); -#endif /* _USB2_SERIAL_H_ */ +#endif /* _USB_SERIAL_H_ */ Modified: head/sys/dev/usb/usb.h ============================================================================== --- head/sys/dev/usb/usb.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb.h Mon Jun 15 01:09:19 2009 (r194230) @@ -36,8 +36,8 @@ * USB v3.0 */ -#ifndef _USB2_STANDARD_H_ -#define _USB2_STANDARD_H_ +#ifndef _USB_STANDARD_H_ +#define _USB_STANDARD_H_ #include @@ -642,4 +642,4 @@ struct usb_port_status { } __packed; typedef struct usb_port_status usb_port_status_t; -#endif /* _USB2_STANDARD_H_ */ +#endif /* _USB_STANDARD_H_ */ Modified: head/sys/dev/usb/usb_bus.h ============================================================================== --- head/sys/dev/usb/usb_bus.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_bus.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_BUS_H_ -#define _USB2_BUS_H_ +#ifndef _USB_BUS_H_ +#define _USB_BUS_H_ /* * The following structure defines the USB explore message sent to the USB @@ -105,4 +105,4 @@ struct usb_bus { } scratch[1]; }; -#endif /* _USB2_BUS_H_ */ +#endif /* _USB_BUS_H_ */ Modified: head/sys/dev/usb/usb_busdma.h ============================================================================== --- head/sys/dev/usb/usb_busdma.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_busdma.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_BUSDMA_H_ -#define _USB2_BUSDMA_H_ +#ifndef _USB_BUSDMA_H_ +#define _USB_BUSDMA_H_ #include #include @@ -172,4 +172,4 @@ void usb_pc_cpu_invalidate(struct usb_pa void usb_pc_dmamap_destroy(struct usb_page_cache *pc); void usb_pc_free_mem(struct usb_page_cache *pc); -#endif /* _USB2_BUSDMA_H_ */ +#endif /* _USB_BUSDMA_H_ */ Modified: head/sys/dev/usb/usb_controller.h ============================================================================== --- head/sys/dev/usb/usb_controller.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_controller.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_CONTROLLER_H_ -#define _USB2_CONTROLLER_H_ +#ifndef _USB_CONTROLLER_H_ +#define _USB_CONTROLLER_H_ /* defines */ @@ -190,4 +190,4 @@ uint16_t usb_isoc_time_expand(struct usb uint16_t usbd_fs_isoc_schedule_isoc_time_expand(struct usb_device *udev, struct usb_fs_isoc_schedule **pp_start, struct usb_fs_isoc_schedule **pp_end, uint16_t isoc_time); uint8_t usbd_fs_isoc_schedule_alloc(struct usb_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len); -#endif /* _USB2_CONTROLLER_H_ */ +#endif /* _USB_CONTROLLER_H_ */ Modified: head/sys/dev/usb/usb_core.h ============================================================================== --- head/sys/dev/usb/usb_core.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_core.h Mon Jun 15 01:09:19 2009 (r194230) @@ -28,8 +28,8 @@ * Including this file is mandatory for all USB related c-files in the kernel. */ -#ifndef _USB2_CORE_H_ -#define _USB2_CORE_H_ +#ifndef _USB_CORE_H_ +#define _USB_CORE_H_ #define USB_STACK_VERSION 2000 /* 2.0 */ @@ -542,4 +542,4 @@ uint8_t usbd_get_device_index(struct usb void usbd_set_power_mode(struct usb_device *udev, uint8_t power_mode); uint8_t usbd_device_attached(struct usb_device *udev); -#endif /* _USB2_CORE_H_ */ +#endif /* _USB_CORE_H_ */ Modified: head/sys/dev/usb/usb_debug.h ============================================================================== --- head/sys/dev/usb/usb_debug.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_debug.h Mon Jun 15 01:09:19 2009 (r194230) @@ -26,8 +26,8 @@ /* This file contains various factored out debug macros. */ -#ifndef _USB2_DEBUG_H_ -#define _USB2_DEBUG_H_ +#ifndef _USB_DEBUG_H_ +#define _USB_DEBUG_H_ /* Declare parent SYSCTL USB node. */ SYSCTL_DECL(_hw_usb); @@ -62,4 +62,4 @@ void usb_dump_queue(struct usb_endpoint void usb_dump_endpoint(struct usb_endpoint *ep); void usb_dump_xfer(struct usb_xfer *xfer); -#endif /* _USB2_DEBUG_H_ */ +#endif /* _USB_DEBUG_H_ */ Modified: head/sys/dev/usb/usb_defs.h ============================================================================== --- head/sys/dev/usb/usb_defs.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_defs.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_DEFS_H_ -#define _USB2_DEFS_H_ +#ifndef _USB_DEFS_H_ +#define _USB_DEFS_H_ /* Definition of some hardcoded USB constants. */ @@ -58,4 +58,4 @@ #if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) #error "The root hub address must be less than USB_MIN_DEVICES." #endif -#endif /* _USB2_DEFS_H_ */ +#endif /* _USB_DEFS_H_ */ Modified: head/sys/dev/usb/usb_dev.h ============================================================================== --- head/sys/dev/usb/usb_dev.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_dev.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_DEV_H_ -#define _USB2_DEV_H_ +#ifndef _USB_DEV_H_ +#define _USB_DEV_H_ #include #include @@ -204,4 +204,4 @@ int usb_read_symlink(uint8_t *user_ptr, uint32_t user_len); void usb_fifo_set_close_zlp(struct usb_fifo *, uint8_t); -#endif /* _USB2_DEV_H_ */ +#endif /* _USB_DEV_H_ */ Modified: head/sys/dev/usb/usb_device.h ============================================================================== --- head/sys/dev/usb/usb_device.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_device.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_DEVICE_H_ -#define _USB2_DEVICE_H_ +#ifndef _USB_DEVICE_H_ +#define _USB_DEVICE_H_ struct usb_symlink; /* UGEN */ struct usb_device; /* linux compat */ @@ -256,4 +256,4 @@ struct usb_endpoint *usb_endpoint_foreac void usb_set_device_state(struct usb_device *udev, enum usb_dev_state state); -#endif /* _USB2_DEVICE_H_ */ +#endif /* _USB_DEVICE_H_ */ Modified: head/sys/dev/usb/usb_dynamic.h ============================================================================== --- head/sys/dev/usb/usb_dynamic.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_dynamic.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_DYNAMIC_H_ -#define _USB2_DYNAMIC_H_ +#ifndef _USB_DYNAMIC_H_ +#define _USB_DYNAMIC_H_ /* prototypes */ @@ -64,4 +64,4 @@ void usb_bus_unload(void *); uint8_t usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk); -#endif /* _USB2_DYNAMIC_H_ */ +#endif /* _USB_DYNAMIC_H_ */ Modified: head/sys/dev/usb/usb_endian.h ============================================================================== --- head/sys/dev/usb/usb_endian.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_endian.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_ENDIAN_H_ -#define _USB2_ENDIAN_H_ +#ifndef _USB_ENDIAN_H_ +#define _USB_ENDIAN_H_ #include #include @@ -116,4 +116,4 @@ typedef uint8_t uQWord[8]; (w)[7] = (uint8_t)(b7); \ } while (0) -#endif /* _USB2_ENDIAN_H_ */ +#endif /* _USB_ENDIAN_H_ */ Modified: head/sys/dev/usb/usb_error.h ============================================================================== --- head/sys/dev/usb/usb_error.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_error.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_ERROR_H_ -#define _USB2_ERROR_H_ +#ifndef _USB_ERROR_H_ +#define _USB_ERROR_H_ enum { /* keep in sync with usb_errstr_table */ USB_ERR_NORMAL_COMPLETION = 0, @@ -60,4 +60,4 @@ enum { /* keep in sync with usb_errstr_t USB_ERR_MAX }; -#endif /* _USB2_ERROR_H_ */ +#endif /* _USB_ERROR_H_ */ Modified: head/sys/dev/usb/usb_generic.h ============================================================================== --- head/sys/dev/usb/usb_generic.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_generic.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _USB2_GENERIC_H_ -#define _USB2_GENERIC_H_ +#ifndef _USB_GENERIC_H_ +#define _USB_GENERIC_H_ extern struct usb_fifo_methods usb_ugen_methods; int ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur); -#endif /* _USB2_GENERIC_H_ */ +#endif /* _USB_GENERIC_H_ */ Modified: head/sys/dev/usb/usb_handle_request.h ============================================================================== --- head/sys/dev/usb/usb_handle_request.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_handle_request.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#ifndef _USB2_HANDLE_REQUEST_H_ -#define _USB2_HANDLE_REQUEST_H_ +#ifndef _USB_HANDLE_REQUEST_H_ +#define _USB_HANDLE_REQUEST_H_ -#endif /* _USB2_HANDLE_REQUEST_H_ */ +#endif /* _USB_HANDLE_REQUEST_H_ */ Modified: head/sys/dev/usb/usb_hid.h ============================================================================== --- head/sys/dev/usb/usb_hid.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_hid.h Mon Jun 15 01:09:19 2009 (r194230) @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_CORE_HID_H_ -#define _USB2_CORE_HID_H_ +#ifndef _USB_CORE_HID_H_ +#define _USB_CORE_HID_H_ struct usb_hid_descriptor; struct usb_config_descriptor; @@ -92,4 +92,4 @@ usb_error_t usbd_req_get_hid_desc(struct void **descp, uint16_t *sizep, struct malloc_type *mem, uint8_t iface_index); -#endif /* _USB2_CORE_HID_H_ */ +#endif /* _USB_CORE_HID_H_ */ Modified: head/sys/dev/usb/usb_hub.h ============================================================================== --- head/sys/dev/usb/usb_hub.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_hub.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_HUB_H_ -#define _USB2_HUB_H_ +#ifndef _USB_HUB_H_ +#define _USB_HUB_H_ /* * The following structure defines an USB port. @@ -79,4 +79,4 @@ void usb_bus_power_update(struct usb_bus void usb_bus_powerd(struct usb_bus *bus); void uhub_root_intr(struct usb_bus *, const uint8_t *, uint8_t); -#endif /* _USB2_HUB_H_ */ +#endif /* _USB_HUB_H_ */ Modified: head/sys/dev/usb/usb_ioctl.h ============================================================================== --- head/sys/dev/usb/usb_ioctl.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_ioctl.h Mon Jun 15 01:09:19 2009 (r194230) @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_IOCTL_H_ -#define _USB2_IOCTL_H_ +#ifndef _USB_IOCTL_H_ +#define _USB_IOCTL_H_ #include @@ -272,4 +272,4 @@ struct usb_gen_quirk { #define USB_DEV_QUIRK_ADD _IOW ('Q', 2, struct usb_gen_quirk) #define USB_DEV_QUIRK_REMOVE _IOW ('Q', 3, struct usb_gen_quirk) -#endif /* _USB2_IOCTL_H_ */ +#endif /* _USB_IOCTL_H_ */ Modified: head/sys/dev/usb/usb_lookup.h ============================================================================== --- head/sys/dev/usb/usb_lookup.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_lookup.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_LOOKUP_H_ -#define _USB2_LOOKUP_H_ +#ifndef _USB_LOOKUP_H_ +#define _USB_LOOKUP_H_ struct usb_attach_arg; @@ -119,4 +119,4 @@ const struct usb_device_id *usbd_lookup_ int usbd_lookup_id_by_uaa(const struct usb_device_id *id, usb_size_t sizeof_id, struct usb_attach_arg *uaa); -#endif /* _USB2_LOOKUP_H_ */ +#endif /* _USB_LOOKUP_H_ */ Modified: head/sys/dev/usb/usb_mbuf.h ============================================================================== --- head/sys/dev/usb/usb_mbuf.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_mbuf.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_MBUF_H_ -#define _USB2_MBUF_H_ +#ifndef _USB_MBUF_H_ +#define _USB_MBUF_H_ /* * The following structure defines a minimum re-implementation of the @@ -99,4 +99,4 @@ struct usb_ifqueue { void *usb_alloc_mbufs(struct malloc_type *type, struct usb_ifqueue *ifq, usb_size_t block_size, uint16_t nblocks); -#endif /* _USB2_MBUF_H_ */ +#endif /* _USB_MBUF_H_ */ Modified: head/sys/dev/usb/usb_mfunc.h ============================================================================== --- head/sys/dev/usb/usb_mfunc.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_mfunc.h Mon Jun 15 01:09:19 2009 (r194230) @@ -26,8 +26,8 @@ /* This file contains various macro functions. */ -#ifndef _USB2_MFUNC_H_ -#define _USB2_MFUNC_H_ +#ifndef _USB_MFUNC_H_ +#define _USB_MFUNC_H_ #define USB_LOG2(n) ( \ ((x) <= (1<<0x00)) ? 0x00 : \ @@ -75,4 +75,4 @@ /* debug macro */ #define USB_ASSERT KASSERT -#endif /* _USB2_MFUNC_H_ */ +#endif /* _USB_MFUNC_H_ */ Modified: head/sys/dev/usb/usb_msctest.h ============================================================================== --- head/sys/dev/usb/usb_msctest.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_msctest.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#ifndef _USB2_MSCTEST_H_ -#define _USB2_MSCTEST_H_ +#ifndef _USB_MSCTEST_H_ +#define _USB_MSCTEST_H_ usb_error_t usb_test_autoinstall(struct usb_device *udev, uint8_t iface_index, uint8_t do_eject); -#endif /* _USB2_MSCTEST_H_ */ +#endif /* _USB_MSCTEST_H_ */ Modified: head/sys/dev/usb/usb_parse.h ============================================================================== --- head/sys/dev/usb/usb_parse.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_parse.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_PARSE_H_ -#define _USB2_PARSE_H_ +#ifndef _USB_PARSE_H_ +#define _USB_PARSE_H_ /* structures */ @@ -51,4 +51,4 @@ uint8_t usbd_get_no_descriptors(struct u uint8_t usbd_get_no_alts(struct usb_config_descriptor *cd, struct usb_interface_descriptor *id); -#endif /* _USB2_PARSE_H_ */ +#endif /* _USB_PARSE_H_ */ Modified: head/sys/dev/usb/usb_pci.h ============================================================================== --- head/sys/dev/usb/usb_pci.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_pci.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_PCI_H_ -#define _USB2_PCI_H_ +#ifndef _USB_PCI_H_ +#define _USB_PCI_H_ /* * We don't want the following files included everywhere, that's why @@ -36,4 +36,4 @@ #include -#endif /* _USB2_PCI_H_ */ +#endif /* _USB_PCI_H_ */ Modified: head/sys/dev/usb/usb_process.h ============================================================================== --- head/sys/dev/usb/usb_process.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_process.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_PROCESS_H_ -#define _USB2_PROCESS_H_ +#ifndef _USB_PROCESS_H_ +#define _USB_PROCESS_H_ #include @@ -85,4 +85,4 @@ void usb_proc_mwait(struct usb_process * void usb_proc_free(struct usb_process *up); void *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1); -#endif /* _USB2_PROCESS_H_ */ +#endif /* _USB_PROCESS_H_ */ Modified: head/sys/dev/usb/usb_request.h ============================================================================== --- head/sys/dev/usb/usb_request.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_request.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_REQUEST_H_ -#define _USB2_REQUEST_H_ +#ifndef _USB_REQUEST_H_ +#define _USB_REQUEST_H_ struct usb_process; @@ -103,4 +103,4 @@ usb_error_t usbd_req_set_device_feature( #define usbd_do_request(u,m,r,d) \ usbd_do_request_flags(u,m,r,d,0,NULL,USB_DEFAULT_TIMEOUT) -#endif /* _USB2_REQUEST_H_ */ +#endif /* _USB_REQUEST_H_ */ Modified: head/sys/dev/usb/usb_revision.h ============================================================================== --- head/sys/dev/usb/usb_revision.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_revision.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_REVISION_H_ -#define _USB2_REVISION_H_ +#ifndef _USB_REVISION_H_ +#define _USB_REVISION_H_ /* * The "USB_SPEED" macros defines all the supported USB speeds. @@ -74,4 +74,4 @@ enum usb_dev_state { USB_STATE_CONFIGURED, }; #define USB_STATE_MAX (USB_STATE_CONFIGURED+1) -#endif /* _USB2_REVISION_H_ */ +#endif /* _USB_REVISION_H_ */ Modified: head/sys/dev/usb/usb_transfer.h ============================================================================== --- head/sys/dev/usb/usb_transfer.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_transfer.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_TRANSFER_H_ -#define _USB2_TRANSFER_H_ +#ifndef _USB_TRANSFER_H_ +#define _USB_TRANSFER_H_ /* * The following structure defines the messages that is used to signal @@ -135,4 +135,4 @@ void usbd_transfer_timeout_ms(struct usb usb_timeout_t usbd_get_dma_delay(struct usb_bus *bus); void usbd_transfer_power_ref(struct usb_xfer *xfer, int val); -#endif /* _USB2_TRANSFER_H_ */ +#endif /* _USB_TRANSFER_H_ */ Modified: head/sys/dev/usb/usb_util.h ============================================================================== --- head/sys/dev/usb/usb_util.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usb_util.h Mon Jun 15 01:09:19 2009 (r194230) @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_UTIL_H_ -#define _USB2_UTIL_H_ +#ifndef _USB_UTIL_H_ +#define _USB_UTIL_H_ int device_delete_all_children(device_t dev); uint8_t usb_make_str_desc(void *ptr, uint16_t max_len, const char *s); @@ -34,4 +34,4 @@ void usb_pause_mtx(struct mtx *mtx, int void usb_printbcd(char *p, uint16_t p_len, uint16_t bcd); void usb_trim_spaces(char *p); -#endif /* _USB2_UTIL_H_ */ +#endif /* _USB_UTIL_H_ */ Modified: head/sys/dev/usb/usbhid.h ============================================================================== --- head/sys/dev/usb/usbhid.h Mon Jun 15 01:05:46 2009 (r194229) +++ head/sys/dev/usb/usbhid.h Mon Jun 15 01:09:19 2009 (r194230) @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#ifndef _USB2_HID_H_ -#define _USB2_HID_H_ +#ifndef _USB_HID_H_ +#define _USB_HID_H_ #include @@ -173,4 +173,4 @@ struct usb_hid_descriptor { #define HIO_VOLATILE 0x080 #define HIO_BUFBYTES 0x100 -#endif /* _USB2_HID_H_ */ +#endif /* _USB_HID_H_ */