auto import from //branches/cupcake/...@130745

This commit is contained in:
The Android Open Source Project
2009-02-10 15:44:04 -08:00
parent f87393cb24
commit b376203efb
5 changed files with 59 additions and 20 deletions

View File

@@ -39,13 +39,13 @@ __BEGIN_DECLS
* graphics/PixelFormat.java, ui/PixelFormat.h, pixelflinger/format.h
*/
enum {
COPYBIT_FORMAT_RGBA_8888 = 1,
COPYBIT_FORMAT_RGB_565 = 4,
COPYBIT_FORMAT_BGRA_8888 = 5,
COPYBIT_FORMAT_RGBA_5551 = 6,
COPYBIT_FORMAT_RGBA_4444 = 7,
COPYBIT_FORMAT_YCbCr_422_SP = 0x10,
COPYBIT_FORMAT_YCbCr_420_SP = 0x11
COPYBIT_FORMAT_RGBA_8888 = HAL_PIXEL_FORMAT_RGBA_8888,
COPYBIT_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
COPYBIT_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
COPYBIT_FORMAT_RGBA_5551 = HAL_PIXEL_FORMAT_RGBA_5551,
COPYBIT_FORMAT_RGBA_4444 = HAL_PIXEL_FORMAT_RGBA_4444,
COPYBIT_FORMAT_YCbCr_422_SP = HAL_PIXEL_FORMAT_YCbCr_422_SP,
COPYBIT_FORMAT_YCbCr_420_SP = HAL_PIXEL_FORMAT_YCbCr_420_SP,
};
/* name for copybit_set_parameter */

View File

@@ -106,6 +106,25 @@ struct hw_device_t {
*/
int hw_get_module(const char *id, const struct hw_module_t **module);
/**
* pixel format definitions
*/
enum {
HAL_PIXEL_FORMAT_RGBA_8888 = 1,
HAL_PIXEL_FORMAT_RGB_565 = 4,
HAL_PIXEL_FORMAT_BGRA_8888 = 5,
HAL_PIXEL_FORMAT_RGBA_5551 = 6,
HAL_PIXEL_FORMAT_RGBA_4444 = 7,
HAL_PIXEL_FORMAT_YCbCr_422_SP = 0x10,
HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x11,
HAL_PIXEL_FORMAT_YCbCr_422_P = 0x12,
HAL_PIXEL_FORMAT_YCbCr_420_P = 0x13,
HAL_PIXEL_FORMAT_YCbCr_422_I = 0x14,
HAL_PIXEL_FORMAT_YCbCr_420_I = 0x15
};
__END_DECLS
#endif /* ANDROID_INCLUDE_HARDWARE_HARDWARE_H */

View File

@@ -42,13 +42,11 @@ __BEGIN_DECLS
/* possible overlay formats */
enum {
OVERLAY_FORMAT_RGBA_8888 = 1,
OVERLAY_FORMAT_RGB_565 = 4,
OVERLAY_FORMAT_BGRA_8888 = 5,
OVERLAY_FORMAT_YCbCr_422_SP = 0x10,
OVERLAY_FORMAT_YCbCr_420_SP = 0x11,
OVERLAY_FORMAT_YCbCr_422_I = 0x14,
OVERLAY_FORMAT_YCbCr_420_I = 0x15
OVERLAY_FORMAT_RGBA_8888 = HAL_PIXEL_FORMAT_RGBA_8888,
OVERLAY_FORMAT_RGB_565 = HAL_PIXEL_FORMAT_RGB_565,
OVERLAY_FORMAT_BGRA_8888 = HAL_PIXEL_FORMAT_BGRA_8888,
OVERLAY_FORMAT_YCbCr_422_I = HAL_PIXEL_FORMAT_YCbCr_422_I,
OVERLAY_FORMAT_YCbCr_420_I = HAL_PIXEL_FORMAT_YCbCr_420_I
};
/* values for copybit_set_parameter(OVERLAY_TRANSFORM) */
@@ -193,6 +191,8 @@ struct overlay_data_device_t {
/* returns the address of a given buffer if supported, NULL otherwise. */
void* (*getBufferAddress)(struct overlay_data_device_t *dev,
overlay_buffer_t buffer);
int (*getBufferCount)(struct overlay_data_device_t *dev);
};

View File

@@ -37,7 +37,10 @@ __BEGIN_DECLS
#define SENSORS_HARDWARE_DATA "data"
/**
* Handles must be higher than SENSORS_HANDLE_BASE
* Handles must be higher than SENSORS_HANDLE_BASE and must be unique.
* A Handle identifies a given sensors. The handle is used to activate
* and/or deactivate sensors.
* In this version of the API there can only be 256 handles.
*/
#define SENSORS_HANDLE_BASE 0
#define SENSORS_HANDLE_BITS 8
@@ -232,22 +235,37 @@ struct sensors_module_t {
struct hw_module_t common;
/**
* @return bit map of available sensors defined by
* the constants SENSORS_XXXX.
* Enumerate all available sensors. The list is returned in "list".
* @return number of sensors in the list
*/
int (*get_sensors_list)(struct sensors_module_t* module,
struct sensor_t const**);
struct sensor_t const** list);
};
struct sensor_t {
/* name of this sensors */
const char* name;
/* vendor of the hardware part */
const char* vendor;
/* version of the hardware part + driver. The value of this field is
* left to the implementation and doesn't have to be monotonicaly
* increasing.
*/
int version;
/* handle that identifies this sensors. This handle is used to activate
* and deactivate this sensor. The value of the handle must be 8 bits
* in this version of the API.
*/
int handle;
/* this sensor's type. */
int type;
/* maximaum range of this sensor's value in SI units */
float maxRange;
/* smallest difference between two values reported by this sensor */
float resolution;
/* rough estimate of this sensor's power consumption in mA */
float power;
/* reserved fields, must be zero */
void* reserved[9];
};
@@ -269,9 +287,9 @@ struct sensors_control_device_t {
*/
int (*open_data_source)(struct sensors_control_device_t *dev);
/** Activate/deactivate one or more of the sensors.
/** Activate/deactivate one sensor.
*
* @param sensors is the handle of the sensors to change.
* @param handle is the handle of the sensor to change.
* @param enabled set to 1 to enable, or 0 to disable the sensor.
*
* @return 0 on success, negative errno code otherwise

View File

@@ -7,6 +7,8 @@ libhardware.so eventually should contain *just* the HAL hub
Modules are .so in /system/libs/hw/ and have a well defined naming
convention:
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.product.board>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.board.platform>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.<ro.arch>.so
/system/libs/hw/<*_HARDWARE_MODULE_ID>.default.so