]> oss.titaniummirror.com Git - cp210x.git/commitdiff
Changes in progress to support debian (ubuntu) integration
authorsmckown <smckown@986fd584-583e-0410-b54d-b9fe63dff8e5>
Thu, 28 Aug 2008 17:59:00 +0000 (17:59 +0000)
committersmckown <smckown@986fd584-583e-0410-b54d-b9fe63dff8e5>
Thu, 28 Aug 2008 17:59:00 +0000 (17:59 +0000)
42 files changed:
Docs/SIL00205 design.doc [deleted file]
Docs/SIL00205_RNF_20060115.doc [deleted file]
Docs/SIL00205_RNF_20060901.doc [deleted file]
Docs/igx_to_2_6_15_1_diff.txt [deleted file]
Makefile [deleted file]
Makefile.go [deleted file]
Makefile24 [deleted file]
Makefile26 [deleted file]
Modules.symvers [deleted file]
README [new file with mode: 0644]
README.txt [deleted file]
Rules.make [deleted file]
configure [deleted file]
cp2101.c [deleted file]
examples/Makefile [deleted file]
examples/README.txt [deleted file]
examples/cpio.c [deleted file]
examples/cpmfg.c [deleted file]
examples/cptwiddle.c [deleted file]
installmod [deleted file]
rpm/buildRPM [deleted file]
rpm/cp2103.spec [deleted file]
src/Docs/SIL00205 design.doc [new file with mode: 0644]
src/Docs/SIL00205_RNF_20060115.doc [new file with mode: 0644]
src/Docs/SIL00205_RNF_20060901.doc [new file with mode: 0644]
src/Docs/igx_to_2_6_15_1_diff.txt [new file with mode: 0644]
src/Makefile [new file with mode: 0644]
src/Makefile.go [new file with mode: 0644]
src/Makefile24 [new file with mode: 0644]
src/Makefile26 [new file with mode: 0644]
src/Modules.symvers [new file with mode: 0644]
src/Rules.make [new file with mode: 0644]
src/configure [new file with mode: 0755]
src/cp2101.c [new file with mode: 0644]
src/examples/Makefile [new file with mode: 0644]
src/examples/README.txt [new file with mode: 0644]
src/examples/cpio.c [new file with mode: 0644]
src/examples/cpmfg.c [new file with mode: 0644]
src/examples/cptwiddle.c [new file with mode: 0644]
src/installmod [new file with mode: 0644]
src/rpm/buildRPM [new file with mode: 0755]
src/rpm/cp2103.spec [new file with mode: 0644]

