[Feature][ZXW-88]merge P50 version
Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/os/linux/linux-3.4.x/ipc/shm_ctrl.h b/ap/os/linux/linux-3.4.x/ipc/shm_ctrl.h
index 5a850a1..4726ea8 100755
--- a/ap/os/linux/linux-3.4.x/ipc/shm_ctrl.h
+++ b/ap/os/linux/linux-3.4.x/ipc/shm_ctrl.h
@@ -29,19 +29,24 @@
#include <mach/spinlock.h>
/**
- * Êý¾ÝÀàÐͶ¨Òå
- */
+ * ºê¶¨Òå
+*/
#define TRUE 1
#define FALSE 0
-#define SHM_REMOTE_ATTR_YES (0x594553) /*YES ASCIIÂë*/
-#define SHM_REMOTE_ATTR_MASK (0xFFFFF000)
+
#define SHM_CTRL_OK (0)
#define SHM_CTRL_ERROR (-1)
#define SHM_CTRL_VMA_LINK_NUM (2)
#define SHM_CTRL_MEMSYNC_CHANNEL (15)
#define SHM_CTRL_CHANNEL_SIZE (0x40)
#define SHM_CTRL_LONG_32BIT (32)
+#define SHM_REMOTE_SYSV_YES (0x73797376) /*SYSV ASCIIÂë*/
+#define SHM_REMOTE_POSIX_YES (0x706F7378) /*POSX ASCIIÂë*/
+#define SHM_REMOTE_SYSV_MASK (0xFFFFF800) /*(key:-1~-2047)*/
+/**
+ * Êý¾ÝÀàÐͶ¨Òå
+ */
struct shm_pool_msg
{
unsigned int shm_len;
@@ -50,7 +55,12 @@
phys_addr_t key_manage_phy;
};
-
+extern int shm_remote_free_pages(key_t key);
+extern key_t shm_hash_name_to_key(const char *name, int len);
+extern int shm_do_newseg_check(key_t key, unsigned long len);
+extern int shm_do_remote_map_vma(struct vm_area_struct *vma, key_t key);
+extern void shm_unmap_page_range(struct mm_struct *mm, struct vm_area_struct *vma,
+ unsigned long addr, unsigned long end);
#endif
#endif // _SHM_CTRL_H