Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe8a78e4 authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

staging: android: Split uapi out of ashmem.h 



Move the userspace interface of ashmem.h to
drivers/staging/android/uapi/ashmem.h

Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Colin Cross <ccross@android.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: default avatarColin Cross <ccross@android.com>
[jstultz: Minor commit message tweak]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6b09619

drivers/staging/android/ashmem.h

+1 −29
Original line number Diff line number Diff line
@@ -16,35 +16,7 @@ 
#include <linux/ioctl.h>

#include <linux/compat.h>



#define ASHMEM_NAME_LEN		256



#define ASHMEM_NAME_DEF		"dev/ashmem"



/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */

#define ASHMEM_NOT_PURGED	0

#define ASHMEM_WAS_PURGED	1



/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */

#define ASHMEM_IS_UNPINNED	0

#define ASHMEM_IS_PINNED	1



struct ashmem_pin {

	__u32 offset;	/* offset into region, in bytes, page-aligned */

	__u32 len;	/* length forward from offset, in bytes, page-aligned */

};



#define __ASHMEMIOC		0x77



#define ASHMEM_SET_NAME		_IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])

#define ASHMEM_GET_NAME		_IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])

#define ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, size_t)

#define ASHMEM_GET_SIZE		_IO(__ASHMEMIOC, 4)

#define ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned long)

#define ASHMEM_GET_PROT_MASK	_IO(__ASHMEMIOC, 6)

#define ASHMEM_PIN		_IOW(__ASHMEMIOC, 7, struct ashmem_pin)

#define ASHMEM_UNPIN		_IOW(__ASHMEMIOC, 8, struct ashmem_pin)

#define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)

#define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)

#include "uapi/ashmem.h"



/* support of 32bit userspace on 64bit platforms */

#ifdef CONFIG_COMPAT

drivers/staging/android/uapi/ashmem.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * drivers/staging/android/uapi/ashmem.h

 *

 * Copyright 2008 Google Inc.

 * Author: Robert Love

 *

 * This file is dual licensed.  It may be redistributed and/or modified

 * under the terms of the Apache 2.0 License OR version 2 of the GNU

 * General Public License.

 */



#ifndef _UAPI_LINUX_ASHMEM_H

#define _UAPI_LINUX_ASHMEM_H



#include <linux/ioctl.h>



#define ASHMEM_NAME_LEN		256



#define ASHMEM_NAME_DEF		"dev/ashmem"



/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */

#define ASHMEM_NOT_PURGED	0

#define ASHMEM_WAS_PURGED	1



/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */

#define ASHMEM_IS_UNPINNED	0

#define ASHMEM_IS_PINNED	1



struct ashmem_pin {

	__u32 offset;	/* offset into region, in bytes, page-aligned */

	__u32 len;	/* length forward from offset, in bytes, page-aligned */

};



#define __ASHMEMIOC		0x77



#define ASHMEM_SET_NAME		_IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])

#define ASHMEM_GET_NAME		_IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])

#define ASHMEM_SET_SIZE		_IOW(__ASHMEMIOC, 3, size_t)

#define ASHMEM_GET_SIZE		_IO(__ASHMEMIOC, 4)

#define ASHMEM_SET_PROT_MASK	_IOW(__ASHMEMIOC, 5, unsigned long)

#define ASHMEM_GET_PROT_MASK	_IO(__ASHMEMIOC, 6)

#define ASHMEM_PIN		_IOW(__ASHMEMIOC, 7, struct ashmem_pin)

#define ASHMEM_UNPIN		_IOW(__ASHMEMIOC, 8, struct ashmem_pin)

#define ASHMEM_GET_PIN_STATUS	_IO(__ASHMEMIOC, 9)

#define ASHMEM_PURGE_ALL_CACHES	_IO(__ASHMEMIOC, 10)



#endif	/* _UAPI_LINUX_ASHMEM_H */