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

Commit 491ecd0b authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* changes:
  adb: Add USB vendor ID for YotaDevices
  adb: Add USB vendor ID for TechFaith
  adb: Add USB vendor ID for Rockchip
  adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
  adb: Add USB vendor ID for Allwinner
  adb: Add USB vendor ID for Amlogic
  added Gigaset's USB vendor ID
  adb: alphabetically sort usb vendors lists
parents 5234147c c1b6b153
Loading
Loading
Loading
Loading
+175 −150
Original line number Original line Diff line number Diff line
@@ -35,196 +35,221 @@


#define TRACE_TAG               TRACE_USB
#define TRACE_TAG               TRACE_USB


// Google's USB Vendor ID
/* Keep the list below sorted alphabetically by #define name */
#define VENDOR_ID_GOOGLE        0x18d1
// Intel's USB Vendor ID
#define VENDOR_ID_INTEL         0x8087
// HTC's USB Vendor ID
#define VENDOR_ID_HTC           0x0bb4
// Samsung's USB Vendor ID
#define VENDOR_ID_SAMSUNG       0x04e8
// Motorola's USB Vendor ID
#define VENDOR_ID_MOTOROLA      0x22b8
// LG's USB Vendor ID
#define VENDOR_ID_LGE           0x1004
// Huawei's USB Vendor ID
#define VENDOR_ID_HUAWEI        0x12D1
// Acer's USB Vendor ID
// Acer's USB Vendor ID
#define VENDOR_ID_ACER          0x0502
#define VENDOR_ID_ACER          0x0502
// Sony Ericsson's USB Vendor ID
// Allwinner's USB Vendor ID
#define VENDOR_ID_SONY_ERICSSON 0x0FCE
#define VENDOR_ID_ALLWINNER     0x1F3A
// Foxconn's USB Vendor ID
// Amlogic's USB Vendor ID
#define VENDOR_ID_FOXCONN       0x0489
#define VENDOR_ID_AMLOGIC       0x1b8e
// Dell's USB Vendor ID
// AnyDATA's USB Vendor ID
#define VENDOR_ID_DELL          0x413c
#define VENDOR_ID_ANYDATA       0x16D5
// Nvidia's USB Vendor ID
// Archos's USB Vendor ID
#define VENDOR_ID_NVIDIA        0x0955
#define VENDOR_ID_ARCHOS        0x0E79
// Garmin-Asus's USB Vendor ID
#define VENDOR_ID_GARMIN_ASUS   0x091E
// Sharp's USB Vendor ID
#define VENDOR_ID_SHARP         0x04dd
// ZTE's USB Vendor ID
#define VENDOR_ID_ZTE           0x19D2
// Kyocera's USB Vendor ID
#define VENDOR_ID_KYOCERA       0x0482
// Pantech's USB Vendor ID
#define VENDOR_ID_PANTECH       0x10A9
// Qualcomm's USB Vendor ID
#define VENDOR_ID_QUALCOMM      0x05c6
// On-The-Go-Video's USB Vendor ID
#define VENDOR_ID_OTGV          0x2257
// NEC's USB Vendor ID
#define VENDOR_ID_NEC           0x0409
// Panasonic Mobile Communication's USB Vendor ID
#define VENDOR_ID_PMC           0x04DA
// Toshiba's USB Vendor ID
#define VENDOR_ID_TOSHIBA       0x0930
// SK Telesys's USB Vendor ID
#define VENDOR_ID_SK_TELESYS    0x1F53
// KT Tech's USB Vendor ID
#define VENDOR_ID_KT_TECH       0x2116
// Asus's USB Vendor ID
// Asus's USB Vendor ID
#define VENDOR_ID_ASUS          0x0b05
#define VENDOR_ID_ASUS          0x0b05
// Philips's USB Vendor ID
// BYD's USB Vendor ID
#define VENDOR_ID_PHILIPS       0x0471
#define VENDOR_ID_BYD           0x1D91
// Texas Instruments's USB Vendor ID
// Compal's USB Vendor ID
#define VENDOR_ID_TI            0x0451
#define VENDOR_ID_COMPAL        0x1219
// Dell's USB Vendor ID
#define VENDOR_ID_DELL          0x413c
// ECS's USB Vendor ID
#define VENDOR_ID_ECS           0x03fc
// EMERGING_TECH's USB Vendor ID
#define VENDOR_ID_EMERGING_TECH 0x297F
// Foxconn's USB Vendor ID
#define VENDOR_ID_FOXCONN       0x0489
// Fujitsu's USB Vendor ID
#define VENDOR_ID_FUJITSU       0x04C5
// Funai's USB Vendor ID
// Funai's USB Vendor ID
#define VENDOR_ID_FUNAI         0x0F1C
#define VENDOR_ID_FUNAI         0x0F1C
// Garmin-Asus's USB Vendor ID
#define VENDOR_ID_GARMIN_ASUS   0x091E
// Gigabyte's USB Vendor ID
// Gigabyte's USB Vendor ID
#define VENDOR_ID_GIGABYTE      0x0414
#define VENDOR_ID_GIGABYTE      0x0414
// Gigaset's USB Vendor ID
#define VENDOR_ID_GIGASET       0x1E85
// Google's USB Vendor ID
#define VENDOR_ID_GOOGLE        0x18d1
// Haier's USB Vendor ID
#define VENDOR_ID_HAIER         0x201E
// Harris's USB Vendor ID
#define VENDOR_ID_HARRIS        0x19A5
// Hisense's USB Vendor ID
#define VENDOR_ID_HISENSE       0x109b
// HTC's USB Vendor ID
#define VENDOR_ID_HTC           0x0bb4
// Huawei's USB Vendor ID
#define VENDOR_ID_HUAWEI        0x12D1
// INQ Mobile's USB Vendor ID
#define VENDOR_ID_INQ_MOBILE    0x2314
// Intel's USB Vendor ID
#define VENDOR_ID_INTEL         0x8087
// IRiver's USB Vendor ID
// IRiver's USB Vendor ID
#define VENDOR_ID_IRIVER        0x2420
#define VENDOR_ID_IRIVER        0x2420
// Compal's USB Vendor ID
#define VENDOR_ID_COMPAL        0x1219
// T & A Mobile Phones' USB Vendor ID
#define VENDOR_ID_T_AND_A       0x1BBB
// LenovoMobile's USB Vendor ID
#define VENDOR_ID_LENOVOMOBILE  0x2006
// Lenovo's USB Vendor ID
#define VENDOR_ID_LENOVO        0x17EF
// Vizio's USB Vendor ID
#define VENDOR_ID_VIZIO         0xE040
// K-Touch's USB Vendor ID
// K-Touch's USB Vendor ID
#define VENDOR_ID_K_TOUCH       0x24E3
#define VENDOR_ID_K_TOUCH       0x24E3
// KT Tech's USB Vendor ID
#define VENDOR_ID_KT_TECH       0x2116
// Kobo's USB Vendor ID
#define VENDOR_ID_KOBO          0x2237
// Kyocera's USB Vendor ID
#define VENDOR_ID_KYOCERA       0x0482
// Lab126's USB Vendor ID
#define VENDOR_ID_LAB126        0x1949
// Lenovo's USB Vendor ID
#define VENDOR_ID_LENOVO        0x17EF
// LenovoMobile's USB Vendor ID
#define VENDOR_ID_LENOVOMOBILE  0x2006
// LG's USB Vendor ID
#define VENDOR_ID_LGE           0x1004
// Lumigon's USB Vendor ID
#define VENDOR_ID_LUMIGON       0x25E3
// Motorola's USB Vendor ID
#define VENDOR_ID_MOTOROLA      0x22b8
// MSI's USB Vendor ID
#define VENDOR_ID_MSI           0x0DB0
// MTK's USB Vendor ID
#define VENDOR_ID_MTK           0x0e8d
// NEC's USB Vendor ID
#define VENDOR_ID_NEC           0x0409
// B&N Nook's USB Vendor ID
#define VENDOR_ID_NOOK          0x2080
// Nvidia's USB Vendor ID
#define VENDOR_ID_NVIDIA        0x0955
// OPPO's USB Vendor ID
#define VENDOR_ID_OPPO          0x22D9
// On-The-Go-Video's USB Vendor ID
#define VENDOR_ID_OTGV          0x2257
// OUYA's USB Vendor ID
#define VENDOR_ID_OUYA          0x2836
// Pantech's USB Vendor ID
#define VENDOR_ID_PANTECH       0x10A9
// Pegatron's USB Vendor ID
// Pegatron's USB Vendor ID
#define VENDOR_ID_PEGATRON      0x1D4D
#define VENDOR_ID_PEGATRON      0x1D4D
// Archos's USB Vendor ID
// Philips's USB Vendor ID
#define VENDOR_ID_ARCHOS        0x0E79
#define VENDOR_ID_PHILIPS       0x0471
// Panasonic Mobile Communication's USB Vendor ID
#define VENDOR_ID_PMC           0x04DA
// Positivo's USB Vendor ID
// Positivo's USB Vendor ID
#define VENDOR_ID_POSITIVO      0x1662
#define VENDOR_ID_POSITIVO      0x1662
// Fujitsu's USB Vendor ID
// Qisda's USB Vendor ID
#define VENDOR_ID_FUJITSU       0x04C5
#define VENDOR_ID_QISDA         0x1D45
// Lumigon's USB Vendor ID
// Qualcomm's USB Vendor ID
#define VENDOR_ID_LUMIGON       0x25E3
#define VENDOR_ID_QUALCOMM      0x05c6
// Quanta's USB Vendor ID
// Quanta's USB Vendor ID
#define VENDOR_ID_QUANTA        0x0408
#define VENDOR_ID_QUANTA        0x0408
// INQ Mobile's USB Vendor ID
// Rockchip's USB Vendor ID
#define VENDOR_ID_INQ_MOBILE    0x2314
#define VENDOR_ID_ROCKCHIP      0x2207
// Samsung's USB Vendor ID
#define VENDOR_ID_SAMSUNG       0x04e8
// Sharp's USB Vendor ID
#define VENDOR_ID_SHARP         0x04dd
// SK Telesys's USB Vendor ID
#define VENDOR_ID_SK_TELESYS    0x1F53
// Sony's USB Vendor ID
// Sony's USB Vendor ID
#define VENDOR_ID_SONY          0x054C
#define VENDOR_ID_SONY          0x054C
// Lab126's USB Vendor ID
// Sony Ericsson's USB Vendor ID
#define VENDOR_ID_LAB126        0x1949
#define VENDOR_ID_SONY_ERICSSON 0x0FCE
// Yulong Coolpad's USB Vendor ID
// T & A Mobile Phones' USB Vendor ID
#define VENDOR_ID_YULONG_COOLPAD 0x1EBF
#define VENDOR_ID_T_AND_A       0x1BBB
// Kobo's USB Vendor ID
// TechFaith's USB Vendor ID
#define VENDOR_ID_KOBO          0x2237
#define VENDOR_ID_TECHFAITH     0x1d09
// Teleepoch's USB Vendor ID
// Teleepoch's USB Vendor ID
#define VENDOR_ID_TELEEPOCH     0x2340
#define VENDOR_ID_TELEEPOCH     0x2340
// AnyDATA's USB Vendor ID
// Texas Instruments's USB Vendor ID
#define VENDOR_ID_ANYDATA       0x16D5
#define VENDOR_ID_TI            0x0451
// Harris's USB Vendor ID
// Toshiba's USB Vendor ID
#define VENDOR_ID_HARRIS        0x19A5
#define VENDOR_ID_TOSHIBA       0x0930
// OPPO's USB Vendor ID
// Vizio's USB Vendor ID
#define VENDOR_ID_OPPO          0x22D9
#define VENDOR_ID_VIZIO         0xE040
// Xiaomi's USB Vendor ID
#define VENDOR_ID_XIAOMI        0x2717
// BYD's USB Vendor ID
#define VENDOR_ID_BYD           0x1D91
// OUYA's USB Vendor ID
#define VENDOR_ID_OUYA          0x2836
// Haier's USB Vendor ID
#define VENDOR_ID_HAIER         0x201E
// Hisense's USB Vendor ID
#define VENDOR_ID_HISENSE       0x109b
// MTK's USB Vendor ID
#define VENDOR_ID_MTK           0x0e8d
// B&N Nook's USB Vendor ID
#define VENDOR_ID_NOOK          0x2080
// Qisda's USB Vendor ID
#define VENDOR_ID_QISDA         0x1D45
// ECS's USB Vendor ID
#define VENDOR_ID_ECS           0x03fc
// MSI's USB Vendor ID
#define VENDOR_ID_MSI           0x0DB0
// Wacom's USB Vendor ID
// Wacom's USB Vendor ID
#define VENDOR_ID_WACOM         0x0531
#define VENDOR_ID_WACOM         0x0531
// Xiaomi's USB Vendor ID
#define VENDOR_ID_XIAOMI        0x2717
// YotaDevices's USB Vendor ID
#define VENDOR_ID_YOTADEVICES   0x2916
// Yulong Coolpad's USB Vendor ID
#define VENDOR_ID_YULONG_COOLPAD 0x1EBF
// ZTE's USB Vendor ID
#define VENDOR_ID_ZTE           0x19D2
/* Keep the list above sorted alphabetically by #define name */


