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
fca373c2
Commit
fca373c2
authored
Jan 08, 2004
by
Jean Tourrilhes
Committed by
Stephen Hemminger
Jan 08, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[IRDA]: Fix sir-dev 'raw' mode for sir dongles that need it.
From Martin Diehl.
parent
2aa824e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
7 deletions
+33
-7
drivers/net/irda/sir-dev.h
drivers/net/irda/sir-dev.h
+1
-0
drivers/net/irda/sir_dev.c
drivers/net/irda/sir_dev.c
+32
-7
No files found.
drivers/net/irda/sir-dev.h
View file @
fca373c2
...
@@ -179,6 +179,7 @@ struct sir_dev {
...
@@ -179,6 +179,7 @@ struct sir_dev {
struct
sir_fsm
fsm
;
struct
sir_fsm
fsm
;
atomic_t
enable_rx
;
atomic_t
enable_rx
;
int
raw_tx
;
spinlock_t
tx_lock
;
spinlock_t
tx_lock
;
u32
new_speed
;
u32
new_speed
;
...
...
drivers/net/irda/sir_dev.c
View file @
fca373c2
...
@@ -31,7 +31,9 @@ void sirdev_enable_rx(struct sir_dev *dev)
...
@@ -31,7 +31,9 @@ void sirdev_enable_rx(struct sir_dev *dev)
/* flush rx-buffer - should also help in case of problems with echo cancelation */
/* flush rx-buffer - should also help in case of problems with echo cancelation */
dev
->
rx_buff
.
data
=
dev
->
rx_buff
.
head
;
dev
->
rx_buff
.
data
=
dev
->
rx_buff
.
head
;
dev
->
tx_buff
.
len
=
0
;
dev
->
rx_buff
.
len
=
0
;
dev
->
rx_buff
.
in_frame
=
FALSE
;
dev
->
rx_buff
.
state
=
OUTSIDE_FRAME
;
atomic_set
(
&
dev
->
enable_rx
,
1
);
atomic_set
(
&
dev
->
enable_rx
,
1
);
}
}
...
@@ -78,8 +80,17 @@ int sirdev_raw_write(struct sir_dev *dev, const char *buf, int len)
...
@@ -78,8 +80,17 @@ int sirdev_raw_write(struct sir_dev *dev, const char *buf, int len)
dev
->
tx_buff
.
data
=
dev
->
tx_buff
.
head
;
dev
->
tx_buff
.
data
=
dev
->
tx_buff
.
head
;
memcpy
(
dev
->
tx_buff
.
data
,
buf
,
len
);
memcpy
(
dev
->
tx_buff
.
data
,
buf
,
len
);
dev
->
tx_buff
.
len
=
len
;
ret
=
dev
->
drv
->
do_write
(
dev
,
dev
->
tx_buff
.
data
,
dev
->
tx_buff
.
len
);
ret
=
dev
->
drv
->
do_write
(
dev
,
dev
->
tx_buff
.
data
,
dev
->
tx_buff
.
len
);
if
(
ret
>
0
)
{
IRDA_DEBUG
(
3
,
"%s(), raw-tx started
\n
"
,
__FUNCTION__
);
dev
->
tx_buff
.
data
+=
ret
;
dev
->
tx_buff
.
len
-=
ret
;
dev
->
raw_tx
=
1
;
ret
=
len
;
/* all data is going to be sent */
}
spin_unlock_irqrestore
(
&
dev
->
tx_lock
,
flags
);
spin_unlock_irqrestore
(
&
dev
->
tx_lock
,
flags
);
return
ret
;
return
ret
;
}
}
...
@@ -95,13 +106,13 @@ int sirdev_raw_read(struct sir_dev *dev, char *buf, int len)
...
@@ -95,13 +106,13 @@ int sirdev_raw_read(struct sir_dev *dev, char *buf, int len)
count
=
(
len
<
dev
->
rx_buff
.
len
)
?
len
:
dev
->
rx_buff
.
len
;
count
=
(
len
<
dev
->
rx_buff
.
len
)
?
len
:
dev
->
rx_buff
.
len
;
if
(
count
>
0
)
if
(
count
>
0
)
{
memcpy
(
buf
,
dev
->
rx_buff
.
head
,
count
);
memcpy
(
buf
,
dev
->
rx_buff
.
data
,
count
);
dev
->
rx_buff
.
data
+=
count
;
dev
->
rx_buff
.
len
-=
count
;
}
/* forget trailing stuff */
/* remaining stuff gets flushed when re-enabling normal rx */
dev
->
rx_buff
.
data
=
dev
->
rx_buff
.
head
;
dev
->
rx_buff
.
len
=
0
;
dev
->
rx_buff
.
state
=
OUTSIDE_FRAME
;
return
count
;
return
count
;
}
}
...
@@ -150,6 +161,19 @@ void sirdev_write_complete(struct sir_dev *dev)
...
@@ -150,6 +161,19 @@ void sirdev_write_complete(struct sir_dev *dev)
}
}
}
}
if
(
unlikely
(
dev
->
raw_tx
!=
0
))
{
/* in raw mode we are just done now after the buffer was sent
* completely. Since this was requested by some dongle driver
* running under the control of the irda-thread we must take
* care here not to re-enable the queue. The queue will be
* restarted when the irda-thread has completed the request.
*/
IRDA_DEBUG
(
3
,
"%s(), raw-tx done
\n
"
,
__FUNCTION__
);
dev
->
raw_tx
=
0
;
return
;
}
/* we have finished now sending this skb.
/* we have finished now sending this skb.
* update statistics and free the skb.
* update statistics and free the skb.
* finally we check and trigger a pending speed change, if any.
* finally we check and trigger a pending speed change, if any.
...
@@ -482,6 +506,7 @@ static int sirdev_open(struct net_device *ndev)
...
@@ -482,6 +506,7 @@ static int sirdev_open(struct net_device *ndev)
goto
errout_free
;
goto
errout_free
;
sirdev_enable_rx
(
dev
);
sirdev_enable_rx
(
dev
);
dev
->
raw_tx
=
0
;
netif_start_queue
(
ndev
);
netif_start_queue
(
ndev
);
dev
->
irlap
=
irlap_open
(
ndev
,
&
dev
->
qos
,
dev
->
hwname
);
dev
->
irlap
=
irlap_open
(
ndev
,
&
dev
->
qos
,
dev
->
hwname
);
...
...
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