[PATCH 2.4.20-pre8] irtty MODEM_BITS additional fix

Jean Tourrilhes (jt@bougret.hpl.hp.com)
Wed, 25 Sep 2002 19:39:50 -0700


Hi Marcelo,

Alan did fix the compile of the irtty driver for i386 in
pre8. Unfortunately, there is still many platforms which doesn't
compile, including some that I know where IrDA is heavily used (PPC,
ARM).
This patch make sure the code works on all platforms. It's
2.4.X, so I guess the code *must* work.

Regards,

Jean

P.S. : Russel : this is an opportunity to fix the ARM platform
difference in the proper way. I guess irtty is still used on some ARM
platforms (especially with serial dongles).

-----------------------------------------------

--- linux/drivers/net/irda/irtty.a0.c Wed Sep 25 19:10:25 2002
+++ linux/drivers/net/irda/irtty.c Wed Sep 25 19:18:14 2002
@@ -46,6 +46,19 @@ static struct tty_ldisc irda_ldisc;

static int qos_mtt_bits = 0x03; /* 5 ms or more */

+/* To workaround some of the difference in the serial driver over various
+ * arch, some people have introduced TIOCM_MODEM_BITS.
+ * Unfortunately, this is not yet defined on all architectures, so
+ * we make sure the code is still usable. - Jean II */
+#ifndef TIOCM_MODEM_BITS
+#warning "Please define TIOCM_MODEM_BITS in termios.h !"
+#ifdef TIOCM_OUT2
+#define TIOCM_MODEM_BITS TIOCM_OUT2 /* Most architectures */
+#else
+#define TIOCM_MODEM_BITS 0 /* Not defined for ARM */
+#endif
+#endif
+
/* Network device fuction prototypes */
static int irtty_hard_xmit(struct sk_buff *skb, struct net_device *dev);
static int irtty_net_init(struct net_device *dev);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/