summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/pci_ids.h6
-rw-r--r--tizen/src/hw/maru_overlay.c7
m---------tizen/src/ui0
3 files changed, 8 insertions, 5 deletions
diff --git a/hw/pci_ids.h b/hw/pci_ids.h
index 83f38934ec..8c349ebadb 100644
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@ -73,6 +73,12 @@
#define PCI_DEVICE_ID_SUN_SIMBA 0x5000
#define PCI_DEVICE_ID_SUN_SABRE 0xa000
+#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_CMD 0x1095
#define PCI_DEVICE_ID_CMD_646 0x0646
diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c
index 9a455a9ab8..39e3fa520a 100644
--- a/tizen/src/hw/maru_overlay.c
+++ b/tizen/src/hw/maru_overlay.c
@@ -196,11 +196,8 @@ static int overlay_initfn(PCIDevice *dev)
/* setup memory space */
/* memory #0 device memory (overlay surface) */
/* memory #1 memory-mapped I/O */
- pci_register_bar(&s->dev, 0, OVERLAY_MEM_SIZE,
- PCI_BASE_ADDRESS_MEM_PREFETCH, overlay_mem_map);
-
- pci_register_bar(&s->dev, 1, OVERLAY_REG_SIZE,
- PCI_BASE_ADDRESS_SPACE_MEMORY, overlay_mmio_map);
+ pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, overlay_mem_map);
+ pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, overlay_mmio_map);
return 0;
}
diff --git a/tizen/src/ui b/tizen/src/ui
-Subproject a3a66ec0b2cf218e640fc79a2adc092371406b5
+Subproject a65b724345c2c93390d1bb67366e3dc971b2eb4