Merge change 20154
* changes:
Added defines for <stdint.h> and <stdbool.h>.
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 850e10b..c81222a 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -147,9 +147,11 @@
int match_fastboot(usb_ifc_info *info)
{
if(!(vendor_id && (info->dev_vendor == vendor_id)) &&
- (info->dev_vendor != 0x18d1) &&
+ (info->dev_vendor != 0x18d1) && // Google
(info->dev_vendor != 0x0451) &&
- (info->dev_vendor != 0x0bb4)) return -1;
+ (info->dev_vendor != 0x22b8) && // Motorola
+ (info->dev_vendor != 0x0bb4)) // HTC
+ return -1;
if(info->ifc_class != 0xff) return -1;
if(info->ifc_subclass != 0x42) return -1;
if(info->ifc_protocol != 0x03) return -1;
diff --git a/init/devices.c b/init/devices.c
index 11b9e61..13ebae7 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -99,8 +99,8 @@
{ "/dev/msm_hw3dc", 0666, AID_ROOT, AID_ROOT, 0 },
/* these should not be world writable */
- { "/dev/diag", 0660, AID_ROOT, AID_ROOT, 0 },
- { "/dev/diag_arm9", 0660, AID_ROOT, AID_ROOT, 0 },
+ { "/dev/diag", 0660, AID_RADIO, AID_RADIO, 0 },
+ { "/dev/diag_arm9", 0660, AID_RADIO, AID_RADIO, 0 },
{ "/dev/android_adb", 0660, AID_ADB, AID_ADB, 0 },
{ "/dev/android_adb_enable", 0660, AID_ADB, AID_ADB, 0 },
{ "/dev/ttyMSM0", 0600, AID_BLUETOOTH, AID_BLUETOOTH, 0 },