auto import from //branches/cupcake/...@130745 (13f797da) · Commits · e / os / android_system_core

adb/usb_linux.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,8 @@ static int find_usb_device(const char *base,
		}
		}

		register_device_callback(devname, local_ep_in, local_ep_out, i, serial, zero_mask);
		register_device_callback(devname, local_ep_in, local_ep_out,
		interface->bInterfaceNumber, serial, zero_mask);

		found_device = 1;
		break;

+4 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ void usage(void)
		"\n"
		"commands:\n"
		" update <filename> reflash device from update.zip\n"
		" flashall 'flash boot' + 'flash system'\n"
		" flashall flash boot + recovery + system\n"
		" flash <partition> [ <filename> ] write a file to a flash partition\n"
		" erase <partition> erase a flash partition\n"
		" getvar <variable> display a bootloader variable\n"
		@@ -588,6 +588,9 @@ int main(int argc, char **argv)
		} else if(!strcmp(*argv, "reboot-bootloader")) {
		wants_reboot_bootloader = 1;
		skip(1);
		} else if (!strcmp(*argv, "continue")) {
		fb_queue_command("continue", "resuming boot");
		skip(1);
		} else if(!strcmp(*argv, "boot")) {
		char *kname = 0;
		char *rname = 0;

+8 −3

Original line number	Diff line number	Diff line
		@@ -42,8 +42,10 @@ enum GGLPixelFormat {
		// YCbCr formats (SP=semi-planar, P=planar)
		GGL_PIXEL_FORMAT_YCbCr_422_SP= 0x10,
		GGL_PIXEL_FORMAT_YCbCr_420_SP= 0x11,
		GGL_PIXEL_FORMAT_YCbCr_422_P = 0x14,
		GGL_PIXEL_FORMAT_YCbCr_420_P = 0x15,
		GGL_PIXEL_FORMAT_YCbCr_422_P = 0x12,
		GGL_PIXEL_FORMAT_YCbCr_420_P = 0x13,
		GGL_PIXEL_FORMAT_YCbCr_422_I = 0x14,
		GGL_PIXEL_FORMAT_YCbCr_420_I = 0x15,

		// reserved/special formats
		GGL_PIXEL_FORMAT_Z_16 = 0x18,
		@@ -60,7 +62,10 @@ enum GGLFormatComponents {
		GGL_RGBA = 0x1908,
		GGL_LUMINANCE = 0x1909,
		GGL_LUMINANCE_ALPHA = 0x190A,
		GGL_Y_CB_CR = 0x8000,
		GGL_Y_CB_CR_SP = 0x8000,
		GGL_Y_CB_CR = GGL_Y_CB_CR_SP,
		GGL_Y_CB_CR_P = 0x8001,
		GGL_Y_CB_CR_I = 0x8002,
		};

		enum GGLFormatComponentIndex {

+6 −6

Original line number	Diff line number	Diff line
		@@ -40,12 +40,12 @@ static GGLFormat const gPixelFormatInfos[] =
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE

		{ 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR },// PIXEL_FORMAT_YCbCr_422_SP
		{ 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR },// PIXEL_FORMAT_YCbCr_420_SP
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_SP },// PIXEL_FORMAT_YCbCr_422_SP
		{ 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_SP },// PIXEL_FORMAT_YCbCr_420_SP
		{ 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_P }, // PIXEL_FORMAT_YCbCr_422_P
		{ 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_P }, // PIXEL_FORMAT_YCbCr_420_P
		{ 1, 16, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_I }, // PIXEL_FORMAT_YCbCr_422_I
		{ 1, 12, {{ 0, 8, 0, 8, 0, 8, 0, 0 }}, GGL_Y_CB_CR_I }, // PIXEL_FORMAT_YCbCr_420_I
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE
		{ 0, 0, {{ 0, 0, 0, 0, 0, 0, 0, 0 }}, 0 }, // PIXEL_FORMAT_NONE

+15 −2

Original line number	Diff line number	Diff line
		@@ -58,6 +58,9 @@
		# This is logged when the partial wake lock (keeping the device awake
		# regardless of whether the screen is off) is acquired or released.
		2729 power_partial_wake_state (releasedorAcquired\|1\|5),(tag\|3)
		# This is logged when battery goes from discharging to charging.
		# It lets us count the total amount of time between charges and the discharge level
		2730 battery_discharge (duration\|2\|3),(minLevel\|1\|6),(maxLevel\|1\|6)
		#
		# Leave IDs through 2739 for more power logs
		#
		@@ -304,10 +307,19 @@
		# Suspicious status of data connection while radio poweroff
		50108 data_network_status_on_radio_off (dc_state\|3), (enable\|1\|5)

		# PDP drop caused by network
		50109 pdp_network_drop (cid\|1\|5), (network_type\|1\|5)

		# Do not change these names without updating tag in:
		#//device/dalvik/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.c
		51000 socket_stats (send\|1\|2),(recv\|1\|2),(ip\|1\|5),(port\|1\|5),(close\|1\|5)

		# db stats. 0 is query, 1 is write (may become more fine grained in the
		# future)
		52000 db_operation (name\|3),(op_type\|1\|5),(time\|2\|3)

		# http request/response stats
		52001 http_stats (useragent\|3),(response\|2\|3),(processing\|2\|3),(tx\|1\|2),(rx\|1\|2)
		60000 viewroot_draw (Draw time\|1\|3)
		60001 viewroot_layout (Layout time\|1\|3)
		60002 view_build_drawing_cache (View created drawing cache\|1\|5)
		@@ -315,3 +327,4 @@

		# 0 for screen off, 1 for screen on, 2 for key-guard done
		70000 screen_toggled (screen_state\|1\|5)