From: giwoong.kim Date: Thu, 16 Feb 2012 08:19:27 +0000 (+0900) Subject: [Title] rollback wacom code & modified vendor define X-Git-Tag: 2.2.1_release^2~182^2^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9899be13df50f1bacf7ab69c98b7387586b0e69d;p=sdk%2Femulator%2Femulator-kernel.git [Title] rollback wacom code & modified vendor define [Type] support [Module] emulator [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I0598607d43505bf62756163e95a986f2f30c2286 --- diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h old mode 100755 new mode 100644 index 2c092246e6c4..9114ae1c7488 --- a/drivers/input/tablet/wacom.h +++ b/drivers/input/tablet/wacom.h @@ -123,7 +123,6 @@ extern void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data); extern void wacom_report_key(void *wcombo, unsigned int key_type, int key_data); extern void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value); extern void wacom_input_sync(void *wcombo); -extern void wacom_input_mt_sync(void *wcombo); extern void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac); extern void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac); diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c old mode 100755 new mode 100644 index 90e6080183ea..ea30c983a33e --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@ -11,10 +11,6 @@ * (at your option) any later version. */ -/* - * 2011-12-08 GiWoong Kim Add multi-touch function - */ - #include "wacom.h" #include "wacom_wac.h" @@ -153,11 +149,6 @@ void wacom_input_sync(void *wcombo) input_sync(get_input_dev((struct wacom_combo *)wcombo)); } -void wacom_input_mt_sync(void *wcombo) -{ - input_mt_sync(get_input_dev((struct wacom_combo *)wcombo)); -} - static int wacom_open(struct input_dev *dev) { struct wacom *wacom = input_get_drvdata(dev); @@ -496,12 +487,8 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i } input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); - input_dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH); -#if 0 //convert device type for emulator input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS); -#endif - input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0); input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0); input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0); @@ -512,12 +499,6 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i } input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC); - /* for multitouch */ - input_set_abs_params(input_dev, ABS_MT_TRACKING_ID, 0, 1, 0, 0); - input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, features->pressure_max, 0, 0); - input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, features->touch_x_max, 0, 0); - input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, features->touch_y_max, 0, 0); - wacom_init_input_dev(input_dev, wacom_wac); usb_fill_int_urb(wacom->irq, dev, diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c old mode 100755 new mode 100644 index c012e9439ed3..c896d6a21b7e --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -11,11 +11,6 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ - -/* - * 2011-12-08 GiWoong Kim Add multi-touch function - */ - #include "wacom.h" #include "wacom_wac.h" @@ -43,7 +38,6 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom, void *wcombo) } break; case 2: -#if 0 wacom_report_key(wcombo, BTN_TOOL_PEN, 1); wacom_report_abs(wcombo, ABS_MISC, STYLUS_DEVICE_ID); /* report tool id */ wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[1])); @@ -51,24 +45,6 @@ static int wacom_penpartner_irq(struct wacom_wac *wacom, void *wcombo) wacom_report_abs(wcombo, ABS_PRESSURE, (signed char)data[6] + 127); wacom_report_key(wcombo, BTN_TOUCH, ((signed char)data[6] > -80) && !(data[5] & 0x20)); wacom_report_key(wcombo, BTN_STYLUS, (data[5] & 0x40)); -#else - if ((signed char)data[6] > -127) { //pressed - wacom_report_abs(wcombo, ABS_MT_TRACKING_ID, data[5]); - wacom_report_abs(wcombo, ABS_MT_TOUCH_MAJOR, 5); - wacom_report_abs(wcombo, ABS_MT_POSITION_X, wacom_le16_to_cpu(&data[1])); - wacom_report_abs(wcombo, ABS_MT_POSITION_Y, wacom_le16_to_cpu(&data[3])); - wacom_input_mt_sync(wcombo); - } else { //release - if (data[5] == 1) { - wacom_report_abs(wcombo, ABS_MT_TRACKING_ID, 1); - wacom_report_abs(wcombo, ABS_MT_TOUCH_MAJOR, 0); - wacom_input_mt_sync(wcombo); - } - wacom_report_abs(wcombo, ABS_MT_TRACKING_ID, 0); - wacom_report_abs(wcombo, ABS_MT_TOUCH_MAJOR, 0); - wacom_input_mt_sync(wcombo); - } -#endif break; default: printk(KERN_INFO "wacom_penpartner_irq: received unknown report #%d\n", data[0]); @@ -821,7 +797,7 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w input_dev_pl(input_dev, wacom_wac); /* fall through */ case PENPARTNER: - //input_dev_pt(input_dev, wacom_wac); + input_dev_pt(input_dev, wacom_wac); break; } return; diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h old mode 100755 new mode 100644 diff --git a/drivers/maru/maru_codec.c b/drivers/maru/maru_codec.c index 53e4abd527aa..6ab11c0a32b2 100644 --- a/drivers/maru/maru_codec.c +++ b/drivers/maru/maru_codec.c @@ -97,7 +97,7 @@ typedef struct _svcodec_dev { static struct pci_device_id svcodec_pci_table[] __devinitdata = { { - .vendor = PCI_VENDOR_ID_SCORE, + .vendor = PCI_VENDOR_ID_TIZEN, .device = PCI_DEVICE_ID_VIRTUAL_CODEC, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, diff --git a/drivers/maru/maru_touchscreen.c b/drivers/maru/maru_touchscreen.c index 1a4080dd21cd..49bafb75efdd 100644 --- a/drivers/maru/maru_touchscreen.c +++ b/drivers/maru/maru_touchscreen.c @@ -56,7 +56,7 @@ struct emul_touchscreen { char phys[32]; }; -/* These structure must match the qemu definitions */ +/* This structure must match the qemu definitions */ typedef struct USBEmulTouchscreenPacket { uint16_t x, y, z; uint8_t state; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4ee9c2050317..8dbb8a8a7217 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1999,7 +1999,7 @@ #define PCI_VENDOR_ID_SAMSUNG 0x144d -#define PCI_VENDOR_ID_SCORE 0x1480 +#define PCI_VENDOR_ID_TIZEN 0x1480 #define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 #define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C