From 7e19bfdbb68f81f5777e3664b867054bc437a515 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 22 Jun 2017 23:48:28 +0200 Subject: [PATCH] monitor: Add missing UUID and EIR definitions --- monitor/packet.c | 10 +++++ monitor/uuid.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/monitor/packet.c b/monitor/packet.c index 7d1c5e86d..a3d188ae0 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -3249,6 +3249,16 @@ static void print_fec(uint8_t fec) #define BT_EIR_LE_ROLE 0x1c #define BT_EIR_SSP_HASH_P256 0x1d #define BT_EIR_SSP_RANDOMIZER_P256 0x1e +#define BT_EIR_SERVICE_UUID32 0x1f +#define BT_EIR_SERVICE_DATA32 0x20 +#define BT_EIR_SERVICE_DATA128 0x21 +#define BT_EIR_LE_SC_CONFIRM_VALUE 0x22 +#define BT_EIR_LE_SC_RANDOM_VALUE 0x23 +#define BT_EIR_URI 0x24 +#define BT_EIR_INDOOR_POSITIONING 0x25 +#define BT_EIR_TRANSPORT_DISCOVERY 0x26 +#define BT_EIR_LE_SUPPORTED_FEATURES 0x27 +#define BT_EIR_CHANNEL_MAP_UPDATE_IND 0x28 #define BT_EIR_3D_INFO_DATA 0x3d #define BT_EIR_MANUFACTURER_DATA 0xff diff --git a/monitor/uuid.c b/monitor/uuid.c index 000e04b4b..fb0b210fb 100644 --- a/monitor/uuid.c +++ b/monitor/uuid.c @@ -169,7 +169,8 @@ static const struct { { 0x1823, "HTTP Proxy" }, { 0x1824, "Transport Discovery" }, { 0x1825, "Object Transfer" }, - /* 0x1824 to 0x27ff undefined */ + { 0x1826, "Fitness Machine" }, + /* 0x1827 to 0x27ff undefined */ { 0x2800, "Primary Service" }, { 0x2801, "Secondary Service" }, { 0x2802, "Include" }, @@ -379,6 +380,23 @@ static const struct { { 0x2ac6, "Object List Control Point" }, { 0x2ac7, "Object List Filter" }, { 0x2ac8, "Object Changed" }, + { 0x2ac9, "Resolvable Private Address Only" }, + /* 0x2aca and 0x2acb undefined */ + { 0x2acc, "Fitness Machine Feature" }, + { 0x2acd, "Treadmill Data" }, + { 0x2ace, "Cross Trainer Data" }, + { 0x2acf, "Step Climber Data" }, + { 0x2ad0, "Stair Climber Data" }, + { 0x2ad1, "Rower Data" }, + { 0x2ad2, "Indoor Bike Data" }, + { 0x2ad3, "Training Status" }, + { 0x2ad4, "Supported Speed Range" }, + { 0x2ad5, "Supported Inclination Range" }, + { 0x2ad6, "Supported Resistance Level Range" }, + { 0x2ad7, "Supported Heart Rate Range" }, + { 0x2ad8, "Supported Power Range" }, + { 0x2ad9, "Fitness Machine Control Point" }, + { 0x2ada, "Fitness Machine Status" }, /* vendor defined */ { 0xfeff, "GN Netcom" }, { 0xfefe, "GN ReSound A/S" }, @@ -534,7 +552,82 @@ static const struct { { 0xfe68, "Qualcomm Life Inc" }, { 0xfe67, "Lab Sensor Solutions" }, { 0xfe66, "Intel Corporation" }, + { 0xfe65, "CHIPOLO d.o.o." }, + { 0xfe64, "Siemens AG" }, + { 0xfe63, "Connected Yard, Inc." }, + { 0xfe62, "Indagem Tech LLC" }, + { 0xfe61, "Logitech International SA" }, + { 0xfe60, "Lierda Science & Technology Group Co., Ltd." }, + { 0xfe5F, "Eyefi, Inc." }, + { 0xfe5E, "Plastc Corporation" }, + { 0xfe5D, "Grundfos A/S" }, + { 0xfe5C, "million hunters GmbH" }, + { 0xfe5B, "GT-tronics HK Ltd" }, + { 0xfe5A, "Chronologics Corporation" }, + { 0xfe59, "Nordic Semiconductor ASA" }, + { 0xfe58, "Nordic Semiconductor ASA" }, + { 0xfe57, "Dotted Labs" }, + { 0xfe56, "Google Inc." }, + { 0xfe55, "Google Inc." }, + { 0xfe54, "Motiv, Inc." }, + { 0xfe53, "3M" }, + { 0xfe52, "SetPoint Medical" }, + { 0xfe51, "SRAM" }, + { 0xfe50, "Google Inc." }, + { 0xfe4F, "Molekule, Inc." }, + { 0xfe4E, "NTT docomo" }, + { 0xfe4D, "Casambi Technologies Oy" }, + { 0xfe4C, "Volkswagen AG" }, + { 0xfe4B, "Koninklijke Philips N.V." }, + { 0xfe4A, "OMRON HEALTHCARE Co., Ltd." }, + { 0xfe49, "SenionLab AB" }, + { 0xfe48, "General Motors" }, + { 0xfe47, "General Motors" }, + { 0xfe46, "B&O Play A/S" }, + { 0xfe45, "Snapchat Inc" }, + { 0xfe44, "SK Telecom" }, + { 0xfe43, "Andreas Stihl AG & Co. KG" }, + { 0xfe42, "Nets A/S" }, + { 0xfe41, "Inugo Systems Limited" }, + { 0xfe40, "Inugo Systems Limited" }, + { 0xfe3F, "Friday Labs Limited" }, + { 0xfe3E, "BD Medical" }, + { 0xfe3D, "BD Medical" }, + { 0xfe3C, "Alibaba" }, + { 0xfe3B, "Dolby Laboratories" }, + { 0xfe3A, "TTS Tooltechnic Systems AG & Co. KG" }, + { 0xfe39, "TTS Tooltechnic Systems AG & Co. KG" }, + { 0xfe38, "Spaceek LTD" }, + { 0xfe37, "Spaceek LTD" }, + { 0xfe36, "HUAWEI Technologies Co., Ltd" }, + { 0xfe35, "HUAWEI Technologies Co., Ltd" }, + { 0xfe34, "SmallLoop LLC" }, + { 0xfe33, "CHIPOLO d.o.o." }, + { 0xfe32, "Pro-Mark, Inc." }, + { 0xfe31, "Volkswagen AG" }, + { 0xfe30, "Volkswagen AG" }, + { 0xfe2F, "CRESCO Wireless, Inc" }, + { 0xfe2E, "ERi,Inc." }, + { 0xfe2D, "SMART INNOVATION Co.,Ltd" }, + { 0xfe2C, "Google Inc." }, + { 0xfe2B, "ITT Industries" }, + { 0xfe2A, "DaisyWorks, Inc." }, + { 0xfe29, "Gibson Innovations" }, + { 0xfe28, "Ayla Network" }, + { 0xfe27, "Google Inc." }, + { 0xfe26, "Google Inc." }, + { 0xfe25, "Apple, Inc." }, + { 0xfe24, "August Home Inc" }, + { 0xfe23, "Zoll Medical Corporation" }, + { 0xfe22, "Zoll Medical Corporation" }, + { 0xfe21, "Bose Corporation" }, + { 0xfe20, "Emerson" }, + { 0xfe1F, "Garmin International, Inc." }, + { 0xfe1E, "Smart Innovations Co., Ltd" }, + { 0xfe1D, "Illuminati Instrument Corporation" }, + { 0xfe1C, "NetMedia, Inc." }, /* SDO defined */ + { 0xfffc, "AirFuel Alliance" }, { 0xfffe, "Alliance for Wireless Power (A4WP)" }, { 0xfffd, "Fast IDentity Online Alliance (FIDO)" }, { } -- 2.47.3