*
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/errno.h>
#include <linux/wait.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
-#include <linux/usb/serial.h>
+#include "usb-serial.h"
#include "io_edgeport.h"
#include "io_ionsp.h" /* info for the iosp messages */
#include "io_16654.h" /* 16654 UART defines */
/* This structure holds all of the individual device information */
struct edgeport_serial {
- char name[MAX_NAME_LEN+2]; /* string name of this device */
+ char name[MAX_NAME_LEN+1]; /* string name of this device */
struct edge_manuf_descriptor manuf_descriptor; /* the manufacturer descriptor */
struct edge_boot_descriptor boot_descriptor; /* the boot firmware descriptor */
static void get_boot_desc (struct edgeport_serial *edge_serial);
static void load_application_firmware (struct edgeport_serial *edge_serial);
-static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size);
+static void unicode_to_ascii (char *string, __le16 *unicode, int unicode_size);
// ************************************************************************
* Get string descriptor from device *
* *
************************************************************************/
-static int get_string (struct usb_device *dev, int Id, char *string, int buflen)
+static int get_string (struct usb_device *dev, int Id, char *string)
{
struct usb_string_descriptor StringDesc;
struct usb_string_descriptor *pStringDesc;
return 0;
}
- unicode_to_ascii(string, buflen, pStringDesc->wData, pStringDesc->bLength/2);
+ unicode_to_ascii(string, pStringDesc->wData, pStringDesc->bLength/2-1);
kfree(pStringDesc);
return strlen(string);
* ASCII range, but it's only for debugging...
* NOTE: expects the unicode in LE format
****************************************************************************/
-static void unicode_to_ascii(char *string, int buflen, __le16 *unicode, int unicode_size)
+static void unicode_to_ascii (char *string, __le16 *unicode, int unicode_size)
{
int i;
- if (buflen <= 0) /* never happens, but... */
+ if (unicode_size <= 0)
return;
- --buflen; /* space for nul */
- for (i = 0; i < unicode_size; i++) {
- if (i >= buflen)
- break;
+ for (i = 0; i < unicode_size; ++i)
string[i] = (char)(le16_to_cpu(unicode[i]));
- }
- string[i] = 0x00;
+ string[unicode_size] = 0x00;
}
dbg(" BoardRev: %d", edge_serial->manuf_descriptor.BoardRev);
dbg(" NumPorts: %d", edge_serial->manuf_descriptor.NumPorts);
dbg(" DescDate: %d/%d/%d", edge_serial->manuf_descriptor.DescDate[0], edge_serial->manuf_descriptor.DescDate[1], edge_serial->manuf_descriptor.DescDate[2]+1900);
- unicode_to_ascii(string, sizeof(string),
- edge_serial->manuf_descriptor.SerialNumber,
- edge_serial->manuf_descriptor.SerNumLength/2);
+ unicode_to_ascii (string, edge_serial->manuf_descriptor.SerialNumber, edge_serial->manuf_descriptor.SerNumLength/2-1);
dbg(" SerialNumber: %s", string);
- unicode_to_ascii(string, sizeof(string),
- edge_serial->manuf_descriptor.AssemblyNumber,
- edge_serial->manuf_descriptor.AssemblyNumLength/2);
+ unicode_to_ascii (string, edge_serial->manuf_descriptor.AssemblyNumber, edge_serial->manuf_descriptor.AssemblyNumLength/2-1);
dbg(" AssemblyNumber: %s", string);
- unicode_to_ascii(string, sizeof(string),
- edge_serial->manuf_descriptor.OemAssyNumber,
- edge_serial->manuf_descriptor.OemAssyNumLength/2);
+ unicode_to_ascii (string, edge_serial->manuf_descriptor.OemAssyNumber, edge_serial->manuf_descriptor.OemAssyNumLength/2-1);
dbg(" OemAssyNumber: %s", string);
dbg(" UartType: %d", edge_serial->manuf_descriptor.UartType);
dbg(" IonPid: %d", edge_serial->manuf_descriptor.IonPid);
struct edgeport_serial *edge_serial;
struct edgeport_port *edge_port;
struct usb_device *dev;
- int i, j;
+ int i;
dev = serial->dev;
/* create our private serial structure */
- edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL);
+ edge_serial = kmalloc (sizeof(struct edgeport_serial), GFP_KERNEL);
if (edge_serial == NULL) {
dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__);
return -ENOMEM;
}
+ memset (edge_serial, 0, sizeof(struct edgeport_serial));
spin_lock_init(&edge_serial->es_lock);
edge_serial->serial = serial;
usb_set_serial_data(serial, edge_serial);
/* get the name for the device from the device */
- i = get_string(dev, dev->descriptor.iManufacturer,
- &edge_serial->name[0], MAX_NAME_LEN+1);
- edge_serial->name[i++] = ' ';
- get_string(dev, dev->descriptor.iProduct,
- &edge_serial->name[i], MAX_NAME_LEN+2 - i);
+ if ( (i = get_string(dev, dev->descriptor.iManufacturer, &edge_serial->name[0])) != 0) {
+ edge_serial->name[i-1] = ' ';
+ }
+
+ get_string(dev, dev->descriptor.iProduct, &edge_serial->name[i]);
dev_info(&serial->dev->dev, "%s detected\n", edge_serial->name);
edge_port = kmalloc (sizeof(struct edgeport_port), GFP_KERNEL);
if (edge_port == NULL) {
dev_err(&serial->dev->dev, "%s - Out of memory\n", __FUNCTION__);
- for (j = 0; j < i; ++j) {
- kfree (usb_get_serial_port_data(serial->port[j]));
- usb_set_serial_port_data(serial->port[j], NULL);
- }
usb_set_serial_data(serial, NULL);
kfree(edge_serial);
return -ENOMEM;