Commit 9189bfc2 authored by Oliver Bock's avatar Oliver Bock Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: rename Cypress CY7C63xxx driver to proper name and fix up some tiny things 



This is a new driver for the Cypress CY7C63xxx mirco controller series.
It currently supports the pre-programmed CYC63001A-PC by AK Modul-Bus
GmbH.  It's based on a kernel 2.4 driver (cyport) by Marcus Maul which I
ported to kernel 2.6 using sysfs. I intend to support more controllers
of this family (and more features) as soon as I get hold of the required
IDs etc. Please see the source code's header for more information.

Signed-off-by: default avatarOliver Bock <o.bock@fh-wolfenbuettel.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 58a5b0a6

drivers/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ obj-$(CONFIG_USB_MICROTEK) += image/ 
obj-$(CONFIG_USB_SERIAL)	+= serial/



obj-$(CONFIG_USB_AUERSWALD)	+= misc/

obj-$(CONFIG_USB_CY7C63)	+= misc/

obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/

obj-$(CONFIG_USB_CYTHERM)	+= misc/

obj-$(CONFIG_USB_EMI26)		+= misc/

obj-$(CONFIG_USB_EMI62)		+= misc/

drivers/usb/misc/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -88,19 +88,19 @@ config USB_LED 
	  To compile this driver as a module, choose M here: the

	  module will be called usbled.



config USB_CY7C63

config USB_CYPRESS_CY7C63

	tristate "Cypress CY7C63xxx USB driver support"

	depends on USB

	help

	  Say Y here if you want to connect a Cypress CY7C63xxx

	  micro controller to your computer's USB port. This driver

	  supports the pre-programmed devices (incl. firmware) by

	  AK Modul-Bus Computer GmbH.

	  micro controller to your computer's USB port. Currently this

	  driver supports the pre-programmed devices (incl. firmware)

	  by AK Modul-Bus Computer GmbH.



	  Please see: http://www.ak-modul-bus.de/stat/mikrocontroller.html



	  To compile this driver as a module, choose M here: the

	  module will be called cy7c63.

	  module will be called cypress_cy7c63.



config USB_CYTHERM

	tristate "Cypress USB thermometer driver support"

drivers/usb/misc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o

obj-$(CONFIG_USB_CY7C63)	+= cy7c63.o

obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o

obj-$(CONFIG_USB_CYTHERM)	+= cytherm.o

obj-$(CONFIG_USB_EMI26)		+= emi26.o

obj-$(CONFIG_USB_EMI62)		+= emi62.o

drivers/usb/misc/cy7c63.c→drivers/usb/misc/cypress_cy7c63.c

