3 files changed, 107 insertions, 0 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index b869076d9c7c..0c4aa00bb39d 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -395,6 +395,15 @@ config USB_SERIAL_PL2303
           To compile this driver as a module, choose M here: the
           module will be called pl2303.
 
+config USB_SERIAL_HP4X
+        tristate "USB HP4x Calculators support"
+        depends on USB_SERIAL
+        help
+          Say Y here if you want to use an Hewlett-Packard 4x Calculator.
+
+          To compile this driver as a module, choose M here: the
+          module will be called hp4x.
+
 config USB_SERIAL_SAFE
         tristate "USB Safe Serial (Encapsulated) Driver (EXPERIMENTAL)"
         depends on USB_SERIAL && EXPERIMENTAL
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 351b81855b18..b0aac47d1959 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)		+= io_ti.o
 obj-$(CONFIG_USB_SERIAL_EMPEG)                  += empeg.o
 obj-$(CONFIG_USB_SERIAL_FTDI_SIO)               += ftdi_sio.o
 obj-$(CONFIG_USB_SERIAL_GARMIN)                 += garmin_gps.o
+obj-$(CONFIG_USB_SERIAL_HP4X)                   += hp4x.o
 obj-$(CONFIG_USB_SERIAL_IPAQ)                   += ipaq.o
 obj-$(CONFIG_USB_SERIAL_IPW)                    += ipw.o
 obj-$(CONFIG_USB_SERIAL_IR)                     += ir-usb.o
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
new file mode 100644
index 000000000000..020f9a15605b
--- /dev/null
+++ b/drivers/usb/serial/hp4x.c
@@ -0,0 +1,97 @@
+/*
+ * HP4x Calculators Serial USB driver
+ *
+ * Copyright (C) 2005 Arthur Huillet (ahuillet@users.sf.net)
+ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)
+ *
+ *      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.
+ *
+ * See Documentation/usb/usb-serial.txt for more information on using this driver
+ */
+
+#include <linux/config.h>
+#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/serial.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/spinlock.h>
+#include <asm/uaccess.h>
+#include <linux/usb.h>
+#include "usb-serial.h"
+
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v1.00"
+#define DRIVER_DESC "HP4x (48/49) Generic Serial driver"
+
+#define HP_VENDOR_ID 0x03f0
+#define HP49GP_PRODUCT_ID 0x0121
+
+static int debug;
+
+static struct usb_device_id id_table [] = {
+        { USB_DEVICE(HP_VENDOR_ID, HP49GP_PRODUCT_ID) },
+        { }                                     /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static struct usb_driver hp49gp_driver = {
+        .owner =        THIS_MODULE,
+        .name =         "HP4X",
+        .probe =        usb_serial_probe,
+        .disconnect =   usb_serial_disconnect,
+        .id_table =     id_table,
+};
+
+static struct usb_serial_device_type hp49gp_device = {
+        .owner =                THIS_MODULE,
+        .name =                 "HP4X",
+        .id_table =             id_table,
+        .num_interrupt_in =     NUM_DONT_CARE,
+        .num_bulk_in =          NUM_DONT_CARE,
+        .num_bulk_out =         NUM_DONT_CARE,
+        .num_ports =            1,
+};
+
+static int __init hp49gp_init(void)
+{
+        int retval;
+        retval = usb_serial_register(&hp49gp_device);
+        if (retval)
+                goto failed_usb_serial_register;
+        retval = usb_register(&hp49gp_driver);
+        if (retval)
+                goto failed_usb_register;
+        info(DRIVER_DESC " " DRIVER_VERSION);
+        return 0;
+failed_usb_register:
+        usb_serial_deregister(&hp49gp_device);
+failed_usb_serial_register:
+        return retval;
+}
+
+
+static void __exit hp49gp_exit(void)
+{
+        usb_deregister(&hp49gp_driver);
+        usb_serial_deregister(&hp49gp_device);
+}
+
+
+module_init(hp49gp_init);
+module_exit(hp49gp_exit);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");