patch-2.4.20 linux-2.4.20/drivers/usb/serial/keyspan.c
Next file: linux-2.4.20/drivers/usb/serial/keyspan.h
Previous file: linux-2.4.20/drivers/usb/serial/ir-usb.c
Back to the patch index
Back to the overall index
- Lines: 1560
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/usb/serial/keyspan.c
- Orig date:
Fri Dec 21 09:41:55 2001
diff -urN linux-2.4.19/drivers/usb/serial/keyspan.c linux-2.4.20/drivers/usb/serial/keyspan.c
@@ -1,8 +1,8 @@
/*
Keyspan USB to Serial Converter driver
- (C) Copyright (C) 2000-2001
- Hugh Blemings <hugh@misc.nu>
+ (C) Copyright (C) 2000-2001 Hugh Blemings <hugh@blemings.org>
+ (C) Copyright (C) 2002 Greg Kroah-Hartman <greg@kroah.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,6 +28,17 @@
Change History
+ Wed Apr 25 12:00:00 PST 2002 (Keyspan)
+ Started with Hugh Blemings' code dated Jan 17, 2002. All adapters
+ now supported (including QI and QW). Modified port open, port
+ close, and send setup() logic to fix various data and endpoint
+ synchronization bugs and device LED status bugs. Changed keyspan_
+ write_room() to accurately return transmit buffer availability.
+ Changed forwardingLength from 1 to 16 for all adapters.
+
+ Fri Oct 12 16:45:00 EST 2001
+ Preliminary USA-19QI and USA-28 support (both test OK for me, YMMV)
+
Mon Oct 8 14:29:00 EST 2001 hugh
Fixed bug that prevented mulitport devices operating correctly
if they weren't the first unit attached.
@@ -65,19 +76,15 @@
#include <linux/config.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
#include <linux/errno.h>
-#include <linux/poll.h>
#include <linux/init.h>
#include <linux/slab.h>
-#include <linux/fcntl.h>
#include <linux/tty.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/spinlock.h>
-#include <linux/usb.h>
+#include <asm/uaccess.h>
#ifdef CONFIG_USB_SERIAL_DEBUG
static int debug = 1;
@@ -95,7 +102,7 @@
/*
* Version Information
*/
-#define DRIVER_VERSION "v1.1.1"
+#define DRIVER_VERSION "v1.1.3"
#define DRIVER_AUTHOR "Hugh Blemings <hugh@misc.nu"
#define DRIVER_DESC "Keyspan USB to Serial Converter Driver"
@@ -107,13 +114,13 @@
/* number of active ports */
atomic_t active_count;
- const keyspan_device_details *device_details;
+ const struct keyspan_device_details *device_details;
- urb_t *instat_urb;
+ struct urb *instat_urb;
char instat_buf[INSTAT_BUFLEN];
/* XXX this one probably will need a lock */
- urb_t *glocont_urb;
+ struct urb *glocont_urb;
char glocont_buf[GLOCONT_BUFLEN];
};
@@ -125,21 +132,21 @@
/* Keep duplicate of device details in each port
structure as well - simplifies some of the
callback functions etc. */
- const keyspan_device_details *device_details;
+ const struct keyspan_device_details *device_details;
/* Input endpoints and buffer for this port */
- urb_t *in_urbs[2];
+ struct urb *in_urbs[2];
char in_buffer[2][64];
/* Output endpoints and buffer for this port */
- urb_t *out_urbs[2];
+ struct urb *out_urbs[2];
char out_buffer[2][64];
/* Input ack endpoint */
- urb_t *inack_urb;
+ struct urb *inack_urb;
char inack_buffer[1];
/* Output control endpoint */
- urb_t *outcont_urb;
+ struct urb *outcont_urb;
char outcont_buffer[64];
/* Settings for the port */
@@ -167,34 +174,14 @@
#include "keyspan_usa28msg.h"
#include "keyspan_usa49msg.h"
-/* If you don't get debugging output, uncomment the following
- two lines to enable cheat. */
-#if 0
- #undef dbg
- #define dbg printk
-#endif
-
/* Functions used by new usb-serial code. */
static int __init keyspan_init (void)
{
- usb_serial_register (&keyspan_usa18x_pre_device);
- usb_serial_register (&keyspan_usa19_pre_device);
- usb_serial_register (&keyspan_usa19w_pre_device);
- usb_serial_register (&keyspan_usa28_pre_device);
- usb_serial_register (&keyspan_usa28x_pre_device);
- usb_serial_register (&keyspan_usa28xa_pre_device);
- usb_serial_register (&keyspan_usa28xb_pre_device);
- usb_serial_register (&keyspan_usa49w_pre_device);
-
- usb_serial_register (&keyspan_usa18x_device);
- usb_serial_register (&keyspan_usa19_device);
- usb_serial_register (&keyspan_usa19w_device);
- usb_serial_register (&keyspan_usa28_device);
- usb_serial_register (&keyspan_usa28x_device);
- usb_serial_register (&keyspan_usa28xa_device);
- /* We don't need a separate entry for the usa28xb as it appears as a 28x anyway */
- usb_serial_register (&keyspan_usa49w_device);
+ usb_serial_register (&keyspan_pre_device);
+ usb_serial_register (&keyspan_1port_device);
+ usb_serial_register (&keyspan_2port_device);
+ usb_serial_register (&keyspan_4port_device);
info(DRIVER_VERSION ":" DRIVER_DESC);
@@ -203,23 +190,10 @@
static void __exit keyspan_exit (void)
{
- usb_serial_deregister (&keyspan_usa18x_pre_device);
- usb_serial_deregister (&keyspan_usa19_pre_device);
- usb_serial_deregister (&keyspan_usa19w_pre_device);
- usb_serial_deregister (&keyspan_usa28_pre_device);
- usb_serial_deregister (&keyspan_usa28x_pre_device);
- usb_serial_deregister (&keyspan_usa28xa_pre_device);
- usb_serial_deregister (&keyspan_usa28xb_pre_device);
- usb_serial_deregister (&keyspan_usa49w_pre_device);
-
- usb_serial_deregister (&keyspan_usa18x_device);
- usb_serial_deregister (&keyspan_usa19_device);
- usb_serial_deregister (&keyspan_usa19w_device);
- usb_serial_deregister (&keyspan_usa28_device);
- usb_serial_deregister (&keyspan_usa28x_device);
- usb_serial_deregister (&keyspan_usa28xa_device);
- /* We don't need a separate entry for the usa28xb as it appears as a 28x anyway */
- usb_serial_deregister (&keyspan_usa49w_device);
+ usb_serial_deregister (&keyspan_pre_device);
+ usb_serial_deregister (&keyspan_1port_device);
+ usb_serial_deregister (&keyspan_2port_device);
+ usb_serial_deregister (&keyspan_4port_device);
}
module_init(keyspan_init);
@@ -227,13 +201,13 @@
static void keyspan_rx_throttle (struct usb_serial_port *port)
{
- dbg("keyspan_rx_throttle port %d\n", port->number);
+ dbg("%s - port %d", __FUNCTION__, port->number);
}
static void keyspan_rx_unthrottle (struct usb_serial_port *port)
{
- dbg("keyspan_rx_unthrottle port %d\n", port->number);
+ dbg("%s - port %d", __FUNCTION__, port->number);
}
@@ -241,7 +215,7 @@
{
struct keyspan_port_private *p_priv;
- dbg("keyspan_break_ctl\n");
+ dbg("%s", __FUNCTION__);
p_priv = (struct keyspan_port_private *)port->private;
@@ -257,16 +231,17 @@
static void keyspan_set_termios (struct usb_serial_port *port,
struct termios *old_termios)
{
- int baud_rate;
+ int baud_rate, device_port;
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
unsigned int cflag;
- dbg(__FUNCTION__ ".\n");
+ dbg("%s", __FUNCTION__);
p_priv = (struct keyspan_port_private *)(port->private);
d_details = p_priv->device_details;
cflag = port->tty->termios->c_cflag;
+ device_port = port->number - port->serial->minor;
/* Baud rate calculation takes baud rate as an integer
so other rates can be generated if desired. */
@@ -274,7 +249,7 @@
/* If no match or invalid, don't change */
if (baud_rate >= 0
&& d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
- NULL, NULL, NULL) == KEYSPAN_BAUD_RATE_OK) {
+ NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {
/* FIXME - more to do here to ensure rate changes cleanly */
p_priv->baud = baud_rate;
}
@@ -337,19 +312,17 @@
const unsigned char *buf, int count)
{
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
int flip;
int left, todo;
- urb_t *this_urb;
+ struct urb *this_urb;
int err;
p_priv = (struct keyspan_port_private *)(port->private);
d_details = p_priv->device_details;
-#if 0
- dbg(__FUNCTION__ " for port %d (%d chars [%x]), flip=%d\n",
- port->number, count, buf[0], p_priv->out_flip);
-#endif
+ dbg("%s - for port %d (%d chars [%x]), flip=%d",
+ __FUNCTION__, port->number, count, buf[0], p_priv->out_flip);
for (left = count; left > 0; left -= todo) {
todo = left;
@@ -361,11 +334,11 @@
/* Check we have a valid urb/endpoint before we use it... */
if ((this_urb = p_priv->out_urbs[flip]) == 0) {
/* no bulk out, so return 0 bytes written */
- dbg(__FUNCTION__ " no output urb :(\n");
+ dbg("%s - no output urb :(", __FUNCTION__);
return count;
}
- dbg(__FUNCTION__ " endpoint %d\n", usb_pipeendpoint(this_urb->pipe));
+ dbg("%s - endpoint %d flip %d", __FUNCTION__, usb_pipeendpoint(this_urb->pipe), flip);
if (this_urb->status == -EINPROGRESS) {
if (this_urb->transfer_flags & USB_ASYNC_UNLINK)
@@ -395,7 +368,7 @@
this_urb->transfer_flags &= ~USB_ASYNC_UNLINK;
this_urb->dev = port->serial->dev;
if ((err = usb_submit_urb(this_urb)) != 0) {
- dbg("usb_submit_urb(write bulk) failed (%d)\n", err);
+ dbg("usb_submit_urb(write bulk) failed (%d)", err);
}
p_priv->tx_start_time[flip] = jiffies;
@@ -415,26 +388,28 @@
struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
endpoint = usb_pipeendpoint(urb->pipe);
if (urb->status) {
- dbg(__FUNCTION__ "nonzero status: %x on endpoint %d.\n",
- urb->status, endpoint);
+ dbg("%s - nonzero status: %x on endpoint %d.",
+ __FUNCTION__, urb->status, endpoint);
return;
}
port = (struct usb_serial_port *) urb->context;
tty = port->tty;
if (urb->actual_length) {
- if (data[0] == 0) {
+ /* 0x80 bit is error flag */
+ if ((data[0] & 0x80) == 0) {
/* no error on any byte */
for (i = 1; i < urb->actual_length ; ++i) {
tty_insert_flip_char(tty, data[i], 0);
}
} else {
/* some bytes had errors, every byte has status */
+ dbg("%s - RX error!!!!", __FUNCTION__);
for (i = 0; i + 1 < urb->actual_length; i += 2) {
int stat = data[i], flag = 0;
if (stat & RXERROR_OVERRUN)
@@ -452,9 +427,10 @@
/* Resubmit urb so we continue receiving */
urb->dev = port->serial->dev;
- if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err);
- }
+ if (port->open_count)
+ if ((err = usb_submit_urb(urb)) != 0) {
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
+ }
return;
}
@@ -466,9 +442,9 @@
port = (struct usb_serial_port *) urb->context;
p_priv = (struct keyspan_port_private *)(port->private);
- dbg (__FUNCTION__ " urb %d\n", urb == p_priv->out_urbs[1]);
+ dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]);
- if (port->active) {
+ if (port->open_count) {
queue_task(&port->tqueue, &tq_immediate);
mark_bh(IMMEDIATE_BH);
}
@@ -476,7 +452,7 @@
static void usa26_inack_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
@@ -489,15 +465,15 @@
p_priv = (struct keyspan_port_private *)(port->private);
if (p_priv->resend_cont) {
- dbg (__FUNCTION__ " sending setup\n");
- keyspan_usa26_send_setup(port->serial, port, 0);
+ dbg ("%s - sending setup", __FUNCTION__);
+ keyspan_usa26_send_setup(port->serial, port, p_priv->resend_cont - 1);
}
}
static void usa26_instat_callback(struct urb *urb)
{
unsigned char *data = urb->transfer_buffer;
- keyspan_usa26_portStatusMessage *msg;
+ struct keyspan_usa26_portStatusMessage *msg;
struct usb_serial *serial;
struct usb_serial_port *port;
struct keyspan_port_private *p_priv;
@@ -506,19 +482,19 @@
serial = (struct usb_serial *) urb->context;
if (urb->status) {
- dbg(__FUNCTION__ " nonzero status: %x\n", urb->status);
+ dbg("%s - nonzero status: %x", __FUNCTION__, urb->status);
return;
}
if (urb->actual_length != 9) {
- dbg(__FUNCTION__ " %d byte report??\n", urb->actual_length);
+ dbg("%s - %d byte report??", __FUNCTION__, urb->actual_length);
goto exit;
}
- msg = (keyspan_usa26_portStatusMessage *)data;
+ msg = (struct keyspan_usa26_portStatusMessage *)data;
#if 0
- dbg(__FUNCTION__ " port status: port %d cts %d dcd %d dsr %d ri %d toff %d txoff %d rxen %d cr %d\n",
- msg->port, msg->hskia_cts, msg->gpia_dcd, msg->dsr, msg->ri, msg->_txOff,
+ dbg("%s - port status: port %d cts %d dcd %d dsr %d ri %d toff %d txoff %d rxen %d cr %d",
+ __FUNCTION__, msg->port, msg->hskia_cts, msg->gpia_dcd, msg->dsr, msg->ri, msg->_txOff,
msg->_txXoff, msg->rxEnabled, msg->controlResponse);
#endif
@@ -527,7 +503,7 @@
/* Check port number from message and retrieve private data */
if (msg->port >= serial->num_ports) {
- dbg ("Unexpected port number %d\n", msg->port);
+ dbg ("%s - Unexpected port number %d", __FUNCTION__, msg->port);
goto exit;
}
port = &serial->port[msg->port];
@@ -548,17 +524,17 @@
/* wake_up_interruptible(&p_priv->open_wait); */
}
-exit:
/* Resubmit urb so we continue receiving */
urb->dev = serial->dev;
if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err);
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
}
+exit:
}
static void usa26_glocont_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
@@ -571,7 +547,7 @@
unsigned char *data;
struct keyspan_port_private *p_priv;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
port = (struct usb_serial_port *) urb->context;
p_priv = (struct keyspan_port_private *)(port->private);
@@ -582,9 +558,8 @@
do {
if (urb->status) {
- dbg(__FUNCTION__ "nonzero status: %x on endpoint
-%d.\n",
- urb->status, usb_pipeendpoint(urb->pipe));
+ dbg("%s - nonzero status: %x on endpoint %d.",
+ __FUNCTION__, urb->status, usb_pipeendpoint(urb->pipe));
return;
}
@@ -602,10 +577,10 @@
/* Resubmit urb so we continue receiving */
urb->dev = port->serial->dev;
- if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n",
-err);
- }
+ if (port->open_count)
+ if ((err = usb_submit_urb(urb)) != 0) {
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
+ }
p_priv->in_flip ^= 1;
urb = p_priv->in_urbs[p_priv->in_flip];
@@ -614,7 +589,7 @@
static void usa28_inack_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
static void usa28_outcont_callback(struct urb *urb)
@@ -626,8 +601,8 @@
p_priv = (struct keyspan_port_private *)(port->private);
if (p_priv->resend_cont) {
- dbg (__FUNCTION__ " sending setup\n");
- keyspan_usa28_send_setup(port->serial, port, 0);
+ dbg ("%s - sending setup", __FUNCTION__);
+ keyspan_usa28_send_setup(port->serial, port, p_priv->resend_cont - 1);
}
}
@@ -635,7 +610,7 @@
{
int err;
unsigned char *data = urb->transfer_buffer;
- keyspan_usa28_portStatusMessage *msg;
+ struct keyspan_usa28_portStatusMessage *msg;
struct usb_serial *serial;
struct usb_serial_port *port;
struct keyspan_port_private *p_priv;
@@ -644,26 +619,26 @@
serial = (struct usb_serial *) urb->context;
if (urb->status) {
- dbg(__FUNCTION__ " nonzero status: %x\n", urb->status);
+ dbg("%s - nonzero status: %x", __FUNCTION__, urb->status);
return;
}
if (urb->actual_length != sizeof(struct keyspan_usa28_portStatusMessage)) {
- dbg(__FUNCTION__ " bad length %d\n", urb->actual_length);
+ dbg("%s - bad length %d", __FUNCTION__, urb->actual_length);
goto exit;
}
- /*dbg(__FUNCTION__ " %x %x %x %x %x %x %x %x %x %x %x %x\n",
+ /*dbg("%s %x %x %x %x %x %x %x %x %x %x %x %x", __FUNCTION__
data[0], data[1], data[2], data[3], data[4], data[5],
data[6], data[7], data[8], data[9], data[10], data[11]);*/
/* Now do something useful with the data */
- msg = (keyspan_usa28_portStatusMessage *)data;
+ msg = (struct keyspan_usa28_portStatusMessage *)data;
/* Check port number from message and retrieve private data */
if (msg->port >= serial->num_ports) {
- dbg ("Unexpected port number %d\n", msg->port);
+ dbg ("%s - Unexpected port number %d", __FUNCTION__, msg->port);
goto exit;
}
port = &serial->port[msg->port];
@@ -684,17 +659,17 @@
/* wake_up_interruptible(&p_priv->open_wait); */
}
-exit:
/* Resubmit urb so we continue receiving */
urb->dev = serial->dev;
if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err);
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
}
+exit:
}
static void usa28_glocont_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
@@ -705,7 +680,7 @@
struct keyspan_port_private *p_priv;
int i;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
serial = (struct usb_serial *) urb->context;
for (i = 0; i < serial->num_ports; ++i) {
@@ -713,8 +688,8 @@
p_priv = (struct keyspan_port_private *)(port->private);
if (p_priv->resend_cont) {
- dbg (__FUNCTION__ " sending setup\n");
- keyspan_usa49_send_setup(serial, port, 0);
+ dbg ("%s - sending setup", __FUNCTION__);
+ keyspan_usa49_send_setup(serial, port, p_priv->resend_cont - 1);
break;
}
}
@@ -726,36 +701,36 @@
{
int err;
unsigned char *data = urb->transfer_buffer;
- keyspan_usa49_portStatusMessage *msg;
+ struct keyspan_usa49_portStatusMessage *msg;
struct usb_serial *serial;
struct usb_serial_port *port;
struct keyspan_port_private *p_priv;
int old_dcd_state;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
serial = (struct usb_serial *) urb->context;
if (urb->status) {
- dbg(__FUNCTION__ " nonzero status: %x\n", urb->status);
+ dbg("%s - nonzero status: %x", __FUNCTION__, urb->status);
return;
}
if (urb->actual_length != sizeof(struct keyspan_usa49_portStatusMessage)) {
- dbg(__FUNCTION__ " bad length %d\n", urb->actual_length);
+ dbg("%s - bad length %d", __FUNCTION__, urb->actual_length);
goto exit;
}
- /*dbg(__FUNCTION__ " %x %x %x %x %x %x %x %x %x %x %x\n",
+ /*dbg(" %x %x %x %x %x %x %x %x %x %x %x", __FUNCTION__,
data[0], data[1], data[2], data[3], data[4], data[5],
data[6], data[7], data[8], data[9], data[10]);*/
/* Now do something useful with the data */
- msg = (keyspan_usa49_portStatusMessage *)data;
+ msg = (struct keyspan_usa49_portStatusMessage *)data;
/* Check port number from message and retrieve private data */
if (msg->portNumber >= serial->num_ports) {
- dbg ("Unexpected port number %d\n", msg->portNumber);
+ dbg ("%s - Unexpected port number %d", __FUNCTION__, msg->portNumber);
goto exit;
}
port = &serial->port[msg->portNumber];
@@ -776,18 +751,18 @@
/* wake_up_interruptible(&p_priv->open_wait); */
}
-exit:
/* Resubmit urb so we continue receiving */
urb->dev = serial->dev;
if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err);
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
}
+exit:
}
static void usa49_inack_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
static void usa49_indat_callback(struct urb *urb)
@@ -798,20 +773,21 @@
struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
endpoint = usb_pipeendpoint(urb->pipe);
if (urb->status) {
- dbg(__FUNCTION__ "nonzero status: %x on endpoint %d.\n",
- urb->status, endpoint);
+ dbg("%s - nonzero status: %x on endpoint %d.", __FUNCTION__,
+ urb->status, endpoint);
return;
}
port = (struct usb_serial_port *) urb->context;
tty = port->tty;
if (urb->actual_length) {
- if (data[0] == 0) {
+ /* 0x80 bit is error flag */
+ if ((data[0] & 0x80) == 0) {
/* no error on any byte */
for (i = 1; i < urb->actual_length ; ++i) {
tty_insert_flip_char(tty, data[i], 0);
@@ -835,24 +811,43 @@
/* Resubmit urb so we continue receiving */
urb->dev = port->serial->dev;
- if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ "resubmit read urb failed. (%d)\n", err);
- }
+ if (port->open_count)
+ if ((err = usb_submit_urb(urb)) != 0) {
+ dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
+ }
}
/* not used, usa-49 doesn't have per-port control endpoints */
static void usa49_outcont_callback(struct urb *urb)
{
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
}
static int keyspan_write_room (struct usb_serial_port *port)
{
- dbg("keyspan_write_room called\n");
- return (32);
+ struct keyspan_port_private *p_priv;
+ const struct keyspan_device_details *d_details;
+ int flip;
+ struct urb *this_urb;
+ dbg("%s", __FUNCTION__);
+ p_priv = (struct keyspan_port_private *)(port->private);
+ d_details = p_priv->device_details;
+
+ flip = p_priv->out_flip;
+
+ /* Check both endpoints to see if any are available. */
+ if ((this_urb = p_priv->out_urbs[flip]) != 0) {
+ if (this_urb->status != -EINPROGRESS)
+ return (63);
+ flip = (flip + 1) & d_details->outdat_endp_flip;
+ if ((this_urb = p_priv->out_urbs[flip]) != 0)
+ if (this_urb->status != -EINPROGRESS)
+ return (63);
+ }
+ return (0);
}
@@ -867,26 +862,15 @@
struct keyspan_port_private *p_priv;
struct keyspan_serial_private *s_priv;
struct usb_serial *serial = port->serial;
- const keyspan_device_details *d_details;
- int i, already_active, err;
- urb_t *urb;
+ const struct keyspan_device_details *d_details;
+ int i, err;
+ struct urb *urb;
s_priv = (struct keyspan_serial_private *)(serial->private);
p_priv = (struct keyspan_port_private *)(port->private);
d_details = s_priv->device_details;
- dbg("keyspan_open called for port%d.\n", port->number);
-
- MOD_INC_USE_COUNT;
-
- down (&port->sem);
- ++port->open_count;
- already_active = port->active;
- port->active = 1;
- up (&port->sem);
-
- if (already_active)
- return 0;
+ dbg("%s - port%d.", __FUNCTION__, port->number);
p_priv = (struct keyspan_port_private *)(port->private);
@@ -894,22 +878,37 @@
p_priv->rts_state = 1;
p_priv->dtr_state = 1;
- /* Start reading from endpoints */
+ p_priv->out_flip = 0;
+ p_priv->in_flip = 0;
+
+ /* Reset low level data toggle and start reading from endpoints */
for (i = 0; i < 2; i++) {
if ((urb = p_priv->in_urbs[i]) == NULL)
continue;
urb->dev = serial->dev;
+ usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0);
+
if ((err = usb_submit_urb(urb)) != 0) {
- dbg(__FUNCTION__ " submit urb %d failed (%d)\n", i, err);
+ dbg("%s - submit urb %d failed (%d)", __FUNCTION__, i, err);
}
}
+ /* Reset low level data toggle on out endpoints */
+ for (i = 0; i < 2; i++) {
+ if ((urb = p_priv->out_urbs[i]) == NULL)
+ continue;
+ urb->dev = serial->dev;
+ /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0); */
+ }
+
+ keyspan_send_setup(port, 1);
+ //mdelay(100);
keyspan_set_termios(port, NULL);
return (0);
}
-static inline void stop_urb(urb_t *urb)
+static inline void stop_urb(struct urb *urb)
{
if (urb && urb->status == -EINPROGRESS) {
urb->transfer_flags &= ~USB_ASYNC_UNLINK;
@@ -928,44 +927,37 @@
if (!serial)
return;
- dbg("keyspan_close called\n");
+ dbg("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
p_priv = (struct keyspan_port_private *)(port->private);
p_priv->rts_state = 0;
p_priv->dtr_state = 0;
- if (serial->dev)
- keyspan_send_setup(port, 1);
+ if (serial->dev) {
+ keyspan_send_setup(port, 2);
+ /* pilot-xfer seems to work best with this delay */
+ mdelay(100);
+ keyspan_set_termios(port, NULL);
+ }
/*while (p_priv->outcont_urb->status == -EINPROGRESS) {
- dbg("close - urb in progress\n");
+ dbg("%s - urb in progress", __FUNCTION__);
}*/
p_priv->out_flip = 0;
p_priv->in_flip = 0;
- down (&port->sem);
-
- if (--port->open_count <= 0) {
- if (port->active) {
- if (serial->dev) {
- /* Stop reading/writing urbs */
- stop_urb(p_priv->inack_urb);
- stop_urb(p_priv->outcont_urb);
- for (i = 0; i < 2; i++) {
- stop_urb(p_priv->in_urbs[i]);
- stop_urb(p_priv->out_urbs[i]);
- }
- }
+ if (serial->dev) {
+ /* Stop reading/writing urbs */
+ stop_urb(p_priv->inack_urb);
+ /* stop_urb(p_priv->outcont_urb); */
+ for (i = 0; i < 2; i++) {
+ stop_urb(p_priv->in_urbs[i]);
+ stop_urb(p_priv->out_urbs[i]);
}
- port->active = 0;
- port->open_count = 0;
- port->tty = 0;
}
- up (&port->sem);
-
- MOD_DEC_USE_COUNT;
+ port->tty = 0;
}
@@ -976,12 +968,12 @@
const struct ezusb_hex_record *record;
char *fw_name;
- dbg("Keyspan startup version %04x product %04x\n",
+ dbg("Keyspan startup version %04x product %04x",
serial->dev->descriptor.bcdDevice,
serial->dev->descriptor.idProduct);
if ((serial->dev->descriptor.bcdDevice & 0x8000) != 0x8000) {
- dbg("Firmware already loaded. Quitting.\n");
+ dbg("Firmware already loaded. Quitting.");
return(1);
}
@@ -1012,6 +1004,16 @@
fw_name = "USA19";
break;
+ case keyspan_usa19qi_pre_product_id:
+ record = &keyspan_usa19qi_firmware[0];
+ fw_name = "USA19QI";
+ break;
+
+ case keyspan_usa19qw_pre_product_id:
+ record = &keyspan_usa19qw_firmware[0];
+ fw_name = "USA19QI";
+ break;
+
case keyspan_usa18x_pre_product_id:
record = &keyspan_usa18x_firmware[0];
fw_name = "USA18X";
@@ -1038,7 +1040,7 @@
return(1);
}
- dbg("Uploading Keyspan %s firmware.\n", fw_name);
+ dbg("Uploading Keyspan %s firmware.", fw_name);
/* download the firmware image */
response = ezusb_set_reset(serial, 1);
@@ -1065,19 +1067,19 @@
}
/* Helper functions used by keyspan_setup_urbs */
-static urb_t *keyspan_setup_urb(struct usb_serial *serial, int endpoint,
- int dir, void *ctx, char *buf, int len,
- void (*callback)(urb_t *))
+static struct urb *keyspan_setup_urb (struct usb_serial *serial, int endpoint,
+ int dir, void *ctx, char *buf, int len,
+ void (*callback)(struct urb *))
{
- urb_t *urb;
+ struct urb *urb;
if (endpoint == -1)
return NULL; /* endpoint not needed */
- dbg (__FUNCTION__ " alloc for endpoint %d.\n", endpoint);
+ dbg ("%s - alloc for endpoint %d.", __FUNCTION__, endpoint);
urb = usb_alloc_urb(0); /* No ISO */
if (urb == NULL) {
- dbg (__FUNCTION__ " alloc for endpoint %d failed.\n", endpoint);
+ dbg ("%s - alloc for endpoint %d failed.", __FUNCTION__, endpoint);
return NULL;
}
@@ -1090,37 +1092,37 @@
}
static struct callbacks {
- void (*instat_callback)(urb_t *);
- void (*glocont_callback)(urb_t *);
- void (*indat_callback)(urb_t *);
- void (*outdat_callback)(urb_t *);
- void (*inack_callback)(urb_t *);
- void (*outcont_callback)(urb_t *);
+ void (*instat_callback)(struct urb *);
+ void (*glocont_callback)(struct urb *);
+ void (*indat_callback)(struct urb *);
+ void (*outdat_callback)(struct urb *);
+ void (*inack_callback)(struct urb *);
+ void (*outcont_callback)(struct urb *);
} keyspan_callbacks[] = {
{
/* msg_usa26 callbacks */
- instat_callback: usa26_instat_callback,
- glocont_callback: usa26_glocont_callback,
- indat_callback: usa26_indat_callback,
- outdat_callback: usa2x_outdat_callback,
- inack_callback: usa26_inack_callback,
- outcont_callback: usa26_outcont_callback,
+ .instat_callback = usa26_instat_callback,
+ .glocont_callback = usa26_glocont_callback,
+ .indat_callback = usa26_indat_callback,
+ .outdat_callback = usa2x_outdat_callback,
+ .inack_callback = usa26_inack_callback,
+ .outcont_callback = usa26_outcont_callback,
}, {
/* msg_usa28 callbacks */
- instat_callback: usa28_instat_callback,
- glocont_callback: usa28_glocont_callback,
- indat_callback: usa28_indat_callback,
- outdat_callback: usa2x_outdat_callback,
- inack_callback: usa28_inack_callback,
- outcont_callback: usa28_outcont_callback,
+ .instat_callback = usa28_instat_callback,
+ .glocont_callback = usa28_glocont_callback,
+ .indat_callback = usa28_indat_callback,
+ .outdat_callback = usa2x_outdat_callback,
+ .inack_callback = usa28_inack_callback,
+ .outcont_callback = usa28_outcont_callback,
}, {
/* msg_usa49 callbacks */
- instat_callback: usa49_instat_callback,
- glocont_callback: usa49_glocont_callback,
- indat_callback: usa49_indat_callback,
- outdat_callback: usa2x_outdat_callback,
- inack_callback: usa49_inack_callback,
- outcont_callback: usa49_outcont_callback,
+ .instat_callback = usa49_instat_callback,
+ .glocont_callback = usa49_glocont_callback,
+ .indat_callback = usa49_indat_callback,
+ .outdat_callback = usa2x_outdat_callback,
+ .inack_callback = usa49_inack_callback,
+ .outcont_callback = usa49_outcont_callback,
}
};
@@ -1130,13 +1132,13 @@
{
int i, j;
struct keyspan_serial_private *s_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
struct usb_serial_port *port;
struct keyspan_port_private *p_priv;
struct callbacks *cback;
int endp;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
d_details = s_priv->device_details;
@@ -1198,13 +1200,14 @@
}
/* usa19 function doesn't require prescaler */
-static int keyspan_usa19_calc_baud(u32 baud_rate, u32 baudclk,
- u8 *rate_hi, u8 *rate_low, u8 *prescaler)
+static int keyspan_usa19_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,
+ u8 *rate_low, u8 *prescaler, int portnum)
{
u32 b16, /* baud rate times 16 (actual rate used internally) */
div, /* divisor */
cnt; /* inverse of divisor (programmed into 8051) */
+ dbg ("%s - %d.", __FUNCTION__, baud_rate);
/* prevent divide by zero... */
if( (b16 = (baud_rate * 16L)) == 0) {
@@ -1237,14 +1240,14 @@
*rate_hi = (u8) ((cnt >> 8) & 0xff);
}
if (rate_low && rate_hi) {
- dbg (__FUNCTION__ " %d %02x %02x.", baud_rate, *rate_hi, *rate_low);
+ dbg ("%s - %d %02x %02x.", __FUNCTION__, baud_rate, *rate_hi, *rate_low);
}
return (KEYSPAN_BAUD_RATE_OK);
}
-static int keyspan_usa19w_calc_baud(u32 baud_rate, u32 baudclk,
- u8 *rate_hi, u8 *rate_low, u8 *prescaler)
+static int keyspan_usa19w_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,
+ u8 *rate_low, u8 *prescaler, int portnum)
{
u32 b16, /* baud rate times 16 (actual rate used internally) */
clk, /* clock with 13/8 prescaler */
@@ -1255,7 +1258,7 @@
u8 best_prescaler;
int i;
- dbg (__FUNCTION__ " %d.\n", baud_rate);
+ dbg ("%s - %d.", __FUNCTION__, baud_rate);
/* prevent divide by zero */
if( (b16 = baud_rate * 16L) == 0) {
@@ -1271,8 +1274,7 @@
/* 0 is an invalid prescaler, used as a flag */
best_prescaler = 0;
- for(i = 8; i <= 0xff; ++i)
- {
+ for(i = 8; i <= 0xff; ++i) {
clk = (baudclk * 8) / (u32) i;
if( (div = clk / b16) == 0) {
@@ -1282,8 +1284,7 @@
res = clk / div;
diff= (res > b16) ? (res-b16) : (b16-res);
- if(diff < smallest_diff)
- {
+ if(diff < smallest_diff) {
best_prescaler = i;
smallest_diff = diff;
}
@@ -1305,8 +1306,59 @@
}
if (prescaler) {
*prescaler = best_prescaler;
- /* dbg(__FUNCTION__ " %d %d", *prescaler, div); */
+ /* dbg("%s - %d %d", __FUNCTION__, *prescaler, div); */
+ }
+ return (KEYSPAN_BAUD_RATE_OK);
+}
+
+ /* USA-28 supports different maximum baud rates on each port */
+static int keyspan_usa28_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,
+ u8 *rate_low, u8 *prescaler, int portnum)
+{
+ u32 b16, /* baud rate times 16 (actual rate used internally) */
+ div, /* divisor */
+ cnt; /* inverse of divisor (programmed into 8051) */
+
+ dbg ("%s - %d.", __FUNCTION__, baud_rate);
+
+ /* prevent divide by zero */
+ if ((b16 = baud_rate * 16L) == 0)
+ return (KEYSPAN_INVALID_BAUD_RATE);
+
+ /* calculate the divisor and the counter (its inverse) */
+ if ((div = (KEYSPAN_USA28_BAUDCLK / b16)) == 0) {
+ return (KEYSPAN_INVALID_BAUD_RATE);
+ }
+ else {
+ cnt = 0 - div;
+ }
+
+ /* check for out of range, based on portnum,
+ and return result */
+ if(portnum == 0) {
+ if(div > 0xffff)
+ return (KEYSPAN_INVALID_BAUD_RATE);
+ }
+ else {
+ if(portnum == 1) {
+ if(div > 0xff) {
+ return (KEYSPAN_INVALID_BAUD_RATE);
+ }
+ }
+ else {
+ return (KEYSPAN_INVALID_BAUD_RATE);
+ }
+ }
+
+ /* return the counter values if not NULL
+ (port 1 will ignore retHi) */
+ if (rate_low) {
+ *rate_low = (u8) (cnt & 0xff);
+ }
+ if (rate_hi) {
+ *rate_hi = (u8) ((cnt >> 8) & 0xff);
}
+ dbg ("%s - %d OK.", __FUNCTION__, baud_rate);
return (KEYSPAN_BAUD_RATE_OK);
}
@@ -1317,31 +1369,35 @@
struct keyspan_usa26_portControlMessage msg;
struct keyspan_serial_private *s_priv;
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
int outcont_urb;
- urb_t *this_urb;
- int err;
+ struct urb *this_urb;
+ int device_port, err;
- dbg ("%s reset=%d\n", __FUNCTION__, reset_port);
+ dbg ("%s reset=%d", __FUNCTION__, reset_port);
s_priv = (struct keyspan_serial_private *)(serial->private);
p_priv = (struct keyspan_port_private *)(port->private);
d_details = s_priv->device_details;
+ device_port = port->number - port->serial->minor;
outcont_urb = d_details->outcont_endpoints[port->number];
this_urb = p_priv->outcont_urb;
- dbg(__FUNCTION__ " endpoint %d\n", usb_pipeendpoint(this_urb->pipe));
+ dbg("%s - endpoint %d", __FUNCTION__, usb_pipeendpoint(this_urb->pipe));
/* Make sure we have an urb then send the message */
if (this_urb == NULL) {
- dbg(__FUNCTION__ " oops no urb.\n");
+ dbg("%s - oops no urb.", __FUNCTION__);
return -1;
}
- p_priv->resend_cont = 1;
+ /* Save reset port val for resend.
+ Don't overwrite resend for close condition. */
+ if (p_priv->resend_cont != 3)
+ p_priv->resend_cont = reset_port + 1;
if (this_urb->status == -EINPROGRESS) {
- /* dbg (__FUNCTION__ " already writing"); */
+ /* dbg ("%s - already writing", __FUNCTION__); */
return(-1);
}
@@ -1353,8 +1409,8 @@
msg.setClocking = 0xff;
if (d_details->calculate_baud_rate
(p_priv->baud, d_details->baudclk, &msg.baudHi,
- &msg.baudLo, &msg.prescaler) == KEYSPAN_INVALID_BAUD_RATE ) {
- dbg(__FUNCTION__ "Invalid baud rate %d requested, using 9600.\n",
+ &msg.baudLo, &msg.prescaler, device_port) == KEYSPAN_INVALID_BAUD_RATE ) {
+ dbg("%s - Invalid baud rate %d requested, using 9600.", __FUNCTION__,
p_priv->baud);
msg.baudLo = 0;
msg.baudHi = 125; /* Values for 9600 baud */
@@ -1388,12 +1444,26 @@
msg.ctsFlowControl = (p_priv->flow_control == flow_cts);
msg.xonFlowControl = 0;
msg.setFlowControl = 0xff;
-
- msg.forwardingLength = 1;
+ msg.forwardingLength = 16;
msg.xonChar = 17;
msg.xoffChar = 19;
- if (reset_port) {
+ /* Opening port */
+ if (reset_port == 1) {
+ msg._txOn = 1;
+ msg._txOff = 0;
+ msg.txFlush = 0;
+ msg.txBreak = 0;
+ msg.rxOn = 1;
+ msg.rxOff = 0;
+ msg.rxFlush = 1;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0xff;
+ }
+
+ /* Closing port */
+ else if (reset_port == 2) {
msg._txOn = 0;
msg._txOff = 1;
msg.txFlush = 0;
@@ -1403,14 +1473,16 @@
msg.rxFlush = 1;
msg.rxForward = 0;
msg.returnStatus = 0;
- msg.resetDataToggle = 0xff;
+ msg.resetDataToggle = 0;
}
+
+ /* Sending intermediate configs */
else {
msg._txOn = (! p_priv->break_on);
msg._txOff = 0;
msg.txFlush = 0;
msg.txBreak = (p_priv->break_on);
- msg.rxOn = 1;
+ msg.rxOn = 0;
msg.rxOff = 0;
msg.rxFlush = 0;
msg.rxForward = 0;
@@ -1433,11 +1505,11 @@
this_urb->dev = serial->dev;
if ((err = usb_submit_urb(this_urb)) != 0) {
- dbg(__FUNCTION__ " usb_submit_urb(setup) failed (%d)\n", err);
+ dbg("%s - usb_submit_urb(setup) failed (%d)", __FUNCTION__, err);
}
#if 0
else {
- dbg(__FUNCTION__ " usb_submit_urb(%d) OK %d bytes (end %d)",
+ dbg("%s - usb_submit_urb(%d) OK %d bytes (end %d)", __FUNCTION__
outcont_urb, this_urb->transfer_buffer_length,
usb_pipeendpoint(this_urb->pipe));
}
@@ -1453,32 +1525,38 @@
struct keyspan_usa28_portControlMessage msg;
struct keyspan_serial_private *s_priv;
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
- urb_t *this_urb;
- int err;
+ const struct keyspan_device_details *d_details;
+ struct urb *this_urb;
+ int device_port, err;
+
+ dbg ("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
p_priv = (struct keyspan_port_private *)(port->private);
d_details = s_priv->device_details;
+ device_port = port->number - port->serial->minor;
/* only do something if we have a bulk out endpoint */
if ((this_urb = p_priv->outcont_urb) == NULL) {
- dbg(__FUNCTION__ " oops no urb.\n");
+ dbg("%s - oops no urb.", __FUNCTION__);
return -1;
}
- p_priv->resend_cont = 1;
+ /* Save reset port val for resend.
+ Don't overwrite resend for close condition. */
+ if (p_priv->resend_cont != 3)
+ p_priv->resend_cont = reset_port + 1;
if (this_urb->status == -EINPROGRESS) {
- dbg (__FUNCTION__ " already writing\n");
+ dbg ("%s already writing", __FUNCTION__);
return(-1);
}
memset(&msg, 0, sizeof (struct keyspan_usa28_portControlMessage));
msg.setBaudRate = 1;
- if (keyspan_usa19_calc_baud(p_priv->baud, d_details->baudclk,
- &msg.baudHi, &msg.baudLo, NULL) == KEYSPAN_INVALID_BAUD_RATE ) {
- dbg(__FUNCTION__ "Invalid baud rate requested %d.", p_priv->baud);
+ if (d_details->calculate_baud_rate(p_priv->baud, d_details->baudclk,
+ &msg.baudHi, &msg.baudLo, NULL, device_port) == KEYSPAN_INVALID_BAUD_RATE ) {
+ dbg("%s - Invalid baud rate requested %d.", __FUNCTION__, p_priv->baud);
msg.baudLo = 0xff;
msg.baudHi = 0xb2; /* Values for 9600 baud */
}
@@ -1493,23 +1571,56 @@
msg.rts = p_priv->rts_state;
msg.dtr = p_priv->dtr_state;
- msg.forwardingLength = 1;
+ msg.forwardingLength = 16;
msg.forwardMs = 10;
msg.breakThreshold = 45;
msg.xonChar = 17;
msg.xoffChar = 19;
- msg._txOn = 1;
- msg._txOff = 0;
- msg.txFlush = 0;
- msg.txForceXoff = 0;
- msg.txBreak = 0;
- msg.rxOn = 1;
- msg.rxOff = 0;
- msg.rxFlush = 0;
- msg.rxForward = 0;
/*msg.returnStatus = 1;
msg.resetDataToggle = 0xff;*/
+ /* Opening port */
+ if (reset_port == 1) {
+ msg._txOn = 1;
+ msg._txOff = 0;
+ msg.txFlush = 0;
+ msg.txForceXoff = 0;
+ msg.txBreak = 0;
+ msg.rxOn = 1;
+ msg.rxOff = 0;
+ msg.rxFlush = 1;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0xff;
+ }
+ /* Closing port */
+ else if (reset_port == 2) {
+ msg._txOn = 0;
+ msg._txOff = 1;
+ msg.txFlush = 0;
+ msg.txForceXoff = 0;
+ msg.txBreak = 0;
+ msg.rxOn = 0;
+ msg.rxOff = 1;
+ msg.rxFlush = 1;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0;
+ }
+ /* Sending intermediate configs */
+ else {
+ msg._txOn = (! p_priv->break_on);
+ msg._txOff = 0;
+ msg.txFlush = 0;
+ msg.txForceXoff = 0;
+ msg.txBreak = (p_priv->break_on);
+ msg.rxOn = 0;
+ msg.rxOff = 0;
+ msg.rxFlush = 0;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0x0;
+ }
p_priv->resend_cont = 0;
memcpy (this_urb->transfer_buffer, &msg, sizeof(msg));
@@ -1519,11 +1630,11 @@
this_urb->dev = serial->dev;
if ((err = usb_submit_urb(this_urb)) != 0) {
- dbg(__FUNCTION__ " usb_submit_urb(setup) failed\n");
+ dbg("%s - usb_submit_urb(setup) failed", __FUNCTION__);
}
#if 0
else {
- dbg(__FUNCTION__ " usb_submit_urb(setup) OK %d bytes",
+ dbg("%s - usb_submit_urb(setup) OK %d bytes", __FUNCTION__,
this_urb->transfer_buffer_length);
}
#endif
@@ -1538,13 +1649,12 @@
struct keyspan_usa49_portControlMessage msg;
struct keyspan_serial_private *s_priv;
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
int glocont_urb;
- urb_t *this_urb;
- int err;
- int device_port;
+ struct urb *this_urb;
+ int err, device_port;
- dbg ("%s\n", __FUNCTION__);
+ dbg ("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
p_priv = (struct keyspan_port_private *)(port->private);
@@ -1556,17 +1666,20 @@
/* Work out which port within the device is being setup */
device_port = port->number - port->serial->minor;
- dbg(__FUNCTION__ " endpoint %d port %d (%d)\n", usb_pipeendpoint(this_urb->pipe), port->number, device_port);
+ dbg("%s - endpoint %d port %d (%d)",__FUNCTION__, usb_pipeendpoint(this_urb->pipe), port->number, device_port);
/* Make sure we have an urb then send the message */
if (this_urb == NULL) {
- dbg(__FUNCTION__ " oops no urb for port %d.\n", port->number);
+ dbg("%s - oops no urb for port %d.", __FUNCTION__, port->number);
return -1;
}
- p_priv->resend_cont = 1;
+ /* Save reset port val for resend.
+ Don't overwrite resend for close condition. */
+ if (p_priv->resend_cont != 3)
+ p_priv->resend_cont = reset_port + 1;
if (this_urb->status == -EINPROGRESS) {
- /* dbg (__FUNCTION__ " already writing"); */
+ /* dbg ("%s - already writing", __FUNCTION__); */
return(-1);
}
@@ -1581,8 +1694,8 @@
msg.setClocking = 0xff;
if (d_details->calculate_baud_rate
(p_priv->baud, d_details->baudclk, &msg.baudHi,
- &msg.baudLo, &msg.prescaler) == KEYSPAN_INVALID_BAUD_RATE ) {
- dbg(__FUNCTION__ "Invalid baud rate %d requested, using 9600.\n",
+ &msg.baudLo, &msg.prescaler, device_port) == KEYSPAN_INVALID_BAUD_RATE ) {
+ dbg("%s - Invalid baud rate %d requested, using 9600.", __FUNCTION__,
p_priv->baud);
msg.baudLo = 0;
msg.baudHi = 125; /* Values for 9600 baud */
@@ -1617,20 +1730,55 @@
msg.xonFlowControl = 0;
msg.setFlowControl = 0xff;
- msg.forwardingLength = 1;
+ msg.forwardingLength = 16;
msg.xonChar = 17;
msg.xoffChar = 19;
-
- msg._txOn = 1;
- msg._txOff = 0;
- msg.txFlush = 0;
- msg.txBreak = 0;
- msg.rxOn = 1;
- msg.rxOff = 0;
- msg.rxFlush = 0;
- msg.rxForward = 0;
- msg.enablePort = 0xff;
- msg.disablePort = 0;
+
+ /* Opening port */
+ if (reset_port == 1) {
+ msg._txOn = 1;
+ msg._txOff = 0;
+ msg.txFlush = 0;
+ msg.txBreak = 0;
+ msg.rxOn = 1;
+ msg.rxOff = 0;
+ msg.rxFlush = 1;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0xff;
+ msg.enablePort = 1;
+ msg.disablePort = 0;
+ }
+ /* Closing port */
+ else if (reset_port == 2) {
+ msg._txOn = 0;
+ msg._txOff = 1;
+ msg.txFlush = 0;
+ msg.txBreak = 0;
+ msg.rxOn = 0;
+ msg.rxOff = 1;
+ msg.rxFlush = 1;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0;
+ msg.enablePort = 0;
+ msg.disablePort = 1;
+ }
+ /* Sending intermediate configs */
+ else {
+ msg._txOn = (! p_priv->break_on);
+ msg._txOff = 0;
+ msg.txFlush = 0;
+ msg.txBreak = (p_priv->break_on);
+ msg.rxOn = 0;
+ msg.rxOff = 0;
+ msg.rxFlush = 0;
+ msg.rxForward = 0;
+ msg.returnStatus = 0;
+ msg.resetDataToggle = 0x0;
+ msg.enablePort = 0;
+ msg.disablePort = 0;
+ }
/* Do handshaking outputs */
msg.setRts = 0xff;
@@ -1647,11 +1795,11 @@
this_urb->dev = serial->dev;
if ((err = usb_submit_urb(this_urb)) != 0) {
- dbg(__FUNCTION__ " usb_submit_urb(setup) failed (%d)\n", err);
+ dbg("%s - usb_submit_urb(setup) failed (%d)", __FUNCTION__, err);
}
#if 0
else {
- dbg(__FUNCTION__ " usb_submit_urb(%d) OK %d bytes (end %d)",
+ dbg("%s - usb_submit_urb(%d) OK %d bytes (end %d)", __FUNCTION__,
outcont_urb, this_urb->transfer_buffer_length,
usb_pipeendpoint(this_urb->pipe));
}
@@ -1663,8 +1811,10 @@
static void keyspan_send_setup(struct usb_serial_port *port, int reset_port)
{
struct usb_serial *serial = port->serial;
- struct keyspan_serial_private *s_priv;
- const keyspan_device_details *d_details;
+ struct keyspan_serial_private *s_priv;
+ const struct keyspan_device_details *d_details;
+
+ dbg ("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
d_details = s_priv->device_details;
@@ -1690,16 +1840,15 @@
struct usb_serial_port *port;
struct keyspan_serial_private *s_priv;
struct keyspan_port_private *p_priv;
- const keyspan_device_details *d_details;
+ const struct keyspan_device_details *d_details;
- dbg("keyspan_startup called.\n");
+ dbg("%s", __FUNCTION__);
for (i = 0; (d_details = keyspan_devices[i]) != NULL; ++i)
if (d_details->product_id == serial->dev->descriptor.idProduct)
break;
if (d_details == NULL) {
- printk(KERN_ERR __FUNCTION__ ": unknown product id %x\n",
- serial->dev->descriptor.idProduct);
+ err("%s - unknown product id %x", __FUNCTION__, serial->dev->descriptor.idProduct);
return 1;
}
@@ -1707,7 +1856,7 @@
serial->private = kmalloc(sizeof(struct keyspan_serial_private),
GFP_KERNEL);
if (!serial->private) {
- dbg(__FUNCTION__ "kmalloc for keyspan_serial_private failed.\n");
+ dbg("%s - kmalloc for keyspan_serial_private failed.", __FUNCTION__);
return (1);
}
memset(serial->private, 0, sizeof(struct keyspan_serial_private));
@@ -1721,7 +1870,7 @@
port->private = kmalloc(sizeof(struct keyspan_port_private),
GFP_KERNEL);
if (!port->private) {
- dbg(__FUNCTION__ "kmalloc for keyspan_port_private (%d) failed!.\n", i);
+ dbg("%s - kmalloc for keyspan_port_private (%d) failed!.", __FUNCTION__, i);
return (1);
}
memset(port->private, 0, sizeof(struct keyspan_port_private));
@@ -1733,7 +1882,7 @@
s_priv->instat_urb->dev = serial->dev;
if ((err = usb_submit_urb(s_priv->instat_urb)) != 0) {
- dbg(__FUNCTION__ " submit instat urb failed %d\n", err);
+ dbg("%s - submit instat urb failed %d", __FUNCTION__, err);
}
return (0);
@@ -1746,7 +1895,7 @@
struct keyspan_serial_private *s_priv;
struct keyspan_port_private *p_priv;
- dbg("keyspan_shutdown called\n");
+ dbg("%s", __FUNCTION__);
s_priv = (struct keyspan_serial_private *)(serial->private);
@@ -1791,10 +1940,6 @@
/* Now free per port private data */
for (i = 0; i < serial->num_ports; i++) {
port = &serial->port[i];
- while (port->open_count > 0) {
- --port->open_count;
- MOD_DEC_USE_COUNT;
- }
kfree(port->private);
}
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)