Attached is the updated patch against 2.4.21-pre5
--
/jbm, but you can call me Josh. Really, you can!
"What's a metaphor?" "For sheep to graze in"
7958 1C1C 306A CDF8 4468 3EDE 1F93 F49D 5FA1 49C4
On Tue, 25 Feb 2003, Greg KH wrote:
> On Tue, Feb 25, 2003 at 01:24:50PM -0500, Josh Myer wrote:
> > Attached are drivers for the KB Gear JamStudio Tablet. There are two
> > files, one is against 2.4.20, the other against 2.5.62. I'm hoping this
> > isn't too late in the 2.4.21-pre stages to get included (or the 2.5, for
> > that matter =). This driver Works For Me, on both 2.4.20 and 2.5.62.
>
> I've applied this to the 2.5 tree, but the 2.4 patch failed on the
> Config.in and Makefile files. Can you rediff it against 2.4.21-pre4 (or
> -pre5 when it comes out in a few days) and resend it?
>
> thanks,
>
> greg k-h
>
>
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> [EMAIL PROTECTED]
> To unsubscribe, use the last form field at:
> https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
>
diff -urN linux-2.4.21-pre5/drivers/usb/Config.in
linux-2.4.21-pre5-jbm/drivers/usb/Config.in
--- linux-2.4.21-pre5/drivers/usb/Config.in 2003-02-28 11:05:52.000000000 -0500
+++ linux-2.4.21-pre5-jbm/drivers/usb/Config.in 2003-02-28 12:36:53.000000000 -0500
@@ -68,6 +68,7 @@
fi
dep_tristate ' Aiptek 6000U/8000U tablet support' CONFIG_USB_AIPTEK $CONFIG_USB
$CONFIG_INPUT
dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB
$CONFIG_INPUT
+ dep_tristate ' KB Gear JamStudio tablet support' CONFIG_USB_KBTAB $CONFIG_USB
$CONFIG_INPUT
dep_tristate ' Griffin Technology PowerMate support' CONFIG_USB_POWERMATE
$CONFIG_USB $CONFIG_INPUT
comment 'USB Imaging devices'
diff -urN linux-2.4.21-pre5/drivers/usb/Makefile
linux-2.4.21-pre5-jbm/drivers/usb/Makefile
--- linux-2.4.21-pre5/drivers/usb/Makefile 2003-02-28 11:05:52.000000000 -0500
+++ linux-2.4.21-pre5-jbm/drivers/usb/Makefile 2003-02-28 12:36:23.000000000 -0500
@@ -70,6 +70,7 @@
obj-$(CONFIG_USB_KBD) += usbkbd.o
obj-$(CONFIG_USB_AIPTEK) += aiptek.o
obj-$(CONFIG_USB_WACOM) += wacom.o
+obj-$(CONFIG_USB_KBTAB) += kbtab.o
obj-$(CONFIG_USB_POWERMATE) += powermate.o
obj-$(CONFIG_USB_SCANNER) += scanner.o
diff -urN linux-2.4.21-pre5/drivers/usb/hid-core.c
linux-2.4.21-pre5-jbm/drivers/usb/hid-core.c
--- linux-2.4.21-pre5/drivers/usb/hid-core.c 2003-02-28 11:05:53.000000000 -0500
+++ linux-2.4.21-pre5-jbm/drivers/usb/hid-core.c 2003-02-28 12:35:36.000000000
-0500
@@ -1080,6 +1080,9 @@
#define USB_DEVICE_ID_WACOM_PL 0x0030
#define USB_DEVICE_ID_WACOM_INTUOS2 0x0041
+#define USB_VENDOR_ID_KBGEAR 0x084e
+#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO 0x1001
+
#define USB_VENDOR_ID_ATEN 0x0557
#define USB_DEVICE_ID_ATEN_UC100KM 0x2004
#define USB_DEVICE_ID_ATEN_CS124U 0x2202
@@ -1121,6 +1124,7 @@
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 2, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 3, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS2 + 4, HID_QUIRK_IGNORE },
+ { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
diff -urN linux-2.4.21-pre5/drivers/usb/kbtab.c
linux-2.4.21-pre5-jbm/drivers/usb/kbtab.c
--- linux-2.4.21-pre5/drivers/usb/kbtab.c 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.4.21-pre5-jbm/drivers/usb/kbtab.c 2003-02-28 12:34:44.000000000 -0500
@@ -0,0 +1,179 @@
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/usb.h>
+
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v0.0.1"
+#define DRIVER_AUTHOR "Josh Myer <[EMAIL PROTECTED]>"
+#define DRIVER_DESC "KB Gear Jam Studio Tablet Driver"
+
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_LICENSE("GPL");
+
+#define USB_VENDOR_ID_KBTAB 0x84e
+
+static int kb_pressure_click = 0x10;
+MODULE_PARM (kb_pressure_click,"i");
+MODULE_PARM_DESC(kb_pressure_click,
+ "pressure threshold for clicks");
+
+struct kbtab {
+ signed char data[8];
+ struct input_dev dev;
+ struct usb_device *usbdev;
+ struct urb irq;
+ int open;
+ int x, y;
+ int button;
+ int pressure;
+};
+
+static void kbtab_irq(struct urb *urb)
+{
+
+ struct kbtab *tab = urb->context;
+ unsigned char *data = tab->data;
+ struct input_dev *dev = &tab->dev;
+
+ if(urb->status)
+ return;
+
+ tab->x = (data[2] << 8) + data[1];
+ tab->y = (data[4] << 8) + data[3];
+
+ tab->pressure = (data[5]);
+
+ /* XXX: don't report unless actual change */
+
+ input_report_abs(dev, ABS_X, tab->x);
+ input_report_abs(dev, ABS_Y, tab->y);
+ input_report_abs(dev, ABS_PRESSURE, tab->pressure);
+
+ input_report_key(dev, BTN_STYLUS, (data[0] & 2));
+ input_report_key(dev, BTN_TOUCH, (data[0] & 1));
+ input_report_key(dev, BTN_LEFT, (tab->pressure > kb_pressure_click) ? 1 : 0);
+
+ input_event(dev, EV_MSC, MSC_SERIAL, 0);
+}
+
+struct usb_device_id kbtab_ids[] = {
+ { USB_DEVICE(USB_VENDOR_ID_KBTAB, 0x1001), driver_info : 0 },
+ { }
+};
+
+MODULE_DEVICE_TABLE(usb, kbtab_ids);
+
+static int kbtab_open(struct input_dev *dev)
+{
+ struct kbtab *kbtab = dev->private;
+
+ if(kbtab->open++)
+ return 0;
+
+ kbtab->irq.dev = kbtab->usbdev;
+ if(usb_submit_urb(&kbtab->irq))
+ return -EIO;
+
+ return 0;
+}
+
+static void kbtab_close(struct input_dev *dev)
+{
+ struct kbtab *kbtab = dev->private;
+
+ if(!--kbtab->open)
+ usb_unlink_urb(&kbtab->irq);
+}
+
+static void *kbtab_probe(struct usb_device *dev, unsigned int ifnum, const struct
usb_device_id *id)
+{
+ struct usb_endpoint_descriptor *endpoint;
+ struct kbtab *kbtab;
+
+ if(!(kbtab = kmalloc(sizeof(struct kbtab), GFP_KERNEL)))
+ return NULL;
+
+ memset(kbtab, 0, sizeof(struct kbtab));
+
+ kbtab->dev.evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC);
+ kbtab->dev.absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
+
+ kbtab->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) |
BIT(BTN_MIDDLE);
+ kbtab->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_STYLUS);
+
+ kbtab->dev.mscbit[0] |= BIT(MSC_SERIAL);
+
+ kbtab->dev.absmax[ABS_X] = 0x2000;
+ kbtab->dev.absmax[ABS_Y] = 0x1750;
+
+ kbtab->dev.absmax[ABS_PRESSURE] = 0xff;
+
+ kbtab->dev.absfuzz[ABS_X] = 4;
+ kbtab->dev.absfuzz[ABS_Y] = 4;
+
+ kbtab->dev.private = kbtab;
+
+ kbtab->dev.open = kbtab_open;
+ kbtab->dev.close = kbtab_close;
+
+ kbtab->dev.name = "KB Gear Tablet";
+ kbtab->dev.idbus = BUS_USB;
+
+ kbtab->dev.idvendor = dev->descriptor.idVendor;
+ kbtab->dev.idproduct = dev->descriptor.idProduct;
+ kbtab->dev.idversion = dev->descriptor.bcdDevice;
+ kbtab->usbdev = dev;
+
+
+ endpoint = dev->config[0].interface[ifnum].altsetting[0].endpoint + 0;
+
+ usb_set_idle(dev,
dev->config[0].interface[ifnum].altsetting[0].bInterfaceNumber, 0, 0);
+
+ FILL_INT_URB(&kbtab->irq, dev, usb_rcvintpipe(dev, endpoint->bEndpointAddress),
+ kbtab->data, 8, kbtab_irq, kbtab, endpoint->bInterval);
+
+ input_register_device(&kbtab->dev);
+
+ printk(KERN_INFO "input%d: KB Gear Tablet on usb%d:%d.%d\n",
+ kbtab->dev.number, dev->bus->busnum, dev->devnum, ifnum);
+
+ return kbtab;
+
+}
+
+static void kbtab_disconnect(struct usb_device *dev, void *ptr)
+{
+ struct kbtab *kbtab = ptr;
+ usb_unlink_urb(&kbtab->irq);
+ input_unregister_device(&kbtab->dev);
+ kfree(kbtab);
+}
+
+static struct usb_driver kbtab_driver = {
+ name: "kbtab",
+ probe: kbtab_probe,
+ disconnect: kbtab_disconnect,
+ id_table: kbtab_ids,
+};
+
+static int __init kbtab_init(void)
+{
+ usb_register(&kbtab_driver);
+ info(DRIVER_VERSION " " DRIVER_AUTHOR);
+ info(DRIVER_DESC);
+ return 0;
+}
+
+static void __exit kbtab_exit(void)
+{
+ usb_deregister(&kbtab_driver);
+}
+
+module_init(kbtab_init);
+module_exit(kbtab_exit);