diff --git a/Docs/SIL00205 design.doc b/Docs/SIL00205 design.doc
deleted file mode 100644 (file)
index 3599f1b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ÐÏ\11ࡱ
\ No newline at end of file
diff --git a/Docs/SIL00205_RNF_20060115.doc b/Docs/SIL00205_RNF_20060115.doc
deleted file mode 100644 (file)
index f3a7444..0000000
Binary files a/Docs/SIL00205_RNF_20060115.doc and /dev/null differ
diff --git a/Docs/SIL00205_RNF_20060901.doc b/Docs/SIL00205_RNF_20060901.doc
deleted file mode 100644 (file)
index ac89801..0000000
Binary files a/Docs/SIL00205_RNF_20060901.doc and /dev/null differ
diff --git a/Docs/igx_to_2_6_15_1_diff.txt b/Docs/igx_to_2_6_15_1_diff.txt
deleted file mode 100644 (file)
index 909c4df..0000000
+++ /dev/null
@@ -1,415 +0,0 @@
-26a27
-> #include <linux/moduleparam.h>
-29,48d29
-< 
-< #if LINUX26
-< 
-< #include <linux/moduleparam.h>
-< #define DEV_ERR(dev,format,arg...) dev_err(dev,format, ## arg)
-< #define USB_KILL_URB usb_kill_urb
-< 
-< #else /* !LINUX26 */
-< 
-< #ifdef CONFIG_USB_SERIAL_DEBUG
-<      static int debug = 1;
-< #else
-<      static int debug;
-< #endif
-< 
-< #define DEV_ERR(dev,format,arg...)  err(format, ## arg)
-< #define USB_KILL_URB  usb_unlink_urb
-< 
-< #endif /* LINUX26 */
-< 
-54,55c35,36
-< #define DRIVER_VERSION "v0.10"
-< #define DRIVER_DESC "Silicon Labs CP2101/CP2102/CP2103 RS232 serial adaptor driver"
----
-> #define DRIVER_VERSION "v0.05"
-> #define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver"
-60c41
-< static int   cp2101_open(struct usb_serial_port*, struct file*);
----
-> static int cp2101_open(struct usb_serial_port*, struct file*);
-64a46,48
-> static int cp2101_tiocmget (struct usb_serial_port *, struct file *);
-> static int cp2101_tiocmset (struct usb_serial_port *, struct file *,
->              unsigned int, unsigned int);
-66c50
-< static int   cp2101_startup (struct usb_serial *);
----
-> static int cp2101_startup (struct usb_serial *);
-68,70c52
-< static int  cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg);
-< static int   cp2101_tiocmget (struct usb_serial_port *, struct file *);
-< static int   cp2101_tiocmset (struct usb_serial_port *, struct file *, unsigned int, unsigned int);
----
-> 
-74a57
->      { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
-76a60,61
->      { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
->      { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
-77a63
->      { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
-83d68
-< #if LINUX26
-86c71
-<      .name           = "CP2101",
----
->      .name           = "cp2101",
-91,92d75
-< #define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_ , GFP_ATOMIC)
-< #define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_ , GFP_KERNEL)
-94,103c77,82
-< #else  /* LINUX26 */
-< 
-< #define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_)
-< #define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_)
-< #endif
-< 
-< static struct usb_serial_device_type cp2101_device = {
-<      .owner                          = THIS_MODULE,
-<      .name                           = "CP2101/CP2102/CP2103 USB to UART Bridge",
-<      .id_table                       = id_table,
----
-> static struct usb_serial_driver cp2101_device = {
->      .driver = {
->              .owner =        THIS_MODULE,
->              .name =         "cp2101",
->      },
->      .id_table               = id_table,
-107,111c86,89
-<      .num_ports                      = 1,
-<      .open                           = cp2101_open,
-<      .close                          = cp2101_close,
-<     .ioctl              = cp2101_ioctl,     /* GLA, Added backport */
-<      .break_ctl                      = cp2101_break_ctl,
----
->      .num_ports              = 1,
->      .open                   = cp2101_open,
->      .close                  = cp2101_close,
->      .break_ctl              = cp2101_break_ctl,
-113,120c91,94
-<      .shutdown                       = cp2101_shutdown,
-< #if LINUX26
-<      .tiocmget                       = cp2101_tiocmget,
-<      .tiocmset                       = cp2101_tiocmset,
-<      .attach                         = cp2101_startup
-< #else
-<      .startup                        = cp2101_startup
-< #endif
----
->      .tiocmget               = cp2101_tiocmget,
->      .tiocmset               = cp2101_tiocmset,
->      .attach                 = cp2101_startup,
->      .shutdown               = cp2101_shutdown,
-128,134c102,108
-< #define CP2101_UART                  0x00    /* Enable / Disable */
-< #define CP2101_BAUDRATE                      0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
-< #define CP2101_BITS                          0x03    /* 0x(0)(databits)(parity)(stopbits) */
-< #define CP2101_BREAK                 0x05    /* On / Off */
-< #define CP2101_CONTROL                       0x07    /* Flow control line states */
-< #define CP2101_MODEMCTL                      0x13    /* Modem controls */
-< #define CP2101_CONFIG_6                      0x19    /* 6 bytes of config data ??? */
----
-> #define CP2101_UART          0x00    /* Enable / Disable */
-> #define CP2101_BAUDRATE              0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
-> #define CP2101_BITS          0x03    /* 0x(0)(databits)(parity)(stopbits) */
-> #define CP2101_BREAK         0x05    /* On / Off */
-> #define CP2101_CONTROL               0x07    /* Flow control line states */
-> #define CP2101_MODEMCTL              0x13    /* Modem controls */
-> #define CP2101_CONFIG_6              0x19    /* 6 bytes of config data ??? */
-137,138c111,112
-< #define UART_ENABLE                          0x0001
-< #define UART_DISABLE                 0x0000
----
-> #define UART_ENABLE          0x0001
-> #define UART_DISABLE         0x0000
-141c115
-< #define BAUD_RATE_GEN_FREQ           0x384000
----
-> #define BAUD_RATE_GEN_FREQ   0x384000
-144,161c118,135
-< #define BITS_DATA_MASK                       0x0f00
-< #define BITS_DATA_5                          0x0500
-< #define BITS_DATA_6                          0x0600
-< #define BITS_DATA_7                          0x0700
-< #define BITS_DATA_8                          0x0800
-< #define BITS_DATA_9                          0x0900
-< 
-< #define BITS_PARITY_MASK             0x00f0
-< #define BITS_PARITY_NONE             0x0000
-< #define BITS_PARITY_ODD                      0x0010
-< #define BITS_PARITY_EVEN             0x0020
-< #define BITS_PARITY_MARK             0x0030
-< #define BITS_PARITY_SPACE            0x0040
-< 
-< #define BITS_STOP_MASK                   0x000f
-< #define BITS_STOP_1                  0x0000
-< #define BITS_STOP_1_5                    0x0001
-< #define BITS_STOP_2                  0x0002
----
-> #define BITS_DATA_MASK               0X0f00
-> #define BITS_DATA_5          0X0500
-> #define BITS_DATA_6          0X0600
-> #define BITS_DATA_7          0X0700
-> #define BITS_DATA_8          0X0800
-> #define BITS_DATA_9          0X0900
-> 
-> #define BITS_PARITY_MASK     0x00f0
-> #define BITS_PARITY_NONE     0x0000
-> #define BITS_PARITY_ODD              0x0010
-> #define BITS_PARITY_EVEN     0x0020
-> #define BITS_PARITY_MARK     0x0030
-> #define BITS_PARITY_SPACE    0x0040
-> 
-> #define BITS_STOP_MASK               0x000f
-> #define BITS_STOP_1          0x0000
-> #define BITS_STOP_1_5                0x0001
-> #define BITS_STOP_2          0x0002
-164,165c138,139
-< #define BREAK_ON                     0x0000
-< #define BREAK_OFF                    0x0001
----
-> #define BREAK_ON             0x0000
-> #define BREAK_OFF            0x0001
-168,175c142,149
-< #define CONTROL_DTR                  0x0001
-< #define CONTROL_RTS                  0x0002
-< #define CONTROL_CTS                  0x0010
-< #define CONTROL_DSR                  0x0020
-< #define CONTROL_RING             0x0040
-< #define CONTROL_DCD                  0x0080
-< #define CONTROL_WRITE_DTR        0x0100
-< #define CONTROL_WRITE_RTS        0x0200
----
-> #define CONTROL_DTR          0x0001
-> #define CONTROL_RTS          0x0002
-> #define CONTROL_CTS          0x0010
-> #define CONTROL_DSR          0x0020
-> #define CONTROL_RING         0x0040
-> #define CONTROL_DCD          0x0080
-> #define CONTROL_WRITE_DTR    0x0100
-> #define CONTROL_WRITE_RTS    0x0200
-198c172
-<              DEV_ERR(&port->dev,"%s - out of memory.\n", __FUNCTION__);
----
->              dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
-206,215c180,182
-<      result = usb_control_msg (
-<                     serial->dev,
-<                     usb_rcvctrlpipe (serial->dev, 0),
-<                                  request, 
-<                     REQTYPE_DEVICE_TO_HOST, 
-<                     0x0000,
-<                                  0, 
-<                     buf, 
-<                     size, 
-<                     300);
----
->      result = usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev, 0),
->                              request, REQTYPE_DEVICE_TO_HOST, 0x0000,
->                              0, buf, size, 300);
-218c185,186
-<      for (i=0; i<length; i++) data[i] = le32_to_cpu(buf[i]);
----
->      for (i=0; i<length; i++)
->              data[i] = le32_to_cpu(buf[i]);
-223c191
-<              DEV_ERR(&port->dev,"%s - Unable to send config request, "
----
->              dev_err(&port->dev, "%s - Unable to send config request, "
-250c218
-<              DEV_ERR(&port->dev,"%s - out of memory.\n",
----
->              dev_err(&port->dev, "%s - out of memory.\n",
-256c224,225
-<      for (i = 0; i < length; i++) buf[i] = cpu_to_le32(data[i]);
----
->      for (i = 0; i < length; i++)
->              buf[i] = cpu_to_le32(data[i]);
-259,268c228,231
-<              result = usb_control_msg (
-<                     serial->dev,
-<                                  usb_sndctrlpipe(serial->dev, 0),
-<                                  request, 
-<                     REQTYPE_HOST_TO_DEVICE, 
-<                     0x0000,
-<                                  0, 
-<                     buf, 
-<                     size, 
-<                     300);
----
->              result = usb_control_msg (serial->dev,
->                              usb_sndctrlpipe(serial->dev, 0),
->                              request, REQTYPE_HOST_TO_DEVICE, 0x0000,
->                              0, buf, size, 300);
-270,279c233,236
-<              result = usb_control_msg (
-<                     serial->dev,
-<                                  usb_sndctrlpipe(serial->dev, 0),
-<                                  request, 
-<                     REQTYPE_HOST_TO_DEVICE, 
-<                     data[0],
-<                                  0, 
-<                     NULL, 
-<                     0, 
-<                     300);
----
->              result = usb_control_msg (serial->dev,
->                              usb_sndctrlpipe(serial->dev, 0),
->                              request, REQTYPE_HOST_TO_DEVICE, data[0],
->                              0, NULL, 0, 300);
-285c242
-<              DEV_ERR(&port->dev,"%s - Unable to send request, "
----
->              dev_err(&port->dev, "%s - Unable to send request, "
-292,301c249,252
-<      result = usb_control_msg (
-<                 serial->dev,
-<                          usb_sndctrlpipe(serial->dev, 0),
-<                          request,
-<                 REQTYPE_HOST_TO_DEVICE, 
-<                 data[0],
-<                          0, 
-<                 NULL, 
-<                 0, 
-<                 300);
----
->      result = usb_control_msg (serial->dev,
->                      usb_sndctrlpipe(serial->dev, 0),
->                      request, REQTYPE_HOST_TO_DEVICE, data[0],
->                      0, NULL, 0, 300);
-324c275
-<              DEV_ERR(&port->dev, "%s - Unable to enable UART\n",
----
->              dev_err(&port->dev, "%s - Unable to enable UART\n",
-337c288
-<      result = USB_SUBMIT_URB_KERNEL(port->read_urb);
----
->      result = usb_submit_urb(port->read_urb, GFP_KERNEL);
-339c290
-<              DEV_ERR(&port->dev, "%s - failed resubmitting read urb, "
----
->              dev_err(&port->dev, "%s - failed resubmitting read urb, "
-359c310
-<      if (serial != NULL && serial->dev) {
----
->      if (serial->dev) {
-362c313
-<                      USB_KILL_URB(port->write_urb);
----
->                      usb_kill_urb(port->write_urb);
-364c315
-<                      USB_KILL_URB(port->read_urb);
----
->                      usb_kill_urb(port->read_urb);
-366,374d316
-< 
-< #if LINUX26
-<      kfree (usb_get_serial_port_data(port));
-<      usb_set_serial_port_data(port, NULL);
-< #else
-<      /*TODOGLA: port.private maybe?
-<        Nobody is using that at the moement in this driver*/
-< #endif
-< 
-383,384c325,326
-<      USB_KILL_URB(port->write_urb);
-<      USB_KILL_URB(port->read_urb);
----
->      usb_kill_urb(port->write_urb);
->      usb_kill_urb(port->read_urb);
-615c557
-<                              DEV_ERR(&port->dev, "cp2101 driver does not "
----
->                              dev_err(&port->dev, "cp2101 driver does not "
-625c567
-<                              DEV_ERR(&port->dev, "Baud rate requested not "
----
->                              dev_err(&port->dev, "Baud rate requested not "
-656c598
-<                              DEV_ERR(&port->dev, "cp2101 driver does not "
----
->                              dev_err(&port->dev, "cp2101 driver does not "
-663c605
-<                      DEV_ERR(&port->dev,"Number of data bits requested "
----
->                      dev_err(&port->dev, "Number of data bits requested "
-680c622
-<                      DEV_ERR(&port->dev,"Parity mode not supported "
----
->                      dev_err(&port->dev, "Parity mode not supported "
-695c637
-<                      DEV_ERR(&port->dev,"Number of stop bits requested "
----
->                      dev_err(&port->dev, "Number of stop bits requested "
-789,827d730
-< static int cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
-< {
-<      dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
-< 
-<      switch (cmd) {
-<              
-< #if !LINUX26
-<              case TIOCMGET:
-<             {
-<                 int result = cp2101_tiocmget(port, file);
-<                 if (copy_to_user(&arg, &result, sizeof(int)))
-<                              return -EFAULT; 
-<             }
-<             break;
-<             
-<              case TIOCMSET:
-<              case TIOCMBIS:
-< 
-<              case TIOCMBIC:
-<             {
-<                 int val = 0;
-<                 
-<                  if (copy_from_user(&val, &arg, sizeof(int)))
-<                          return -EFAULT;
-<             
-<                 if(cp2101_tiocmset(port, file, cmd==TIOCMBIC?0:val,  cmd==TIOCMBIC?val:0))
-<                     return -EFAULT;
-<             }
-<             break;
-< #endif
-< 
-<              default:
-<                      dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
-<                      break;
-<      }
-< 
-<      return -ENOIOCTLCMD;
-< }
-< 
-843d745
-< #if LINUX26
-845,847d746
-< #else
-<              cp2101_cleanup(&serial->port[i]);
-< #endif
-859,860c758
-< #if LINUX26
-<      retval = usb_register(&cp2101_driver);
----
->      retval = usb_register(&cp2101_driver);
-866c764
-< #endif
----
-> 
-874d771
-< #if LINUX26
-876d772
-< #endif
-883a780
-> MODULE_VERSION(DRIVER_VERSION);
-886,887d782
-< #if LINUX26
-< MODULE_VERSION(DRIVER_VERSION);
-889,891d783
-< #else
-< MODULE_PARM(debug, "i");
-< #endif
diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 5d5dbb8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# CP2101 Makefile
-
-ifeq ("$(src)", "")
-       include Makefile.config
-       include Makefile$(KVER1)$(KVER2)
-else
-       include $(src)/Makefile.config
-       include $(src)/Makefile$(KVER1)$(KVER2)
-endif
-
diff --git a/Makefile.go b/Makefile.go
deleted file mode 100644 (file)
index 407680c..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# CP2101/CP2102/CP2103 USB to Serial Bridge Makefile
-#
-# (c) 2005-2006 Silicon Laboratories
-#
-# all       - builds the modules, same as modules
-# modules   - builds kernel module
-# install   - installs driver
-# clean     - removes all object code
-# distclean - remove everything resulting from building
-# mrproper  - remove emacs debris
-#
-
-OBJS = cp2101.o
-
-SRC = cp2102.c
-
-
-include ./Makefile.config
-
-KVER=$(KVER1).$(KVER2).$(KVER3)
-MODULE=cp2101$(EXT)
-MODULES_DIR=$(INSTALL_PREFIX)/lib/modules
-MODULES_VER_DIR=$(MODULES_DIR)/$(KVER)
-
-# Rules
-
-all:   modules
-
-clean:
-       rm -f *.o .*.o.flags
-       rm -f *.ko .*.o.cmd .*.ko.cmd *.mod.c
-       rm -rf .tmp_versions
-
-distclean: clean mrproper
-       rm -f Makefile.config
-
-install:
-       ./installmod $(MODULE) $(MODULES_VER_DIR) $(MODULES_DIR)
-
-mrproper:
-       rm -f *~
-       rm -f Makefile.bak
-
-modules:
-       make -C $(LINUX_KERNEL) SUBDIRS="`pwd`" modules
diff --git a/Makefile24 b/Makefile24
deleted file mode 100644 (file)
index 4a19ad3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-
-EXTRA_CFLAGS += -I$(LINUX_KERNEL)/drivers/usb/serial
-
-obj-m += cp2101.o
-
-include $(TOPDIR)/Rules.make
diff --git a/Makefile26 b/Makefile26
deleted file mode 100644 (file)
index 2456377..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# CP2101/CP2102/CP2103 2.6 makefile
-
-EXTRA_CFLAGS += -I$(LINUX_INCLUDE) -I$(LINUX_KERNEL)/drivers/usb/serial -DLINUX26
-
-obj-m := cp2101.o
-
-cp2101-objs := $(OBJS)
diff --git a/Modules.symvers b/Modules.symvers
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/README b/README
new file mode 100644 (file)
index 0000000..f2c583c
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+To make the cp2101 driver from this code base:
+
+For older kernels (2.6.15-2.6.17):
+
+./configure
+vi cp2101.c
+  replace #include "usb-serial.h" with
+  #include "/path/to/usb-serial.h"
+  The file is found in linux source; may have to download it
+make -f Makefile.go all
+sudo make -f Makefile.go install
+to test: sudo modprobe cp2101, or plug in a device
+
+For newer kernels (2.6.20 and up):
+
+./configure -kver `uname -r`
+make -f Makefile.go all
+chmod a+x installmod
+sudo make -f Makefile.go install
+to test: sudo modprobe cp2101, or plug in a device
diff --git a/README.txt b/README.txt
deleted file mode 100644 (file)
index f2c583c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-To make the cp2101 driver from this code base:
-
-For older kernels (2.6.15-2.6.17):
-
-./configure
-vi cp2101.c
-  replace #include "usb-serial.h" with
-  #include "/path/to/usb-serial.h"
-  The file is found in linux source; may have to download it
-make -f Makefile.go all
-sudo make -f Makefile.go install
-to test: sudo modprobe cp2101, or plug in a device
-
-For newer kernels (2.6.20 and up):
-
-./configure -kver `uname -r`
-make -f Makefile.go all
-chmod a+x installmod
-sudo make -f Makefile.go install
-to test: sudo modprobe cp2101, or plug in a device
diff --git a/Rules.make b/Rules.make
deleted file mode 100644 (file)
index c855f39..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*-makefile-*-
-#
-# This file is a helper make file that makes building easier. It is meant 
-# to be generic and is designed to be recycled by other drivers. The 
-# comments should be clear enough. It partly comes from Linux Makefile, 
-# and needs GNU make. 
-
-# TOPDIR is declared by the Makefile including this file.
-ifndef TOPDIR
-    TOPDIR = .
-endif
-
-# KERNELDIR can be speficied on the command line or environment
-#  this may assuems a symbolic link has been set to /usr/src/linux
-ifndef KERNELDIR
-    KERNELDIR = /usr/src/linux
-endif
-# The headers are taken from the kernel
-    INCLUDEDIR = $(KERNELDIR)/include
-
-# We need the configuration file, for CONFIG_SMP and possibly other stuff
-# (especiall for RISC platforms, where CFLAGS depends on the exact
-# processor being used).
-#ifeq ($(KERNELDIR)/.config,$(wildcard $(KERNELDIR))/.config)
-#   include $(KERNELDIR)/.config
-#else
-#   MESSAGE := $(shell echo "WARNING: no .config file in $(KERNELDIR)")
-#endif
-
-# ARCH can be speficed on the comdline or env. too, and defaults to this arch
-# Unfortunately, we can't easily extract if from kernel configuration
-# (well, we could look athe asm- symlink... don't know if worth the effort)
-ifndef ARCH
-  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-        -e s/arm.*/arm/ -e s/sa110/arm/)
-endif
-
-# This is useful if cross-compiling. Taken from kernel Makefile (CC changed)
-AS      =$(CROSS_COMPILE)as
-LD      =$(CROSS_COMPILE)ld
-CC      =$(CROSS_COMPILE)gcc
-CPP     =$(CC) -E
-AR      =$(CROSS_COMPILE)ar
-NM      =$(CROSS_COMPILE)nm
-STRIP   =$(CROSS_COMPILE)strip
-OBJCOPY =$(CROSS_COMPILE)objcopy
-OBJDUMP =$(CROSS_COMPILE)objdump
-
-# The platform-specific Makefiles include portability nightmares.
-# Some platforms, though, don't have one, so check for existence first
-ARCHMAKEFILE = $(TOPDIR)/Makefile.$(ARCH)
-ifeq ($(ARCHMAKEFILE),$(wildcard $(ARCHMAKEFILE)))
-  include $(ARCHMAKEFILE)
-endif
-
-# CFLAGS: all assignments to CFLAGS are inclremental, so you can specify
-# the initial flags on the command line or environment, if needed.
-
-    CFLAGS +=  -Wall -D__KERNEL__ -DMODULE -I$(INCLUDEDIR)
-
-ifdef CONFIG_SMP
-    CFLAGS += -D__SMP__ -DSMP
-endif
-
-# Prepend modversions.h if we're running with versioning.
-ifdef CONFIG_MODVERSIONS
-    CFLAGS += -DMODVERSIONS -include $(KERNELDIR)/include/linux/modversions.h
-endif
-
-#Install dir
-VERSIONFILE = $(INCLUDEDIR)/linux/version.h
-VERSION     = $(shell awk -F\" '/REL/ {print $$2}' $(VERSIONFILE))
-INSTALLDIR = /lib/modules/$(VERSION)/misc
diff --git a/configure b/configure
deleted file mode 100755 (executable)
index 1d20a18..0000000
--- a/configure
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-function usage()
-{
-    echo "Usage: $0 [option ...]"
-    echo ""
-    echo "Where 'option' can be one of the following:"
-    echo "  -kinc <path>                 Kernel header files."
-    echo "  -kpath <path>                Kernel sources."
-    echo "  -kver <version>              Kernel version."
-    echo "  -p <install folder>          Prefix for installing the kernel module."
-}
-
-this_dir=`pwd`
-
-ARCH=""
-TARGET="linux"
-LINUX_KERNEL="/lib/modules/`uname -r`/build"
-KVER=""
-LIBPATH=""
-INSTALL_PREFIX=""
-CONFIG_FILE="Makefile.config"
-
-
-while (($# > 0)) ; do
-    if [ "$1" == "-help" ] || [ "$1" == "-h" ] ; then
-        usage
-       exit 0   
-    elif [ "$1" == "-kinc" ] ; then
-       if [ "$2" == "" ] ; then
-           usage
-           exit 1
-       fi
-        LINUX_INCLUDE="$2"
-       shift 2
-    elif [ "$1" == "-kpath" ] ; then
-       if [ "$2" == "" ] ; then
-           usage
-           exit 1
-       fi
-        LINUX_KERNEL="$2"
-       shift 2
-    elif [ "$1" == "-kver" ] ; then
-       if [ "$2" == "" ] ; then
-           usage
-           exit 1
-       fi
-       KVER="$2"
-       shift 2
-    elif [ "$1" == "-p" ] ; then
-       if [ "$2" == "" ] ; then
-           usage
-           exit 1
-       fi
-        INSTALL_PREFIX="$2"
-       shift 2
-    else
-        echo "ERROR: Unknown option $1"
-        exit 1
-    fi
-done
-
-if [ "$LINUX_INCLUDE" == "" ] ; then
-    LINUX_INCLUDE="$LINUX_KERNEL/include"
-fi
-
-if [ ! -d "$LINUX_KERNEL" ] ; then
-       echo "ERROR: $LINUX_KERNEL was not found."
-       exit 1
-fi
-
-if [ ! -d "$LINUX_INCLUDE" ] ; then
-       echo "ERROR: $LINUX_INCLUDE was not found."
-       exit 1
-fi
-
-if [ "$KVER" == "" ] ; then
-    if [ -f "$LINUX_INCLUDE/linux/version.h" ] ; then
-       KVER=`grep UTS_RELEASE $LINUX_INCLUDE/linux/version.h | awk -- '{ if (FNR==1) { print $3 } }'`
-       KVER=`echo $KVER | sed -e 's/"//g'`
-    else
-       echo "ERROR: $LINUX_INCLUDE/linux/version.h was not found. Configured kernel?"
-       exit 1
-    fi
-fi
-
-KVER1=`echo $KVER | awk -F . -- '{ print $1 }'`
-KVER2=`echo $KVER | awk -F . -- '{ print $2 }'`
-KVER3=`echo $KVER | sed -e "s/$KVER1\\.$KVER2\\.//g"`
-
-case $KVER2 in
-    4)
-       makefile="Makefile24"
-       EXT=".o"
-       ;;
-    6)
-       makefile="Makefile26"
-       EXT=".ko"
-       ;;
-esac
-
-echo "Kernel version        : $KVER1.$KVER2.$KVER3"
-echo "Module extension      : $EXT"
-echo "Kernel directory      : $LINUX_KERNEL"
-echo "Include directory     : $LINUX_INCLUDE"
-echo "Module install prefix : $INSTALL_PREFIX"
-
-
-rm -f $CONFIG_FILE
-echo "# Makefile.config" >>$CONFIG_FILE
-echo "# Automatically generated" >>$CONFIG_FILE
-echo "KVER1=$KVER1" >>$CONFIG_FILE
-echo "KVER2=$KVER2" >>$CONFIG_FILE
-echo "KVER3=$KVER3" >>$CONFIG_FILE
-echo "EXT=$EXT" >>$CONFIG_FILE
-echo "LINUX_KERNEL=$LINUX_KERNEL" >>$CONFIG_FILE
-echo "LINUX_INCLUDE=$LINUX_INCLUDE" >>$CONFIG_FILE
-echo "INSTALL_PREFIX=$INSTALL_PREFIX" >>$CONFIG_FILE
diff --git a/cp2101.c b/cp2101.c
deleted file mode 100644 (file)
index 53dd422..0000000
--- a/cp2101.c
+++ /dev/null
@@ -1,1405 +0,0 @@
-/*
- * Silicon Laboratories CP2101/CP2102/CP2103 USB to RS232 serial adaptor driver
- *
- * Copyright (C) 2005 Craig Shelley (craig@microtron.org.uk)
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License version
- *     2 as published by the Free Software Foundation.
- *
- * Support to set flow control line levels using TIOCMGET and TIOCMSET
- * thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
- * control thanks to Munir Nassar nassarmu@real-time.com
- *
- * Port configuration, usb descriptor and gpio management by R. Steve McKown
- * (smckown@titaniummirror.com).
- *
- * Outstanding Issues:
- *  Buffers are not flushed when the port is opened.
- *  Multiple calls to write() may fail with "Resource temporarily unavailable"
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/tty.h>
-#include <linux/tty_flip.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/version.h>
-#include <asm/uaccess.h>
-#include <linux/byteorder/generic.h>
-
-#ifndef KERNEL_VERSION
-#define KERNEL_VERSION(a,b,c) ((a)*65536 + (b)*256 + (c))
-#endif
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-#ifdef LINUX26
-#undef LINUX26
-#endif
-#define LINUX26
-#endif
-
-#ifdef LINUX26
-
-#include <linux/moduleparam.h>
-#include <linux/usb/serial.h>
-#define DEV_ERR(dev,format,arg...) dev_err(dev,format, ## arg)
-#define USB_KILL_URB usb_kill_urb
-
-#else /* !LINUX26 */
-
-#include <linux/config.h>
-#include "usb-serial.h"
-
-#ifdef CONFIG_USB_SERIAL_DEBUG
-       static int debug = 1;
-#else
-       static int debug;
-#endif
-
-#define DEV_ERR(dev,format,arg...)  err(format, ## arg)
-#define USB_KILL_URB  usb_unlink_urb
-
-#endif /* LINUX26 */
-
-/*
- * Version Information
- * RJM: updated to 0.11 for 2.6.15 and later kernels
- */
-#define DRIVER_VERSION "v0.11rsm"
-#define DRIVER_DESC "Silicon Labs CP2101/CP2102/CP2103 RS232 serial adaptor driver"
-
-/*
- * Function Prototypes
- */
-static int     cp2101_open(struct usb_serial_port*, struct file*);
-static void cp2101_cleanup(struct usb_serial_port*);
-static void cp2101_close(struct usb_serial_port*, struct file*);
-static void cp2101_get_termios(struct usb_serial_port*);
-static void cp2101_set_termios(struct usb_serial_port*, struct termios*);
-static void cp2101_break_ctl(struct usb_serial_port*, int);
-static int     cp2101_startup (struct usb_serial *);
-static void cp2101_shutdown(struct usb_serial*);
-static int  cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg);
-static int     cp2101_tiocmget (struct usb_serial_port *, struct file *);
-static int     cp2101_tiocmset (struct usb_serial_port *, struct file *, unsigned int, unsigned int);
-
-static int debug;
-
-static struct usb_device_id id_table [] = {
-       { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
-       { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
-       { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
-       { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */
-       { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */
-       { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
-       { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
-       { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
-       { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
-       { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
-       { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
-       { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
-       { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
-       { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
-       { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */
-       { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
-       { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
-       { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
-       { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
-       { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
-       { } /* Terminating Entry */
-};
-
-MODULE_DEVICE_TABLE (usb, id_table);
-
-#ifdef LINUX26
-static struct usb_driver cp2101_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-       .owner          = THIS_MODULE,
-#endif
-       .name           = "CP2101",
-       .probe          = usb_serial_probe,
-       .disconnect     = usb_serial_disconnect,
-       .id_table       = id_table,
-};
-#define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_ , GFP_ATOMIC)
-#define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_ , GFP_KERNEL)
-
-#else  /* LINUX26 */
-
-#define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_)
-#define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_)
-#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-static struct usb_serial_driver cp2101_device = {
-       .driver = {
-               .owner =        THIS_MODULE,
-               .name =         "cp2101",
-       },
-#else
-static struct usb_serial_device_type cp2101_device = {
-       .owner                          = THIS_MODULE,
-       .name                           = "CP2101/CP2102/CP2103 USB to UART Bridge",
-#endif
-       .id_table                       = id_table,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-       .num_interrupt_in       = 0,
-       .num_bulk_in            = 0,
-       .num_bulk_out           = 0,
-#else
-       .num_interrupt_in       = NUM_DONT_CARE,
-       .num_bulk_in            = NUM_DONT_CARE,
-       .num_bulk_out           = NUM_DONT_CARE,
-#endif
-       .num_ports                      = 1,
-       .open                           = cp2101_open,
-       .close                          = cp2101_close,
-       .ioctl                          = cp2101_ioctl,     /* GLA, Added backport */
-       .break_ctl                      = cp2101_break_ctl,
-       .set_termios                    = cp2101_set_termios,
-#ifdef LINUX26
-       .tiocmget                       = cp2101_tiocmget,
-       .tiocmset                       = cp2101_tiocmset,
-       .attach                         = cp2101_startup,
-#else
-       .startup                        = cp2101_startup,
-#endif
-       .shutdown                       = cp2101_shutdown
-};
-
-/* Config request types */
-#define REQTYPE_HOST_TO_DEVICE 0x41
-#define REQTYPE_DEVICE_TO_HOST 0xc1
-
-/* Config SET requests. To GET, add 1 to the request number */
-#define CP2101_UART                    0x00    /* Enable / Disable */
-#define CP2101_BAUDRATE                        0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
-#define CP2101_BITS                            0x03    /* 0x(0)(databits)(parity)(stopbits) */
-#define CP2101_BREAK                   0x05    /* On / Off */
-#define CP2101_CONTROL                 0x07    /* Flow control line states */
-#define CP2101_MODEMCTL                        0x13    /* Modem controls */
-#define CP2101_CONFIG_6                        0x19    /* 6 bytes of config data ??? */
-
-/* CP2101_UART */
-#define UART_ENABLE                            0x0001
-#define UART_DISABLE                   0x0000
-
-/* CP2101_BAUDRATE */
-#define BAUD_RATE_GEN_FREQ             0x384000
-
-/* CP2101_BITS */
-#define BITS_DATA_MASK                 0x0f00
-#define BITS_DATA_5                            0x0500
-#define BITS_DATA_6                            0x0600
-#define BITS_DATA_7                            0x0700
-#define BITS_DATA_8                            0x0800
-#define BITS_DATA_9                            0x0900
-
-#define BITS_PARITY_MASK               0x00f0
-#define BITS_PARITY_NONE               0x0000
-#define BITS_PARITY_ODD                        0x0010
-#define BITS_PARITY_EVEN               0x0020
-#define BITS_PARITY_MARK               0x0030
-#define BITS_PARITY_SPACE              0x0040
-
-#define BITS_STOP_MASK             0x000f
-#define BITS_STOP_1                    0x0000
-#define BITS_STOP_1_5              0x0001
-#define BITS_STOP_2                    0x0002
-
-/* CP2101_BREAK */
-#define BREAK_ON                       0x0000
-#define BREAK_OFF                      0x0001
-
-/* CP2101_CONTROL */
-#define CONTROL_DTR                    0x0001
-#define CONTROL_RTS                    0x0002
-#define CONTROL_CTS                    0x0010
-#define CONTROL_DSR                    0x0020
-#define CONTROL_RING               0x0040
-#define CONTROL_DCD                    0x0080
-#define CONTROL_WRITE_DTR          0x0100
-#define CONTROL_WRITE_RTS          0x0200
-
-/* CP2103 ioctls */
-#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
-#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
-#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
-#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
-
-/* CP210x ioctls principally used during initial device configuration */
-#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
-#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
-#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
-#define IOCTL_SETVID           0x8007  /* Set vendor id */
-#define IOCTL_SETPID           0x8008  /* Set product id */
-#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
-#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
-#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
-#define IOCTL_SETDEVVER                0x800c  /* set device version id */
-/* FIXME: where is IOCTL_SETMFG? */
-
-/* CP2103 GPIO */
-#define GPIO_0         0x01
-#define GPIO_1         0x02
-#define GPIO_2         0x04
-#define GPIO_3         0x08
-#define GPIO_MASK      (GPIO_0|GPIO_1|GPIO_2|GPIO_3)
-
-/* GetDeviceVersion() return codes */
-#define                CP210x_CP2101_VERSION                           0x01
-#define                CP210x_CP2102_VERSION                           0x02
-#define                CP210x_CP2103_VERSION                           0x03
-                                                                                       
-/* Return codes */
-#define                CP210x_SUCCESS                                          0x00
-#define                CP210x_DEVICE_NOT_FOUND                         0xFF
-#define                CP210x_INVALID_HANDLE                           0x01
-#define                CP210x_INVALID_PARAMETER                        0x02
-#define                CP210x_DEVICE_IO_FAILED                         0x03
-#define                CP210x_FUNCTION_NOT_SUPPORTED           0x04
-#define                CP210x_GLOBAL_DATA_ERROR                        0x05
-#define                CP210x_FILE_ERROR                                       0x06
-#define                CP210x_COMMAND_FAILED                           0x08
-#define                CP210x_INVALID_ACCESS_TYPE                      0x09
-
-/* USB descriptor sizes */
-#define                CP210x_MAX_DEVICE_STRLEN                        256
-#define                CP210x_MAX_PRODUCT_STRLEN                       126
-#define                CP210x_MAX_SERIAL_STRLEN                        63
-#define                CP210x_MAX_MAXPOWER                                     250
-
-/* Used to pass variable sized buffers between user and kernel space (ioctls) */
-typedef struct {
-       char* buf;
-       size_t len;
-} cp2101_buffer_t;
-
-/* Port config definitions */
-typedef struct {
-    uint16_t mode;             /* Push-pull = 1, Open-drain = 0 */
-    uint16_t lowPower;
-    uint16_t latch;            /* Logic high = 1, Logic low = 0 */
-} cp2101_port_state_t;
-
-typedef struct {
-    cp2101_port_state_t reset;
-    cp2101_port_state_t suspend;
-    uint8_t enhancedFxn;
-} cp2101_port_config_t;
-
-#define PORT_CONFIG_LEN        13      /* Because sizeof() will pad to full words */
-
-
-/*
- * cp2101_buf_from_user
- * Copy a buffer from user space, returning the number of bytes copied
- * from ubuf.buf into kbuf.  klen is the size of the buffer at kbuf.
- */
-size_t copy_buf_from_user(char* kbuf, unsigned long ubuf, size_t klen)
-{
-    cp2101_buffer_t t;
-
-       if (!kbuf || !ubuf || !klen || copy_from_user(&t, (cp2101_buffer_t *)ubuf,
-                       sizeof(t)))
-               return 0;
-       if (t.len < klen)
-               klen = t.len;
-       if (!t.buf || !t.len || copy_from_user(kbuf, t.buf, klen))
-               return 0;
-       return klen;
-}
-
-/*
- * cp2101_get_config
- * Reads from the CP2101 configuration registers
- * 'size' is specified in bytes.
- * 'data' is a pointer to a pre-allocated array of integers large
- * enough to hold 'size' bytes (with 4 bytes to each integer)
- */
-static int cp2101_get_config(struct usb_serial_port* port, u8 request,
-               unsigned int *data, int size)
-{
-       struct usb_serial *serial = port->serial;
-       u32 *buf;
-       int result, i, length;
-
-       /* Number of integers required to contain the array */
-       length = (((size - 1) | 3) + 1)/4;
-
-       buf = kmalloc (length * sizeof(u32), GFP_KERNEL);
-       memset(buf, 0, length * sizeof(u32));
-
-       if (!buf) {
-               DEV_ERR(&port->dev,"%s - out of memory.\n", __FUNCTION__);
-               return -ENOMEM;
-       }
-
-       /* For get requests, the request number must be incremented */
-       request++;
-
-       /* Issue the request, attempting to read 'size' bytes */
-       result = usb_control_msg (
-                    serial->dev,
-                    usb_rcvctrlpipe (serial->dev, 0),
-                                   request, 
-                    REQTYPE_DEVICE_TO_HOST, 
-                    0x0000,
-                                   0, 
-                    buf, 
-                    size, 
-                    300);
-
-       /* Convert data into an array of integers */
-       for (i=0; i<length; i++) data[i] = le32_to_cpu(buf[i]);
-
-       kfree(buf);
-
-       if (result != size) {
-               DEV_ERR(&port->dev,"%s - Unable to send config request, "
-                               "request=0x%x size=%d result=%d\n",
-                               __FUNCTION__, request, size, result);
-               return -EPROTO;
-       }
-
-       return 0;
-}
-
-/*
- * cp2101_set_config
- * Writes to the CP2101 configuration registers
- * Values less than 16 bits wide are sent directly
- * 'size' is specified in bytes.
- */
-static int cp2101_set_config(struct usb_serial_port* port, u8 request,
-               unsigned int *data, int size)
-{
-       struct usb_serial *serial = port->serial;
-       u32 *buf;
-       int result, i, length;
-
-       /* Number of integers required to contain the array */
-       length = (((size - 1) | 3) + 1)/4;
-
-       buf = kmalloc(length * sizeof(u32), GFP_KERNEL);
-       if (!buf) {
-               DEV_ERR(&port->dev,"%s - out of memory.\n",
-                               __FUNCTION__);
-               return -ENOMEM;
-       }
-
-       /* Array of integers into bytes */
-       for (i = 0; i < length; i++) buf[i] = cpu_to_le32(data[i]);
-
-       if (size > 2) {
-               result = usb_control_msg (
-                    serial->dev,
-                                   usb_sndctrlpipe(serial->dev, 0),
-                                   request, 
-                    REQTYPE_HOST_TO_DEVICE, 
-                    0x0000,
-                                   0, 
-                    buf, 
-                    size, 
-                    300);
-       } else {
-               result = usb_control_msg (
-                    serial->dev,
-                                   usb_sndctrlpipe(serial->dev, 0),
-                                   request, 
-                    REQTYPE_HOST_TO_DEVICE, 
-                    data[0],
-                                   0, 
-                    NULL, 
-                    0, 
-                    300);
-       }
-
-       kfree(buf);
-
-       if ((size > 2 && result != size) || result < 0) {
-               DEV_ERR(&port->dev,"%s - Unable to send request, "
-                               "request=0x%x size=%d result=%d\n",
-                               __FUNCTION__, request, size, result);
-               return -EPROTO;
-       }
-
-       /* Single data value */
-       result = usb_control_msg (
-                serial->dev,
-                           usb_sndctrlpipe(serial->dev, 0),
-                           request,
-                REQTYPE_HOST_TO_DEVICE, 
-                data[0],
-                           0, 
-                NULL, 
-                0, 
-                300);
-       return 0;
-}
-
-/*
- * cp2101_set_config_single
- * Convenience function for calling cp2101_set_config on single data values
- * without requiring an integer pointer
- */
-static inline int cp2101_set_config_single(struct usb_serial_port* port,
-               u8 request, unsigned int data)
-{
-       return cp2101_set_config(port, request, &data, 2);
-}
-
-/*
- * cp2101_ctlmsg
- * A generic usb control message interface.
- * Returns the actual size of the data read or written within the message, 0
- * if no data were read or written, or a negative value to indicate an error.
- */
-static int cp2101_ctlmsg(struct usb_serial_port* port, u8 request,
-               u8 requestype, u16 value, u16 index, void* data, u16 size)
-{
-       struct usb_device *dev = port->serial->dev;
-       u8 *tbuf;
-       int ret;
-
-       if (!(tbuf = kmalloc(size, GFP_KERNEL)))
-               return -ENOMEM;
-       if (requestype & 0x80) {
-               ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
-                               requestype, value, index, tbuf, size, 300);
-               if (ret > 0 && size)
-                       memcpy(data, tbuf, size);
-       } else {
-               if (size)
-                       memcpy(tbuf, data, size);
-               ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), request,
-                               requestype, value, index, tbuf, size, 300);
-       }
-       kfree(tbuf);
-       if (ret < 0 && ret != -EPIPE) {
-               dev_printk(KERN_DEBUG, &dev->dev, "cp2101: control failed cmd rqt %u "
-                               "rq %u len %u ret %d\n", requestype, request, size, ret);
-       }
-       return ret;
-}
-
-static int cp2101_reset(struct usb_serial_port *port)
-{
-       dbg("%s", __FUNCTION__);
-
-#if 1
-    /* Is this better than usb_device_reset?  It may be.  Once a client issues
-        * the reset ioctl, it must disconnect and reconnect, since the USB
-        * connections are torn down.  We also ignore the error return, since the
-        * part resets and doesn't send one...
-        */
-       cp2101_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, 0, 0);
-#else
-       usb_reset_device(port->serial->dev);
-#endif
-       return 0;
-}
-
-static int cp2101_get_partnum(struct usb_serial_port *port)
-{
-       static u8 _partnum = 0;
-       int ret = CP210x_SUCCESS;
-       if (!_partnum) {
-               u8 addr = port->serial->dev->actconfig->interface[0]->cur_altsetting->
-                       endpoint[0].desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
-
-               if (addr == 0x03 || addr == 0x02) /* The part is a cp2101 */
-                       _partnum = 0x01;
-               else if (addr == 0x01) /* Must query part to determine part number */
-                       ret = (cp2101_ctlmsg(port, 0xff, 0xc0, 0x370b, 0x00, &_partnum, 1)
-                                       == 1) ? CP210x_SUCCESS : CP210x_DEVICE_IO_FAILED;
-               else
-                       ret = CP210x_DEVICE_IO_FAILED;
-       }
-       dbg("%s - partnum %u err %d", __FUNCTION__, _partnum, ret);
-       return (ret == CP210x_SUCCESS) ? _partnum : 0;
-}
-
-inline int cp2101_setu16(struct usb_serial_port *port, int cmd,
-               unsigned int value)
-{
-       return cp2101_ctlmsg(port, 0xff, 0x40, 3700 | (cmd & 0xff), value, 0, 0);
-}
-
-/* Populates usbstr with: (len) + (0x03) + unicode(str).  Each char in str
- * takes up two bytes in unicode format, so the resulting len(usbstr) is
- * 2 * len(str) + 2.
- * Returns the resulting length of the string in usbstr.
- * This function can accept overlapping usbstr and str as long as the overlap
- * does not cause data written to usbstr to overwrite data not yet read from
- * str.
- */
-static int make_usb_string(char* usbstr, size_t usblen, char* src,
-               size_t srclen)
-{
-       int len = 0;
-
-       if (usbstr && usblen >= 2 && src && *src && srclen) {
-               char* p;
-
-               /* The usb string format uses a single byte to represent length */
-               if (usblen > 256)
-                       usblen = 256;
-
-               p = usbstr + 1;
-               *p++ = 0x03;
-               len = 2;
-               while (srclen && len < usblen) {
-                       *p++ = *src++;
-                       *p++ = 0;
-                       len += 2;
-                       srclen--;
-               }
-               *usbstr = (char)len;
-       }
-       return len;
-}
-
-/*
- * cp2101_setstr
- *
- * Set a USB string descriptor using proprietary cp210x control messages.
- * Return the number of characters actually written.
- */
-inline int cp2101_setstr(struct usb_serial_port *port, int cmd, char *usbstr)
-{
-       unsigned len = usbstr[0];
-       int ret = cp2101_ctlmsg(port, 0xff, 0x40, 0x3700 | (cmd & 0xff), 0, usbstr,
-                       len);
-       dbg("%s - cmd 0x%02x len %d ret %d", __FUNCTION__, cmd, len, ret);
-       return ret;
-}
-
-static int cp2101_open (struct usb_serial_port *port, struct file *filp)
-{
-       struct usb_serial *serial = port->serial;
-       int result;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if (cp2101_set_config_single(port, CP2101_UART, UART_ENABLE)) {
-               DEV_ERR(&port->dev, "%s - Unable to enable UART\n",
-                               __FUNCTION__);
-               return -EPROTO;
-       }
-
-       /* Start reading from the device */
-       usb_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,
-                       serial->type->read_bulk_callback,
-                       port);
-       result = USB_SUBMIT_URB_KERNEL(port->read_urb);
-       if (result) {
-               DEV_ERR(&port->dev, "%s - failed resubmitting read urb, "
-                               "error %d\n", __FUNCTION__, result);
-               return result;
-       }
-
-       /* Configure the termios structure */
-       cp2101_get_termios(port);
-
-       /* Set the DTR and RTS pins low */
-       cp2101_tiocmset(port, NULL, TIOCM_DTR | TIOCM_RTS, 0);
-
-       return 0;
-}
-
-static void cp2101_cleanup (struct usb_serial_port *port)
-{
-       struct usb_serial *serial = port->serial;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if (serial != NULL && serial->dev) {
-               /* shutdown any bulk reads that might be going on */
-               if (serial->num_bulk_out)
-                       USB_KILL_URB(port->write_urb);
-               if (serial->num_bulk_in)
-                       USB_KILL_URB(port->read_urb);
-       }
-
-#ifdef LINUX26
-       kfree (usb_get_serial_port_data(port));
-       usb_set_serial_port_data(port, NULL);
-#else
-       /*TODOGLA: port.private maybe?
-         Nobody is using that at the moement in this driver*/
-#endif
-
-}
-
-static void cp2101_close (struct usb_serial_port *port, struct file * filp)
-{
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       /* shutdown our urbs */
-       dbg("%s - shutting down urbs", __FUNCTION__);
-       USB_KILL_URB(port->write_urb);
-       USB_KILL_URB(port->read_urb);
-
-       cp2101_set_config_single(port, CP2101_UART, UART_DISABLE);
-}
-
-/*
- * cp2101_get_termios
- * Reads the baud rate, data bits, parity, stop bits and flow control mode
- * from the device, corrects any unsupported values, and configures the
- * termios structure to reflect the state of the device
- */
-static void cp2101_get_termios (struct usb_serial_port *port)
-{
-       unsigned int cflag, modem_ctl[4];
-       int baud;
-       int bits;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if ((!port->tty) || (!port->tty->termios)) {
-               dbg("%s - no tty structures", __FUNCTION__);
-               return;
-       }
-       cflag = port->tty->termios->c_cflag;
-
-       cp2101_get_config(port, CP2101_BAUDRATE, &baud, 2);
-       /* Convert to baudrate */
-       if (baud)
-               baud = BAUD_RATE_GEN_FREQ / baud;
-
-       dbg("%s - baud rate = %d", __FUNCTION__, baud);
-       cflag &= ~CBAUD;
-       switch (baud) {
-               /*
-                * The baud rates which are commented out below
-                * appear to be supported by the device
-                * but are non-standard
-                */
-               case 600:       cflag |= B600;          break;
-               case 1200:      cflag |= B1200;         break;
-               case 1800:      cflag |= B1800;         break;
-               case 2400:      cflag |= B2400;         break;
-               case 4800:      cflag |= B4800;         break;
-               /*case 7200:    cflag |= B7200;         break;*/
-               case 9600:      cflag |= B9600;         break;
-               /*case 14400:   cflag |= B14400;        break;*/
-               case 19200:     cflag |= B19200;        break;
-               /*case 28800:   cflag |= B28800;        break;*/
-               case 38400:     cflag |= B38400;        break;
-               /*case 55854:   cflag |= B55054;        break;*/
-               case 57600:     cflag |= B57600;        break;
-               case 115200:    cflag |= B115200;       break;
-               /*case 127117:  cflag |= B127117;       break;*/
-               case 230400:    cflag |= B230400;       break;
-               case 460800:    cflag |= B460800;       break;
-               case 921600:    cflag |= B921600;       break;
-               /*case 3686400: cflag |= B3686400;      break;*/
-               default:
-                       dbg("%s - Baud rate is not supported, "
-                                       "using 9600 baud", __FUNCTION__);
-                       cflag |= B9600;
-                       cp2101_set_config_single(port, CP2101_BAUDRATE,
-                                       (BAUD_RATE_GEN_FREQ/9600));
-                       break;
-       }
-
-       cp2101_get_config(port, CP2101_BITS, &bits, 2);
-       cflag &= ~CSIZE;
-       switch(bits & BITS_DATA_MASK) {
-               case BITS_DATA_5:
-                       dbg("%s - data bits = 5", __FUNCTION__);
-                       cflag |= CS5;
-                       break;
-               case BITS_DATA_6:
-                       dbg("%s - data bits = 6", __FUNCTION__);
-                       cflag |= CS6;
-                       break;
-               case BITS_DATA_7:
-                       dbg("%s - data bits = 7", __FUNCTION__);
-                       cflag |= CS7;
-                       break;
-               case BITS_DATA_8:
-                       dbg("%s - data bits = 8", __FUNCTION__);
-                       cflag |= CS8;
-                       break;
-               case BITS_DATA_9:
-                       dbg("%s - data bits = 9 (not supported, "
-                                       "using 8 data bits)", __FUNCTION__);
-                       cflag |= CS8;
-                       bits &= ~BITS_DATA_MASK;
-                       bits |= BITS_DATA_8;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-               default:
-                       dbg("%s - Unknown number of data bits, "
-                                       "using 8", __FUNCTION__);
-                       cflag |= CS8;
-                       bits &= ~BITS_DATA_MASK;
-                       bits |= BITS_DATA_8;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-       }
-
-       switch(bits & BITS_PARITY_MASK) {
-               case BITS_PARITY_NONE:
-                       dbg("%s - parity = NONE", __FUNCTION__);
-                       cflag &= ~PARENB;
-                       break;
-               case BITS_PARITY_ODD:
-                       dbg("%s - parity = ODD", __FUNCTION__);
-                       cflag |= (PARENB|PARODD);
-                       break;
-               case BITS_PARITY_EVEN:
-                       dbg("%s - parity = EVEN", __FUNCTION__);
-                       cflag &= ~PARODD;
-                       cflag |= PARENB;
-                       break;
-               case BITS_PARITY_MARK:
-                       dbg("%s - parity = MARK (not supported, "
-                                       "disabling parity)", __FUNCTION__);
-                       cflag &= ~PARENB;
-                       bits &= ~BITS_PARITY_MASK;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-               case BITS_PARITY_SPACE:
-                       dbg("%s - parity = SPACE (not supported, "
-                                       "disabling parity)", __FUNCTION__);
-                       cflag &= ~PARENB;
-                       bits &= ~BITS_PARITY_MASK;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-               default:
-                       dbg("%s - Unknown parity mode, "
-                                       "disabling parity", __FUNCTION__);
-                       cflag &= ~PARENB;
-                       bits &= ~BITS_PARITY_MASK;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-       }
-
-       cflag &= ~CSTOPB;
-       switch(bits & BITS_STOP_MASK) {
-               case BITS_STOP_1:
-                       dbg("%s - stop bits = 1", __FUNCTION__);
-                       break;
-               case BITS_STOP_1_5:
-                       dbg("%s - stop bits = 1.5 (not supported, "
-                                       "using 1 stop bit)", __FUNCTION__);
-                       bits &= ~BITS_STOP_MASK;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-               case BITS_STOP_2:
-                       dbg("%s - stop bits = 2", __FUNCTION__);
-                       cflag |= CSTOPB;
-                       break;
-               default:
-                       dbg("%s - Unknown number of stop bits, "
-                                       "using 1 stop bit", __FUNCTION__);
-                       bits &= ~BITS_STOP_MASK;
-                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
-                       break;
-       }
-
-       cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
-       if (modem_ctl[0] & 0x0008) {
-               dbg("%s - flow control = CRTSCTS", __FUNCTION__);
-               cflag |= CRTSCTS;
-       } else {
-               dbg("%s - flow control = NONE", __FUNCTION__);
-               cflag &= ~CRTSCTS;
-       }
-
-       port->tty->termios->c_cflag = cflag;
-}
-
-static void cp2101_set_termios (struct usb_serial_port *port,
-               struct termios *old_termios)
-{
-       unsigned int cflag, old_cflag=0;
-       int baud=0, bits;
-       unsigned int modem_ctl[4];
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if ((!port->tty) || (!port->tty->termios)) {
-               dbg("%s - no tty structures", __FUNCTION__);
-               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("%s - nothing to change...", __FUNCTION__);
-                       return;
-               }
-
-               old_cflag = old_termios->c_cflag;
-       }
-
-       /* If the baud rate is to be updated*/
-       if ((cflag & CBAUD) != (old_cflag & CBAUD)) {
-               switch (cflag & CBAUD) {
-                       /*
-                        * The baud rates which are commented out below
-                        * appear to be supported by the device
-                        * but are non-standard
-                        */
-                       case B0:        baud = 0;       break;
-                       case B600:      baud = 600;     break;
-                       case B1200:     baud = 1200;    break;
-                       case B1800:     baud = 1800;    break;
-                       case B2400:     baud = 2400;    break;
-                       case B4800:     baud = 4800;    break;
-                       /*case B7200:   baud = 7200;    break;*/
-                       case B9600:     baud = 9600;    break;
-                       /*ase B14400:   baud = 14400;   break;*/
-                       case B19200:    baud = 19200;   break;
-                       /*case B28800:  baud = 28800;   break;*/
-                       case B38400:    baud = 38400;   break;
-                       /*case B55854:  baud = 55054;   break;*/
-                       case B57600:    baud = 57600;   break;
-                       case B115200:   baud = 115200;  break;
-                       /*case B127117: baud = 127117;  break;*/
-                       case B230400:   baud = 230400;  break;
-                       case B460800:   baud = 460800;  break;
-                       case B921600:   baud = 921600;  break;
-                       /*case B3686400:        baud = 3686400; break;*/
-                       default:
-                               DEV_ERR(&port->dev, "cp2101 driver does not "
-                                       "support the baudrate requested\n");
-                               break;
-               }
-
-               if (baud) {
-                       dbg("%s - Setting baud rate to %d baud", __FUNCTION__,
-                                       baud);
-                       if (cp2101_set_config_single(port, CP2101_BAUDRATE,
-                                               (BAUD_RATE_GEN_FREQ / baud)))
-                               DEV_ERR(&port->dev, "Baud rate requested not "
-                                               "supported by device\n");
-               }
-       }
-
-       /* If the number of data bits is to be updated */
-       if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
-               cp2101_get_config(port, CP2101_BITS, &bits, 2);
-               bits &= ~BITS_DATA_MASK;
-               switch (cflag & CSIZE) {
-                       case CS5:
-                               bits |= BITS_DATA_5;
-                               dbg("%s - data bits = 5", __FUNCTION__);
-                               break;
-                       case CS6:
-                               bits |= BITS_DATA_6;
-                               dbg("%s - data bits = 6", __FUNCTION__);
-                               break;
-                       case CS7:
-                               bits |= BITS_DATA_7;
-                               dbg("%s - data bits = 7", __FUNCTION__);
-                               break;
-                       case CS8:
-                               bits |= BITS_DATA_8;
-                               dbg("%s - data bits = 8", __FUNCTION__);
-                               break;
-                       /*case CS9:
-                               bits |= BITS_DATA_9;
-                               dbg("%s - data bits = 9", __FUNCTION__);
-                               break;*/
-                       default:
-                               DEV_ERR(&port->dev, "cp2101 driver does not "
-                                       "support the number of bits requested,"
-                                       " using 8 bit mode\n");
-                               bits |= BITS_DATA_8;
-                               break;
-               }
-               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
-                       DEV_ERR(&port->dev,"Number of data bits requested "
-                                       "not supported by device\n");
-       }
-
-       if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) {
-               cp2101_get_config(port, CP2101_BITS, &bits, 2);
-               bits &= ~BITS_PARITY_MASK;
-               if (cflag & PARENB) {
-                       if (cflag & PARODD) {
-                               bits |= BITS_PARITY_ODD;
-                               dbg("%s - parity = ODD", __FUNCTION__);
-                       } else {
-                               bits |= BITS_PARITY_EVEN;
-                               dbg("%s - parity = EVEN", __FUNCTION__);
-                       }
-               }
-               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
-                       DEV_ERR(&port->dev,"Parity mode not supported "
-                                       "by device\n");
-       }
-
-       if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) {
-               cp2101_get_config(port, CP2101_BITS, &bits, 2);
-               bits &= ~BITS_STOP_MASK;
-               if (cflag & CSTOPB) {
-                       bits |= BITS_STOP_2;
-                       dbg("%s - stop bits = 2", __FUNCTION__);
-               } else {
-                       bits |= BITS_STOP_1;
-                       dbg("%s - stop bits = 1", __FUNCTION__);
-               }
-               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
-                       DEV_ERR(&port->dev,"Number of stop bits requested "
-                                       "not supported by device\n");
-       }
-
-       if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) {
-               cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
-               dbg("%s - read modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
-                               __FUNCTION__, modem_ctl[0], modem_ctl[1],
-                               modem_ctl[2], modem_ctl[3]);
-
-               if (cflag & CRTSCTS) {
-                       modem_ctl[0] &= ~0x7B;
-                       modem_ctl[0] |= 0x09;
-                       modem_ctl[1] = 0x80;
-                       dbg("%s - flow control = CRTSCTS", __FUNCTION__);
-               } else {
-                       modem_ctl[0] &= ~0x7B;
-                       modem_ctl[0] |= 0x01;
-                       modem_ctl[1] |= 0x40;
-                       dbg("%s - flow control = NONE", __FUNCTION__);
-               }
-
-               dbg("%s - write modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
-                               __FUNCTION__, modem_ctl[0], modem_ctl[1],
-                               modem_ctl[2], modem_ctl[3]);
-               cp2101_set_config(port, CP2101_MODEMCTL, modem_ctl, 16);
-       }
-
-}
-
-static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file,
-               unsigned int set, unsigned int clear)
-{
-       int control = 0;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if (set & TIOCM_RTS) {
-               control |= CONTROL_RTS;
-               control |= CONTROL_WRITE_RTS;
-       }
-       if (set & TIOCM_DTR) {
-               control |= CONTROL_DTR;
-               control |= CONTROL_WRITE_DTR;
-       }
-       if (clear & TIOCM_RTS) {
-               control &= ~CONTROL_RTS;
-               control |= CONTROL_WRITE_RTS;
-       }
-       if (clear & TIOCM_DTR) {
-               control &= ~CONTROL_DTR;
-               control |= CONTROL_WRITE_DTR;
-       }
-
-       dbg("%s - control = 0x%.4x", __FUNCTION__, control);
-
-       return cp2101_set_config(port, CP2101_CONTROL, &control, 2);
-
-}
-
-static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file)
-{
-       int control, result;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       cp2101_get_config(port, CP2101_CONTROL, &control, 1);
-
-       result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0)
-               |((control & CONTROL_RTS) ? TIOCM_RTS : 0)
-               |((control & CONTROL_CTS) ? TIOCM_CTS : 0)
-               |((control & CONTROL_DSR) ? TIOCM_DSR : 0)
-               |((control & CONTROL_RING)? TIOCM_RI  : 0)
-               |((control & CONTROL_DCD) ? TIOCM_CD  : 0);
-
-       dbg("%s - control = 0x%.2x", __FUNCTION__, control);
-
-       return result;
-}
-
-static void cp2101_break_ctl (struct usb_serial_port *port, int break_state)
-{
-       int state;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-       if (break_state == 0)
-               state = BREAK_OFF;
-       else
-               state = BREAK_ON;
-       dbg("%s - turning break %s", __FUNCTION__,
-                       state==BREAK_OFF ? "off" : "on");
-       cp2101_set_config(port, CP2101_BREAK, &state, 2);
-}
-
-/* Set all gpio simultaneously */
-static int cp2101_gpioset(struct usb_serial_port *port, u8 gpio)
-{
-       dbg("%s - port %d, gpio = 0x%.2x", __FUNCTION__, port->number, gpio);
-
-    return cp2101_ctlmsg(port, 0xff, 0x40, 0x37e1,
-                       ((uint16_t)gpio << 8) | GPIO_MASK, 0, 0);
-}
-
-/* Set select gpio bits */
-static int cp2101_gpiosetb(struct usb_serial_port *port, u8 set, u8 clear)
-{
-       u16 gpio = 0;
-
-       /* The bitmask is in the LSB, the values in the MSB */
-       if (set & GPIO_0)
-               gpio |= (GPIO_0 << 8)|GPIO_0;
-       if (set & GPIO_1)
-               gpio |= (GPIO_1 << 8)|GPIO_1;
-       if (set & GPIO_2)
-               gpio |= (GPIO_2 << 8)|GPIO_2;
-       if (set & GPIO_3)
-               gpio |= (GPIO_3 << 8)|GPIO_3;
-       if (clear & GPIO_0)
-               gpio = (gpio & ~(GPIO_0 << 8))|GPIO_0;
-       if (clear & GPIO_1)
-               gpio = (gpio & ~(GPIO_1 << 8))|GPIO_1;
-       if (clear & GPIO_2)
-               gpio = (gpio & ~(GPIO_2 << 8))|GPIO_2;
-       if (clear & GPIO_3)
-               gpio = (gpio & ~(GPIO_3 << 8))|GPIO_3;
-
-       dbg("%s - port %d, gpiob = 0x%.4x", __FUNCTION__, port->number, gpio);
-
-       /* FIXME: how about REQTYPE_HOST_TO_DEVICE instead of 0x40? */
-    return cp2101_ctlmsg(port, 0xff, 0x40, 0x37e1, gpio, 0, 0);
-}
-
-static int cp2101_gpioget(struct usb_serial_port *port, u8* gpio)
-{
-       int ret;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       /* FIXME: how about REQTYPE_DEVICE_TO_HOST instead of 0xc0? */
-       ret = cp2101_ctlmsg(port, 0xff, 0xc0, 0x00c2, 0, gpio, 1);
-
-       dbg("%s - gpio = 0x%.2x (%d)", __FUNCTION__, *gpio, ret);
-
-       return (ret == 1) ? 0 : -1;
-}
-
-static int cp2101_portconfset(struct usb_serial_port *port,
-               cp2101_port_config_t* config)
-{
-       cp2101_port_config_t lconfig;
-       int ret;
-
-       dbg("%s", __FUNCTION__);
-
-       memcpy(&lconfig, config, sizeof(lconfig));
-
-       /* apparently not implemented yet */
-       lconfig.suspend.lowPower = 0;
-       lconfig.reset.lowPower = 0;
-
-       /* Words from cp2103 are MSB */
-       lconfig.reset.mode = cpu_to_be16(config->reset.mode);
-       /* lconfig.reset.lowPower = cpu_to_be16(config->reset.lowPower); */
-       lconfig.reset.latch = cpu_to_be16(config->reset.latch);
-       lconfig.suspend.mode = cpu_to_be16(config->suspend.mode);
-       /* lconfig.suspend.lowPower = cpu_to_be16(config->suspend.lowPower); */
-       lconfig.suspend.latch = cpu_to_be16(config->suspend.latch);
-
-       ret = cp2101_ctlmsg(port, 0xff, 0x40, 0x370c, 0, &lconfig, PORT_CONFIG_LEN);
-       if (ret == PORT_CONFIG_LEN)
-               return 0;
-       else if (ret >= 0)
-               return -1;
-       else
-               return ret;
-}
-
-static int cp2101_portconfget(struct usb_serial_port *port,
-               cp2101_port_config_t* config)
-{
-       int ret;
-
-       dbg("%s", __FUNCTION__);
-
-       ret = cp2101_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config, PORT_CONFIG_LEN);
-       if (ret == PORT_CONFIG_LEN) {
-               /* Words from cp2103 are MSB */
-               config->reset.mode = be16_to_cpu(config->reset.mode);
-               config->reset.lowPower = be16_to_cpu(config->reset.lowPower);
-               config->reset.latch = be16_to_cpu(config->reset.latch);
-               config->suspend.mode = be16_to_cpu(config->suspend.mode);
-               config->suspend.lowPower = be16_to_cpu(config->suspend.lowPower);
-               config->suspend.latch = be16_to_cpu(config->suspend.latch);
-
-               /* apparently not implemented yet */
-               config->reset.lowPower = 0;
-               config->suspend.lowPower = 0;
-
-               return 0;
-       } else if (ret >= 0)
-               return -1;
-       else
-               return ret;
-
-}
-
-static int cp2101_ioctl (struct usb_serial_port *port, struct file *file,
-               unsigned int cmd, unsigned long arg)
-{
-       dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
-
-       switch (cmd) {
-               
-#ifndef LINUX26
-               case TIOCMGET:
-            {
-                int result = cp2101_tiocmget(port, file);
-                if (copy_to_user(&arg, &result, sizeof(int)))
-                               return -EFAULT; 
-                               return 0;
-            }
-            break;
-            
-               case TIOCMSET:
-               case TIOCMBIS:
-
-               case TIOCMBIC:
-            {
-                int val = 0;
-
-                               if (copy_from_user(&val, &arg, sizeof(int)))
-                                       return -EFAULT;
-                
-/* this looks wrong:  TIOCMSET isn't going to work right */
-                if(cp2101_tiocmset(port, file, cmd==TIOCMBIC?0:val,  cmd==TIOCMBIC?val:0))
-                    return -EFAULT;
-                               return 0;
-            }
-            break;
-#endif
-
-               case IOCTL_GPIOGET:
-                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION) {
-                               u8 gpio = 0;
-                if (!cp2101_gpioget(port, &gpio) &&
-                                               !copy_to_user((u8*)arg, &gpio, sizeof(gpio)))
-                                       return 0;
-            }
-                       return -EFAULT;
-            break;
-            
-               case IOCTL_GPIOSET:
-                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION &&
-                                       !cp2101_gpioset(port, arg))
-                               return 0;
-                       return -EFAULT;
-            break;
-
-               case IOCTL_GPIOBIC:
-               case IOCTL_GPIOBIS:
-                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION &&
-                                       !cp2101_gpiosetb(port, (cmd==IOCTL_GPIOBIC) ? 0 : arg,
-                                               (cmd==IOCTL_GPIOBIC) ? arg : 0))
-                               return 0;
-                       return -EFAULT;
-            break;
-
-               case IOCTL_DEVICERESET:
-                       return cp2101_reset(port);
-                       break;
-
-               case IOCTL_PORTCONFGET:
-                       {
-                               cp2101_port_config_t config;
-                               if (!cp2101_portconfget(port, &config) &&
-                                               !copy_to_user((cp2101_port_config_t*)arg, &config,
-                                                       sizeof(config)))
-                                       return 0;
-            }
-                       return -EFAULT;
-                       break;
-
-               case IOCTL_PORTCONFSET:
-                       {
-                               cp2101_port_config_t config;
-                   if (!copy_from_user(&config, (cp2101_port_config_t*)arg,
-                                                       sizeof(config)) &&
-                                               !cp2101_portconfset(port, &config))
-                                       return 0;
-                               return -EFAULT;
-                       }
-                       break;
-
-               case IOCTL_SETVID:
-                       {
-                               unsigned int vid;
-                   if (!copy_from_user(&vid, (unsigned int *)arg,
-                                                       sizeof(unsigned int)) &&
-                                               !cp2101_setu16(port, 0x01, vid))
-                                       return 0;
-                               return -EFAULT;
-            }
-            break;
-
-               case IOCTL_SETPID:
-                       {
-                               unsigned int pid;
-                   if (!copy_from_user(&pid, (unsigned int *)arg,
-                                                       sizeof(unsigned int)) &&
-                                               !cp2101_setu16(port, 0x02, pid))
-                                       return 0;
-                               return -EFAULT;
-            }
-            break;
-
-               case IOCTL_SETMFG:
-#if 0 /* Don't know how to set manufacturer desc yet */
-                       {
-                               char usbstr[CP210x_MAX_MFG_STRLEN * 2 + 2];
-                   size_t len = copy_buf_from_user(
-                                               usbstr + sizeof(usbstr) - CP210x_MAX_MFG_STRLEN, arg,
-                                               CP210x_MAX_MFG_STRLEN);
-                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
-                               if (len && cp2101_setstr(port, 0x00, usbstr) == len)
-                                       return 0;
-                               return -EFAULT;
-            }
-#endif
-            break;
-
-               case IOCTL_SETPRODUCT:
-                       {
-                               char usbstr[CP210x_MAX_PRODUCT_STRLEN * 2 + 2];
-                               char* str = usbstr + sizeof(usbstr) - CP210x_MAX_PRODUCT_STRLEN;
-                   size_t len = copy_buf_from_user(str, arg,
-                                               CP210x_MAX_PRODUCT_STRLEN);
-                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
-                               if (len && cp2101_setstr(port, 0x03, usbstr) == len)
-                                       return 0;
-                               return -EFAULT;
-            }
-            break;
-
-               case IOCTL_SETSERIAL:
-                       {
-                               char usbstr[CP210x_MAX_SERIAL_STRLEN * 2 + 2];
-                               char* str = usbstr + sizeof(usbstr) - CP210x_MAX_SERIAL_STRLEN;
-                   size_t len = copy_buf_from_user(str, arg,
-                                               CP210x_MAX_SERIAL_STRLEN);
-                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
-                               if (len && cp2101_setstr(port, 0x04, usbstr) == len)
-                                       return 0;
-                               return -EFAULT;
-            }
-            break;
-
-               case IOCTL_SETDEVVER:
-                       {
-                               unsigned int ver;
-                   if (!copy_from_user(&ver, (unsigned int *)arg,
-                                                       sizeof(unsigned int)) &&
-                                               !cp2101_setu16(port, 0x07, ver))
-                                       return 0;
-                               return -EFAULT;
-            }
-            break;
-
-               default:
-                       dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
-                       break;
-       }
-
-       return -ENOIOCTLCMD;
-}
-
-static int cp2101_startup (struct usb_serial *serial)
-{
-       /* CP2101 buffers behave strangely unless device is reset */
-       usb_reset_device(serial->dev);
-       return 0;
-}
-
-static void cp2101_shutdown (struct usb_serial *serial)
-{
-       int i;
-
-       dbg("%s", __FUNCTION__);
-
-       /* Stop reads and writes on all ports */
-       for (i=0; i < serial->num_ports; ++i) {
-#ifdef LINUX26
-               cp2101_cleanup(serial->port[i]);
-#else
-               cp2101_cleanup(&serial->port[i]);
-#endif
-       }
-}
-
-static int __init cp2101_init (void)
-{
-       int retval;
-
-       retval = usb_serial_register(&cp2101_device);
-       if (retval)
-               return retval; /* Failed to register */
-
-#ifdef LINUX26
-       retval = usb_register(&cp2101_driver);
-       if (retval) {
-               /* Failed to register */
-               usb_serial_deregister(&cp2101_device);
-               return retval;
-       }
-#endif
-       /* Success */
-       info(DRIVER_DESC " " DRIVER_VERSION);
-       return 0;
-}
-
-static void __exit cp2101_exit (void)
-{
-#ifdef LINUX26
-       usb_deregister (&cp2101_driver);
-#endif
-       usb_serial_deregister (&cp2101_device);
-}
-
-module_init(cp2101_init);
-module_exit(cp2101_exit);
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL");
-
-#ifdef LINUX26
-MODULE_VERSION(DRIVER_VERSION);
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-#else
-MODULE_PARM(debug, "i");
-#endif
-MODULE_PARM_DESC(debug, "Enable verbose debugging messages");
-
-/*
-vi:ts=4
-*/
-
diff --git a/examples/Makefile b/examples/Makefile
deleted file mode 100644 (file)
index 85f2190..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-.PHONY: all
-
-PROGS = cpmfg cpio cptwiddle
-# LDFLAGS += -lusb
-
-all: $(PROGS)
-
-$(PROGS): %: %.o
-
-clean:
-       @rm -rf $(PROGS) $(PROGS:%=%.o)
diff --git a/examples/README.txt b/examples/README.txt
deleted file mode 100644 (file)
index c80db59..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Simple test applications for using the enhanced IOCTL's of the cp2101 driver.
diff --git a/examples/cpio.c b/examples/cpio.c
deleted file mode 100644 (file)
index f0f6f38..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * cpio.c
- *
- * Set cp2103 GPIO_0 and GPIO_1 for LED connection to get RX/TX activity.
- * Watch out, the tty is hardcoded.
- */
-
-#include <netinet/in.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define IOCTL_DEVICERESET      0x8004  /* Get port configuration */
-#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
-#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
-
-typedef struct {
-    uint16_t mode;
-    uint16_t lowPower;
-    uint16_t latch;
-} cp2103_port_state_t;
-
-typedef struct {
-    cp2103_port_state_t reset;
-    cp2103_port_state_t suspend;
-    uint8_t enhancedFxn;
-} cp2103_port_config_t;
-
-int cpConnect()
-{
-    int ret, ioval;
-    int fd = open("/dev/usb/tts/0", O_RDWR);
-    if (fd < 0) {
-       fprintf(stderr, "cannot open tty\n");
-       return -1;
-    }
-    printf("tty opened\n");
-    return fd;
-}
-
-void cpDisconnect(int fd)
-{
-    if (fd >= 0)
-       close(fd);
-}
-
-int main()
-{
-    int fd;
-    cp2103_port_config_t config;
-    int ret;
-
-    /* open */
-    if ((fd = cpConnect()) < 0)
-       return 1;
-
-    /* Read the current port configuration */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
-       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
-       return 1;
-    }
-
-    /* Set the current port configuration; turn on GPIO_0 and GPIO_1 to get
-     * activity LEDs.
-     */
-    config.reset.mode &= ~0x0300;
-    config.suspend.mode &= ~0x0300;
-    config.reset.latch |= 0x0300;
-    config.enhancedFxn &= ~0x03;
-    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
-       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
-       return 1;
-    }
-
-    /* Reset the part so the changes take effect. */
-    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
-       fprintf(stderr, "device reset ioctl %d\n", ret);
-       return 1;
-    }
-
-    cpDisconnect(fd);
-    return 0;
-}
diff --git a/examples/cpmfg.c b/examples/cpmfg.c
deleted file mode 100644 (file)
index ed8524a..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * cpcfg.c
- *
- * Configure the USB descriptor and GPIO configurations for a cp2103-equipped
- * device.
- */
-
-#include <netinet/in.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define VID    0x10c4
-#define PID    0xea60
-
-/* CP2103 ioctls */
-#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
-#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
-#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
-#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
-
-/* CP210x ioctls principally used during initial device configuration */
-#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
-#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
-#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
-#define IOCTL_SETVID           0x8007  /* Set vendor id */
-#define IOCTL_SETPID           0x8008  /* Set product id */
-#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
-#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
-#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
-#define IOCTL_SETDEVVER                0x800c  /* set device version id */
-/* FIXME: where is IOCTL_SETMFG? */
-
-/* CP2103 GPIO */
-#define GPIO_0         0x01
-#define GPIO_1         0x02
-#define GPIO_2         0x04
-#define GPIO_3         0x08
-#define GPIO_MASK      (GPIO_0|GPIO_1|GPIO_2|GPIO_3)
-
-/* Port config definitions */
-typedef struct {
-    uint16_t mode;             /* Push-pull = 1, Open-drain = 0 */
-    uint16_t lowPower;
-    uint16_t latch;            /* Logic high = 1, Logic low = 0 */
-} cp2101_port_state_t;
-
-typedef struct {
-    cp2101_port_state_t reset;
-    cp2101_port_state_t suspend;
-    uint8_t enhancedFxn;
-} cp2101_port_config_t;
-
-#define PORT_CONFIG_LEN        13      /* Because sizeof() will pad to full words */
-
-/* Used to pass variable sized buffers between user and kernel space (ioctls) */
-typedef struct {
-       char* buf;
-       size_t len;
-} cp210x_buffer_t;
-
-void exit(int);
-
-int cpConnect(char* device)
-{
-    int ret, ioval;
-    int fd = open(device, O_RDWR);
-    if (fd < 0) {
-       fprintf(stderr, "cannot open %s\n", device);
-       exit(1);
-    }
-    printf("%s opened\n", device);
-    return fd;
-}
-
-void cpDisconnect(int fd)
-{
-    if (fd >= 0)
-       close(fd);
-}
-
-void cpSetStr(int fd, unsigned int ioctlno, char* string, size_t len)
-{
-    int ret;
-    cp210x_buffer_t buf = { buf: string, len: len };
-
-    ret = ioctl(fd, ioctlno, &buf);
-    if (ret) {
-       fprintf(stderr, "failed to set via ioctl 0x%04x, err %d\n", ioctlno,
-               ret);
-       exit(1);
-    }
-}
-
-void cpSetLeds(int fd)
-{
-    int ret;
-    cp2101_port_config_t config;
-
-    /* Read the current port configuration */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
-       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
-       exit(1);
-    }
-
-    /* Set the current port configuration; turn on GPIO_0 and GPIO_1 to get
-     * activity LEDs.  GPIO_2 and GPIO_3 are set for 'regular' gpio.
-     */
-    config.reset.mode &= ~0x0300;
-    config.suspend.mode &= ~0x0300;
-    config.reset.latch |= 0x0300;
-    config.enhancedFxn |= 0x03;
-    config.enhancedFxn &= ~0x10; /* turn off weak pullups */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
-       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
-       exit(1);
-    }
-}
-
-void cpReset(int fd)
-{
-    int ret;
-
-    /* Reset the part */
-    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
-       fprintf(stderr, "device reset ioctl %d\n", ret);
-       exit(1);
-    }
-}
-
-int main(int argc, char* argv[])
-{
-    /* char newmfg[255] = "Company Name"; */
-    char newprod[255] = "CompanyName ";
-    char newsn[255];
-    int fd;
-
-    if (argc != 4) {
-      fprintf(stderr, "usage: %s <tty> <part#> <sn#>\n", argv[0]);
-      exit(1);
-    }
-
-    strcat(newprod, argv[2]);
-    strcpy(newsn, argv[3]);
-    fd = cpConnect(argv[1]);
-    /* SiLabs doesn't allow set of mfg string on cp210x.
-     * cpSetStr(fd, IOCTL_SETMFG, newmfg, strlen(newmfg));
-     */
-    cpSetStr(fd, IOCTL_SETPRODUCT, newprod, strlen(newprod));
-    cpSetStr(fd, IOCTL_SETSERIAL, newsn, strlen(newsn));
-    cpSetLeds(fd);
-    cpReset(fd);
-    cpDisconnect(fd);
-    printf("done\n");
-    return 0;
-}
diff --git a/examples/cptwiddle.c b/examples/cptwiddle.c
deleted file mode 100644 (file)
index 068809e..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * cptwiddle.c
- *
- * Twiddle the leds connected to the cp2103's GPIO_0 and GPIO_1 pins on the
- * USB device.  Twiddle does the following:
- *
- *  - Saves the current latch and port config settings
- *  - Reconfigures for leds as IO
- *  - Resets the device and reconnects to it
- *  - Twiddles the LEDs
- *  - Restores the original configuration
- *  - Resets the device again so that the original config is immediately active
- *
- * Watch out; the tty device is hard-coded.
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-/* CP2103 ioctls */
-#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
-#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
-#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
-#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
-
-/* CP210x ioctls principally used during initial device configuration */
-#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
-#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
-#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
-#define IOCTL_SETVID           0x8007  /* Set vendor id */
-#define IOCTL_SETPID           0x8008  /* Set product id */
-#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
-#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
-#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
-#define IOCTL_SETDEVVER                0x800c  /* set device version id */
-/* FIXME: where is IOCTL_SETMFG? */
-
-
-typedef struct {
-    uint16_t mode;
-    uint16_t lowPower;
-    uint16_t latch;
-} cp2103_port_state_t;
-
-typedef struct {
-    cp2103_port_state_t reset;
-    cp2103_port_state_t suspend;
-    uint8_t enhancedFxn;
-} cp2103_port_config_t;
-
-int cpConnect()
-{
-    int ret, ioval;
-    int fd = open("/dev/usb/tts/0", O_RDWR);
-    if (fd < 0) {
-       fprintf(stderr, "cannot open tty\n");
-       return -1;
-    }
-    printf("tty opened\n");
-    return fd;
-}
-
-void cpDisconnect(int fd)
-{
-    if (fd >= 0)
-       close(fd);
-}
-
-int main()
-{
-    int fd;
-    cp2103_port_config_t config;
-    cp2103_port_config_t saveConfig;
-    uint8_t saveGpio;
-    int ret;
-    int i;
-
-    if ((fd = cpConnect()) < 0)
-       return 1;
-
-    /* Read the current port configuration */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
-       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
-       return 1;
-    }
-    memcpy(&saveConfig, &config, sizeof(config));
-    printf("port config received\n");
-
-    /* Read the current gpio latches */
-    if ((ret = ioctl(fd, IOCTL_GPIOGET, &saveGpio))) {
-       fprintf(stderr, "gpioget ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("saved gpio latches 0x%02x\n", saveGpio);
-
-    /* Set the current port configuration; set GPIO_0 and GPIO_1 as outputs */
-    config.reset.mode &= ~0x0300;
-    config.suspend.mode &= ~0x0300;
-    config.reset.latch |= 0x0300;
-    config.enhancedFxn &= ~0x03;
-    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
-       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("port config altered\n");
-
-    /* Reset the part */
-    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
-       fprintf(stderr, "device reset ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("device reset\n");
-
-    /* Disconnect then reconnect */
-    cpDisconnect(fd);
-    printf("disconnected\n");
-    for (i = 0; i < 10; i++) {
-       sleep(1);
-       if ((fd = cpConnect()) >= 0)
-           break;
-    }
-    if (i == 100) {
-       printf("failed to reconnect\n");
-       return 1;
-    }
-    printf("reconnected\n");
-
-    /* Now, twiddle some bits */
-    for (i = 0; i < 8; i++) {
-       uint8_t leds = i & 0x03;
-       if ((ret = ioctl(fd, IOCTL_GPIOSET, leds))) {
-           fprintf(stderr, "gpio set ioctl failed %d\n", ret);
-           return 1;
-       }
-       printf("set leds %u\n", leds);
-       sleep(1);
-    }
-
-    /* Restore the original latches */
-    if ((ret = ioctl(fd, IOCTL_GPIOSET, saveGpio))) {
-       fprintf(stderr, "gpio set ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("gpio latches restored\n");
-
-    /* Return the original configuration */
-    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &saveConfig))) {
-       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("port config restored\n");
-
-    /* Reset the part again */
-    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
-       fprintf(stderr, "device reset ioctl failed %d\n", ret);
-       return 1;
-    }
-    printf("device reset again\n");
-
-    cpDisconnect(fd);
-    return 0;
-}
diff --git a/installmod b/installmod
deleted file mode 100644 (file)
index 2334445..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ -f $1 ] ; then
-       if [ ! -d $3 ] ; then
-               echo "ERR: \"$3\" does not exist."
-               exit 1
-       fi
-
-       if [ -d $2/kernel/drivers ] ; then
-               installpath=$2/kernel/drivers/usb/serial/$1
-       else
-               installpath=$2/$1
-       fi
-
-       install -m 444 -D $1 $installpath
-
-       if [ $? != 0 ] ; then
-               echo "ERR: Failed to install $1 in $installpath"
-               exit 1
-       else
-               echo "Installed $1 in $installpath"
-       fi
-
-       depmod    
-       exit 0
-else
-       echo "ERR: Module \"$1\" not present"
-       exit 1
-fi
diff --git a/rpm/buildRPM b/rpm/buildRPM
deleted file mode 100755 (executable)
index dbe689b..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-THISDIR=`pwd`
-RPMROOT=/usr/src/redhat
-NAME=cp2103
-VER_MAJ=0
-VER_MIN=11
-VER_PAT=0
-VERSION=$VER_MAJ.$VER_MIN.$VER_PAT
-
-echo $PWD
-echo "Creating infrastructure."
-cd $RPMROOT/SOURCES
-rm -rf $NAME-$VERSION
-rm -rf $NAME-$VERSION.tar.gz
-mkdir $NAME-$VERSION
-cd  $NAME-$VERSION
-
-echo "Copying source code."
-cp -R $THISDIR/. .
-echo "Packaging source code."
-cd ..
-tar cvf $NAME-$VERSION.tar $NAME-$VERSION
-gzip $NAME-$VERSION.tar
-
-echo "Copying source to RPM subsystem."
-cp $NAME-$VERSION/rpm/$NAME.spec $RPMROOT/SPECS/.
-
-echo "Starting RPM build..."
-
-KERNEL_BLD_VERSION=`uname -r`
-export KERNEL_BLD_VERSION
-
-rpmbuild -bs $RPMROOT/SPECS/cp2103.spec
-
-
-
-
-
diff --git a/rpm/cp2103.spec b/rpm/cp2103.spec
deleted file mode 100644 (file)
index c5a507a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# RPM header info
-Summary: Silicon Labs CP2101/CP2102/CP2103 USB To Serial Bridge driver
-Name: cp2103
-Version: 0.11.0
-Release: 1
-Group: System Environment/Kernel
-BuildRoot: /var/tmp/%{name}-%{version}-%{release}
-ExclusiveOS: linux
-Source: %{name}-%{version}.tar.gz
-Packager: Intelligraphics, Inc.
-Vendor: Silicon Laboratories, Inc.
-License: GPL
-
-%description
-Device driver kernel module for the Silicon Laboratories CP2101/CP2102/CP2103 USB To Serial Bridge.
-
-%prep
-%setup -q
-
-%build
-./configure
-make -f Makefile.go modules
-
-%install
-make -f Makefile.go install
-
-%clean
-make -f Makefile.go distclean
-
-%files
-%defattr(-,root,root)
-%doc
-%config
-
diff --git a/src/Docs/SIL00205 design.doc b/src/Docs/SIL00205 design.doc
new file mode 100644 (file)
index 0000000..3599f1b
--- /dev/null
@@ -0,0 +1 @@
+ÐÏ\11ࡱ
\ No newline at end of file
diff --git a/src/Docs/SIL00205_RNF_20060115.doc b/src/Docs/SIL00205_RNF_20060115.doc
new file mode 100644 (file)
index 0000000..f3a7444
Binary files /dev/null and b/src/Docs/SIL00205_RNF_20060115.doc differ
diff --git a/src/Docs/SIL00205_RNF_20060901.doc b/src/Docs/SIL00205_RNF_20060901.doc
new file mode 100644 (file)
index 0000000..ac89801
Binary files /dev/null and b/src/Docs/SIL00205_RNF_20060901.doc differ
diff --git a/src/Docs/igx_to_2_6_15_1_diff.txt b/src/Docs/igx_to_2_6_15_1_diff.txt
new file mode 100644 (file)
index 0000000..909c4df
--- /dev/null
@@ -0,0 +1,415 @@
+26a27
+> #include <linux/moduleparam.h>
+29,48d29
+< 
+< #if LINUX26
+< 
+< #include <linux/moduleparam.h>
+< #define DEV_ERR(dev,format,arg...) dev_err(dev,format, ## arg)
+< #define USB_KILL_URB usb_kill_urb
+< 
+< #else /* !LINUX26 */
+< 
+< #ifdef CONFIG_USB_SERIAL_DEBUG
+<      static int debug = 1;
+< #else
+<      static int debug;
+< #endif
+< 
+< #define DEV_ERR(dev,format,arg...)  err(format, ## arg)
+< #define USB_KILL_URB  usb_unlink_urb
+< 
+< #endif /* LINUX26 */
+< 
+54,55c35,36
+< #define DRIVER_VERSION "v0.10"
+< #define DRIVER_DESC "Silicon Labs CP2101/CP2102/CP2103 RS232 serial adaptor driver"
+---
+> #define DRIVER_VERSION "v0.05"
+> #define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver"
+60c41
+< static int   cp2101_open(struct usb_serial_port*, struct file*);
+---
+> static int cp2101_open(struct usb_serial_port*, struct file*);
+64a46,48
+> static int cp2101_tiocmget (struct usb_serial_port *, struct file *);
+> static int cp2101_tiocmset (struct usb_serial_port *, struct file *,
+>              unsigned int, unsigned int);
+66c50
+< static int   cp2101_startup (struct usb_serial *);
+---
+> static int cp2101_startup (struct usb_serial *);
+68,70c52
+< static int  cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg);
+< static int   cp2101_tiocmget (struct usb_serial_port *, struct file *);
+< static int   cp2101_tiocmset (struct usb_serial_port *, struct file *, unsigned int, unsigned int);
+---
+> 
+74a57
+>      { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
+76a60,61
+>      { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
+>      { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
+77a63
+>      { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
+83d68
+< #if LINUX26
+86c71
+<      .name           = "CP2101",
+---
+>      .name           = "cp2101",
+91,92d75
+< #define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_ , GFP_ATOMIC)
+< #define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_ , GFP_KERNEL)
+94,103c77,82
+< #else  /* LINUX26 */
+< 
+< #define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_)
+< #define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_)
+< #endif
+< 
+< static struct usb_serial_device_type cp2101_device = {
+<      .owner                          = THIS_MODULE,
+<      .name                           = "CP2101/CP2102/CP2103 USB to UART Bridge",
+<      .id_table                       = id_table,
+---
+> static struct usb_serial_driver cp2101_device = {
+>      .driver = {
+>              .owner =        THIS_MODULE,
+>              .name =         "cp2101",
+>      },
+>      .id_table               = id_table,
+107,111c86,89
+<      .num_ports                      = 1,
+<      .open                           = cp2101_open,
+<      .close                          = cp2101_close,
+<     .ioctl              = cp2101_ioctl,     /* GLA, Added backport */
+<      .break_ctl                      = cp2101_break_ctl,
+---
+>      .num_ports              = 1,
+>      .open                   = cp2101_open,
+>      .close                  = cp2101_close,
+>      .break_ctl              = cp2101_break_ctl,
+113,120c91,94
+<      .shutdown                       = cp2101_shutdown,
+< #if LINUX26
+<      .tiocmget                       = cp2101_tiocmget,
+<      .tiocmset                       = cp2101_tiocmset,
+<      .attach                         = cp2101_startup
+< #else
+<      .startup                        = cp2101_startup
+< #endif
+---
+>      .tiocmget               = cp2101_tiocmget,
+>      .tiocmset               = cp2101_tiocmset,
+>      .attach                 = cp2101_startup,
+>      .shutdown               = cp2101_shutdown,
+128,134c102,108
+< #define CP2101_UART                  0x00    /* Enable / Disable */
+< #define CP2101_BAUDRATE                      0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
+< #define CP2101_BITS                          0x03    /* 0x(0)(databits)(parity)(stopbits) */
+< #define CP2101_BREAK                 0x05    /* On / Off */
+< #define CP2101_CONTROL                       0x07    /* Flow control line states */
+< #define CP2101_MODEMCTL                      0x13    /* Modem controls */
+< #define CP2101_CONFIG_6                      0x19    /* 6 bytes of config data ??? */
+---
+> #define CP2101_UART          0x00    /* Enable / Disable */
+> #define CP2101_BAUDRATE              0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
+> #define CP2101_BITS          0x03    /* 0x(0)(databits)(parity)(stopbits) */
+> #define CP2101_BREAK         0x05    /* On / Off */
+> #define CP2101_CONTROL               0x07    /* Flow control line states */
+> #define CP2101_MODEMCTL              0x13    /* Modem controls */
+> #define CP2101_CONFIG_6              0x19    /* 6 bytes of config data ??? */
+137,138c111,112
+< #define UART_ENABLE                          0x0001
+< #define UART_DISABLE                 0x0000
+---
+> #define UART_ENABLE          0x0001
+> #define UART_DISABLE         0x0000
+141c115
+< #define BAUD_RATE_GEN_FREQ           0x384000
+---
+> #define BAUD_RATE_GEN_FREQ   0x384000
+144,161c118,135
+< #define BITS_DATA_MASK                       0x0f00
+< #define BITS_DATA_5                          0x0500
+< #define BITS_DATA_6                          0x0600
+< #define BITS_DATA_7                          0x0700
+< #define BITS_DATA_8                          0x0800
+< #define BITS_DATA_9                          0x0900
+< 
+< #define BITS_PARITY_MASK             0x00f0
+< #define BITS_PARITY_NONE             0x0000
+< #define BITS_PARITY_ODD                      0x0010
+< #define BITS_PARITY_EVEN             0x0020
+< #define BITS_PARITY_MARK             0x0030
+< #define BITS_PARITY_SPACE            0x0040
+< 
+< #define BITS_STOP_MASK                   0x000f
+< #define BITS_STOP_1                  0x0000
+< #define BITS_STOP_1_5                    0x0001
+< #define BITS_STOP_2                  0x0002
+---
+> #define BITS_DATA_MASK               0X0f00
+> #define BITS_DATA_5          0X0500
+> #define BITS_DATA_6          0X0600
+> #define BITS_DATA_7          0X0700
+> #define BITS_DATA_8          0X0800
+> #define BITS_DATA_9          0X0900
+> 
+> #define BITS_PARITY_MASK     0x00f0
+> #define BITS_PARITY_NONE     0x0000
+> #define BITS_PARITY_ODD              0x0010
+> #define BITS_PARITY_EVEN     0x0020
+> #define BITS_PARITY_MARK     0x0030
+> #define BITS_PARITY_SPACE    0x0040
+> 
+> #define BITS_STOP_MASK               0x000f
+> #define BITS_STOP_1          0x0000
+> #define BITS_STOP_1_5                0x0001
+> #define BITS_STOP_2          0x0002
+164,165c138,139
+< #define BREAK_ON                     0x0000
+< #define BREAK_OFF                    0x0001
+---
+> #define BREAK_ON             0x0000
+> #define BREAK_OFF            0x0001
+168,175c142,149
+< #define CONTROL_DTR                  0x0001
+< #define CONTROL_RTS                  0x0002
+< #define CONTROL_CTS                  0x0010
+< #define CONTROL_DSR                  0x0020
+< #define CONTROL_RING             0x0040
+< #define CONTROL_DCD                  0x0080
+< #define CONTROL_WRITE_DTR        0x0100
+< #define CONTROL_WRITE_RTS        0x0200
+---
+> #define CONTROL_DTR          0x0001
+> #define CONTROL_RTS          0x0002
+> #define CONTROL_CTS          0x0010
+> #define CONTROL_DSR          0x0020
+> #define CONTROL_RING         0x0040
+> #define CONTROL_DCD          0x0080
+> #define CONTROL_WRITE_DTR    0x0100
+> #define CONTROL_WRITE_RTS    0x0200
+198c172
+<              DEV_ERR(&port->dev,"%s - out of memory.\n", __FUNCTION__);
+---
+>              dev_err(&port->dev, "%s - out of memory.\n", __FUNCTION__);
+206,215c180,182
+<      result = usb_control_msg (
+<                     serial->dev,
+<                     usb_rcvctrlpipe (serial->dev, 0),
+<                                  request, 
+<                     REQTYPE_DEVICE_TO_HOST, 
+<                     0x0000,
+<                                  0, 
+<                     buf, 
+<                     size, 
+<                     300);
+---
+>      result = usb_control_msg (serial->dev,usb_rcvctrlpipe (serial->dev, 0),
+>                              request, REQTYPE_DEVICE_TO_HOST, 0x0000,
+>                              0, buf, size, 300);
+218c185,186
+<      for (i=0; i<length; i++) data[i] = le32_to_cpu(buf[i]);
+---
+>      for (i=0; i<length; i++)
+>              data[i] = le32_to_cpu(buf[i]);
+223c191
+<              DEV_ERR(&port->dev,"%s - Unable to send config request, "
+---
+>              dev_err(&port->dev, "%s - Unable to send config request, "
+250c218
+<              DEV_ERR(&port->dev,"%s - out of memory.\n",
+---
+>              dev_err(&port->dev, "%s - out of memory.\n",
+256c224,225
+<      for (i = 0; i < length; i++) buf[i] = cpu_to_le32(data[i]);
+---
+>      for (i = 0; i < length; i++)
+>              buf[i] = cpu_to_le32(data[i]);
+259,268c228,231
+<              result = usb_control_msg (
+<                     serial->dev,
+<                                  usb_sndctrlpipe(serial->dev, 0),
+<                                  request, 
+<                     REQTYPE_HOST_TO_DEVICE, 
+<                     0x0000,
+<                                  0, 
+<                     buf, 
+<                     size, 
+<                     300);
+---
+>              result = usb_control_msg (serial->dev,
+>                              usb_sndctrlpipe(serial->dev, 0),
+>                              request, REQTYPE_HOST_TO_DEVICE, 0x0000,
+>                              0, buf, size, 300);
+270,279c233,236
+<              result = usb_control_msg (
+<                     serial->dev,
+<                                  usb_sndctrlpipe(serial->dev, 0),
+<                                  request, 
+<                     REQTYPE_HOST_TO_DEVICE, 
+<                     data[0],
+<                                  0, 
+<                     NULL, 
+<                     0, 
+<                     300);
+---
+>              result = usb_control_msg (serial->dev,
+>                              usb_sndctrlpipe(serial->dev, 0),
+>                              request, REQTYPE_HOST_TO_DEVICE, data[0],
+>                              0, NULL, 0, 300);
+285c242
+<              DEV_ERR(&port->dev,"%s - Unable to send request, "
+---
+>              dev_err(&port->dev, "%s - Unable to send request, "
+292,301c249,252
+<      result = usb_control_msg (
+<                 serial->dev,
+<                          usb_sndctrlpipe(serial->dev, 0),
+<                          request,
+<                 REQTYPE_HOST_TO_DEVICE, 
+<                 data[0],
+<                          0, 
+<                 NULL, 
+<                 0, 
+<                 300);
+---
+>      result = usb_control_msg (serial->dev,
+>                      usb_sndctrlpipe(serial->dev, 0),
+>                      request, REQTYPE_HOST_TO_DEVICE, data[0],
+>                      0, NULL, 0, 300);
+324c275
+<              DEV_ERR(&port->dev, "%s - Unable to enable UART\n",
+---
+>              dev_err(&port->dev, "%s - Unable to enable UART\n",
+337c288
+<      result = USB_SUBMIT_URB_KERNEL(port->read_urb);
+---
+>      result = usb_submit_urb(port->read_urb, GFP_KERNEL);
+339c290
+<              DEV_ERR(&port->dev, "%s - failed resubmitting read urb, "
+---
+>              dev_err(&port->dev, "%s - failed resubmitting read urb, "
+359c310
+<      if (serial != NULL && serial->dev) {
+---
+>      if (serial->dev) {
+362c313
+<                      USB_KILL_URB(port->write_urb);
+---
+>                      usb_kill_urb(port->write_urb);
+364c315
+<                      USB_KILL_URB(port->read_urb);
+---
+>                      usb_kill_urb(port->read_urb);
+366,374d316
+< 
+< #if LINUX26
+<      kfree (usb_get_serial_port_data(port));
+<      usb_set_serial_port_data(port, NULL);
+< #else
+<      /*TODOGLA: port.private maybe?
+<        Nobody is using that at the moement in this driver*/
+< #endif
+< 
+383,384c325,326
+<      USB_KILL_URB(port->write_urb);
+<      USB_KILL_URB(port->read_urb);
+---
+>      usb_kill_urb(port->write_urb);
+>      usb_kill_urb(port->read_urb);
+615c557
+<                              DEV_ERR(&port->dev, "cp2101 driver does not "
+---
+>                              dev_err(&port->dev, "cp2101 driver does not "
+625c567
+<                              DEV_ERR(&port->dev, "Baud rate requested not "
+---
+>                              dev_err(&port->dev, "Baud rate requested not "
+656c598
+<                              DEV_ERR(&port->dev, "cp2101 driver does not "
+---
+>                              dev_err(&port->dev, "cp2101 driver does not "
+663c605
+<                      DEV_ERR(&port->dev,"Number of data bits requested "
+---
+>                      dev_err(&port->dev, "Number of data bits requested "
+680c622
+<                      DEV_ERR(&port->dev,"Parity mode not supported "
+---
+>                      dev_err(&port->dev, "Parity mode not supported "
+695c637
+<                      DEV_ERR(&port->dev,"Number of stop bits requested "
+---
+>                      dev_err(&port->dev, "Number of stop bits requested "
+789,827d730
+< static int cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
+< {
+<      dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
+< 
+<      switch (cmd) {
+<              
+< #if !LINUX26
+<              case TIOCMGET:
+<             {
+<                 int result = cp2101_tiocmget(port, file);
+<                 if (copy_to_user(&arg, &result, sizeof(int)))
+<                              return -EFAULT; 
+<             }
+<             break;
+<             
+<              case TIOCMSET:
+<              case TIOCMBIS:
+< 
+<              case TIOCMBIC:
+<             {
+<                 int val = 0;
+<                 
+<                  if (copy_from_user(&val, &arg, sizeof(int)))
+<                          return -EFAULT;
+<             
+<                 if(cp2101_tiocmset(port, file, cmd==TIOCMBIC?0:val,  cmd==TIOCMBIC?val:0))
+<                     return -EFAULT;
+<             }
+<             break;
+< #endif
+< 
+<              default:
+<                      dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
+<                      break;
+<      }
+< 
+<      return -ENOIOCTLCMD;
+< }
+< 
+843d745
+< #if LINUX26
+845,847d746
+< #else
+<              cp2101_cleanup(&serial->port[i]);
+< #endif
+859,860c758
+< #if LINUX26
+<      retval = usb_register(&cp2101_driver);
+---
+>      retval = usb_register(&cp2101_driver);
+866c764
+< #endif
+---
+> 
+874d771
+< #if LINUX26
+876d772
+< #endif
+883a780
+> MODULE_VERSION(DRIVER_VERSION);
+886,887d782
+< #if LINUX26
+< MODULE_VERSION(DRIVER_VERSION);
+889,891d783
+< #else
+< MODULE_PARM(debug, "i");
+< #endif
diff --git a/src/Makefile b/src/Makefile
new file mode 100644 (file)
index 0000000..5d5dbb8
--- /dev/null
@@ -0,0 +1,10 @@
+# CP2101 Makefile
+
+ifeq ("$(src)", "")
+       include Makefile.config
+       include Makefile$(KVER1)$(KVER2)
+else
+       include $(src)/Makefile.config
+       include $(src)/Makefile$(KVER1)$(KVER2)
+endif
+
diff --git a/src/Makefile.go b/src/Makefile.go
new file mode 100644 (file)
index 0000000..407680c
--- /dev/null
@@ -0,0 +1,46 @@
+#
+# CP2101/CP2102/CP2103 USB to Serial Bridge Makefile
+#
+# (c) 2005-2006 Silicon Laboratories
+#
+# all       - builds the modules, same as modules
+# modules   - builds kernel module
+# install   - installs driver
+# clean     - removes all object code
+# distclean - remove everything resulting from building
+# mrproper  - remove emacs debris
+#
+
+OBJS = cp2101.o
+
+SRC = cp2102.c
+
+
+include ./Makefile.config
+
+KVER=$(KVER1).$(KVER2).$(KVER3)
+MODULE=cp2101$(EXT)
+MODULES_DIR=$(INSTALL_PREFIX)/lib/modules
+MODULES_VER_DIR=$(MODULES_DIR)/$(KVER)
+
+# Rules
+
+all:   modules
+
+clean:
+       rm -f *.o .*.o.flags
+       rm -f *.ko .*.o.cmd .*.ko.cmd *.mod.c
+       rm -rf .tmp_versions
+
+distclean: clean mrproper
+       rm -f Makefile.config
+
+install:
+       ./installmod $(MODULE) $(MODULES_VER_DIR) $(MODULES_DIR)
+
+mrproper:
+       rm -f *~
+       rm -f Makefile.bak
+
+modules:
+       make -C $(LINUX_KERNEL) SUBDIRS="`pwd`" modules
diff --git a/src/Makefile24 b/src/Makefile24
new file mode 100644 (file)
index 0000000..4a19ad3
--- /dev/null
@@ -0,0 +1,7 @@
+#
+
+EXTRA_CFLAGS += -I$(LINUX_KERNEL)/drivers/usb/serial
+
+obj-m += cp2101.o
+
+include $(TOPDIR)/Rules.make
diff --git a/src/Makefile26 b/src/Makefile26
new file mode 100644 (file)
index 0000000..2456377
--- /dev/null
@@ -0,0 +1,7 @@
+# CP2101/CP2102/CP2103 2.6 makefile
+
+EXTRA_CFLAGS += -I$(LINUX_INCLUDE) -I$(LINUX_KERNEL)/drivers/usb/serial -DLINUX26
+
+obj-m := cp2101.o
+
+cp2101-objs := $(OBJS)
diff --git a/src/Modules.symvers b/src/Modules.symvers
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/Rules.make b/src/Rules.make
new file mode 100644 (file)
index 0000000..c855f39
--- /dev/null
@@ -0,0 +1,73 @@
+# -*-makefile-*-
+#
+# This file is a helper make file that makes building easier. It is meant 
+# to be generic and is designed to be recycled by other drivers. The 
+# comments should be clear enough. It partly comes from Linux Makefile, 
+# and needs GNU make. 
+
+# TOPDIR is declared by the Makefile including this file.
+ifndef TOPDIR
+    TOPDIR = .
+endif
+
+# KERNELDIR can be speficied on the command line or environment
+#  this may assuems a symbolic link has been set to /usr/src/linux
+ifndef KERNELDIR
+    KERNELDIR = /usr/src/linux
+endif
+# The headers are taken from the kernel
+    INCLUDEDIR = $(KERNELDIR)/include
+
+# We need the configuration file, for CONFIG_SMP and possibly other stuff
+# (especiall for RISC platforms, where CFLAGS depends on the exact
+# processor being used).
+#ifeq ($(KERNELDIR)/.config,$(wildcard $(KERNELDIR))/.config)
+#   include $(KERNELDIR)/.config
+#else
+#   MESSAGE := $(shell echo "WARNING: no .config file in $(KERNELDIR)")
+#endif
+
+# ARCH can be speficed on the comdline or env. too, and defaults to this arch
+# Unfortunately, we can't easily extract if from kernel configuration
+# (well, we could look athe asm- symlink... don't know if worth the effort)
+ifndef ARCH
+  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+        -e s/arm.*/arm/ -e s/sa110/arm/)
+endif
+
+# This is useful if cross-compiling. Taken from kernel Makefile (CC changed)
+AS      =$(CROSS_COMPILE)as
+LD      =$(CROSS_COMPILE)ld
+CC      =$(CROSS_COMPILE)gcc
+CPP     =$(CC) -E
+AR      =$(CROSS_COMPILE)ar
+NM      =$(CROSS_COMPILE)nm
+STRIP   =$(CROSS_COMPILE)strip
+OBJCOPY =$(CROSS_COMPILE)objcopy
+OBJDUMP =$(CROSS_COMPILE)objdump
+
+# The platform-specific Makefiles include portability nightmares.
+# Some platforms, though, don't have one, so check for existence first
+ARCHMAKEFILE = $(TOPDIR)/Makefile.$(ARCH)
+ifeq ($(ARCHMAKEFILE),$(wildcard $(ARCHMAKEFILE)))
+  include $(ARCHMAKEFILE)
+endif
+
+# CFLAGS: all assignments to CFLAGS are inclremental, so you can specify
+# the initial flags on the command line or environment, if needed.
+
+    CFLAGS +=  -Wall -D__KERNEL__ -DMODULE -I$(INCLUDEDIR)
+
+ifdef CONFIG_SMP
+    CFLAGS += -D__SMP__ -DSMP
+endif
+
+# Prepend modversions.h if we're running with versioning.
+ifdef CONFIG_MODVERSIONS
+    CFLAGS += -DMODVERSIONS -include $(KERNELDIR)/include/linux/modversions.h
+endif
+
+#Install dir
+VERSIONFILE = $(INCLUDEDIR)/linux/version.h
+VERSION     = $(shell awk -F\" '/REL/ {print $$2}' $(VERSIONFILE))
+INSTALLDIR = /lib/modules/$(VERSION)/misc
diff --git a/src/configure b/src/configure
new file mode 100755 (executable)
index 0000000..1d20a18
--- /dev/null
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+function usage()
+{
+    echo "Usage: $0 [option ...]"
+    echo ""
+    echo "Where 'option' can be one of the following:"
+    echo "  -kinc <path>                 Kernel header files."
+    echo "  -kpath <path>                Kernel sources."
+    echo "  -kver <version>              Kernel version."
+    echo "  -p <install folder>          Prefix for installing the kernel module."
+}
+
+this_dir=`pwd`
+
+ARCH=""
+TARGET="linux"
+LINUX_KERNEL="/lib/modules/`uname -r`/build"
+KVER=""
+LIBPATH=""
+INSTALL_PREFIX=""
+CONFIG_FILE="Makefile.config"
+
+
+while (($# > 0)) ; do
+    if [ "$1" == "-help" ] || [ "$1" == "-h" ] ; then
+        usage
+       exit 0   
+    elif [ "$1" == "-kinc" ] ; then
+       if [ "$2" == "" ] ; then
+           usage
+           exit 1
+       fi
+        LINUX_INCLUDE="$2"
+       shift 2
+    elif [ "$1" == "-kpath" ] ; then
+       if [ "$2" == "" ] ; then
+           usage
+           exit 1
+       fi
+        LINUX_KERNEL="$2"
+       shift 2
+    elif [ "$1" == "-kver" ] ; then
+       if [ "$2" == "" ] ; then
+           usage
+           exit 1
+       fi
+       KVER="$2"
+       shift 2
+    elif [ "$1" == "-p" ] ; then
+       if [ "$2" == "" ] ; then
+           usage
+           exit 1
+       fi
+        INSTALL_PREFIX="$2"
+       shift 2
+    else
+        echo "ERROR: Unknown option $1"
+        exit 1
+    fi
+done
+
+if [ "$LINUX_INCLUDE" == "" ] ; then
+    LINUX_INCLUDE="$LINUX_KERNEL/include"
+fi
+
+if [ ! -d "$LINUX_KERNEL" ] ; then
+       echo "ERROR: $LINUX_KERNEL was not found."
+       exit 1
+fi
+
+if [ ! -d "$LINUX_INCLUDE" ] ; then
+       echo "ERROR: $LINUX_INCLUDE was not found."
+       exit 1
+fi
+
+if [ "$KVER" == "" ] ; then
+    if [ -f "$LINUX_INCLUDE/linux/version.h" ] ; then
+       KVER=`grep UTS_RELEASE $LINUX_INCLUDE/linux/version.h | awk -- '{ if (FNR==1) { print $3 } }'`
+       KVER=`echo $KVER | sed -e 's/"//g'`
+    else
+       echo "ERROR: $LINUX_INCLUDE/linux/version.h was not found. Configured kernel?"
+       exit 1
+    fi
+fi
+
+KVER1=`echo $KVER | awk -F . -- '{ print $1 }'`
+KVER2=`echo $KVER | awk -F . -- '{ print $2 }'`
+KVER3=`echo $KVER | sed -e "s/$KVER1\\.$KVER2\\.//g"`
+
+case $KVER2 in
+    4)
+       makefile="Makefile24"
+       EXT=".o"
+       ;;
+    6)
+       makefile="Makefile26"
+       EXT=".ko"
+       ;;
+esac
+
+echo "Kernel version        : $KVER1.$KVER2.$KVER3"
+echo "Module extension      : $EXT"
+echo "Kernel directory      : $LINUX_KERNEL"
+echo "Include directory     : $LINUX_INCLUDE"
+echo "Module install prefix : $INSTALL_PREFIX"
+
+
+rm -f $CONFIG_FILE
+echo "# Makefile.config" >>$CONFIG_FILE
+echo "# Automatically generated" >>$CONFIG_FILE
+echo "KVER1=$KVER1" >>$CONFIG_FILE
+echo "KVER2=$KVER2" >>$CONFIG_FILE
+echo "KVER3=$KVER3" >>$CONFIG_FILE
+echo "EXT=$EXT" >>$CONFIG_FILE
+echo "LINUX_KERNEL=$LINUX_KERNEL" >>$CONFIG_FILE
+echo "LINUX_INCLUDE=$LINUX_INCLUDE" >>$CONFIG_FILE
+echo "INSTALL_PREFIX=$INSTALL_PREFIX" >>$CONFIG_FILE
diff --git a/src/cp2101.c b/src/cp2101.c
new file mode 100644 (file)
index 0000000..53dd422
--- /dev/null
@@ -0,0 +1,1405 @@
+/*
+ * Silicon Laboratories CP2101/CP2102/CP2103 USB to RS232 serial adaptor driver
+ *
+ * Copyright (C) 2005 Craig Shelley (craig@microtron.org.uk)
+ *
+ *     This program is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License version
+ *     2 as published by the Free Software Foundation.
+ *
+ * Support to set flow control line levels using TIOCMGET and TIOCMSET
+ * thanks to Karl Hiramoto karl@hiramoto.org. RTSCTS hardware flow
+ * control thanks to Munir Nassar nassarmu@real-time.com
+ *
+ * Port configuration, usb descriptor and gpio management by R. Steve McKown
+ * (smckown@titaniummirror.com).
+ *
+ * Outstanding Issues:
+ *  Buffers are not flushed when the port is opened.
+ *  Multiple calls to write() may fail with "Resource temporarily unavailable"
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/version.h>
+#include <asm/uaccess.h>
+#include <linux/byteorder/generic.h>
+
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION(a,b,c) ((a)*65536 + (b)*256 + (c))
+#endif
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+#ifdef LINUX26
+#undef LINUX26
+#endif
+#define LINUX26
+#endif
+
+#ifdef LINUX26
+
+#include <linux/moduleparam.h>
+#include <linux/usb/serial.h>
+#define DEV_ERR(dev,format,arg...) dev_err(dev,format, ## arg)
+#define USB_KILL_URB usb_kill_urb
+
+#else /* !LINUX26 */
+
+#include <linux/config.h>
+#include "usb-serial.h"
+
+#ifdef CONFIG_USB_SERIAL_DEBUG
+       static int debug = 1;
+#else
+       static int debug;
+#endif
+
+#define DEV_ERR(dev,format,arg...)  err(format, ## arg)
+#define USB_KILL_URB  usb_unlink_urb
+
+#endif /* LINUX26 */
+
+/*
+ * Version Information
+ * RJM: updated to 0.11 for 2.6.15 and later kernels
+ */
+#define DRIVER_VERSION "v0.11rsm"
+#define DRIVER_DESC "Silicon Labs CP2101/CP2102/CP2103 RS232 serial adaptor driver"
+
+/*
+ * Function Prototypes
+ */
+static int     cp2101_open(struct usb_serial_port*, struct file*);
+static void cp2101_cleanup(struct usb_serial_port*);
+static void cp2101_close(struct usb_serial_port*, struct file*);
+static void cp2101_get_termios(struct usb_serial_port*);
+static void cp2101_set_termios(struct usb_serial_port*, struct termios*);
+static void cp2101_break_ctl(struct usb_serial_port*, int);
+static int     cp2101_startup (struct usb_serial *);
+static void cp2101_shutdown(struct usb_serial*);
+static int  cp2101_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg);
+static int     cp2101_tiocmget (struct usb_serial_port *, struct file *);
+static int     cp2101_tiocmset (struct usb_serial_port *, struct file *, unsigned int, unsigned int);
+
+static int debug;
+
+static struct usb_device_id id_table [] = {
+       { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
+       { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
+       { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
+       { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */
+       { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */
+       { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */
+       { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */
+       { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
+       { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
+       { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
+       { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
+       { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
+       { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
+       { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
+       { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */
+       { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
+       { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
+       { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+       { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
+       { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
+       { } /* Terminating Entry */
+};
+
+MODULE_DEVICE_TABLE (usb, id_table);
+
+#ifdef LINUX26
+static struct usb_driver cp2101_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+       .owner          = THIS_MODULE,
+#endif
+       .name           = "CP2101",
+       .probe          = usb_serial_probe,
+       .disconnect     = usb_serial_disconnect,
+       .id_table       = id_table,
+};
+#define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_ , GFP_ATOMIC)
+#define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_ , GFP_KERNEL)
+
+#else  /* LINUX26 */
+
+#define USB_SUBMIT_URB_ATOMIC(_x_) usb_submit_urb(_x_)
+#define USB_SUBMIT_URB_KERNEL(_x_) usb_submit_urb(_x_)
+#endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+static struct usb_serial_driver cp2101_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+               .name =         "cp2101",
+       },
+#else
+static struct usb_serial_device_type cp2101_device = {
+       .owner                          = THIS_MODULE,
+       .name                           = "CP2101/CP2102/CP2103 USB to UART Bridge",
+#endif
+       .id_table                       = id_table,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+       .num_interrupt_in       = 0,
+       .num_bulk_in            = 0,
+       .num_bulk_out           = 0,
+#else
+       .num_interrupt_in       = NUM_DONT_CARE,
+       .num_bulk_in            = NUM_DONT_CARE,
+       .num_bulk_out           = NUM_DONT_CARE,
+#endif
+       .num_ports                      = 1,
+       .open                           = cp2101_open,
+       .close                          = cp2101_close,
+       .ioctl                          = cp2101_ioctl,     /* GLA, Added backport */
+       .break_ctl                      = cp2101_break_ctl,
+       .set_termios                    = cp2101_set_termios,
+#ifdef LINUX26
+       .tiocmget                       = cp2101_tiocmget,
+       .tiocmset                       = cp2101_tiocmset,
+       .attach                         = cp2101_startup,
+#else
+       .startup                        = cp2101_startup,
+#endif
+       .shutdown                       = cp2101_shutdown
+};
+
+/* Config request types */
+#define REQTYPE_HOST_TO_DEVICE 0x41
+#define REQTYPE_DEVICE_TO_HOST 0xc1
+
+/* Config SET requests. To GET, add 1 to the request number */
+#define CP2101_UART                    0x00    /* Enable / Disable */
+#define CP2101_BAUDRATE                        0x01    /* (BAUD_RATE_GEN_FREQ / baudrate) */
+#define CP2101_BITS                            0x03    /* 0x(0)(databits)(parity)(stopbits) */
+#define CP2101_BREAK                   0x05    /* On / Off */
+#define CP2101_CONTROL                 0x07    /* Flow control line states */
+#define CP2101_MODEMCTL                        0x13    /* Modem controls */
+#define CP2101_CONFIG_6                        0x19    /* 6 bytes of config data ??? */
+
+/* CP2101_UART */
+#define UART_ENABLE                            0x0001
+#define UART_DISABLE                   0x0000
+
+/* CP2101_BAUDRATE */
+#define BAUD_RATE_GEN_FREQ             0x384000
+
+/* CP2101_BITS */
+#define BITS_DATA_MASK                 0x0f00
+#define BITS_DATA_5                            0x0500
+#define BITS_DATA_6                            0x0600
+#define BITS_DATA_7                            0x0700
+#define BITS_DATA_8                            0x0800
+#define BITS_DATA_9                            0x0900
+
+#define BITS_PARITY_MASK               0x00f0
+#define BITS_PARITY_NONE               0x0000
+#define BITS_PARITY_ODD                        0x0010
+#define BITS_PARITY_EVEN               0x0020
+#define BITS_PARITY_MARK               0x0030
+#define BITS_PARITY_SPACE              0x0040
+
+#define BITS_STOP_MASK             0x000f
+#define BITS_STOP_1                    0x0000
+#define BITS_STOP_1_5              0x0001
+#define BITS_STOP_2                    0x0002
+
+/* CP2101_BREAK */
+#define BREAK_ON                       0x0000
+#define BREAK_OFF                      0x0001
+
+/* CP2101_CONTROL */
+#define CONTROL_DTR                    0x0001
+#define CONTROL_RTS                    0x0002
+#define CONTROL_CTS                    0x0010
+#define CONTROL_DSR                    0x0020
+#define CONTROL_RING               0x0040
+#define CONTROL_DCD                    0x0080
+#define CONTROL_WRITE_DTR          0x0100
+#define CONTROL_WRITE_RTS          0x0200
+
+/* CP2103 ioctls */
+#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
+#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
+#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
+#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
+
+/* CP210x ioctls principally used during initial device configuration */
+#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
+#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
+#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
+#define IOCTL_SETVID           0x8007  /* Set vendor id */
+#define IOCTL_SETPID           0x8008  /* Set product id */
+#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
+#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
+#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
+#define IOCTL_SETDEVVER                0x800c  /* set device version id */
+/* FIXME: where is IOCTL_SETMFG? */
+
+/* CP2103 GPIO */
+#define GPIO_0         0x01
+#define GPIO_1         0x02
+#define GPIO_2         0x04
+#define GPIO_3         0x08
+#define GPIO_MASK      (GPIO_0|GPIO_1|GPIO_2|GPIO_3)
+
+/* GetDeviceVersion() return codes */
+#define                CP210x_CP2101_VERSION                           0x01
+#define                CP210x_CP2102_VERSION                           0x02
+#define                CP210x_CP2103_VERSION                           0x03
+                                                                                       
+/* Return codes */
+#define                CP210x_SUCCESS                                          0x00
+#define                CP210x_DEVICE_NOT_FOUND                         0xFF
+#define                CP210x_INVALID_HANDLE                           0x01
+#define                CP210x_INVALID_PARAMETER                        0x02
+#define                CP210x_DEVICE_IO_FAILED                         0x03
+#define                CP210x_FUNCTION_NOT_SUPPORTED           0x04
+#define                CP210x_GLOBAL_DATA_ERROR                        0x05
+#define                CP210x_FILE_ERROR                                       0x06
+#define                CP210x_COMMAND_FAILED                           0x08
+#define                CP210x_INVALID_ACCESS_TYPE                      0x09
+
+/* USB descriptor sizes */
+#define                CP210x_MAX_DEVICE_STRLEN                        256
+#define                CP210x_MAX_PRODUCT_STRLEN                       126
+#define                CP210x_MAX_SERIAL_STRLEN                        63
+#define                CP210x_MAX_MAXPOWER                                     250
+
+/* Used to pass variable sized buffers between user and kernel space (ioctls) */
+typedef struct {
+       char* buf;
+       size_t len;
+} cp2101_buffer_t;
+
+/* Port config definitions */
+typedef struct {
+    uint16_t mode;             /* Push-pull = 1, Open-drain = 0 */
+    uint16_t lowPower;
+    uint16_t latch;            /* Logic high = 1, Logic low = 0 */
+} cp2101_port_state_t;
+
+typedef struct {
+    cp2101_port_state_t reset;
+    cp2101_port_state_t suspend;
+    uint8_t enhancedFxn;
+} cp2101_port_config_t;
+
+#define PORT_CONFIG_LEN        13      /* Because sizeof() will pad to full words */
+
+
+/*
+ * cp2101_buf_from_user
+ * Copy a buffer from user space, returning the number of bytes copied
+ * from ubuf.buf into kbuf.  klen is the size of the buffer at kbuf.
+ */
+size_t copy_buf_from_user(char* kbuf, unsigned long ubuf, size_t klen)
+{
+    cp2101_buffer_t t;
+
+       if (!kbuf || !ubuf || !klen || copy_from_user(&t, (cp2101_buffer_t *)ubuf,
+                       sizeof(t)))
+               return 0;
+       if (t.len < klen)
+               klen = t.len;
+       if (!t.buf || !t.len || copy_from_user(kbuf, t.buf, klen))
+               return 0;
+       return klen;
+}
+
+/*
+ * cp2101_get_config
+ * Reads from the CP2101 configuration registers
+ * 'size' is specified in bytes.
+ * 'data' is a pointer to a pre-allocated array of integers large
+ * enough to hold 'size' bytes (with 4 bytes to each integer)
+ */
+static int cp2101_get_config(struct usb_serial_port* port, u8 request,
+               unsigned int *data, int size)
+{
+       struct usb_serial *serial = port->serial;
+       u32 *buf;
+       int result, i, length;
+
+       /* Number of integers required to contain the array */
+       length = (((size - 1) | 3) + 1)/4;
+
+       buf = kmalloc (length * sizeof(u32), GFP_KERNEL);
+       memset(buf, 0, length * sizeof(u32));
+
+       if (!buf) {
+               DEV_ERR(&port->dev,"%s - out of memory.\n", __FUNCTION__);
+               return -ENOMEM;
+       }
+
+       /* For get requests, the request number must be incremented */
+       request++;
+
+       /* Issue the request, attempting to read 'size' bytes */
+       result = usb_control_msg (
+                    serial->dev,
+                    usb_rcvctrlpipe (serial->dev, 0),
+                                   request, 
+                    REQTYPE_DEVICE_TO_HOST, 
+                    0x0000,
+                                   0, 
+                    buf, 
+                    size, 
+                    300);
+
+       /* Convert data into an array of integers */
+       for (i=0; i<length; i++) data[i] = le32_to_cpu(buf[i]);
+
+       kfree(buf);
+
+       if (result != size) {
+               DEV_ERR(&port->dev,"%s - Unable to send config request, "
+                               "request=0x%x size=%d result=%d\n",
+                               __FUNCTION__, request, size, result);
+               return -EPROTO;
+       }
+
+       return 0;
+}
+
+/*
+ * cp2101_set_config
+ * Writes to the CP2101 configuration registers
+ * Values less than 16 bits wide are sent directly
+ * 'size' is specified in bytes.
+ */
+static int cp2101_set_config(struct usb_serial_port* port, u8 request,
+               unsigned int *data, int size)
+{
+       struct usb_serial *serial = port->serial;
+       u32 *buf;
+       int result, i, length;
+
+       /* Number of integers required to contain the array */
+       length = (((size - 1) | 3) + 1)/4;
+
+       buf = kmalloc(length * sizeof(u32), GFP_KERNEL);
+       if (!buf) {
+               DEV_ERR(&port->dev,"%s - out of memory.\n",
+                               __FUNCTION__);
+               return -ENOMEM;
+       }
+
+       /* Array of integers into bytes */
+       for (i = 0; i < length; i++) buf[i] = cpu_to_le32(data[i]);
+
+       if (size > 2) {
+               result = usb_control_msg (
+                    serial->dev,
+                                   usb_sndctrlpipe(serial->dev, 0),
+                                   request, 
+                    REQTYPE_HOST_TO_DEVICE, 
+                    0x0000,
+                                   0, 
+                    buf, 
+                    size, 
+                    300);
+       } else {
+               result = usb_control_msg (
+                    serial->dev,
+                                   usb_sndctrlpipe(serial->dev, 0),
+                                   request, 
+                    REQTYPE_HOST_TO_DEVICE, 
+                    data[0],
+                                   0, 
+                    NULL, 
+                    0, 
+                    300);
+       }
+
+       kfree(buf);
+
+       if ((size > 2 && result != size) || result < 0) {
+               DEV_ERR(&port->dev,"%s - Unable to send request, "
+                               "request=0x%x size=%d result=%d\n",
+                               __FUNCTION__, request, size, result);
+               return -EPROTO;
+       }
+
+       /* Single data value */
+       result = usb_control_msg (
+                serial->dev,
+                           usb_sndctrlpipe(serial->dev, 0),
+                           request,
+                REQTYPE_HOST_TO_DEVICE, 
+                data[0],
+                           0, 
+                NULL, 
+                0, 
+                300);
+       return 0;
+}
+
+/*
+ * cp2101_set_config_single
+ * Convenience function for calling cp2101_set_config on single data values
+ * without requiring an integer pointer
+ */
+static inline int cp2101_set_config_single(struct usb_serial_port* port,
+               u8 request, unsigned int data)
+{
+       return cp2101_set_config(port, request, &data, 2);
+}
+
+/*
+ * cp2101_ctlmsg
+ * A generic usb control message interface.
+ * Returns the actual size of the data read or written within the message, 0
+ * if no data were read or written, or a negative value to indicate an error.
+ */
+static int cp2101_ctlmsg(struct usb_serial_port* port, u8 request,
+               u8 requestype, u16 value, u16 index, void* data, u16 size)
+{
+       struct usb_device *dev = port->serial->dev;
+       u8 *tbuf;
+       int ret;
+
+       if (!(tbuf = kmalloc(size, GFP_KERNEL)))
+               return -ENOMEM;
+       if (requestype & 0x80) {
+               ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
+                               requestype, value, index, tbuf, size, 300);
+               if (ret > 0 && size)
+                       memcpy(data, tbuf, size);
+       } else {
+               if (size)
+                       memcpy(tbuf, data, size);
+               ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), request,
+                               requestype, value, index, tbuf, size, 300);
+       }
+       kfree(tbuf);
+       if (ret < 0 && ret != -EPIPE) {
+               dev_printk(KERN_DEBUG, &dev->dev, "cp2101: control failed cmd rqt %u "
+                               "rq %u len %u ret %d\n", requestype, request, size, ret);
+       }
+       return ret;
+}
+
+static int cp2101_reset(struct usb_serial_port *port)
+{
+       dbg("%s", __FUNCTION__);
+
+#if 1
+    /* Is this better than usb_device_reset?  It may be.  Once a client issues
+        * the reset ioctl, it must disconnect and reconnect, since the USB
+        * connections are torn down.  We also ignore the error return, since the
+        * part resets and doesn't send one...
+        */
+       cp2101_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, 0, 0);
+#else
+       usb_reset_device(port->serial->dev);
+#endif
+       return 0;
+}
+
+static int cp2101_get_partnum(struct usb_serial_port *port)
+{
+       static u8 _partnum = 0;
+       int ret = CP210x_SUCCESS;
+       if (!_partnum) {
+               u8 addr = port->serial->dev->actconfig->interface[0]->cur_altsetting->
+                       endpoint[0].desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+
+               if (addr == 0x03 || addr == 0x02) /* The part is a cp2101 */
+                       _partnum = 0x01;
+               else if (addr == 0x01) /* Must query part to determine part number */
+                       ret = (cp2101_ctlmsg(port, 0xff, 0xc0, 0x370b, 0x00, &_partnum, 1)
+                                       == 1) ? CP210x_SUCCESS : CP210x_DEVICE_IO_FAILED;
+               else
+                       ret = CP210x_DEVICE_IO_FAILED;
+       }
+       dbg("%s - partnum %u err %d", __FUNCTION__, _partnum, ret);
+       return (ret == CP210x_SUCCESS) ? _partnum : 0;
+}
+
+inline int cp2101_setu16(struct usb_serial_port *port, int cmd,
+               unsigned int value)
+{
+       return cp2101_ctlmsg(port, 0xff, 0x40, 3700 | (cmd & 0xff), value, 0, 0);
+}
+
+/* Populates usbstr with: (len) + (0x03) + unicode(str).  Each char in str
+ * takes up two bytes in unicode format, so the resulting len(usbstr) is
+ * 2 * len(str) + 2.
+ * Returns the resulting length of the string in usbstr.
+ * This function can accept overlapping usbstr and str as long as the overlap
+ * does not cause data written to usbstr to overwrite data not yet read from
+ * str.
+ */
+static int make_usb_string(char* usbstr, size_t usblen, char* src,
+               size_t srclen)
+{
+       int len = 0;
+
+       if (usbstr && usblen >= 2 && src && *src && srclen) {
+               char* p;
+
+               /* The usb string format uses a single byte to represent length */
+               if (usblen > 256)
+                       usblen = 256;
+
+               p = usbstr + 1;
+               *p++ = 0x03;
+               len = 2;
+               while (srclen && len < usblen) {
+                       *p++ = *src++;
+                       *p++ = 0;
+                       len += 2;
+                       srclen--;
+               }
+               *usbstr = (char)len;
+       }
+       return len;
+}
+
+/*
+ * cp2101_setstr
+ *
+ * Set a USB string descriptor using proprietary cp210x control messages.
+ * Return the number of characters actually written.
+ */
+inline int cp2101_setstr(struct usb_serial_port *port, int cmd, char *usbstr)
+{
+       unsigned len = usbstr[0];
+       int ret = cp2101_ctlmsg(port, 0xff, 0x40, 0x3700 | (cmd & 0xff), 0, usbstr,
+                       len);
+       dbg("%s - cmd 0x%02x len %d ret %d", __FUNCTION__, cmd, len, ret);
+       return ret;
+}
+
+static int cp2101_open (struct usb_serial_port *port, struct file *filp)
+{
+       struct usb_serial *serial = port->serial;
+       int result;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if (cp2101_set_config_single(port, CP2101_UART, UART_ENABLE)) {
+               DEV_ERR(&port->dev, "%s - Unable to enable UART\n",
+                               __FUNCTION__);
+               return -EPROTO;
+       }
+
+       /* Start reading from the device */
+       usb_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,
+                       serial->type->read_bulk_callback,
+                       port);
+       result = USB_SUBMIT_URB_KERNEL(port->read_urb);
+       if (result) {
+               DEV_ERR(&port->dev, "%s - failed resubmitting read urb, "
+                               "error %d\n", __FUNCTION__, result);
+               return result;
+       }
+
+       /* Configure the termios structure */
+       cp2101_get_termios(port);
+
+       /* Set the DTR and RTS pins low */
+       cp2101_tiocmset(port, NULL, TIOCM_DTR | TIOCM_RTS, 0);
+
+       return 0;
+}
+
+static void cp2101_cleanup (struct usb_serial_port *port)
+{
+       struct usb_serial *serial = port->serial;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if (serial != NULL && serial->dev) {
+               /* shutdown any bulk reads that might be going on */
+               if (serial->num_bulk_out)
+                       USB_KILL_URB(port->write_urb);
+               if (serial->num_bulk_in)
+                       USB_KILL_URB(port->read_urb);
+       }
+
+#ifdef LINUX26
+       kfree (usb_get_serial_port_data(port));
+       usb_set_serial_port_data(port, NULL);
+#else
+       /*TODOGLA: port.private maybe?
+         Nobody is using that at the moement in this driver*/
+#endif
+
+}
+
+static void cp2101_close (struct usb_serial_port *port, struct file * filp)
+{
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       /* shutdown our urbs */
+       dbg("%s - shutting down urbs", __FUNCTION__);
+       USB_KILL_URB(port->write_urb);
+       USB_KILL_URB(port->read_urb);
+
+       cp2101_set_config_single(port, CP2101_UART, UART_DISABLE);
+}
+
+/*
+ * cp2101_get_termios
+ * Reads the baud rate, data bits, parity, stop bits and flow control mode
+ * from the device, corrects any unsupported values, and configures the
+ * termios structure to reflect the state of the device
+ */
+static void cp2101_get_termios (struct usb_serial_port *port)
+{
+       unsigned int cflag, modem_ctl[4];
+       int baud;
+       int bits;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if ((!port->tty) || (!port->tty->termios)) {
+               dbg("%s - no tty structures", __FUNCTION__);
+               return;
+       }
+       cflag = port->tty->termios->c_cflag;
+
+       cp2101_get_config(port, CP2101_BAUDRATE, &baud, 2);
+       /* Convert to baudrate */
+       if (baud)
+               baud = BAUD_RATE_GEN_FREQ / baud;
+
+       dbg("%s - baud rate = %d", __FUNCTION__, baud);
+       cflag &= ~CBAUD;
+       switch (baud) {
+               /*
+                * The baud rates which are commented out below
+                * appear to be supported by the device
+                * but are non-standard
+                */
+               case 600:       cflag |= B600;          break;
+               case 1200:      cflag |= B1200;         break;
+               case 1800:      cflag |= B1800;         break;
+               case 2400:      cflag |= B2400;         break;
+               case 4800:      cflag |= B4800;         break;
+               /*case 7200:    cflag |= B7200;         break;*/
+               case 9600:      cflag |= B9600;         break;
+               /*case 14400:   cflag |= B14400;        break;*/
+               case 19200:     cflag |= B19200;        break;
+               /*case 28800:   cflag |= B28800;        break;*/
+               case 38400:     cflag |= B38400;        break;
+               /*case 55854:   cflag |= B55054;        break;*/
+               case 57600:     cflag |= B57600;        break;
+               case 115200:    cflag |= B115200;       break;
+               /*case 127117:  cflag |= B127117;       break;*/
+               case 230400:    cflag |= B230400;       break;
+               case 460800:    cflag |= B460800;       break;
+               case 921600:    cflag |= B921600;       break;
+               /*case 3686400: cflag |= B3686400;      break;*/
+               default:
+                       dbg("%s - Baud rate is not supported, "
+                                       "using 9600 baud", __FUNCTION__);
+                       cflag |= B9600;
+                       cp2101_set_config_single(port, CP2101_BAUDRATE,
+                                       (BAUD_RATE_GEN_FREQ/9600));
+                       break;
+       }
+
+       cp2101_get_config(port, CP2101_BITS, &bits, 2);
+       cflag &= ~CSIZE;
+       switch(bits & BITS_DATA_MASK) {
+               case BITS_DATA_5:
+                       dbg("%s - data bits = 5", __FUNCTION__);
+                       cflag |= CS5;
+                       break;
+               case BITS_DATA_6:
+                       dbg("%s - data bits = 6", __FUNCTION__);
+                       cflag |= CS6;
+                       break;
+               case BITS_DATA_7:
+                       dbg("%s - data bits = 7", __FUNCTION__);
+                       cflag |= CS7;
+                       break;
+               case BITS_DATA_8:
+                       dbg("%s - data bits = 8", __FUNCTION__);
+                       cflag |= CS8;
+                       break;
+               case BITS_DATA_9:
+                       dbg("%s - data bits = 9 (not supported, "
+                                       "using 8 data bits)", __FUNCTION__);
+                       cflag |= CS8;
+                       bits &= ~BITS_DATA_MASK;
+                       bits |= BITS_DATA_8;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+               default:
+                       dbg("%s - Unknown number of data bits, "
+                                       "using 8", __FUNCTION__);
+                       cflag |= CS8;
+                       bits &= ~BITS_DATA_MASK;
+                       bits |= BITS_DATA_8;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+       }
+
+       switch(bits & BITS_PARITY_MASK) {
+               case BITS_PARITY_NONE:
+                       dbg("%s - parity = NONE", __FUNCTION__);
+                       cflag &= ~PARENB;
+                       break;
+               case BITS_PARITY_ODD:
+                       dbg("%s - parity = ODD", __FUNCTION__);
+                       cflag |= (PARENB|PARODD);
+                       break;
+               case BITS_PARITY_EVEN:
+                       dbg("%s - parity = EVEN", __FUNCTION__);
+                       cflag &= ~PARODD;
+                       cflag |= PARENB;
+                       break;
+               case BITS_PARITY_MARK:
+                       dbg("%s - parity = MARK (not supported, "
+                                       "disabling parity)", __FUNCTION__);
+                       cflag &= ~PARENB;
+                       bits &= ~BITS_PARITY_MASK;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+               case BITS_PARITY_SPACE:
+                       dbg("%s - parity = SPACE (not supported, "
+                                       "disabling parity)", __FUNCTION__);
+                       cflag &= ~PARENB;
+                       bits &= ~BITS_PARITY_MASK;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+               default:
+                       dbg("%s - Unknown parity mode, "
+                                       "disabling parity", __FUNCTION__);
+                       cflag &= ~PARENB;
+                       bits &= ~BITS_PARITY_MASK;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+       }
+
+       cflag &= ~CSTOPB;
+       switch(bits & BITS_STOP_MASK) {
+               case BITS_STOP_1:
+                       dbg("%s - stop bits = 1", __FUNCTION__);
+                       break;
+               case BITS_STOP_1_5:
+                       dbg("%s - stop bits = 1.5 (not supported, "
+                                       "using 1 stop bit)", __FUNCTION__);
+                       bits &= ~BITS_STOP_MASK;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+               case BITS_STOP_2:
+                       dbg("%s - stop bits = 2", __FUNCTION__);
+                       cflag |= CSTOPB;
+                       break;
+               default:
+                       dbg("%s - Unknown number of stop bits, "
+                                       "using 1 stop bit", __FUNCTION__);
+                       bits &= ~BITS_STOP_MASK;
+                       cp2101_set_config(port, CP2101_BITS, &bits, 2);
+                       break;
+       }
+
+       cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+       if (modem_ctl[0] & 0x0008) {
+               dbg("%s - flow control = CRTSCTS", __FUNCTION__);
+               cflag |= CRTSCTS;
+       } else {
+               dbg("%s - flow control = NONE", __FUNCTION__);
+               cflag &= ~CRTSCTS;
+       }
+
+       port->tty->termios->c_cflag = cflag;
+}
+
+static void cp2101_set_termios (struct usb_serial_port *port,
+               struct termios *old_termios)
+{
+       unsigned int cflag, old_cflag=0;
+       int baud=0, bits;
+       unsigned int modem_ctl[4];
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if ((!port->tty) || (!port->tty->termios)) {
+               dbg("%s - no tty structures", __FUNCTION__);
+               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("%s - nothing to change...", __FUNCTION__);
+                       return;
+               }
+
+               old_cflag = old_termios->c_cflag;
+       }
+
+       /* If the baud rate is to be updated*/
+       if ((cflag & CBAUD) != (old_cflag & CBAUD)) {
+               switch (cflag & CBAUD) {
+                       /*
+                        * The baud rates which are commented out below
+                        * appear to be supported by the device
+                        * but are non-standard
+                        */
+                       case B0:        baud = 0;       break;
+                       case B600:      baud = 600;     break;
+                       case B1200:     baud = 1200;    break;
+                       case B1800:     baud = 1800;    break;
+                       case B2400:     baud = 2400;    break;
+                       case B4800:     baud = 4800;    break;
+                       /*case B7200:   baud = 7200;    break;*/
+                       case B9600:     baud = 9600;    break;
+                       /*ase B14400:   baud = 14400;   break;*/
+                       case B19200:    baud = 19200;   break;
+                       /*case B28800:  baud = 28800;   break;*/
+                       case B38400:    baud = 38400;   break;
+                       /*case B55854:  baud = 55054;   break;*/
+                       case B57600:    baud = 57600;   break;
+                       case B115200:   baud = 115200;  break;
+                       /*case B127117: baud = 127117;  break;*/
+                       case B230400:   baud = 230400;  break;
+                       case B460800:   baud = 460800;  break;
+                       case B921600:   baud = 921600;  break;
+                       /*case B3686400:        baud = 3686400; break;*/
+                       default:
+                               DEV_ERR(&port->dev, "cp2101 driver does not "
+                                       "support the baudrate requested\n");
+                               break;
+               }
+
+               if (baud) {
+                       dbg("%s - Setting baud rate to %d baud", __FUNCTION__,
+                                       baud);
+                       if (cp2101_set_config_single(port, CP2101_BAUDRATE,
+                                               (BAUD_RATE_GEN_FREQ / baud)))
+                               DEV_ERR(&port->dev, "Baud rate requested not "
+                                               "supported by device\n");
+               }
+       }
+
+       /* If the number of data bits is to be updated */
+       if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
+               cp2101_get_config(port, CP2101_BITS, &bits, 2);
+               bits &= ~BITS_DATA_MASK;
+               switch (cflag & CSIZE) {
+                       case CS5:
+                               bits |= BITS_DATA_5;
+                               dbg("%s - data bits = 5", __FUNCTION__);
+                               break;
+                       case CS6:
+                               bits |= BITS_DATA_6;
+                               dbg("%s - data bits = 6", __FUNCTION__);
+                               break;
+                       case CS7:
+                               bits |= BITS_DATA_7;
+                               dbg("%s - data bits = 7", __FUNCTION__);
+                               break;
+                       case CS8:
+                               bits |= BITS_DATA_8;
+                               dbg("%s - data bits = 8", __FUNCTION__);
+                               break;
+                       /*case CS9:
+                               bits |= BITS_DATA_9;
+                               dbg("%s - data bits = 9", __FUNCTION__);
+                               break;*/
+                       default:
+                               DEV_ERR(&port->dev, "cp2101 driver does not "
+                                       "support the number of bits requested,"
+                                       " using 8 bit mode\n");
+                               bits |= BITS_DATA_8;
+                               break;
+               }
+               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
+                       DEV_ERR(&port->dev,"Number of data bits requested "
+                                       "not supported by device\n");
+       }
+
+       if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) {
+               cp2101_get_config(port, CP2101_BITS, &bits, 2);
+               bits &= ~BITS_PARITY_MASK;
+               if (cflag & PARENB) {
+                       if (cflag & PARODD) {
+                               bits |= BITS_PARITY_ODD;
+                               dbg("%s - parity = ODD", __FUNCTION__);
+                       } else {
+                               bits |= BITS_PARITY_EVEN;
+                               dbg("%s - parity = EVEN", __FUNCTION__);
+                       }
+               }
+               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
+                       DEV_ERR(&port->dev,"Parity mode not supported "
+                                       "by device\n");
+       }
+
+       if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) {
+               cp2101_get_config(port, CP2101_BITS, &bits, 2);
+               bits &= ~BITS_STOP_MASK;
+               if (cflag & CSTOPB) {
+                       bits |= BITS_STOP_2;
+                       dbg("%s - stop bits = 2", __FUNCTION__);
+               } else {
+                       bits |= BITS_STOP_1;
+                       dbg("%s - stop bits = 1", __FUNCTION__);
+               }
+               if (cp2101_set_config(port, CP2101_BITS, &bits, 2))
+                       DEV_ERR(&port->dev,"Number of stop bits requested "
+                                       "not supported by device\n");
+       }
+
+       if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) {
+               cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+               dbg("%s - read modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
+                               __FUNCTION__, modem_ctl[0], modem_ctl[1],
+                               modem_ctl[2], modem_ctl[3]);
+
+               if (cflag & CRTSCTS) {
+                       modem_ctl[0] &= ~0x7B;
+                       modem_ctl[0] |= 0x09;
+                       modem_ctl[1] = 0x80;
+                       dbg("%s - flow control = CRTSCTS", __FUNCTION__);
+               } else {
+                       modem_ctl[0] &= ~0x7B;
+                       modem_ctl[0] |= 0x01;
+                       modem_ctl[1] |= 0x40;
+                       dbg("%s - flow control = NONE", __FUNCTION__);
+               }
+
+               dbg("%s - write modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
+                               __FUNCTION__, modem_ctl[0], modem_ctl[1],
+                               modem_ctl[2], modem_ctl[3]);
+               cp2101_set_config(port, CP2101_MODEMCTL, modem_ctl, 16);
+       }
+
+}
+
+static int cp2101_tiocmset (struct usb_serial_port *port, struct file *file,
+               unsigned int set, unsigned int clear)
+{
+       int control = 0;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if (set & TIOCM_RTS) {
+               control |= CONTROL_RTS;
+               control |= CONTROL_WRITE_RTS;
+       }
+       if (set & TIOCM_DTR) {
+               control |= CONTROL_DTR;
+               control |= CONTROL_WRITE_DTR;
+       }
+       if (clear & TIOCM_RTS) {
+               control &= ~CONTROL_RTS;
+               control |= CONTROL_WRITE_RTS;
+       }
+       if (clear & TIOCM_DTR) {
+               control &= ~CONTROL_DTR;
+               control |= CONTROL_WRITE_DTR;
+       }
+
+       dbg("%s - control = 0x%.4x", __FUNCTION__, control);
+
+       return cp2101_set_config(port, CP2101_CONTROL, &control, 2);
+
+}
+
+static int cp2101_tiocmget (struct usb_serial_port *port, struct file *file)
+{
+       int control, result;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       cp2101_get_config(port, CP2101_CONTROL, &control, 1);
+
+       result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0)
+               |((control & CONTROL_RTS) ? TIOCM_RTS : 0)
+               |((control & CONTROL_CTS) ? TIOCM_CTS : 0)
+               |((control & CONTROL_DSR) ? TIOCM_DSR : 0)
+               |((control & CONTROL_RING)? TIOCM_RI  : 0)
+               |((control & CONTROL_DCD) ? TIOCM_CD  : 0);
+
+       dbg("%s - control = 0x%.2x", __FUNCTION__, control);
+
+       return result;
+}
+
+static void cp2101_break_ctl (struct usb_serial_port *port, int break_state)
+{
+       int state;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+       if (break_state == 0)
+               state = BREAK_OFF;
+       else
+               state = BREAK_ON;
+       dbg("%s - turning break %s", __FUNCTION__,
+                       state==BREAK_OFF ? "off" : "on");
+       cp2101_set_config(port, CP2101_BREAK, &state, 2);
+}
+
+/* Set all gpio simultaneously */
+static int cp2101_gpioset(struct usb_serial_port *port, u8 gpio)
+{
+       dbg("%s - port %d, gpio = 0x%.2x", __FUNCTION__, port->number, gpio);
+
+    return cp2101_ctlmsg(port, 0xff, 0x40, 0x37e1,
+                       ((uint16_t)gpio << 8) | GPIO_MASK, 0, 0);
+}
+
+/* Set select gpio bits */
+static int cp2101_gpiosetb(struct usb_serial_port *port, u8 set, u8 clear)
+{
+       u16 gpio = 0;
+
+       /* The bitmask is in the LSB, the values in the MSB */
+       if (set & GPIO_0)
+               gpio |= (GPIO_0 << 8)|GPIO_0;
+       if (set & GPIO_1)
+               gpio |= (GPIO_1 << 8)|GPIO_1;
+       if (set & GPIO_2)
+               gpio |= (GPIO_2 << 8)|GPIO_2;
+       if (set & GPIO_3)
+               gpio |= (GPIO_3 << 8)|GPIO_3;
+       if (clear & GPIO_0)
+               gpio = (gpio & ~(GPIO_0 << 8))|GPIO_0;
+       if (clear & GPIO_1)
+               gpio = (gpio & ~(GPIO_1 << 8))|GPIO_1;
+       if (clear & GPIO_2)
+               gpio = (gpio & ~(GPIO_2 << 8))|GPIO_2;
+       if (clear & GPIO_3)
+               gpio = (gpio & ~(GPIO_3 << 8))|GPIO_3;
+
+       dbg("%s - port %d, gpiob = 0x%.4x", __FUNCTION__, port->number, gpio);
+
+       /* FIXME: how about REQTYPE_HOST_TO_DEVICE instead of 0x40? */
+    return cp2101_ctlmsg(port, 0xff, 0x40, 0x37e1, gpio, 0, 0);
+}
+
+static int cp2101_gpioget(struct usb_serial_port *port, u8* gpio)
+{
+       int ret;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       /* FIXME: how about REQTYPE_DEVICE_TO_HOST instead of 0xc0? */
+       ret = cp2101_ctlmsg(port, 0xff, 0xc0, 0x00c2, 0, gpio, 1);
+
+       dbg("%s - gpio = 0x%.2x (%d)", __FUNCTION__, *gpio, ret);
+
+       return (ret == 1) ? 0 : -1;
+}
+
+static int cp2101_portconfset(struct usb_serial_port *port,
+               cp2101_port_config_t* config)
+{
+       cp2101_port_config_t lconfig;
+       int ret;
+
+       dbg("%s", __FUNCTION__);
+
+       memcpy(&lconfig, config, sizeof(lconfig));
+
+       /* apparently not implemented yet */
+       lconfig.suspend.lowPower = 0;
+       lconfig.reset.lowPower = 0;
+
+       /* Words from cp2103 are MSB */
+       lconfig.reset.mode = cpu_to_be16(config->reset.mode);
+       /* lconfig.reset.lowPower = cpu_to_be16(config->reset.lowPower); */
+       lconfig.reset.latch = cpu_to_be16(config->reset.latch);
+       lconfig.suspend.mode = cpu_to_be16(config->suspend.mode);
+       /* lconfig.suspend.lowPower = cpu_to_be16(config->suspend.lowPower); */
+       lconfig.suspend.latch = cpu_to_be16(config->suspend.latch);
+
+       ret = cp2101_ctlmsg(port, 0xff, 0x40, 0x370c, 0, &lconfig, PORT_CONFIG_LEN);
+       if (ret == PORT_CONFIG_LEN)
+               return 0;
+       else if (ret >= 0)
+               return -1;
+       else
+               return ret;
+}
+
+static int cp2101_portconfget(struct usb_serial_port *port,
+               cp2101_port_config_t* config)
+{
+       int ret;
+
+       dbg("%s", __FUNCTION__);
+
+       ret = cp2101_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config, PORT_CONFIG_LEN);
+       if (ret == PORT_CONFIG_LEN) {
+               /* Words from cp2103 are MSB */
+               config->reset.mode = be16_to_cpu(config->reset.mode);
+               config->reset.lowPower = be16_to_cpu(config->reset.lowPower);
+               config->reset.latch = be16_to_cpu(config->reset.latch);
+               config->suspend.mode = be16_to_cpu(config->suspend.mode);
+               config->suspend.lowPower = be16_to_cpu(config->suspend.lowPower);
+               config->suspend.latch = be16_to_cpu(config->suspend.latch);
+
+               /* apparently not implemented yet */
+               config->reset.lowPower = 0;
+               config->suspend.lowPower = 0;
+
+               return 0;
+       } else if (ret >= 0)
+               return -1;
+       else
+               return ret;
+
+}
+
+static int cp2101_ioctl (struct usb_serial_port *port, struct file *file,
+               unsigned int cmd, unsigned long arg)
+{
+       dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
+
+       switch (cmd) {
+               
+#ifndef LINUX26
+               case TIOCMGET:
+            {
+                int result = cp2101_tiocmget(port, file);
+                if (copy_to_user(&arg, &result, sizeof(int)))
+                               return -EFAULT; 
+                               return 0;
+            }
+            break;
+            
+               case TIOCMSET:
+               case TIOCMBIS:
+
+               case TIOCMBIC:
+            {
+                int val = 0;
+
+                               if (copy_from_user(&val, &arg, sizeof(int)))
+                                       return -EFAULT;
+                
+/* this looks wrong:  TIOCMSET isn't going to work right */
+                if(cp2101_tiocmset(port, file, cmd==TIOCMBIC?0:val,  cmd==TIOCMBIC?val:0))
+                    return -EFAULT;
+                               return 0;
+            }
+            break;
+#endif
+
+               case IOCTL_GPIOGET:
+                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION) {
+                               u8 gpio = 0;
+                if (!cp2101_gpioget(port, &gpio) &&
+                                               !copy_to_user((u8*)arg, &gpio, sizeof(gpio)))
+                                       return 0;
+            }
+                       return -EFAULT;
+            break;
+            
+               case IOCTL_GPIOSET:
+                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION &&
+                                       !cp2101_gpioset(port, arg))
+                               return 0;
+                       return -EFAULT;
+            break;
+
+               case IOCTL_GPIOBIC:
+               case IOCTL_GPIOBIS:
+                       if (cp2101_get_partnum(port) == CP210x_CP2103_VERSION &&
+                                       !cp2101_gpiosetb(port, (cmd==IOCTL_GPIOBIC) ? 0 : arg,
+                                               (cmd==IOCTL_GPIOBIC) ? arg : 0))
+                               return 0;
+                       return -EFAULT;
+            break;
+
+               case IOCTL_DEVICERESET:
+                       return cp2101_reset(port);
+                       break;
+
+               case IOCTL_PORTCONFGET:
+                       {
+                               cp2101_port_config_t config;
+                               if (!cp2101_portconfget(port, &config) &&
+                                               !copy_to_user((cp2101_port_config_t*)arg, &config,
+                                                       sizeof(config)))
+                                       return 0;
+            }
+                       return -EFAULT;
+                       break;
+
+               case IOCTL_PORTCONFSET:
+                       {
+                               cp2101_port_config_t config;
+                   if (!copy_from_user(&config, (cp2101_port_config_t*)arg,
+                                                       sizeof(config)) &&
+                                               !cp2101_portconfset(port, &config))
+                                       return 0;
+                               return -EFAULT;
+                       }
+                       break;
+
+               case IOCTL_SETVID:
+                       {
+                               unsigned int vid;
+                   if (!copy_from_user(&vid, (unsigned int *)arg,
+                                                       sizeof(unsigned int)) &&
+                                               !cp2101_setu16(port, 0x01, vid))
+                                       return 0;
+                               return -EFAULT;
+            }
+            break;
+
+               case IOCTL_SETPID:
+                       {
+                               unsigned int pid;
+                   if (!copy_from_user(&pid, (unsigned int *)arg,
+                                                       sizeof(unsigned int)) &&
+                                               !cp2101_setu16(port, 0x02, pid))
+                                       return 0;
+                               return -EFAULT;
+            }
+            break;
+
+               case IOCTL_SETMFG:
+#if 0 /* Don't know how to set manufacturer desc yet */
+                       {
+                               char usbstr[CP210x_MAX_MFG_STRLEN * 2 + 2];
+                   size_t len = copy_buf_from_user(
+                                               usbstr + sizeof(usbstr) - CP210x_MAX_MFG_STRLEN, arg,
+                                               CP210x_MAX_MFG_STRLEN);
+                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
+                               if (len && cp2101_setstr(port, 0x00, usbstr) == len)
+                                       return 0;
+                               return -EFAULT;
+            }
+#endif
+            break;
+
+               case IOCTL_SETPRODUCT:
+                       {
+                               char usbstr[CP210x_MAX_PRODUCT_STRLEN * 2 + 2];
+                               char* str = usbstr + sizeof(usbstr) - CP210x_MAX_PRODUCT_STRLEN;
+                   size_t len = copy_buf_from_user(str, arg,
+                                               CP210x_MAX_PRODUCT_STRLEN);
+                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
+                               if (len && cp2101_setstr(port, 0x03, usbstr) == len)
+                                       return 0;
+                               return -EFAULT;
+            }
+            break;
+
+               case IOCTL_SETSERIAL:
+                       {
+                               char usbstr[CP210x_MAX_SERIAL_STRLEN * 2 + 2];
+                               char* str = usbstr + sizeof(usbstr) - CP210x_MAX_SERIAL_STRLEN;
+                   size_t len = copy_buf_from_user(str, arg,
+                                               CP210x_MAX_SERIAL_STRLEN);
+                               len = make_usb_string(usbstr, sizeof(usbstr), str, len);
+                               if (len && cp2101_setstr(port, 0x04, usbstr) == len)
+                                       return 0;
+                               return -EFAULT;
+            }
+            break;
+
+               case IOCTL_SETDEVVER:
+                       {
+                               unsigned int ver;
+                   if (!copy_from_user(&ver, (unsigned int *)arg,
+                                                       sizeof(unsigned int)) &&
+                                               !cp2101_setu16(port, 0x07, ver))
+                                       return 0;
+                               return -EFAULT;
+            }
+            break;
+
+               default:
+                       dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
+                       break;
+       }
+
+       return -ENOIOCTLCMD;
+}
+
+static int cp2101_startup (struct usb_serial *serial)
+{
+       /* CP2101 buffers behave strangely unless device is reset */
+       usb_reset_device(serial->dev);
+       return 0;
+}
+
+static void cp2101_shutdown (struct usb_serial *serial)
+{
+       int i;
+
+       dbg("%s", __FUNCTION__);
+
+       /* Stop reads and writes on all ports */
+       for (i=0; i < serial->num_ports; ++i) {
+#ifdef LINUX26
+               cp2101_cleanup(serial->port[i]);
+#else
+               cp2101_cleanup(&serial->port[i]);
+#endif
+       }
+}
+
+static int __init cp2101_init (void)
+{
+       int retval;
+
+       retval = usb_serial_register(&cp2101_device);
+       if (retval)
+               return retval; /* Failed to register */
+
+#ifdef LINUX26
+       retval = usb_register(&cp2101_driver);
+       if (retval) {
+               /* Failed to register */
+               usb_serial_deregister(&cp2101_device);
+               return retval;
+       }
+#endif
+       /* Success */
+       info(DRIVER_DESC " " DRIVER_VERSION);
+       return 0;
+}
+
+static void __exit cp2101_exit (void)
+{
+#ifdef LINUX26
+       usb_deregister (&cp2101_driver);
+#endif
+       usb_serial_deregister (&cp2101_device);
+}
+
+module_init(cp2101_init);
+module_exit(cp2101_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
+#ifdef LINUX26
+MODULE_VERSION(DRIVER_VERSION);
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+#else
+MODULE_PARM(debug, "i");
+#endif
+MODULE_PARM_DESC(debug, "Enable verbose debugging messages");
+
+/*
+vi:ts=4
+*/
+
diff --git a/src/examples/Makefile b/src/examples/Makefile
new file mode 100644 (file)
index 0000000..85f2190
--- /dev/null
@@ -0,0 +1,11 @@
+.PHONY: all
+
+PROGS = cpmfg cpio cptwiddle
+# LDFLAGS += -lusb
+
+all: $(PROGS)
+
+$(PROGS): %: %.o
+
+clean:
+       @rm -rf $(PROGS) $(PROGS:%=%.o)
diff --git a/src/examples/README.txt b/src/examples/README.txt
new file mode 100644 (file)
index 0000000..c80db59
--- /dev/null
@@ -0,0 +1 @@
+Simple test applications for using the enhanced IOCTL's of the cp2101 driver.
diff --git a/src/examples/cpio.c b/src/examples/cpio.c
new file mode 100644 (file)
index 0000000..f0f6f38
--- /dev/null
@@ -0,0 +1,85 @@
+/**
+ * cpio.c
+ *
+ * Set cp2103 GPIO_0 and GPIO_1 for LED connection to get RX/TX activity.
+ * Watch out, the tty is hardcoded.
+ */
+
+#include <netinet/in.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define IOCTL_DEVICERESET      0x8004  /* Get port configuration */
+#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
+#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
+
+typedef struct {
+    uint16_t mode;
+    uint16_t lowPower;
+    uint16_t latch;
+} cp2103_port_state_t;
+
+typedef struct {
+    cp2103_port_state_t reset;
+    cp2103_port_state_t suspend;
+    uint8_t enhancedFxn;
+} cp2103_port_config_t;
+
+int cpConnect()
+{
+    int ret, ioval;
+    int fd = open("/dev/usb/tts/0", O_RDWR);
+    if (fd < 0) {
+       fprintf(stderr, "cannot open tty\n");
+       return -1;
+    }
+    printf("tty opened\n");
+    return fd;
+}
+
+void cpDisconnect(int fd)
+{
+    if (fd >= 0)
+       close(fd);
+}
+
+int main()
+{
+    int fd;
+    cp2103_port_config_t config;
+    int ret;
+
+    /* open */
+    if ((fd = cpConnect()) < 0)
+       return 1;
+
+    /* Read the current port configuration */
+    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
+       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
+       return 1;
+    }
+
+    /* Set the current port configuration; turn on GPIO_0 and GPIO_1 to get
+     * activity LEDs.
+     */
+    config.reset.mode &= ~0x0300;
+    config.suspend.mode &= ~0x0300;
+    config.reset.latch |= 0x0300;
+    config.enhancedFxn &= ~0x03;
+    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
+       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
+       return 1;
+    }
+
+    /* Reset the part so the changes take effect. */
+    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
+       fprintf(stderr, "device reset ioctl %d\n", ret);
+       return 1;
+    }
+
+    cpDisconnect(fd);
+    return 0;
+}
diff --git a/src/examples/cpmfg.c b/src/examples/cpmfg.c
new file mode 100644 (file)
index 0000000..ed8524a
--- /dev/null
@@ -0,0 +1,159 @@
+/**
+ * cpcfg.c
+ *
+ * Configure the USB descriptor and GPIO configurations for a cp2103-equipped
+ * device.
+ */
+
+#include <netinet/in.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#define VID    0x10c4
+#define PID    0xea60
+
+/* CP2103 ioctls */
+#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
+#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
+#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
+#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
+
+/* CP210x ioctls principally used during initial device configuration */
+#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
+#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
+#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
+#define IOCTL_SETVID           0x8007  /* Set vendor id */
+#define IOCTL_SETPID           0x8008  /* Set product id */
+#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
+#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
+#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
+#define IOCTL_SETDEVVER                0x800c  /* set device version id */
+/* FIXME: where is IOCTL_SETMFG? */
+
+/* CP2103 GPIO */
+#define GPIO_0         0x01
+#define GPIO_1         0x02
+#define GPIO_2         0x04
+#define GPIO_3         0x08
+#define GPIO_MASK      (GPIO_0|GPIO_1|GPIO_2|GPIO_3)
+
+/* Port config definitions */
+typedef struct {
+    uint16_t mode;             /* Push-pull = 1, Open-drain = 0 */
+    uint16_t lowPower;
+    uint16_t latch;            /* Logic high = 1, Logic low = 0 */
+} cp2101_port_state_t;
+
+typedef struct {
+    cp2101_port_state_t reset;
+    cp2101_port_state_t suspend;
+    uint8_t enhancedFxn;
+} cp2101_port_config_t;
+
+#define PORT_CONFIG_LEN        13      /* Because sizeof() will pad to full words */
+
+/* Used to pass variable sized buffers between user and kernel space (ioctls) */
+typedef struct {
+       char* buf;
+       size_t len;
+} cp210x_buffer_t;
+
+void exit(int);
+
+int cpConnect(char* device)
+{
+    int ret, ioval;
+    int fd = open(device, O_RDWR);
+    if (fd < 0) {
+       fprintf(stderr, "cannot open %s\n", device);
+       exit(1);
+    }
+    printf("%s opened\n", device);
+    return fd;
+}
+
+void cpDisconnect(int fd)
+{
+    if (fd >= 0)
+       close(fd);
+}
+
+void cpSetStr(int fd, unsigned int ioctlno, char* string, size_t len)
+{
+    int ret;
+    cp210x_buffer_t buf = { buf: string, len: len };
+
+    ret = ioctl(fd, ioctlno, &buf);
+    if (ret) {
+       fprintf(stderr, "failed to set via ioctl 0x%04x, err %d\n", ioctlno,
+               ret);
+       exit(1);
+    }
+}
+
+void cpSetLeds(int fd)
+{
+    int ret;
+    cp2101_port_config_t config;
+
+    /* Read the current port configuration */
+    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
+       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
+       exit(1);
+    }
+
+    /* Set the current port configuration; turn on GPIO_0 and GPIO_1 to get
+     * activity LEDs.  GPIO_2 and GPIO_3 are set for 'regular' gpio.
+     */
+    config.reset.mode &= ~0x0300;
+    config.suspend.mode &= ~0x0300;
+    config.reset.latch |= 0x0300;
+    config.enhancedFxn |= 0x03;
+    config.enhancedFxn &= ~0x10; /* turn off weak pullups */
+    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
+       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
+       exit(1);
+    }
+}
+
+void cpReset(int fd)
+{
+    int ret;
+
+    /* Reset the part */
+    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
+       fprintf(stderr, "device reset ioctl %d\n", ret);
+       exit(1);
+    }
+}
+
+int main(int argc, char* argv[])
+{
+    /* char newmfg[255] = "Company Name"; */
+    char newprod[255] = "CompanyName ";
+    char newsn[255];
+    int fd;
+
+    if (argc != 4) {
+      fprintf(stderr, "usage: %s <tty> <part#> <sn#>\n", argv[0]);
+      exit(1);
+    }
+
+    strcat(newprod, argv[2]);
+    strcpy(newsn, argv[3]);
+    fd = cpConnect(argv[1]);
+    /* SiLabs doesn't allow set of mfg string on cp210x.
+     * cpSetStr(fd, IOCTL_SETMFG, newmfg, strlen(newmfg));
+     */
+    cpSetStr(fd, IOCTL_SETPRODUCT, newprod, strlen(newprod));
+    cpSetStr(fd, IOCTL_SETSERIAL, newsn, strlen(newsn));
+    cpSetLeds(fd);
+    cpReset(fd);
+    cpDisconnect(fd);
+    printf("done\n");
+    return 0;
+}
diff --git a/src/examples/cptwiddle.c b/src/examples/cptwiddle.c
new file mode 100644 (file)
index 0000000..068809e
--- /dev/null
@@ -0,0 +1,167 @@
+/**
+ * cptwiddle.c
+ *
+ * Twiddle the leds connected to the cp2103's GPIO_0 and GPIO_1 pins on the
+ * USB device.  Twiddle does the following:
+ *
+ *  - Saves the current latch and port config settings
+ *  - Reconfigures for leds as IO
+ *  - Resets the device and reconnects to it
+ *  - Twiddles the LEDs
+ *  - Restores the original configuration
+ *  - Resets the device again so that the original config is immediately active
+ *
+ * Watch out; the tty device is hard-coded.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+/* CP2103 ioctls */
+#define IOCTL_GPIOGET          0x8000  /* Get gpio bits */
+#define IOCTL_GPIOSET          0x8001  /* Set gpio bits */
+#define IOCTL_GPIOBIC          0x8002  /* Clear specific gpio bit(s) */
+#define IOCTL_GPIOBIS          0x8003  /* Set specific gpio bit(s) */
+
+/* CP210x ioctls principally used during initial device configuration */
+#define IOCTL_DEVICERESET      0x8004  /* Reset the cp210x */
+#define IOCTL_PORTCONFGET      0x8005  /* Get port configuration */
+#define IOCTL_PORTCONFSET      0x8006  /* Set port configuration */
+#define IOCTL_SETVID           0x8007  /* Set vendor id */
+#define IOCTL_SETPID           0x8008  /* Set product id */
+#define IOCTL_SETMFG           0x8009  /* Set manufacturer string */
+#define IOCTL_SETPRODUCT       0x800a  /* Set product string */
+#define IOCTL_SETSERIAL                0x800b  /* Set serial number string */
+#define IOCTL_SETDEVVER                0x800c  /* set device version id */
+/* FIXME: where is IOCTL_SETMFG? */
+
+
+typedef struct {
+    uint16_t mode;
+    uint16_t lowPower;
+    uint16_t latch;
+} cp2103_port_state_t;
+
+typedef struct {
+    cp2103_port_state_t reset;
+    cp2103_port_state_t suspend;
+    uint8_t enhancedFxn;
+} cp2103_port_config_t;
+
+int cpConnect()
+{
+    int ret, ioval;
+    int fd = open("/dev/usb/tts/0", O_RDWR);
+    if (fd < 0) {
+       fprintf(stderr, "cannot open tty\n");
+       return -1;
+    }
+    printf("tty opened\n");
+    return fd;
+}
+
+void cpDisconnect(int fd)
+{
+    if (fd >= 0)
+       close(fd);
+}
+
+int main()
+{
+    int fd;
+    cp2103_port_config_t config;
+    cp2103_port_config_t saveConfig;
+    uint8_t saveGpio;
+    int ret;
+    int i;
+
+    if ((fd = cpConnect()) < 0)
+       return 1;
+
+    /* Read the current port configuration */
+    if ((ret = ioctl(fd, IOCTL_PORTCONFGET, &config))) {
+       fprintf(stderr, "portconfget ioctl failed %d\n", ret);
+       return 1;
+    }
+    memcpy(&saveConfig, &config, sizeof(config));
+    printf("port config received\n");
+
+    /* Read the current gpio latches */
+    if ((ret = ioctl(fd, IOCTL_GPIOGET, &saveGpio))) {
+       fprintf(stderr, "gpioget ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("saved gpio latches 0x%02x\n", saveGpio);
+
+    /* Set the current port configuration; set GPIO_0 and GPIO_1 as outputs */
+    config.reset.mode &= ~0x0300;
+    config.suspend.mode &= ~0x0300;
+    config.reset.latch |= 0x0300;
+    config.enhancedFxn &= ~0x03;
+    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &config))) {
+       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("port config altered\n");
+
+    /* Reset the part */
+    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
+       fprintf(stderr, "device reset ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("device reset\n");
+
+    /* Disconnect then reconnect */
+    cpDisconnect(fd);
+    printf("disconnected\n");
+    for (i = 0; i < 10; i++) {
+       sleep(1);
+       if ((fd = cpConnect()) >= 0)
+           break;
+    }
+    if (i == 100) {
+       printf("failed to reconnect\n");
+       return 1;
+    }
+    printf("reconnected\n");
+
+    /* Now, twiddle some bits */
+    for (i = 0; i < 8; i++) {
+       uint8_t leds = i & 0x03;
+       if ((ret = ioctl(fd, IOCTL_GPIOSET, leds))) {
+           fprintf(stderr, "gpio set ioctl failed %d\n", ret);
+           return 1;
+       }
+       printf("set leds %u\n", leds);
+       sleep(1);
+    }
+
+    /* Restore the original latches */
+    if ((ret = ioctl(fd, IOCTL_GPIOSET, saveGpio))) {
+       fprintf(stderr, "gpio set ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("gpio latches restored\n");
+
+    /* Return the original configuration */
+    if ((ret = ioctl(fd, IOCTL_PORTCONFSET, &saveConfig))) {
+       fprintf(stderr, "portconfset ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("port config restored\n");
+
+    /* Reset the part again */
+    if ((ret = ioctl(fd, IOCTL_DEVICERESET, 0))) {
+       fprintf(stderr, "device reset ioctl failed %d\n", ret);
+       return 1;
+    }
+    printf("device reset again\n");
+
+    cpDisconnect(fd);
+    return 0;
+}
diff --git a/src/installmod b/src/installmod
new file mode 100644 (file)
index 0000000..2334445
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ -f $1 ] ; then
+       if [ ! -d $3 ] ; then
+               echo "ERR: \"$3\" does not exist."
+               exit 1
+       fi
+
+       if [ -d $2/kernel/drivers ] ; then
+               installpath=$2/kernel/drivers/usb/serial/$1
+       else
+               installpath=$2/$1
+       fi
+
+       install -m 444 -D $1 $installpath
+
+       if [ $? != 0 ] ; then
+               echo "ERR: Failed to install $1 in $installpath"
+               exit 1
+       else
+               echo "Installed $1 in $installpath"
+       fi
+
+       depmod    
+       exit 0
+else
+       echo "ERR: Module \"$1\" not present"
+       exit 1
+fi
diff --git a/src/rpm/buildRPM b/src/rpm/buildRPM
new file mode 100755 (executable)
index 0000000..dbe689b
--- /dev/null
@@ -0,0 +1,38 @@
+#!/bin/sh
+THISDIR=`pwd`
+RPMROOT=/usr/src/redhat
+NAME=cp2103
+VER_MAJ=0
+VER_MIN=11
+VER_PAT=0
+VERSION=$VER_MAJ.$VER_MIN.$VER_PAT
+
+echo $PWD
+echo "Creating infrastructure."
+cd $RPMROOT/SOURCES
+rm -rf $NAME-$VERSION
+rm -rf $NAME-$VERSION.tar.gz
+mkdir $NAME-$VERSION
+cd  $NAME-$VERSION
+
+echo "Copying source code."
+cp -R $THISDIR/. .
+echo "Packaging source code."
+cd ..
+tar cvf $NAME-$VERSION.tar $NAME-$VERSION
+gzip $NAME-$VERSION.tar
+
+echo "Copying source to RPM subsystem."
+cp $NAME-$VERSION/rpm/$NAME.spec $RPMROOT/SPECS/.
+
+echo "Starting RPM build..."
+
+KERNEL_BLD_VERSION=`uname -r`
+export KERNEL_BLD_VERSION
+
+rpmbuild -bs $RPMROOT/SPECS/cp2103.spec
+
+
+
+
+
diff --git a/src/rpm/cp2103.spec b/src/rpm/cp2103.spec
new file mode 100644 (file)
index 0000000..c5a507a
--- /dev/null
@@ -0,0 +1,34 @@
+# RPM header info
+Summary: Silicon Labs CP2101/CP2102/CP2103 USB To Serial Bridge driver
+Name: cp2103
+Version: 0.11.0
+Release: 1
+Group: System Environment/Kernel
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}
+ExclusiveOS: linux
+Source: %{name}-%{version}.tar.gz
+Packager: Intelligraphics, Inc.
+Vendor: Silicon Laboratories, Inc.
+License: GPL
+
+%description
+Device driver kernel module for the Silicon Laboratories CP2101/CP2102/CP2103 USB To Serial Bridge.
+
+%prep
+%setup -q
+
+%build
+./configure
+make -f Makefile.go modules
+
+%install
+make -f Makefile.go install
+
+%clean
+make -f Makefile.go distclean
+
+%files
+%defattr(-,root,root)
+%doc
+%config
+