[linux-usb-devel] Siemens X65 Status Line

[Flavio Leitner]

Hi all,


I'm attaching a patch to fix status when using Siemens X65
mobile. This mobile use first byte instead of normal UART_STATE
byte. 

Please apply.

Thanks! 

[ps: please carbon copy to me because I'm not subcribed.]

-- 
Flávio Bruno Leitner <[EMAIL PROTECTED]>
[0EA2 7F40 4CF4 1E63 4AF6  33C0 3E10 E205 F251 EDDA]

--- linux-2.6.10-72032U10_12cl.pristine/drivers/usb/serial/pl2303.c     
2004-12-24 19:34:44.000000000 -0200
+++ linux-2.6.10-72032U10_12cl/drivers/usb/serial/pl2303.c      2005-03-01 
11:41:11.247558048 -0300
@@ -812,14 +812,41 @@ static void pl2303_shutdown (struct usb_
 }
 
 
+static void pl2303_update_line_status(struct usb_serial_port *port,
+                               unsigned char *data, unsigned int actual_length)
+{
+
+       struct pl2303_private *priv = usb_get_serial_port_data(port);
+       unsigned long flags;
+       u8 status_idx = UART_STATE;
+       u8 length = UART_STATE;
+       
+        if (port->serial->dev->descriptor.idVendor == SIEMENS_VENDOR_ID &&
+               port->serial->dev->descriptor.idProduct == 
SIEMENS_PRODUCT_ID_X65) {
+
+               length = 1;
+               status_idx = 0;
+       }
+
+       if (actual_length < length)
+               goto exit;
+
+        /* Save off the uart status for others to look at */
+       spin_lock_irqsave(&priv->lock, flags);
+       priv->line_status = data[status_idx];
+       spin_unlock_irqrestore(&priv->lock, flags);
+
+exit:
+       return;
+
+}
+
 static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs)
 {
        struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
-       struct pl2303_private *priv = usb_get_serial_port_data(port);
        unsigned char *data = urb->transfer_buffer;
-       unsigned long flags;
+       unsigned int actual_length = urb->actual_length;
        int status;
-       u8 uart_state;
 
        dbg("%s (%d)", __FUNCTION__, port->number);
 
@@ -841,15 +868,7 @@ static void pl2303_read_int_callback (st
 
        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, 
urb->actual_length, urb->transfer_buffer);
 
-       if (urb->actual_length < UART_STATE)
-               goto exit;
-
-       /* Save off the uart status for others to look at */
-       uart_state = data[UART_STATE];
-       spin_lock_irqsave(&priv->lock, flags);
-       uart_state |= (priv->line_status & UART_STATE_TRANSIENT_MASK);
-       priv->line_status = uart_state;
-       spin_unlock_irqrestore(&priv->lock, flags);
+       pl2303_update_line_status(port, data, actual_length);
                
 exit:
        status = usb_submit_urb (urb, GFP_ATOMIC);