mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-31 13:55:30 -04:00
Merge branch 'for-6.4/logitech-hidpp' into for-linus
- support for ADC measurement (Bastien Nocera) - support for Logitech G935 (Bastien Nocera)
This commit is contained in:
@@ -170,6 +170,12 @@ usb_find_last_int_out_endpoint(struct usb_host_interface *alt,
|
||||
return usb_find_common_endpoints_reverse(alt, NULL, NULL, NULL, int_out);
|
||||
}
|
||||
|
||||
enum usb_wireless_status {
|
||||
USB_WIRELESS_STATUS_NA = 0,
|
||||
USB_WIRELESS_STATUS_DISCONNECTED,
|
||||
USB_WIRELESS_STATUS_CONNECTED,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct usb_interface - what usb device drivers talk to
|
||||
* @altsetting: array of interface structures, one for each alternate
|
||||
@@ -197,6 +203,10 @@ usb_find_last_int_out_endpoint(struct usb_host_interface *alt,
|
||||
* following a reset or suspend operation it doesn't support.
|
||||
* @authorized: This allows to (de)authorize individual interfaces instead
|
||||
* a whole device in contrast to the device authorization.
|
||||
* @wireless_status: if the USB device uses a receiver/emitter combo, whether
|
||||
* the emitter is connected.
|
||||
* @wireless_status_work: Used for scheduling wireless status changes
|
||||
* from atomic context.
|
||||
* @dev: driver model's view of this device
|
||||
* @usb_dev: if an interface is bound to the USB major, this will point
|
||||
* to the sysfs representation for that device.
|
||||
@@ -253,6 +263,8 @@ struct usb_interface {
|
||||
unsigned needs_binding:1; /* needs delayed unbind/rebind */
|
||||
unsigned resetting_device:1; /* true: bandwidth alloc after reset */
|
||||
unsigned authorized:1; /* used for interface authorization */
|
||||
enum usb_wireless_status wireless_status;
|
||||
struct work_struct wireless_status_work;
|
||||
|
||||
struct device dev; /* interface specific device info */
|
||||
struct device *usb_dev;
|
||||
@@ -887,6 +899,10 @@ static inline int usb_interface_claimed(struct usb_interface *iface)
|
||||
|
||||
extern void usb_driver_release_interface(struct usb_driver *driver,
|
||||
struct usb_interface *iface);
|
||||
|
||||
int usb_set_wireless_status(struct usb_interface *iface,
|
||||
enum usb_wireless_status status);
|
||||
|
||||
const struct usb_device_id *usb_match_id(struct usb_interface *interface,
|
||||
const struct usb_device_id *id);
|
||||
extern int usb_match_one_id(struct usb_interface *interface,
|
||||
|
||||
Reference in New Issue
Block a user