# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.487 -> 1.488
# drivers/usb/serial/whiteheat.c 1.19 -> 1.20
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/06/14 [EMAIL PROTECTED] 1.488
# USB whiteheat driver: changes due to the usb-serial api changes.
# - moved the firmware download to probe() time
# --------------------------------------------
#
diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
--- a/drivers/usb/serial/whiteheat.c Fri Jun 14 14:15:23 2002
+++ b/drivers/usb/serial/whiteheat.c Fri Jun 14 14:15:23 2002
@@ -125,9 +125,9 @@
static void whiteheat_set_termios (struct usb_serial_port *port, struct termios
* old);
static void whiteheat_throttle (struct usb_serial_port *port);
static void whiteheat_unthrottle (struct usb_serial_port *port);
-static int whiteheat_fake_startup (struct usb_serial *serial);
-static int whiteheat_real_startup (struct usb_serial *serial);
-static void whiteheat_real_shutdown (struct usb_serial *serial);
+static int whiteheat_firmware_download (struct usb_serial *serial);
+static int whiteheat_attach (struct usb_serial *serial);
+static void whiteheat_shutdown (struct usb_serial *serial);
static struct usb_serial_device_type whiteheat_fake_device = {
owner: THIS_MODULE,
@@ -137,7 +137,7 @@
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
num_ports: 1,
- startup: whiteheat_fake_startup,
+ probe: whiteheat_firmware_download,
};
static struct usb_serial_device_type whiteheat_device = {
@@ -154,8 +154,8 @@
unthrottle: whiteheat_unthrottle,
ioctl: whiteheat_ioctl,
set_termios: whiteheat_set_termios,
- startup: whiteheat_real_startup,
- shutdown: whiteheat_real_shutdown,
+ attach: whiteheat_attach,
+ shutdown: whiteheat_shutdown,
};
struct whiteheat_private {
@@ -504,7 +504,7 @@
- device renumerated itself and comes up as new device id with all
firmware download completed.
*/
-static int whiteheat_fake_startup (struct usb_serial *serial)
+static int whiteheat_firmware_download (struct usb_serial *serial)
{
int response;
const struct whiteheat_hex_record *record;
@@ -518,8 +518,8 @@
response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size,
0xa0);
if (response < 0) {
- err(__FUNCTION__ " - ezusb_writememory failed for loader (%d
%04X %p %d)",
- response, record->address, record->data,
record->data_size);
+ err("%s - ezusb_writememory failed for loader (%d %04X %p %d)",
+ __FUNCTION__, response, record->address, record->data,
+record->data_size);
break;
}
++record;
@@ -535,8 +535,8 @@
response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size,
0xa3);
if (response < 0) {
- err(__FUNCTION__ " - ezusb_writememory failed for first
firmware step (%d %04X %p %d)",
- response, record->address, record->data,
record->data_size);
+ err("%s - ezusb_writememory failed for first firmware step (%d
+%04X %p %d)",
+ __FUNCTION__, response, record->address, record->data,
+record->data_size);
break;
}
++record;
@@ -549,8 +549,8 @@
response = ezusb_writememory (serial, record->address,
(unsigned char *)record->data, record->data_size,
0xa0);
if (response < 0) {
- err(__FUNCTION__" - ezusb_writememory failed for second
firmware step (%d %04X %p %d)",
- response, record->address, record->data,
record->data_size);
+ err("%s - ezusb_writememory failed for second firmware step
+(%d %04X %p %d)",
+ __FUNCTION__, response, record->address, record->data,
+record->data_size);
break;
}
++record;
@@ -563,7 +563,7 @@
}
-static int whiteheat_real_startup (struct usb_serial *serial)
+static int whiteheat_attach (struct usb_serial *serial)
{
struct whiteheat_hw_info *hw_info;
int pipe;
@@ -622,7 +622,7 @@
return 0;
}
-static void whiteheat_real_shutdown (struct usb_serial *serial)
+static void whiteheat_shutdown (struct usb_serial *serial)
{
struct usb_serial_port *command_port;
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -
http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
