git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
irda
/
ircomm
/
ircomm_tty_ioctl.c
diff --git
a/net/irda/ircomm/ircomm_tty_ioctl.c
b/net/irda/ircomm/ircomm_tty_ioctl.c
index
cf57786
..
75e39ea
100644
(file)
--- a/
net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/
net/irda/ircomm/ircomm_tty_ioctl.c
@@
-53,7
+53,7
@@
* Change speed of the driver. If the remote device is a DCE, then this
* should make it change the speed of its serial port
*/
* Change speed of the driver. If the remote device is a DCE, then this
* should make it change the speed of its serial port
*/
-void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
+
static
void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
{
unsigned cflag, cval;
int baud;
{
unsigned cflag, cval;
int baud;
@@
-95,7
+95,7
@@
void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
/* This got me. Bummer. Jean II */
if (self->service_type == IRCOMM_3_WIRE_RAW)
self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
/* This got me. Bummer. Jean II */
if (self->service_type == IRCOMM_3_WIRE_RAW)
- WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __FUNCTION__);
+
IRDA_
WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __FUNCTION__);
} else {
self->flags &= ~ASYNC_CTS_FLOW;
self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
} else {
self->flags &= ~ASYNC_CTS_FLOW;
self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
@@
-146,7
+146,7
@@
void ircomm_tty_change_speed(struct ircomm_tty_cb *self)
* do something rational.
*/
void ircomm_tty_set_termios(struct tty_struct *tty,
* do something rational.
*/
void ircomm_tty_set_termios(struct tty_struct *tty,
- struct termios *old_termios)
+ struct
k
termios *old_termios)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int cflag = tty->termios->c_cflag;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
unsigned int cflag = tty->termios->c_cflag;
@@
-230,8
+230,8
@@
int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO;
if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (set & TIOCM_RTS)
self->settings.dte |= IRCOMM_RTS;
if (set & TIOCM_RTS)
self->settings.dte |= IRCOMM_RTS;
@@
-260,7
+260,7
@@
int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
*
*/
static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
*
*/
static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
- struct serial_struct *retinfo)
+ struct serial_struct
__user
*retinfo)
{
struct serial_struct info;
{
struct serial_struct info;
@@
-297,7
+297,7
@@
static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
*
*/
static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
*
*/
static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
- struct serial_struct *new_info)
+ struct serial_struct
__user
*new_info)
{
#if 0
struct serial_struct new_serial;
{
#if 0
struct serial_struct new_serial;
@@
-388,10
+388,10
@@
int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
switch (cmd) {
case TIOCGSERIAL:
switch (cmd) {
case TIOCGSERIAL:
- ret = ircomm_tty_get_serial_info(self, (struct serial_struct *) arg);
+ ret = ircomm_tty_get_serial_info(self, (struct serial_struct
__user
*) arg);
break;
case TIOCSSERIAL:
break;
case TIOCSSERIAL:
- ret = ircomm_tty_set_serial_info(self, (struct serial_struct *) arg);
+ ret = ircomm_tty_set_serial_info(self, (struct serial_struct
__user
*) arg);
break;
case TIOCMIWAIT:
IRDA_DEBUG(0, "(), TIOCMIWAIT, not impl!\n");
break;
case TIOCMIWAIT:
IRDA_DEBUG(0, "(), TIOCMIWAIT, not impl!\n");
@@
-403,7
+403,7
@@
int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file,
save_flags(flags); cli();
cnow = driver->icount;
restore_flags(flags);
save_flags(flags); cli();
cnow = driver->icount;
restore_flags(flags);
- p_cuser = (struct serial_icounter_struct *) arg;
+ p_cuser = (struct serial_icounter_struct
__user
*) arg;
if (put_user(cnow.cts, &p_cuser->cts) ||
put_user(cnow.dsr, &p_cuser->dsr) ||
put_user(cnow.rng, &p_cuser->rng) ||
if (put_user(cnow.cts, &p_cuser->cts) ||
put_user(cnow.dsr, &p_cuser->dsr) ||
put_user(cnow.rng, &p_cuser->rng) ||