+279 −0
Original line number Diff line number Diff line 
/*

* cy7c63.c

* cypress_cy7c63.c

*

* Copyright (c) 2006 Oliver Bock (bock@fh-wolfenbuettel.de)

* Copyright (c) 2006 Oliver Bock (o.bock@fh-wolfenbuettel.de)

*

*	This driver is based on the Cypress Thermometer USB Driver by

*	Marcus Maul and the 2.0 version of Greg Kroah-Hartman's

*	This driver is based on the Cypress USB Driver by Marcus Maul

*	(cyport) and the 2.0 version of Greg Kroah-Hartman's

*	USB Skeleton driver.

*

*	Is is a generic driver for the Cypress CY7C63000 family.

*	For the time being it enables you to toggle the single I/O ports

*	of the device.

*	This is a generic driver for the Cypress CY7C63xxx family.

*	For the time being it enables you to read from and write to

*	the single I/O ports of the device.

*

*	Supported vendors:	AK Modul-Bus Computer GmbH

*	Supported devices:	CY7C63001A-PC (to be continued...)

*	Supported functions:	Read/Write Ports (to be continued...)

*

*	Chipsets families:	CY7C63000, CY7C63001, CY7C63100, CY7C63101

*

*

*	This program is free software; you can redistribute it and/or

*	modify it under the terms of the GNU General Public License as
@@ -28,50 +26,50 @@ 
#include <linux/kernel.h>

#include <linux/usb.h>



#define DRIVER_AUTHOR		"Oliver Bock (bock@fh-wolfenbuettel.de)"

#define DRIVER_AUTHOR		"Oliver Bock (o.bock@fh-wolfenbuettel.de)"

#define DRIVER_DESC		"Cypress CY7C63xxx USB driver"



#define CY7C63_VENDOR_ID	0xa2c

#define CY7C63_PRODUCT_ID	0x8

#define CYPRESS_VENDOR_ID	0xa2c

#define CYPRESS_PRODUCT_ID	0x8



#define CYPRESS_READ_PORT	0x4

#define CYPRESS_WRITE_PORT	0x5



#define CY7C63_READ_PORT	0x4

#define CY7C63_WRITE_PORT	0x5

#define CY7C63_READ_RAM		0x2

#define CY7C63_WRITE_RAM	0x3

#define CY7C63_READ_ROM		0x1

#define CYPRESS_READ_RAM	0x2

#define CYPRESS_WRITE_RAM	0x3

#define CYPRESS_READ_ROM	0x1



#define CY7C63_READ_PORT_ID0	0

#define CY7C63_WRITE_PORT_ID0	0

#define CY7C63_READ_PORT_ID1	0x2

#define CY7C63_WRITE_PORT_ID1	1

#define CYPRESS_READ_PORT_ID0	0

#define CYPRESS_WRITE_PORT_ID0	0

#define CYPRESS_READ_PORT_ID1	0x2

#define CYPRESS_WRITE_PORT_ID1	1



#define CY7C63_MAX_REQSIZE	8

#define CYPRESS_MAX_REQSIZE	8





/* table of devices that work with this driver */

static struct usb_device_id cy7c63_table [] = {

	{ USB_DEVICE(CY7C63_VENDOR_ID, CY7C63_PRODUCT_ID) },

static struct usb_device_id cypress_table [] = {

	{ USB_DEVICE(CYPRESS_VENDOR_ID, CYPRESS_PRODUCT_ID) },

	{ }

};

MODULE_DEVICE_TABLE(usb, cy7c63_table);

MODULE_DEVICE_TABLE(usb, cypress_table);



/* structure to hold all of our device specific stuff */

struct cy7c63 {

struct cypress {

	struct usb_device *	udev;

	char 			port0;

	char			port1;

