From: giwoong.kim <giwoong.kim@samsung.com>
Date: Thu, 16 Feb 2012 07:34:44 +0000 (+0900)
Subject: [Title] change pci vendor-id & wacom tablet off
X-Git-Tag: 2.2.1_release^2~182^2^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e12e94460a4d9e286de255cb3a9830e2b424eba3;p=sdk%2Femulator%2Femulator-kernel.git

[Title] change pci vendor-id & wacom tablet off
[Type] feature
[Module] emulator
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I5bdfb86ba90c00d8deda25365fa9683cf94f9aa0
---

diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig
old mode 100644
new mode 100755
index 9f0d6c5a3c7b..4f8cbabe5352
--- a/arch/x86/configs/i386_emul_defconfig
+++ b/arch/x86/configs/i386_emul_defconfig
@@ -1145,7 +1145,7 @@ CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_AIPTEK is not set
 # CONFIG_TABLET_USB_GTCO is not set
 # CONFIG_TABLET_USB_KBTAB is not set
-CONFIG_TABLET_USB_WACOM=y
+# CONFIG_TABLET_USB_WACOM is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_AD7879_I2C is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile
index a8da6ca1a1fe..da9d0b95faa2 100755
--- a/drivers/maru/Makefile
+++ b/drivers/maru/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_MARU_LCD) += MARU_lcd.o
-obj-$(CONFIG_MARU_CODEC) += MARU_codec.o
-obj-$(CONFIG_MARU_TOUCHSCREEN) += MARU_touchscreen.o
+obj-$(CONFIG_MARU_LCD) += maru_lcd.o
+obj-$(CONFIG_MARU_CODEC) += maru_codec.o
+obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o
 
diff --git a/drivers/maru/maru_codec.c b/drivers/maru/maru_codec.c
index 182317176c38..53e4abd527aa 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_SAMSUNG,
+	.vendor 	= PCI_VENDOR_ID_SCORE,
 	.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
old mode 100644
new mode 100755
index d3a4eed8807c..302496d2a126
--- a/drivers/maru/maru_touchscreen.c
+++ b/drivers/maru/maru_touchscreen.c
@@ -1,5 +1,5 @@
 /*
- * Virtual USB Touchscreen device driver
+ * Maru Virtual USB Touchscreen device driver
  * Based on drivers/input/tablet/wacom_sys.c:
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd. All rights reserved.
@@ -39,7 +39,6 @@ MODULE_AUTHOR("s-core");
 MODULE_DESCRIPTION("Emulator Touchscreen driver for x86");
 
 /* touchscreen device features */
-#define USB_VENDOR_ID_SAMSUNG 0x0419
 #define EMUL_TOUCHSCREEN_PACKET_LEN 7
 #define TOUCHSCREEN_RESOLUTION_X 5040
 #define TOUCHSCREEN_RESOLUTION_Y 3780
@@ -182,7 +181,7 @@ static int emul_touchscreen_probe(struct usb_interface *intf, const struct usb_d
     usb_make_path(usb_ts->usbdev, usb_ts->phys, sizeof(usb_ts->phys));
     strlcat(usb_ts->phys, "/input0", sizeof(usb_ts->phys));
 
-    usb_ts->emuldev->name = "Tizen Touchscreen";
+    usb_ts->emuldev->name = "Maru Touchscreen";
     usb_to_input_id(usb_ts->usbdev, &usb_ts->emuldev->id);
 
     usb_ts->emuldev->dev.parent = &intf->dev;
@@ -271,14 +270,14 @@ static int emul_touchscreen_resume(struct usb_interface *intf)
 }
 
 static struct usb_device_id emul_usb_touchscreen_table[] = {
-    { USB_DEVICE(USB_VENDOR_ID_SAMSUNG, 0x00) },
+    { USB_DEVICE(0x056a, 0x00) },
     { } /* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE(usb, emul_usb_touchscreen_table);
 
 static struct usb_driver emul_touchscreen_driver = {
-    .name                 = "usb_emul_touchscreen",
+    .name                 = "usb-emul-touchscreen",
     .id_table             = emul_usb_touchscreen_table,
     .probe                = emul_touchscreen_probe,
     .disconnect           = emul_touchscreen_disconnect,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e1cc8337653f..4ee9c2050317 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1998,6 +1998,8 @@
 #define PCI_VENDOR_ID_CHELSIO		0x1425
 
 #define PCI_VENDOR_ID_SAMSUNG			0x144d
+
+#define PCI_VENDOR_ID_SCORE			0x1480
 #define PCI_DEVICE_ID_VIRTUAL_CAMERA	0x1018
 #define PCI_DEVICE_ID_VIRTUAL_CODEC		0x101C