auto import from //branches/cupcake/...@131421 (ac65e0b1) · Commits · e / devices / smdk4412 / android_frameworks_native

include/ui/ISurface.h

+3 −9

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@
		#include <utils/RefBase.h>
		#include <ui/PixelFormat.h>

		#include <hardware/hardware.h>

		namespace android {

		typedef int32_t SurfaceID;
		@@ -49,16 +51,8 @@ public:
		class BufferHeap {
		public:
		enum {
		/* flip source image horizontally */
		FLIP_H = 0x01,
		/* flip source image vertically */
		FLIP_V = 0x02,
		/* rotate source image 90 degrees */
		ROT_90 = 0x04,
		/* rotate source image 180 degrees */
		ROT_180 = 0x03,
		/* rotate source image 270 degrees */
		ROT_270 = 0x07,
		ROT_90 = HAL_TRANSFORM_ROT_90,
		};
		BufferHeap();

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/* utils/logger.h
		**
		** Copyright 2007, The Android Open Source Project
		**
		** 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 _UTILS_LOGGER_H
		#define _UTILS_LOGGER_H

		#include <stdint.h>

		struct logger_entry {
		uint16_t len; /* length of the payload */
		uint16_t __pad; /* no matter what, we get 2 bytes of padding */
		int32_t pid; /* generating process's pid */
		int32_t tid; /* generating process's tid */
		int32_t sec; /* seconds since Epoch */
		int32_t nsec; /* nanoseconds */
		char msg[0]; /* the entry's payload */
		};

		#define LOGGER_LOG_MAIN "log/main"
		#define LOGGER_LOG_RADIO "log/radio"
		#define LOGGER_LOG_EVENTS "log/events"

		#define LOGGER_ENTRY_MAX_LEN (4*1024)
		#define LOGGER_ENTRY_MAX_PAYLOAD \
		(LOGGER_ENTRY_MAX_LEN - sizeof(struct logger_entry))

		#ifdef HAVE_IOCTL

		#include <sys/ioctl.h>

		#define __LOGGERIO 0xAE

		#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */
		#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */
		#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */
		#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */

		#endif // HAVE_IOCTL

		#endif /* _UTILS_LOGGER_H */

+1332 −737

File changed.

Preview size limit exceeded, changes collapsed.

+362 −250

File changed.

Preview size limit exceeded, changes collapsed.

+0 −2