|
@@ -1,7 +1,8 @@
|
|
|
/*
|
|
|
* devices.c
|
|
|
* (C) Copyright 1999 Randy Dunlap.
|
|
|
- * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>. (proc file per device)
|
|
|
+ * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>.
|
|
|
+ * (proc file per device)
|
|
|
* (C) Copyright 1999 Deti Fliegl (new USB architecture)
|
|
|
*
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
@@ -57,7 +58,7 @@
|
|
|
#include <linux/usbdevice_fs.h>
|
|
|
#include <linux/usb/hcd.h>
|
|
|
#include <linux/mutex.h>
|
|
|
-#include <asm/uaccess.h>
|
|
|
+#include <linux/uaccess.h>
|
|
|
|
|
|
#include "usb.h"
|
|
|
|
|
@@ -138,8 +139,8 @@ struct class_info {
|
|
|
char *class_name;
|
|
|
};
|
|
|
|
|
|
-static const struct class_info clas_info[] =
|
|
|
-{ /* max. 5 chars. per name string */
|
|
|
+static const struct class_info clas_info[] = {
|
|
|
+ /* max. 5 chars. per name string */
|
|
|
{USB_CLASS_PER_INTERFACE, ">ifc"},
|
|
|
{USB_CLASS_AUDIO, "audio"},
|
|
|
{USB_CLASS_COMM, "comm."},
|
|
@@ -191,8 +192,10 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
|
|
|
|
|
|
if (speed == USB_SPEED_HIGH) {
|
|
|
switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {
|
|
|
- case 1 << 11: bandwidth = 2; break;
|
|
|
- case 2 << 11: bandwidth = 3; break;
|
|
|
+ case 1 << 11:
|
|
|
+ bandwidth = 2; break;
|
|
|
+ case 2 << 11:
|
|
|
+ bandwidth = 3; break;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -200,7 +203,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
|
|
|
switch (usb_endpoint_type(desc)) {
|
|
|
case USB_ENDPOINT_XFER_CONTROL:
|
|
|
type = "Ctrl";
|
|
|
- if (speed == USB_SPEED_HIGH) /* uframes per NAK */
|
|
|
+ if (speed == USB_SPEED_HIGH) /* uframes per NAK */
|
|
|
interval = desc->bInterval;
|
|
|
else
|
|
|
interval = 0;
|