[NOKIA-DKU2] howto make working again with linux 2.6.23?

Hello,

can someone give me a hint how to make attached module working again?
With linux kernel 2.6.16.55 everything is fine but with 2.6.18.8
kobject_add fails and with 2.6.23 the driver OOPS in nokia_probe. The
problems are for example
serial->interface->altsetting[0].endpoint[0].desc.bEndpointAddress and
serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress. I
think i oversaw the changes in the diffs between the kernel versions.

Thank in advance and regards,
Dirk

--

/*
 *  Nokia DKU2 USB driver
 *
 *  Copyright (C) 2004
 *  Author: C Kemp
 *
 *  This program is largely derived from work by the linux-usb group
 *  and associated source files.  Please see the usb/serial files for
 *  individual credits and copyrights.
 *
 *  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
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
 *
 *  Changes:
 *
 *  20.09.2005 - Matthias Bläsing <[email protected]>
 *  Added short name to device structure to make driver load into kernel
2.6.13
 *
 *  20.09.2005 - Matthias Bläsing <[email protected]>
 *  Added usb_deregister to exit code - to allow remove and reinsert of
module
 */


#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/tty.h>
#include <linux/tty_driver.h>
#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>

#ifdef CONFIG_USB_SERIAL_DEBUG
	static int debug = 1;
#else
	static int debug;
#endif

/*
 * Version Information
 */
#define DRIVER_VERSION	"v0.3"
#define DRIVER_AUTHOR	"C Kemp"
#define DRIVER_DESC	"Nokia DKU2 Driver"


#define NOKIA_VENDOR_ID		0x0421
#define NOKIA7600_PRODUCT_ID	0x0400
#define NOKIA6230_PRODUCT_ID	0x040f
#define NOKIA6170_PRODUCT_ID	0x0416
#define NOKIA6230i_PRODUCT_ID	0x0428

#define NOKIA_AT_PORT	0x82
#define NOKIA_FBUS_PORT	0x86

/* Function prototypes */
static int nokia_probe(struct usb_serial *serial, const struct usb_device_id *id);

static struct usb_device_id id_table [] = {
	{ USB_DEVICE(NOKIA_VENDOR_ID, NOKIA7600_PRODUCT_ID) },
	{ USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230_PRODUCT_ID) },
	{ USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6170_PRODUCT_ID) },
	{ USB_DEVICE(NOKIA_VENDOR_ID, NOKIA6230i_PRODUCT_ID) },
	{ }			/* Terminating entry */
};

MODULE_DEVICE_TABLE(usb, id_table);

static struct usb_driver nokia_driver = {
	.name =		"Nokia DKU2",
	.probe =	usb_serial_probe,
	.disconnect =	usb_serial_disconnect,
	.id_table =	id_table,
};

// static struct usb_serial_device_type nokia_device = {
static struct usb_serial_driver nokia_device = {
	.driver = {
		.owner =	THIS_MODULE,
		.name =		"Nokia DKU2",
	},
	.description =		"Nokia 7600/6230/6230i/6170 DKU2 driver",
	.usb_driver =		&nokia_driver,
	.id_table =		id_table,
	.num_interrupt_in =	1,
	.num_bulk_in =		1,
	.num_bulk_out =		1,
	.num_ports =		1,
	.probe =		nokia_probe,
};

/* The only thing which makes this device different from a generic device is that */
/* we have to set an alternative configuration to make the relevant endpoints available */
/* In 2.6 this is really easy... */

static int nokia_probe(struct usb_serial *serial, const struct usb_device_id *id)
{
	int retval = -1;

	dbg("%s", __FUNCTION__);

	if (serial->interface->altsetting[0].endpoint[0].desc.bEndpointAddress == NOKIA_AT_PORT) {
		/* the AT port */
		printk(KERN_INFO "Nokia AT Port:\n");
		retval = 0;

	} else if (serial->interface->num_altsetting == 2 &&
		   serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == 0x83) {
		/* The FBUS port on my 6230i */
		printk(KERN_INFO "Nokia Port (FBUS on 6230i):\n");
		usb_set_interface(serial->dev, 4, 1);
		retval = 0;
	} else if (serial->interface->num_altsetting == 2 &&
		   serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == 0x84) {
		/* dunno */
		printk(KERN_INFO "Nokia Port:\n");
		usb_set_interface(serial->dev, 6, 1);
		retval = 0;
	} else if (serial->interface->num_altsetting == 2 &&
		   serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == 0x85) {
		/* dunno */
		printk(KERN_INFO "Nokia Port:\n");
		usb_set_interface(serial->dev, 8, 1);
		retval = 0;

	} else if (serial->interface->num_altsetting == 2 &&
		   serial->interface->altsetting[1].endpoint[0].desc.bEndpointAddress == NOKIA_FBUS_PORT) {
		/* the FBUS port on older phones */
		printk(KERN_INFO "Nokia Port (FBUS on most):\n");
		usb_set_interface(serial->dev, 10, 1);
		retval = 0;
	}

	return retval;
}


static int __init nokia_init(void)
{
        int retval = 0;

	if ((retval = usb_serial_register(&nokia_device)))
		return retval;

	if ((retval = usb_register(&nokia_driver))) {
	        usb_serial_deregister(&nokia_device);
		return retval;
	}

	info(DRIVER_VERSION " " DRIVER_AUTHOR);
	info(DRIVER_DESC);

	return retval;
}

static void __exit nokia_exit(void)
{
	usb_deregister(&nokia_driver);
	usb_serial_deregister(&nokia_device);
}

module_init(nokia_init);
module_exit(nokia_exit);

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");

module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-users