From ec2d771e656702c59ee6784053bcc401ff2a414e Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Sat, 18 Feb 2012 00:37:48 +0900 Subject: [PATCH] [Title] Modify Makefile of MARU part and PCI VENDOR ID for TIZEN [Type] [Module] emulator-kernel [Priority] Major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- drivers/maru/Makefile | 2 +- drivers/maru/maru_codec.c | 24 +++++------------------- include/linux/pci_ids.h | 8 +++++--- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile index 453a4c879393..3b4c39beb183 100644 --- a/drivers/maru/Makefile +++ b/drivers/maru/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o obj-$(CONFIG_MARU_FB) += maru_fb.o obj-$(CONFIG_MARU_CAMERA) += maru_camera.o obj-$(CONFIG_MARU_BACKLIGHT) += maru_bl.o -obj-$(MARU_OVERLAY) += maru_overlay.o +obj-$(CONFIG_MARU_OVERLAY) += maru_overlay.o obj-$(CONFIG_MARU_JACK) += maru_jack.o obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o obj-$(CONFIG_MARU_USB_MASS_STORAGE) += maru_usb_mass_storage.o diff --git a/drivers/maru/maru_codec.c b/drivers/maru/maru_codec.c index 272407d24a05..187e752583b5 100644 --- a/drivers/maru/maru_codec.c +++ b/drivers/maru/maru_codec.c @@ -47,7 +47,7 @@ #include "avformat.h" -#define DRIVER_NAME "svcodec" +#define DRIVER_NAME "codec" #define CODEC_MAJOR 240 MODULE_DESCRIPTION("Virtual Codec Device Driver"); @@ -115,7 +115,7 @@ DECLARE_WORK(work_queue, call_workqueue); static int svcodec_open (struct inode *inode, struct file *file) { - SVCODEC_LOG("\n"); + printk(KERN_DEBUG "[%s]\n", __func__); try_module_get(THIS_MODULE); /* register interrupt handler */ @@ -187,7 +187,7 @@ static ssize_t svcodec_write (struct file *file, const char __user *buf, int i; if (!svcodec) { - printk(KERN_ERR "[%s] : Fail to get codec device info\n", __func__); + printk(KERN_ERR "[%s]:Fail to get codec device info\n", __func__); } if (copy_from_user(¶mInfo, buf, sizeof(struct _param))) { @@ -435,19 +435,6 @@ static ssize_t svcodec_read (struct file *file, char __user *buf, return 0; } -static void svcodec_vm_open(struct vm_area_struct *vm) -{ -} - -static void svcodec_vm_close(struct vm_area_struct *vm) -{ -} - -static const struct vm_operations_struct svcodec_vm_ops = { - .open = svcodec_vm_open, - .close = svcodec_vm_close, -}; - static int svcodec_mmap (struct file *file, struct vm_area_struct *vm) { unsigned long off; @@ -471,7 +458,6 @@ static int svcodec_mmap (struct file *file, struct vm_area_struct *vm) return -EAGAIN; } - vm->vm_ops = &svcodec_vm_ops; vm->vm_flags |= VM_IO; vm->vm_flags |= VM_RESERVED; @@ -520,7 +506,7 @@ static irqreturn_t svcodec_irq_handler (int irq, void *dev_id) } #endif -struct file_operations codec_fops = { +struct file_operations svcodec_fops = { .owner = THIS_MODULE, .read = svcodec_read, .write = svcodec_write, @@ -617,7 +603,7 @@ static int __devinit svcodec_probe (struct pci_dev *pci_dev, } // pci_set_drvdata(pci_dev, svcodec); - if (register_chrdev(CODEC_MAJOR, DRIVER_NAME, &codec_fops)) { + if (register_chrdev(CODEC_MAJOR, DRIVER_NAME, &svcodec_fops)) { printk(KERN_ERR "[%s] : register_chrdev failed\n", __func__); goto err_io_unmap; } diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 8dbb8a8a7217..d2e35f04e2f1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1999,9 +1999,11 @@ #define PCI_VENDOR_ID_SAMSUNG 0x144d -#define PCI_VENDOR_ID_TIZEN 0x1480 -#define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 -#define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C +#define PCI_VENDOR_ID_TIZEN 0xC9B5 +#define PCI_DEVICE_ID_VIRTUAL_OVERLAY 0x1010 +#define PCI_DEVICE_ID_VIRTUAL_BRIGHTNESS 0x1014 +#define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 +#define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C #define PCI_VENDOR_ID_GIGABYTE 0x1458 -- 2.34.1