	unsigned char		port[2];

};



/* used to send usb control messages to device */

int vendor_command(struct cy7c63 *dev, unsigned char request,

			 unsigned char address, unsigned char data) {



static int vendor_command(struct cypress *dev, unsigned char request,

			  unsigned char address, unsigned char data)

{

	int retval = 0;

	unsigned int pipe;

	unsigned char *iobuf;



	/* allocate some memory for the i/o buffer*/

	iobuf = kzalloc(CY7C63_MAX_REQSIZE, GFP_KERNEL);

	iobuf = kzalloc(CYPRESS_MAX_REQSIZE, GFP_KERNEL);

	if (!iobuf) {

		dev_err(&dev->udev->dev, "Out of memory!\n");

		retval = -ENOMEM;
@@ -84,21 +82,23 @@ int vendor_command(struct cy7c63 *dev, unsigned char request, 
	pipe = usb_rcvctrlpipe(dev->udev, 0);

	retval = usb_control_msg(dev->udev, pipe, request,

				 USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,

				address, data, iobuf, CY7C63_MAX_REQSIZE,

				 address, data, iobuf, CYPRESS_MAX_REQSIZE,

				 USB_CTRL_GET_TIMEOUT);



	/* store returned data (more READs to be added!) */

	/* store returned data (more READs to be added) */

	switch (request) {

		case CY7C63_READ_PORT:

			if (address == CY7C63_READ_PORT_ID0) {

				dev->port0 = iobuf[1];

		case CYPRESS_READ_PORT:

			if (address == CYPRESS_READ_PORT_ID0) {

				dev->port[0] = iobuf[1];

				dev_dbg(&dev->udev->dev,

					"READ_PORT0 returned: %d\n",dev->port0);

					"READ_PORT0 returned: %d\n",

					dev->port[0]);

			}

			else if (address == CY7C63_READ_PORT_ID1) {

				dev->port1 = iobuf[1];

			else if (address == CYPRESS_READ_PORT_ID1) {

				dev->port[1] = iobuf[1];

				dev_dbg(&dev->udev->dev,

					"READ_PORT1 returned: %d\n",dev->port1);

					"READ_PORT1 returned: %d\n",

					dev->port[1]);

			}

			break;

	}
@@ -108,61 +108,96 @@ error: 
	return retval;

}



#define get_set_port(num,read_id,write_id) \

static ssize_t set_port##num(struct device *dev, struct device_attribute *attr,	\

					const char *buf, size_t count) {	\

										\

	int value;								\

	int result = 0;								\

										\

	struct usb_interface *intf = to_usb_interface(dev);			\

	struct cy7c63 *cyp = usb_get_intfdata(intf);				\

										\

	dev_dbg(&cyp->udev->dev, "WRITE_PORT%d called\n", num);			\

										\

	/* validate input data */						\

	if (sscanf(buf, "%d", &value) < 1) {					\

		result = -EINVAL;						\

		goto error;							\

	}									\

	if (value>255 || value<0) {						\

		result = -EINVAL;						\

		goto error;							\

	}									\

										\

	result = vendor_command(cyp, CY7C63_WRITE_PORT, write_id,		\

					 (unsigned char)value);			\

										\

	dev_dbg(&cyp->udev->dev, "Result of vendor_command: %d\n\n",result);	\

error:										\

	return result < 0 ? result : count;					\

}										\

										\

static ssize_t get_port##num(struct device *dev,				\

				 struct device_attribute *attr, char *buf) {	\

										\

	int result = 0;								\

										\

	struct usb_interface *intf = to_usb_interface(dev);			\

	struct cy7c63 *cyp = usb_get_intfdata(intf);				\

										\

	dev_dbg(&cyp->udev->dev, "READ_PORT%d called\n", num);			\

										\

	result = vendor_command(cyp, CY7C63_READ_PORT, read_id, 0);		\

										\

	dev_dbg(&cyp->udev->dev, "Result of vendor_command: %d\n\n", result);	\

										\

	return sprintf(buf, "%d", cyp->port##num);				\

}										\

static DEVICE_ATTR(port##num, S_IWUGO | S_IRUGO, get_port##num, set_port##num);



get_set_port(0, CY7C63_READ_PORT_ID0, CY7C63_WRITE_PORT_ID0);

get_set_port(1, CY7C63_READ_PORT_ID1, CY7C63_WRITE_PORT_ID1);



static int cy7c63_probe(struct usb_interface *interface,

			const struct usb_device_id *id) {



	struct cy7c63 *dev = NULL;

/* write port value */

static ssize_t write_port(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t count,

			  int port_num, int write_id)

{

	int value = -1;

	int result = 0;



	struct usb_interface *intf = to_usb_interface(dev);

	struct cypress *cyp = usb_get_intfdata(intf);



	dev_dbg(&cyp->udev->dev, "WRITE_PORT%d called\n", port_num);



	/* validate input data */

	if (sscanf(buf, "%d", &value) < 1) {

		result = -EINVAL;

		goto error;

	}

	if (value < 0 || value > 255) {

		result = -EINVAL;

		goto error;

	}



	result = vendor_command(cyp, CYPRESS_WRITE_PORT, write_id,

				(unsigned char)value);



	dev_dbg(&cyp->udev->dev, "Result of vendor_command: %d\n\n", result);

error:

	return result < 0 ? result : count;

}



/* attribute callback handler (write) */

static ssize_t set_port0_handler(struct device *dev,

				 struct device_attribute *attr,

				 const char *buf, size_t count)

{

	return write_port(dev, attr, buf, count, 0, CYPRESS_WRITE_PORT_ID0);

}



/* attribute callback handler (write) */

static ssize_t set_port1_handler(struct device *dev,

				 struct device_attribute *attr,

				 const char *buf, size_t count)

{

	return write_port(dev, attr, buf, count, 1, CYPRESS_WRITE_PORT_ID1);

}



/* read port value */

static ssize_t read_port(struct device *dev, struct device_attribute *attr,

			 char *buf, int port_num, int read_id)

{

	int result = 0;



	struct usb_interface *intf = to_usb_interface(dev);

	struct cypress *cyp = usb_get_intfdata(intf);



	dev_dbg(&cyp->udev->dev, "READ_PORT%d called\n", port_num);



	result = vendor_command(cyp, CYPRESS_READ_PORT, read_id, 0);



	dev_dbg(&cyp->udev->dev, "Result of vendor_command: %d\n\n", result);



	return sprintf(buf, "%d", cyp->port[port_num]);

}



/* attribute callback handler (read) */

static ssize_t get_port0_handler(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	return read_port(dev, attr, buf, 0, CYPRESS_READ_PORT_ID0);

}



/* attribute callback handler (read) */

static ssize_t get_port1_handler(struct device *dev,

				 struct device_attribute *attr, char *buf)

{

	return read_port(dev, attr, buf, 1, CYPRESS_READ_PORT_ID1);

}



static DEVICE_ATTR(port0, S_IWUGO | S_IRUGO,

		   get_port0_handler, set_port0_handler);



static DEVICE_ATTR(port1, S_IWUGO | S_IRUGO,

		   get_port1_handler, set_port1_handler);





static int cypress_probe(struct usb_interface *interface,

			 const struct usb_device_id *id)

{

	struct cypress *dev = NULL;

	int retval = -ENOMEM;



	/* allocate memory for our device state and initialize it */
@@ -181,7 +216,7 @@ static int cy7c63_probe(struct usb_interface *interface, 
	device_create_file(&interface->dev, &dev_attr_port0);

	device_create_file(&interface->dev, &dev_attr_port1);



	/* let the user know what node this device is now attached to */

	/* let the user know that the device is now attached */

	dev_info(&interface->dev,

		 "Cypress CY7C63xxx device now attached\n");
@@ -190,9 +225,9 @@ error: 
	return retval;

}



static void cy7c63_disconnect(struct usb_interface *interface) {



	struct cy7c63 *dev;

static void cypress_disconnect(struct usb_interface *interface)

{

	struct cypress *dev;



	dev = usb_get_intfdata(interface);

	usb_set_intfdata(interface, NULL);
@@ -209,19 +244,19 @@ static void cy7c63_disconnect(struct usb_interface *interface) { 
	kfree(dev);

}



static struct usb_driver cy7c63_driver = {

	.name = "cy7c63",

	.probe = cy7c63_probe,

	.disconnect = cy7c63_disconnect,

	.id_table = cy7c63_table,

static struct usb_driver cypress_driver = {

	.name = "cypress_cy7c63",

	.probe = cypress_probe,

	.disconnect = cypress_disconnect,

	.id_table = cypress_table,

};



static int __init cy7c63_init(void) {



static int __init cypress_init(void)

{

	int result;



	/* register this driver with the USB subsystem */

	result = usb_register(&cy7c63_driver);

	result = usb_register(&cypress_driver);

	if (result) {

		err("Function usb_register failed! Error number: %d\n", result);

	}
@@ -229,14 +264,14 @@ static int __init cy7c63_init(void) { 
	return result;

}



static void __exit cy7c63_exit(void) {



static void __exit cypress_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&cy7c63_driver);

	usb_deregister(&cypress_driver);

}



module_init(cy7c63_init);

module_exit(cy7c63_exit);

module_init(cypress_init);

module_exit(cypress_exit);



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

CRA Git | Maintained and supported by SUSTech CRA and CCSE