Skip to contentSkip to conversation

IrCOMM TTY API fix

PATCH Applied Jean Tourrilhes 2 participants 2 messages Jan 15, 2004 Networking

lore
Share & tools
lore

Jean Tourrilhes

author
#0 lore raw

PATCH 1/1 IrCOMM TTY API fix

Hi Dave,

Another bug fix, this time from Russell. This problem prevent some users to make connection to their phones over IrDA. Would you mind adding that to my previous batch of patches ?

Thanks...

Jean

=========================================================================

ir260_ircomm_ioctl-2.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~
<Patch from Russell King>
o [CORRECT] Migrate TIOCMGET and TIOCMSET ioctls in IrCOMM to the new TTY API.

include/net/irda/ircomm_tty.h renamed from include/net/irda/ircomm_tty.d5.h +3 -0
diff -u -p linux/include/net/irda/ircomm_tty.d5.h linux/include/net/irda/ircomm_tty.h
@@ -122,6 +122,9 @@ void ircomm_tty_stop(struct tty_struct *
 void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self);
 
 extern void ircomm_tty_change_speed(struct ircomm_tty_cb *self);
+extern int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file);
+extern int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
+			       unsigned int set, unsigned int clear);
 extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, 
 			    unsigned int cmd, unsigned long arg);
 extern void ircomm_tty_set_termios(struct tty_struct *tty,
net/irda/ircomm/ircomm_tty.c renamed from net/irda/ircomm/ircomm_tty.d5.c +3 -1
diff -u -p linux/net/irda/ircomm/ircomm_tty.d5.c linux/net/irda/ircomm/ircomm_tty.c
@@ -86,7 +86,9 @@ static struct tty_operations ops = {
 	.write_room      = ircomm_tty_write_room,
 	.chars_in_buffer = ircomm_tty_chars_in_buffer,
 	.flush_buffer    = ircomm_tty_flush_buffer,
-	.ioctl           = ircomm_tty_ioctl,
+	.ioctl           = ircomm_tty_ioctl,	/* ircomm_tty_ioctl.c */
+	.tiocmget        = ircomm_tty_tiocmget,	/* ircomm_tty_ioctl.c */
+	.tiocmset        = ircomm_tty_tiocmset,	/* ircomm_tty_ioctl.c */
 	.throttle        = ircomm_tty_throttle,
 	.unthrottle      = ircomm_tty_unthrottle,
 	.send_xchar      = ircomm_tty_send_xchar,
net/irda/ircomm/ircomm_tty_ioctl.c renamed from net/irda/ircomm/ircomm_tty_ioctl.d5.c +25 -52

120 lines not on this page · raw message

Applied
#1 lore raw
Quoted 2 lines · On Wed, 14 Jan 2004 19:36:59 -0800 Jean Tourrilhes <[email protected]>…

Another bug fix, this time from Russell. This problem prevent some users to make connection to their phones over IrDA. Would you mind adding that to my previous batch of patches ?

Applied, thanks guys.