Print this page
5832 EOF wireless usb (aka UWB)
Reviewed by: TBD
Reviewed by: TBD
Approved by: TBD
@@ -18,10 +18,12 @@
*
* CDDL HEADER END
*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright 2014 Garrett D'Amore <garrett@damore.org>
*/
#ifndef _SYS_USB_USBA_USBA_TYPES_H
#define _SYS_USB_USBA_USBA_TYPES_H
@@ -224,20 +226,10 @@
usb_client_dev_data_t *cddl_dev_data;
uint_t cddl_ifno;
} usb_client_dev_data_list_t;
/*
- * wireless usb specific data
- */
-typedef struct usba_wireless_data {
- uint8_t *wusb_bos; /* raw bos descr */
- uint_t wusb_bos_length; /* length of bos descr */
- usb_uwb_cap_descr_t *uwb_descr; /* UWB capability descr */
-} usba_wireless_data_t;
-
-
-/*
* This structure uniquely identifies a USB device
* with all interfaces, or just one interface of a USB device.
* usba_device is associated with a devinfo node
*
* This structure is allocated and maintained by USBA and
@@ -301,15 +293,10 @@
uint_t usb_active_cfg_ndx;
char **usb_cfg_str_descr;
uchar_t usb_n_cfgs;
uchar_t usb_n_ifs;
- /* To support WUSB */
- boolean_t usb_is_wa;
- boolean_t usb_is_wireless;
- usba_wireless_data_t *usb_wireless_data;
-
/*
* power drawn from hub, if > 0, the power has been
* subtracted from the parent hub's power budget
*/
uint16_t usb_pwr_from_hub;
@@ -354,11 +341,10 @@
#define USBA_CLIENT_FLAG_EV_CBS 0x02
#define USBA_CLIENT_FLAG_DEV_DATA 0x04
_NOTE(MUTEX_PROTECTS_DATA(usba_device::usb_mutex, usba_device))
_NOTE(MUTEX_PROTECTS_DATA(usba_device::usb_mutex, usba_evdata))
-_NOTE(MUTEX_PROTECTS_DATA(usba_device::usb_mutex, usba_wireless_data))
_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
usba_evdata::ev_rm_cb_id))
_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
usba_evdata::ev_ins_cb_id))
@@ -365,17 +351,10 @@
_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
usba_evdata::ev_suspend_cb_id))
_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
usba_evdata::ev_resume_cb_id))
-_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
- usba_wireless_data::wusb_bos))
-_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
- usba_wireless_data::wusb_bos_length))
-_NOTE(SCHEME_PROTECTS_DATA("chg at attach only",
- usba_wireless_data::uwb_descr))
-
/* this should be really stable data */
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_serialno_str))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_root_hub_dip))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_root_hubd))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_product_str))
@@ -403,13 +382,10 @@
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::resume_cookie))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_client_flags))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_client_attach_list))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_client_ev_cb_list))
_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_dip))
-_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_is_wireless))
-_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_wireless_data))
-_NOTE(DATA_READABLE_WITHOUT_LOCK(usba_device::usb_is_wa))
_NOTE(SCHEME_PROTECTS_DATA("set at device creation",
usba_device::usb_shared_taskq))
_NOTE(SCHEME_PROTECTS_DATA("local use only",
usb_key_descr::bDescriptorType))