/** built-in vendor list */
/** built-in vendor list */
/* Keep the list below sorted alphabetically */
int builtInVendorIds[] = {
int builtInVendorIds[] = {
    VENDOR_ID_GOOGLE,
    VENDOR_ID_INTEL,
    VENDOR_ID_HTC,
    VENDOR_ID_SAMSUNG,
    VENDOR_ID_MOTOROLA,
    VENDOR_ID_LGE,
    VENDOR_ID_HUAWEI,
    VENDOR_ID_ACER,
    VENDOR_ID_ACER,
    VENDOR_ID_SONY_ERICSSON,
    VENDOR_ID_ALLWINNER,
    VENDOR_ID_FOXCONN,
    VENDOR_ID_AMLOGIC,
    VENDOR_ID_DELL,
    VENDOR_ID_ANYDATA,
    VENDOR_ID_NVIDIA,
    VENDOR_ID_ARCHOS,
    VENDOR_ID_GARMIN_ASUS,
    VENDOR_ID_SHARP,
    VENDOR_ID_ZTE,
    VENDOR_ID_KYOCERA,
    VENDOR_ID_PANTECH,
    VENDOR_ID_QUALCOMM,
    VENDOR_ID_OTGV,
    VENDOR_ID_NEC,
    VENDOR_ID_PMC,
    VENDOR_ID_TOSHIBA,
    VENDOR_ID_SK_TELESYS,
    VENDOR_ID_KT_TECH,
    VENDOR_ID_ASUS,
    VENDOR_ID_ASUS,
    VENDOR_ID_PHILIPS,
    VENDOR_ID_BYD,
    VENDOR_ID_TI,
    VENDOR_ID_COMPAL,
    VENDOR_ID_DELL,
    VENDOR_ID_ECS,
    VENDOR_ID_EMERGING_TECH,
    VENDOR_ID_FOXCONN,
    VENDOR_ID_FUJITSU,
    VENDOR_ID_FUNAI,
    VENDOR_ID_FUNAI,
    VENDOR_ID_GARMIN_ASUS,
    VENDOR_ID_GIGABYTE,
    VENDOR_ID_GIGABYTE,
    VENDOR_ID_GIGASET,
    VENDOR_ID_GOOGLE,
    VENDOR_ID_HAIER,
    VENDOR_ID_HARRIS,
    VENDOR_ID_HISENSE,
    VENDOR_ID_HTC,
    VENDOR_ID_HUAWEI,
    VENDOR_ID_INQ_MOBILE,
    VENDOR_ID_INTEL,
    VENDOR_ID_IRIVER,
    VENDOR_ID_IRIVER,
    VENDOR_ID_COMPAL,
    VENDOR_ID_KOBO,
    VENDOR_ID_T_AND_A,
    VENDOR_ID_LENOVOMOBILE,
    VENDOR_ID_LENOVO,
    VENDOR_ID_VIZIO,
    VENDOR_ID_K_TOUCH,
    VENDOR_ID_K_TOUCH,
    VENDOR_ID_KT_TECH,
    VENDOR_ID_KYOCERA,
    VENDOR_ID_LAB126,
    VENDOR_ID_LENOVO,
    VENDOR_ID_LENOVOMOBILE,
    VENDOR_ID_LGE,
    VENDOR_ID_LUMIGON,
    VENDOR_ID_MOTOROLA,
    VENDOR_ID_MSI,
    VENDOR_ID_MTK,
    VENDOR_ID_NEC,
    VENDOR_ID_NOOK,
    VENDOR_ID_NVIDIA,
    VENDOR_ID_OPPO,
    VENDOR_ID_OTGV,
    VENDOR_ID_OUYA,
    VENDOR_ID_PANTECH,
    VENDOR_ID_PEGATRON,
    VENDOR_ID_PEGATRON,
    VENDOR_ID_ARCHOS,
    VENDOR_ID_PHILIPS,
    VENDOR_ID_PMC,
    VENDOR_ID_POSITIVO,
    VENDOR_ID_POSITIVO,
    VENDOR_ID_FUJITSU,
    VENDOR_ID_QISDA,
    VENDOR_ID_LUMIGON,
    VENDOR_ID_QUALCOMM,
    VENDOR_ID_QUANTA,
    VENDOR_ID_QUANTA,
    VENDOR_ID_INQ_MOBILE,
    VENDOR_ID_ROCKCHIP,
    VENDOR_ID_SAMSUNG,
    VENDOR_ID_SHARP,
    VENDOR_ID_SK_TELESYS,
    VENDOR_ID_SONY,
    VENDOR_ID_SONY,
    VENDOR_ID_LAB126,
    VENDOR_ID_SONY_ERICSSON,
    VENDOR_ID_YULONG_COOLPAD,
    VENDOR_ID_T_AND_A,
    VENDOR_ID_KOBO,
    VENDOR_ID_TECHFAITH,
    VENDOR_ID_TELEEPOCH,
    VENDOR_ID_TELEEPOCH,
    VENDOR_ID_ANYDATA,
    VENDOR_ID_TI,
    VENDOR_ID_HARRIS,
    VENDOR_ID_TOSHIBA,
    VENDOR_ID_OPPO,
    VENDOR_ID_VIZIO,
    VENDOR_ID_XIAOMI,
    VENDOR_ID_BYD,
    VENDOR_ID_OUYA,
    VENDOR_ID_HAIER,
    VENDOR_ID_HISENSE,
    VENDOR_ID_MTK,
    VENDOR_ID_NOOK,
    VENDOR_ID_QISDA,
    VENDOR_ID_ECS,
    VENDOR_ID_MSI,
    VENDOR_ID_WACOM,
    VENDOR_ID_WACOM,
    VENDOR_ID_XIAOMI,
    VENDOR_ID_YOTADEVICES,
    VENDOR_ID_YULONG_COOLPAD,
    VENDOR_ID_ZTE,
};
};
/* Keep the list above sorted alphabetically */


#define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))
#define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))