Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ec72070b
Commit
ec72070b
authored
Feb 28, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
parents
436002e3
34d1a8aa
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
12 deletions
+47
-12
drivers/usb/gadget/lh7a40x_udc.c
drivers/usb/gadget/lh7a40x_udc.c
+4
-2
drivers/usb/gadget/rndis.c
drivers/usb/gadget/rndis.c
+7
-4
drivers/usb/host/pci-quirks.c
drivers/usb/host/pci-quirks.c
+6
-5
drivers/usb/input/hid-core.c
drivers/usb/input/hid-core.c
+2
-0
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.c
+6
-0
drivers/usb/serial/ftdi_sio.h
drivers/usb/serial/ftdi_sio.h
+9
-1
drivers/usb/serial/visor.c
drivers/usb/serial/visor.c
+3
-0
drivers/usb/serial/visor.h
drivers/usb/serial/visor.h
+3
-0
drivers/usb/storage/unusual_devs.h
drivers/usb/storage/unusual_devs.h
+7
-0
No files found.
drivers/usb/gadget/lh7a40x_udc.c
View file @
ec72070b
...
...
@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_ep *_ep,
ep
->
pio_irqs
=
0
;
ep
->
ep
.
maxpacket
=
le16_to_cpu
(
desc
->
wMaxPacketSize
);
spin_unlock_irqrestore
(
&
ep
->
dev
->
lock
,
flags
);
/* Reset halt state (does flush) */
lh7a40x_set_halt
(
_ep
,
0
);
spin_unlock_irqrestore
(
&
ep
->
dev
->
lock
,
flags
);
DEBUG
(
"%s: enabled %s
\n
"
,
__FUNCTION__
,
_ep
->
name
);
return
0
;
}
...
...
@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
break
;
qep
=
&
dev
->
ep
[
ep_num
];
spin_unlock
(
&
dev
->
lock
);
if
(
ctrl
.
bRequest
==
USB_REQ_SET_FEATURE
)
{
DEBUG_SETUP
(
"SET_FEATURE (%d)
\n
"
,
ep_num
);
...
...
@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7a40x_udc *dev, u32 csr)
ep_num
);
lh7a40x_set_halt
(
&
qep
->
ep
,
0
);
}
spin_lock
(
&
dev
->
lock
);
usb_set_index
(
0
);
/* Reply with a ZLP on next IN token */
...
...
drivers/usb/gadget/rndis.c
View file @
ec72070b
...
...
@@ -853,11 +853,14 @@ static int rndis_query_response (int configNr, rndis_query_msg_type *buf)
// DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID));
if
(
!
rndis_per_dev_params
[
configNr
].
dev
)
return
-
ENOTSUPP
;
/*
* we need more memory:
* oid_supported_list is the largest answer
/*
* we need more memory:
* gen_ndis_query_resp expects enough space for
* rndis_query_cmplt_type followed by data.
* oid_supported_list is the largest data reply
*/
r
=
rndis_add_response
(
configNr
,
sizeof
(
oid_supported_list
));
r
=
rndis_add_response
(
configNr
,
sizeof
(
oid_supported_list
)
+
sizeof
(
rndis_query_cmplt_type
));
if
(
!
r
)
return
-
ENOMEM
;
resp
=
(
rndis_query_cmplt_type
*
)
r
->
buf
;
...
...
drivers/usb/host/pci-quirks.c
View file @
ec72070b
...
...
@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
offset + EHCI_USBLEGCTLSTS,
val | EHCI_USBLEGCTLSTS_SOOE);
#endif
}
/* always say Linux will own the hardware
* by setting EHCI_USBLEGSUP_OS.
*/
pci_write_config_byte
(
pdev
,
offset
+
3
,
1
);
/* some systems get upset if this semaphore is
* set for any other reason than forcing a BIOS
* handoff..
*/
pci_write_config_byte
(
pdev
,
offset
+
3
,
1
);
}
/* if boot firmware now owns EHCI, spin till
* it hands it over.
...
...
drivers/usb/input/hid-core.c
View file @
ec72070b
...
...
@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device *hid)
#define USB_VENDOR_ID_WISEGROUP 0x0925
#define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
#define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866
#define USB_VENDOR_ID_CODEMERCS 0x07c0
#define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500
...
...
@@ -1577,6 +1578,7 @@ static const struct hid_blacklist {
{
USB_VENDOR_ID_CHICONY
,
USB_DEVICE_ID_CHICONY_USBHUB_KB
,
HID_QUIRK_NOGET
},
{
USB_VENDOR_ID_HP
,
USB_DEVICE_ID_HP_USBHUB_KB
,
HID_QUIRK_NOGET
},
{
USB_VENDOR_ID_TANGTOP
,
USB_DEVICE_ID_TANGTOP_USBPS2
,
HID_QUIRK_NOGET
},
{
USB_VENDOR_ID_WISEGROUP
,
USB_DEVICE_ID_DUAL_USB_JOYPAD
,
HID_QUIRK_NOGET
|
HID_QUIRK_MULTI_INPUT
},
{
USB_VENDOR_ID_APPLE
,
USB_DEVICE_ID_APPLE_POWERMOUSE
,
HID_QUIRK_2WHEEL_POWERMOUSE
},
{
USB_VENDOR_ID_A4TECH
,
USB_DEVICE_ID_A4TECH_WCP32PU
,
HID_QUIRK_2WHEEL_MOUSE_HACK_7
},
...
...
drivers/usb/serial/ftdi_sio.c
View file @
ec72070b
...
...
@@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = {
{
USB_DEVICE
(
FTDI_VID
,
XSENS_CONVERTER_7_PID
)
},
{
USB_DEVICE
(
MOBILITY_VID
,
MOBILITY_USB_SERIAL_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_ACTIVE_ROBOTS_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_KW_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_YS_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_Y6_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_Y8_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_IC_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_DB9_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_RS232_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_MHAM_Y9_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_TERATRONIK_VCP_PID
)
},
{
USB_DEVICE
(
FTDI_VID
,
FTDI_TERATRONIK_D2XX_PID
)
},
{
USB_DEVICE
(
EVOLUTION_VID
,
EVOLUTION_ER1_PID
)
},
...
...
drivers/usb/serial/ftdi_sio.h
View file @
ec72070b
...
...
@@ -333,10 +333,18 @@
/*
* microHAM product IDs (http://www.microham.com).
* Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
* Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
* and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
* Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
*/
#define FTDI_MHAM_KW_PID 0xEEE8
/* USB-KW interface */
#define FTDI_MHAM_YS_PID 0xEEE9
/* USB-YS interface */
#define FTDI_MHAM_Y6_PID 0xEEEA
/* USB-Y6 interface */
#define FTDI_MHAM_Y8_PID 0xEEEB
/* USB-Y8 interface */
#define FTDI_MHAM_IC_PID 0xEEEC
/* USB-IC interface */
#define FTDI_MHAM_DB9_PID 0xEEED
/* USB-DB9 interface */
#define FTDI_MHAM_RS232_PID 0xEEEE
/* USB-RS232 interface */
#define FTDI_MHAM_Y9_PID 0xEEEF
/* USB-Y9 interface */
/*
* Active Robots product ids.
...
...
drivers/usb/serial/visor.c
View file @
ec72070b
...
...
@@ -69,6 +69,8 @@ static struct usb_device_id id_table [] = {
.
driver_info
=
(
kernel_ulong_t
)
&
palm_os_4_probe
},
{
USB_DEVICE
(
HANDSPRING_VENDOR_ID
,
HANDSPRING_TREO600_ID
),
.
driver_info
=
(
kernel_ulong_t
)
&
palm_os_4_probe
},
{
USB_DEVICE
(
GSPDA_VENDOR_ID
,
GSPDA_XPLORE_M68_ID
),
.
driver_info
=
(
kernel_ulong_t
)
&
palm_os_4_probe
},
{
USB_DEVICE
(
PALM_VENDOR_ID
,
PALM_M500_ID
),
.
driver_info
=
(
kernel_ulong_t
)
&
palm_os_4_probe
},
{
USB_DEVICE
(
PALM_VENDOR_ID
,
PALM_M505_ID
),
...
...
@@ -139,6 +141,7 @@ static struct usb_device_id id_table_combined [] = {
{
USB_DEVICE
(
HANDSPRING_VENDOR_ID
,
HANDSPRING_VISOR_ID
)
},
{
USB_DEVICE
(
HANDSPRING_VENDOR_ID
,
HANDSPRING_TREO_ID
)
},
{
USB_DEVICE
(
HANDSPRING_VENDOR_ID
,
HANDSPRING_TREO600_ID
)
},
{
USB_DEVICE
(
GSPDA_VENDOR_ID
,
GSPDA_XPLORE_M68_ID
)
},
{
USB_DEVICE
(
PALM_VENDOR_ID
,
PALM_M500_ID
)
},
{
USB_DEVICE
(
PALM_VENDOR_ID
,
PALM_M505_ID
)
},
{
USB_DEVICE
(
PALM_VENDOR_ID
,
PALM_M515_ID
)
},
...
...
drivers/usb/serial/visor.h
View file @
ec72070b
...
...
@@ -36,6 +36,9 @@
#define PALM_ZIRE_ID 0x0070
#define PALM_M100_ID 0x0080
#define GSPDA_VENDOR_ID 0x115e
#define GSPDA_XPLORE_M68_ID 0xf100
#define SONY_VENDOR_ID 0x054C
#define SONY_CLIE_3_5_ID 0x0038
#define SONY_CLIE_4_0_ID 0x0066
...
...
drivers/usb/storage/unusual_devs.h
View file @
ec72070b
...
...
@@ -753,6 +753,13 @@ UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100,
"Flashgate"
,
US_SC_SCSI
,
US_PR_BULK
,
NULL
,
0
),
/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
UNUSUAL_DEV
(
0x069b
,
0x3004
,
0x0001
,
0x0001
,
"Thomson Multimedia Inc."
,
"RCA RD1080 MP3 Player"
,
US_SC_DEVICE
,
US_PR_DEVICE
,
NULL
,
US_FL_FIX_CAPACITY
),
UNUSUAL_DEV
(
0x0781
,
0x0001
,
0x0200
,
0x0200
,
"Sandisk"
,
"ImageMate SDDR-05a"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment