Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195333
b: refs/heads/master
c: 2a1e7d5
h: refs/heads/master
i:
  195331: 9dea06f
v: v3
  • Loading branch information
Vijay Kumar authored and Greg Kroah-Hartman committed May 20, 2010
1 parent 9913170 commit a6042b6
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 92d2c5e4badc622999d3b17e6dfbf6babacb52f6
refs/heads/master: 2a1e7d5d54c1c046c1fe47dffd119b45087c6de6
8 changes: 8 additions & 0 deletions trunk/drivers/usb/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,14 @@ config USB_SERIAL_VIVOPAY_SERIAL
To compile this driver as a module, choose M here: the
module will be called vivopay-serial.

config USB_SERIAL_ZIO
tristate "ZIO Motherboard USB serial interface driver"
help
Say Y here if you want to use ZIO Motherboard.

To compile this driver as a module, choose M here: the
module will be called zio.

config USB_SERIAL_DEBUG
tristate "USB Debugging Device"
help
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/usb/serial/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@ obj-$(CONFIG_USB_SERIAL_VISOR) += visor.o
obj-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat.o
obj-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda.o
obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL) += vivopay-serial.o
obj-$(CONFIG_USB_SERIAL_ZIO) += zio.o

64 changes: 64 additions & 0 deletions trunk/drivers/usb/serial/zio.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* ZIO Motherboard USB driver
*
* Copyright (C) 2010 Zilogic Systems <code@zilogic.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version
* 2 as published by the Free Software Foundation.
*/

#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>
#include <linux/usb/serial.h>
#include <linux/uaccess.h>

static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x1CBE, 0x0103) },
{ },
};
MODULE_DEVICE_TABLE(usb, id_table);

static struct usb_driver zio_driver = {
.name = "zio",
.probe = usb_serial_probe,
.disconnect = usb_serial_disconnect,
.id_table = id_table,
.no_dynamic_id = 1,
};

static struct usb_serial_driver zio_device = {
.driver = {
.owner = THIS_MODULE,
.name = "zio",
},
.id_table = id_table,
.usb_driver = &zio_driver,
.num_ports = 1,
};

static int __init zio_init(void)
{
int retval;

retval = usb_serial_register(&zio_device);
if (retval)
return retval;
retval = usb_register(&zio_driver);
if (retval)
usb_serial_deregister(&zio_device);
return retval;
}

static void __exit zio_exit(void)
{
usb_deregister(&zio_driver);
usb_serial_deregister(&zio_device);
}

module_init(zio_init);
module_exit(zio_exit);
MODULE_LICENSE("GPL");

0 comments on commit a6042b6

Please sign in to comment.