Hi,
Here's a patch against 2.4.10-ac8 that adds a driver to enable a USB
IrDA device as a simple serial device, like a serial IrDA device can be
used. This is helpful for users that do not have a IrDA support on
the other side of their Ir connection (like some embedded systems.)
The driver only binds to one specific USB IrDA device right now as it's
all I have to test it with.
thanks,
greg k-h
diff --minimal -Nru a/drivers/usb/serial/Config.in b/drivers/usb/serial/Config.in
--- a/drivers/usb/serial/Config.in Sun Oct 7 18:31:32 2001
+++ b/drivers/usb/serial/Config.in Sun Oct 7 18:31:32 2001
@@ -15,6 +15,7 @@
dep_tristate ' USB Empeg empeg-car Mark I/II Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_EMPEG $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
dep_tristate ' USB FTDI Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_FTDI_SIO $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
dep_tristate ' USB Handspring Visor / Palm m50x / Sony Clie Driver'
CONFIG_USB_SERIAL_VISOR $CONFIG_USB_SERIAL
+dep_tristate ' USB IR Dongle Serial Driver (EXPERIMENTAL)' CONFIG_USB_SERIAL_IR
+$CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
dep_tristate ' USB Inside Out Edgeport Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_EDGEPORT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
dep_tristate ' USB Keyspan PDA Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_KEYSPAN_PDA $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
dep_tristate ' USB Keyspan USA-xxx Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_KEYSPAN $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
diff --minimal -Nru a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
--- a/drivers/usb/serial/Makefile Sun Oct 7 18:31:32 2001
+++ b/drivers/usb/serial/Makefile Sun Oct 7 18:31:32 2001
@@ -21,6 +21,7 @@
obj-$(CONFIG_USB_SERIAL_EDGEPORT) += io_edgeport.o
obj-$(CONFIG_USB_SERIAL_PL2303) += pl2303.o
obj-$(CONFIG_USB_SERIAL_CYBERJACK) += cyberjack.o
+obj-$(CONFIG_USB_SERIAL_IR) += ir-usb.o
# Objects that export symbols.
export-objs := usbserial.o
diff --minimal -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/drivers/usb/serial/ir-usb.c Sun Oct 7 18:31:32 2001
@@ -0,0 +1,446 @@
+/*
+ * USB IR Dongle driver
+ *
+ * Copyright (C) 2001 Greg Kroah-Hartman ([EMAIL PROTECTED])
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This driver allows a USB IrDA device to be used as a "dumb" serial device.
+ * This can be useful if you do not have access to a full IrDA stack on the
+ * other side of the connection. If you do have an IrDA stack on both devices,
+ * please use the usb-irda driver, as it contains the proper error checking and
+ * other goodness of a full IrDA stack.
+ *
+ * See Documentation/usb/usb-serial.txt for more information on using this driver
+ *
+ * 2001_Oct_07 greg kh
+ * initial version released.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/signal.h>
+#include <linux/errno.h>
+#include <linux/poll.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/fcntl.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/usb.h>
+#include <net/irda/irda-usb.h>
+
+#ifdef CONFIG_USB_SERIAL_DEBUG
+ static int debug = 1;
+#else
+ static int debug;
+#endif
+
+#include "usb-serial.h"
+
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v0.1"
+#define DRIVER_AUTHOR "Greg Kroah-Hartman <[EMAIL PROTECTED]>"
+#define DRIVER_DESC "USB IR Dongle driver"
+
+static int ir_startup (struct usb_serial *serial);
+static int ir_open (struct usb_serial_port *port, struct file *filep);
+static void ir_close (struct usb_serial_port *port, struct file *filep);
+static int ir_write (struct usb_serial_port *port, int from_user, const unsigned
+char *buf, int count);
+static void ir_write_bulk_callback (struct urb *urb);
+static void ir_read_bulk_callback (struct urb *urb);
+static void ir_set_termios (struct usb_serial_port *port, struct termios
+*old_termios);
+
+
+static __devinitdata struct usb_device_id id_table [] = {
+ { USB_DEVICE(0x09c4, 0x0011) },
+ { } /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE (usb, id_table);
+
+
+struct usb_serial_device_type ir_device = {
+ name: "IR Dongle",
+ id_table: id_table,
+ needs_interrupt_in: MUST_HAVE,
+ needs_bulk_in: MUST_HAVE,
+ needs_bulk_out: MUST_HAVE,
+ num_interrupt_in: 1,
+ num_bulk_in: 1,
+ num_bulk_out: 1,
+ num_ports: 1,
+ set_termios: ir_set_termios,
+ startup: ir_startup,
+ open: ir_open,
+ close: ir_close,
+ write: ir_write,
+ write_bulk_callback: ir_write_bulk_callback,
+ read_bulk_callback: ir_read_bulk_callback,
+};
+
+static inline void irda_usb_dump_class_desc(struct irda_class_desc *desc)
+{
+ dbg("bLength=%x", desc->bLength);
+ dbg("bDescriptorType=%x", desc->bDescriptorType);
+ dbg("bcdSpecRevision=%x", desc->bcdSpecRevision);
+ dbg("bmDataSize=%x", desc->bmDataSize);
+ dbg("bmWindowSize=%x", desc->bmWindowSize);
+ dbg("bmMinTurnaroundTime=%d", desc->bmMinTurnaroundTime);
+ dbg("wBaudRate=%x", desc->wBaudRate);
+ dbg("bmAdditionalBOFs=%x", desc->bmAdditionalBOFs);
+ dbg("bIrdaRateSniff=%x", desc->bIrdaRateSniff);
+ dbg("bMaxUnicastList=%x", desc->bMaxUnicastList);
+}
+
+/*------------------------------------------------------------------*/
+/*
+ * Function irda_usb_find_class_desc(dev, ifnum)
+ *
+ * Returns instance of IrDA class descriptor, or NULL if not found
+ *
+ * The class descriptor is some extra info that IrDA USB devices will
+ * offer to us, describing their IrDA characteristics. We will use that in
+ * irda_usb_init_qos()
+ */
+static inline struct irda_class_desc *irda_usb_find_class_desc(struct usb_device
+*dev, unsigned int ifnum)
+{
+ struct usb_interface_descriptor *interface;
+ struct irda_class_desc *desc;
+ struct irda_class_desc *ptr;
+ int ret;
+
+ desc = kmalloc(sizeof (struct irda_class_desc), GFP_KERNEL);
+ if (desc == NULL)
+ return NULL;
+ memset(desc, 0, sizeof(struct irda_class_desc));
+
+ ret = usb_get_class_descriptor(dev, ifnum, USB_DT_IRDA, 0, (void *) desc,
+sizeof(struct irda_class_desc));
+ dbg(__FUNCTION__ " - ret=%d", ret);
+ if (ret)
+ dbg(__FUNCTION__ " - usb_get_class_descriptor failed (0x%x)", ret);
+
+ /* Check if we found it? */
+ if (desc->bDescriptorType == USB_DT_IRDA)
+ goto exit;
+
+ dbg(__FUNCTION__ " - parsing extra descriptors...");
+
+ /* Check if the class descriptor is interleaved with standard descriptors */
+ interface = &dev->actconfig->interface[ifnum].altsetting[0];
+ ret = usb_get_extra_descriptor(interface, USB_DT_IRDA, &ptr);
+ if (ret) {
+ kfree(desc);
+ return NULL;
+ }
+ *desc = *ptr;
+exit:
+ irda_usb_dump_class_desc(desc);
+ return desc;
+}
+
+static int ir_startup (struct usb_serial *serial)
+{
+ struct irda_class_desc *irda_desc;
+
+ irda_desc = irda_usb_find_class_desc (serial->dev, 0);
+ if (irda_desc == NULL) {
+ err ("IRDA class descriptor not found, device not bound");
+ return -ENODEV;
+ }
+ dbg (__FUNCTION__" - Baud rates supported: %s%s%s%s%s%s%s%s%s",
+ (irda_desc->wBaudRate & 0x0001) ? "2400 " : "",
+ irda_desc->wBaudRate & 0x0002 ? "9600 " : "",
+ irda_desc->wBaudRate & 0x0004 ? "19200 " : "",
+ irda_desc->wBaudRate & 0x0008 ? "38400 " : "",
+ irda_desc->wBaudRate & 0x0010 ? "57600 " : "",
+ irda_desc->wBaudRate & 0x0020 ? "115200 " : "",
+ irda_desc->wBaudRate & 0x0040 ? "576000 " : "",
+ irda_desc->wBaudRate & 0x0080 ? "1152000 " : "",
+ irda_desc->wBaudRate & 0x0100 ? "4000000 " : "");
+
+ kfree (irda_desc);
+
+ return 0;
+}
+
+static int ir_open (struct usb_serial_port *port, struct file *filp)
+{
+ struct usb_serial *serial = port->serial;
+ int result = 0;
+
+ if (port_paranoia_check (port, __FUNCTION__))
+ return -ENODEV;
+
+ dbg(__FUNCTION__ " - port %d", port->number);
+
+ down (&port->sem);
+
+ ++port->open_count;
+ MOD_INC_USE_COUNT;
+
+ if (!port->active) {
+ port->active = 1;
+
+ /* force low_latency on so that our tty_push actually forces the data
+through,
+ otherwise it is scheduled, and with high data rates (like with
+OHCI) data
+ can get lost. */
+ port->tty->low_latency = 1;
+
+ /* Start reading from the device */
+ FILL_BULK_URB(port->read_urb, serial->dev,
+ usb_rcvbulkpipe(serial->dev,
+port->bulk_in_endpointAddress),
+ port->read_urb->transfer_buffer,
+port->read_urb->transfer_buffer_length,
+ ir_read_bulk_callback, port);
+ result = usb_submit_urb(port->read_urb);
+ if (result)
+ err(__FUNCTION__ " - failed submitting read urb, error %d",
+result);
+ }
+
+ up (&port->sem);
+
+ return result;
+}
+
+static void ir_close (struct usb_serial_port *port, struct file * filp)
+{
+ struct usb_serial *serial;
+
+ if (port_paranoia_check (port, __FUNCTION__))
+ return;
+
+ dbg(__FUNCTION__ " - port %d", port->number);
+
+ serial = get_usb_serial (port, __FUNCTION__);
+ if (!serial)
+ return;
+
+ down (&port->sem);
+
+ --port->open_count;
+
+ if (port->open_count <= 0) {
+ /* shutdown our bulk read */
+ usb_unlink_urb (port->read_urb);
+ port->active = 0;
+ port->open_count = 0;
+
+ }
+ up (&port->sem);
+ MOD_DEC_USE_COUNT;
+}
+
+static int ir_write (struct usb_serial_port *port, int from_user, const unsigned char
+*buf, int count)
+{
+ unsigned char *transfer_buffer;
+ int result;
+
+ dbg(__FUNCTION__ " - port = %d, count = %d", port->number, count);
+
+ if (!port->tty) {
+ err (__FUNCTION__ " - no tty???");
+ return 0;
+ }
+
+ if (count == 0)
+ return 0;
+
+ if (port->write_urb->status == -EINPROGRESS) {
+ dbg (__FUNCTION__ " - already writing");
+ return 0;
+ }
+
+ /*
+ * The first byte of the packet we send to the device contains a BOD
+ * and baud rate change. So we set it to 0.
+ * See section 5.4.2.2 of the USB IrDA spec.
+ */
+ transfer_buffer = port->write_urb->transfer_buffer;
+ count = min (port->bulk_out_size-1, count);
+ if (from_user) {
+ if (copy_from_user (&transfer_buffer[1], buf, count))
+ return -EFAULT;
+ } else {
+ memcpy (&transfer_buffer[1], buf, count);
+ }
+
+ transfer_buffer[0] = 0x00;
+
+ usb_serial_debug_data (__FILE__, __FUNCTION__, count+1, transfer_buffer);
+
+ port->write_urb->transfer_buffer_length = count + 1;
+ port->write_urb->dev = port->serial->dev;
+ result = usb_submit_urb (port->write_urb);
+ if (result)
+ err(__FUNCTION__ " - failed submitting write urb, error %d", result);
+ else
+ result = count;
+
+ return result;
+}
+
+static void ir_write_bulk_callback (struct urb *urb)
+{
+ struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
+
+ if (port_paranoia_check (port, __FUNCTION__))
+ return;
+
+ dbg(__FUNCTION__ " - port %d", port->number);
+
+ if (urb->status) {
+ dbg(__FUNCTION__ " - nonzero write bulk status received: %d",
+urb->status);
+ return;
+ }
+
+ queue_task(&port->tqueue, &tq_immediate);
+ mark_bh(IMMEDIATE_BH);
+
+ return;
+}
+
+static void ir_read_bulk_callback (struct urb *urb)
+{
+ struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
+ struct usb_serial *serial = get_usb_serial (port, __FUNCTION__);
+ struct tty_struct *tty;
+ unsigned char *data = urb->transfer_buffer;
+ int i;
+ int result;
+
+ if (port_paranoia_check (port, __FUNCTION__))
+ return;
+
+ dbg(__FUNCTION__ " - port %d", port->number);
+
+ if (!serial) {
+ dbg(__FUNCTION__ " - bad serial pointer, exiting");
+ return;
+ }
+
+ if (urb->status) {
+ dbg(__FUNCTION__ " - nonzero read bulk status received: %d",
+urb->status);
+ return;
+ }
+
+ usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data);
+
+ tty = port->tty;
+ if (urb->actual_length > 1) {
+ for (i = 1; i < urb->actual_length ; ++i) {
+ /* if we insert more than TTY_FLIPBUF_SIZE characters, we drop
+them. */
+ if(tty->flip.count >= TTY_FLIPBUF_SIZE) {
+ tty_flip_buffer_push(tty);
+ }
+ /* this doesn't actually push the data through unless
+tty->low_latency is set */
+ tty_insert_flip_char(tty, data[i], 0);
+ }
+ tty_flip_buffer_push(tty);
+ }
+
+ /* Continue trying to always read */
+ FILL_BULK_URB(port->read_urb, serial->dev,
+ usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress),
+ port->read_urb->transfer_buffer,
+port->read_urb->transfer_buffer_length,
+ ir_read_bulk_callback, port);
+ result = usb_submit_urb(port->read_urb);
+ if (result)
+ err(__FUNCTION__ " - failed resubmitting read urb, error %d", result);
+ return;
+}
+
+static void ir_set_termios (struct usb_serial_port *port, struct termios *old_termios)
+{
+ unsigned char *transfer_buffer;
+ unsigned int cflag;
+ int result;
+ u8 baud;
+
+ dbg(__FUNCTION__ " - port %d", port->number);
+
+ if ((!port->tty) || (!port->tty->termios)) {
+ dbg(__FUNCTION__" - no tty structures");
+ return;
+ }
+
+ cflag = port->tty->termios->c_cflag;
+ /* check that they really want us to change something */
+ if (old_termios) {
+ if ((cflag == old_termios->c_cflag) &&
+ (RELEVANT_IFLAG(port->tty->termios->c_iflag) ==
+RELEVANT_IFLAG(old_termios->c_iflag))) {
+ dbg(__FUNCTION__ " - nothing to change...");
+ return;
+ }
+ }
+
+ /* All we can change is the baud rate */
+ if (cflag & CBAUD) {
+ dbg (__FUNCTION__ " - asking for baud %d",
+tty_get_baud_rate(port->tty));
+ /*
+ * FIXME, we should compare the baud request against the
+ * capability stated in the IR header that we got in the
+ * startup funtion.
+ */
+ switch (cflag & CBAUD) {
+ case B2400: baud = SPEED_2400; break;
+ case B9600: baud = SPEED_9600; break;
+ case B19200: baud = SPEED_19200; break;
+ case B38400: baud = SPEED_38400; break;
+ case B57600: baud = SPEED_57600; break;
+ case B115200: baud = SPEED_115200; break;
+ case B576000: baud = SPEED_576000; break;
+ case B1152000: baud = SPEED_1152000; break;
+ case B4000000: baud = SPEED_4000000; break;
+ default:
+ err ("ir-usb driver does not support the baudrate (%d)
+requested", tty_get_baud_rate(port->tty));
+ return;
+ }
+
+ /* FIXME need to check to see if our write urb is busy right
+ * now, or use a urb pool. */
+ /* send the baud change out on an "empty" data packet */
+ transfer_buffer = port->write_urb->transfer_buffer;
+ transfer_buffer[0] = baud;
+ port->write_urb->transfer_buffer_length = 1;
+ port->write_urb->dev = port->serial->dev;
+ result = usb_submit_urb (port->write_urb);
+ if (result)
+ err(__FUNCTION__ " - failed submitting write urb, error %d",
+result);
+ }
+ return;
+}
+
+
+static int __init ir_init (void)
+{
+ usb_serial_register (&ir_device);
+ info(DRIVER_DESC " " DRIVER_VERSION);
+ return 0;
+}
+
+
+static void __exit ir_exit (void)
+{
+ usb_serial_deregister (&ir_device);
+}
+
+
+module_init(ir_init);
+module_exit(ir_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+MODULE_PARM(debug, "i");
+MODULE_PARM_DESC(debug, "Debug enabled or not");
+
