Revert "fix compile error overlay"

This reverts commit 9f2d86fbd4c3b306113ba5fd6633898ce02bc242.

diff --git a/hw/pci_ids.h b/hw/pci_ids.h
index 8c349eb..83f3893 100644 (file)
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@ -73,12 +73,6 @@
 #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 39e3fa5..9a455a9 100644 (file)
--- a/tizen/src/hw/maru_overlay.c
+++ b/tizen/src/hw/maru_overlay.c
@@ -196,8 +196,11 @@ 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, PCI_BASE_ADDRESS_MEM_PREFETCH, overlay_mem_map);
-    pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, overlay_mmio_map);
+    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);
 
     return 0;
 }

diff --git a/tizen/src/ui b/tizen/src/ui
index a65b724..a3a66ec 160000 (submodule)
--- a/tizen/src/ui
+++ b/tizen/src/ui
@@ -1 +1 @@
-Subproject commit a65b724345c2c93390d1bb67366e3dc971b2eb4a
+Subproject commit a3a66ec0b2cf218e640fc79a2adc092371406b5f