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
12477ec1
Commit
12477ec1
authored
Jan 16, 2004
by
Matthias Bruestle
Committed by
Greg Kroah-Hartman
Jan 16, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] USB: update the cyberjack driver
parent
2e4bd50f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
4 deletions
+30
-4
drivers/usb/serial/cyberjack.c
drivers/usb/serial/cyberjack.c
+30
-4
No files found.
drivers/usb/serial/cyberjack.c
View file @
12477ec1
...
@@ -36,6 +36,8 @@
...
@@ -36,6 +36,8 @@
#include <asm/uaccess.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
#include <linux/usb.h>
#define CYBERJACK_LOCAL_BUF_SIZE 32
#ifdef CONFIG_USB_SERIAL_DEBUG
#ifdef CONFIG_USB_SERIAL_DEBUG
static
int
debug
=
1
;
static
int
debug
=
1
;
#else
#else
...
@@ -62,6 +64,7 @@ static int cyberjack_open (struct usb_serial_port *port, struct file *filp);
...
@@ -62,6 +64,7 @@ static int cyberjack_open (struct usb_serial_port *port, struct file *filp);
static
void
cyberjack_close
(
struct
usb_serial_port
*
port
,
struct
file
*
filp
);
static
void
cyberjack_close
(
struct
usb_serial_port
*
port
,
struct
file
*
filp
);
static
int
cyberjack_write
(
struct
usb_serial_port
*
port
,
int
from_user
,
static
int
cyberjack_write
(
struct
usb_serial_port
*
port
,
int
from_user
,
const
unsigned
char
*
buf
,
int
count
);
const
unsigned
char
*
buf
,
int
count
);
static
int
cyberjack_write_room
(
struct
usb_serial_port
*
port
);
static
void
cyberjack_read_int_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
static
void
cyberjack_read_int_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
static
void
cyberjack_read_bulk_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
static
void
cyberjack_read_bulk_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
static
void
cyberjack_write_bulk_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
static
void
cyberjack_write_bulk_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
);
...
@@ -95,6 +98,7 @@ static struct usb_serial_device_type cyberjack_device = {
...
@@ -95,6 +98,7 @@ static struct usb_serial_device_type cyberjack_device = {
.
open
=
cyberjack_open
,
.
open
=
cyberjack_open
,
.
close
=
cyberjack_close
,
.
close
=
cyberjack_close
,
.
write
=
cyberjack_write
,
.
write
=
cyberjack_write
,
.
write_room
=
cyberjack_write_room
,
.
read_int_callback
=
cyberjack_read_int_callback
,
.
read_int_callback
=
cyberjack_read_int_callback
,
.
read_bulk_callback
=
cyberjack_read_bulk_callback
,
.
read_bulk_callback
=
cyberjack_read_bulk_callback
,
.
write_bulk_callback
=
cyberjack_write_bulk_callback
,
.
write_bulk_callback
=
cyberjack_write_bulk_callback
,
...
@@ -156,6 +160,11 @@ static int cyberjack_open (struct usb_serial_port *port, struct file *filp)
...
@@ -156,6 +160,11 @@ static int cyberjack_open (struct usb_serial_port *port, struct file *filp)
dbg
(
"%s - port %d"
,
__FUNCTION__
,
port
->
number
);
dbg
(
"%s - port %d"
,
__FUNCTION__
,
port
->
number
);
dbg
(
"%s - usb_clear_halt"
,
__FUNCTION__
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
write_urb
->
pipe
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
read_urb
->
pipe
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
interrupt_in_urb
->
pipe
);
/* force low_latency on so that our tty_push actually forces
/* force low_latency on so that our tty_push actually forces
* the data through, otherwise it is scheduled, and with high
* the data through, otherwise it is scheduled, and with high
* data rates (like with OHCI) data can get lost.
* data rates (like with OHCI) data can get lost.
...
@@ -192,6 +201,10 @@ static void cyberjack_close (struct usb_serial_port *port, struct file *filp)
...
@@ -192,6 +201,10 @@ static void cyberjack_close (struct usb_serial_port *port, struct file *filp)
usb_unlink_urb
(
port
->
write_urb
);
usb_unlink_urb
(
port
->
write_urb
);
usb_unlink_urb
(
port
->
read_urb
);
usb_unlink_urb
(
port
->
read_urb
);
usb_unlink_urb
(
port
->
interrupt_in_urb
);
usb_unlink_urb
(
port
->
interrupt_in_urb
);
dbg
(
"%s - usb_clear_halt"
,
__FUNCTION__
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
write_urb
->
pipe
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
read_urb
->
pipe
);
usb_clear_halt
(
port
->
serial
->
dev
,
port
->
interrupt_in_urb
->
pipe
);
}
}
}
}
...
@@ -202,6 +215,7 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
...
@@ -202,6 +215,7 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
unsigned
long
flags
;
unsigned
long
flags
;
int
result
;
int
result
;
int
wrexpected
;
int
wrexpected
;
unsigned
char
localbuf
[
CYBERJACK_LOCAL_BUF_SIZE
];
/* Buffer for collecting data to write */
dbg
(
"%s - port %d"
,
__FUNCTION__
,
port
->
number
);
dbg
(
"%s - port %d"
,
__FUNCTION__
,
port
->
number
);
dbg
(
"%s - from_user %d"
,
__FUNCTION__
,
from_user
);
dbg
(
"%s - from_user %d"
,
__FUNCTION__
,
from_user
);
...
@@ -218,22 +232,29 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
...
@@ -218,22 +232,29 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
if
(
(
count
+
priv
->
wrfilled
)
>
sizeof
(
priv
->
wrbuf
)
)
{
if
(
(
count
+
priv
->
wrfilled
)
>
sizeof
(
priv
->
wrbuf
)
||
(
count
>
sizeof
(
localbuf
))
)
{
/* To much data for buffer. Reset buffer. */
/* To much data for buffer. Reset buffer. */
priv
->
wrfilled
=
0
;
priv
->
wrfilled
=
0
;
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
(
0
);
return
(
0
);
}
}
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
/* Copy data */
/* Copy data */
if
(
from_user
)
{
if
(
from_user
)
{
if
(
copy_from_user
(
priv
->
wrbuf
+
priv
->
wrfilled
,
buf
,
count
))
{
if
(
copy_from_user
(
localbuf
,
buf
,
count
))
{
spin_unlock_irqrestore
(
&
priv
->
lock
,
flags
);
return
-
EFAULT
;
return
-
EFAULT
;
}
}
}
else
{
}
else
{
memcpy
(
priv
->
wrbuf
+
priv
->
wrfilled
,
buf
,
count
);
memcpy
(
localbuf
,
buf
,
count
);
}
}
spin_lock_irqsave
(
&
priv
->
lock
,
flags
);
memcpy
(
priv
->
wrbuf
+
priv
->
wrfilled
,
localbuf
,
count
);
usb_serial_debug_data
(
__FILE__
,
__FUNCTION__
,
count
,
usb_serial_debug_data
(
__FILE__
,
__FUNCTION__
,
count
,
priv
->
wrbuf
+
priv
->
wrfilled
);
priv
->
wrbuf
+
priv
->
wrfilled
);
priv
->
wrfilled
+=
count
;
priv
->
wrfilled
+=
count
;
...
@@ -291,6 +312,11 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
...
@@ -291,6 +312,11 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
return
(
count
);
return
(
count
);
}
}
static
int
cyberjack_write_room
(
struct
usb_serial_port
*
port
)
{
return
CYBERJACK_LOCAL_BUF_SIZE
;
}
static
void
cyberjack_read_int_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
)
static
void
cyberjack_read_int_callback
(
struct
urb
*
urb
,
struct
pt_regs
*
regs
)
{
{
struct
usb_serial_port
*
port
=
(
struct
usb_serial_port
*
)
urb
->
context
;
struct
usb_serial_port
*
port
=
(
struct
usb_serial_port
*
)
urb
->
context
;
...
...
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