* [PATCH BlueZ 1/4] lib/uuid: Add helpers to decode UUIDs strings
@ 2017-12-19 12:40 Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 2/4] tools: Remove monitor/uuid.{c,h} Luiz Augusto von Dentz
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2017-12-19 12:40 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds helpers functions to decode UUIDs strings.
---
lib/uuid.c | 742 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/uuid.h | 4 +
2 files changed, 746 insertions(+)
diff --git a/lib/uuid.c b/lib/uuid.c
index d4c7002f5..167c3a3aa 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -310,3 +310,745 @@ int bt_uuid_to_le(const bt_uuid_t *src, void *dst)
return -EINVAL;
}
}
+
+static const struct {
+ uint16_t uuid;
+ const char *str;
+} uuid16_table[] = {
+ { 0x0001, "SDP" },
+ { 0x0003, "RFCOMM" },
+ { 0x0005, "TCS-BIN" },
+ { 0x0007, "ATT" },
+ { 0x0008, "OBEX" },
+ { 0x000f, "BNEP" },
+ { 0x0010, "UPNP" },
+ { 0x0011, "HIDP" },
+ { 0x0012, "Hardcopy Control Channel" },
+ { 0x0014, "Hardcopy Data Channel" },
+ { 0x0016, "Hardcopy Notification" },
+ { 0x0017, "AVCTP" },
+ { 0x0019, "AVDTP" },
+ { 0x001b, "CMTP" },
+ { 0x001e, "MCAP Control Channel" },
+ { 0x001f, "MCAP Data Channel" },
+ { 0x0100, "L2CAP" },
+ /* 0x0101 to 0x0fff undefined */
+ { 0x1000, "Service Discovery Server Service Class" },
+ { 0x1001, "Browse Group Descriptor Service Class" },
+ { 0x1002, "Public Browse Root" },
+ /* 0x1003 to 0x1100 undefined */
+ { 0x1101, "Serial Port" },
+ { 0x1102, "LAN Access Using PPP" },
+ { 0x1103, "Dialup Networking" },
+ { 0x1104, "IrMC Sync" },
+ { 0x1105, "OBEX Object Push" },
+ { 0x1106, "OBEX File Transfer" },
+ { 0x1107, "IrMC Sync Command" },
+ { 0x1108, "Headset" },
+ { 0x1109, "Cordless Telephony" },
+ { 0x110a, "Audio Source" },
+ { 0x110b, "Audio Sink" },
+ { 0x110c, "A/V Remote Control Target" },
+ { 0x110d, "Advanced Audio Distribution" },
+ { 0x110e, "A/V Remote Control" },
+ { 0x110f, "A/V Remote Control Controller" },
+ { 0x1110, "Intercom" },
+ { 0x1111, "Fax" },
+ { 0x1112, "Headset AG" },
+ { 0x1113, "WAP" },
+ { 0x1114, "WAP Client" },
+ { 0x1115, "PANU" },
+ { 0x1116, "NAP" },
+ { 0x1117, "GN" },
+ { 0x1118, "Direct Printing" },
+ { 0x1119, "Reference Printing" },
+ { 0x111a, "Basic Imaging Profile" },
+ { 0x111b, "Imaging Responder" },
+ { 0x111c, "Imaging Automatic Archive" },
+ { 0x111d, "Imaging Referenced Objects" },
+ { 0x111e, "Handsfree" },
+ { 0x111f, "Handsfree Audio Gateway" },
+ { 0x1120, "Direct Printing Refrence Objects Service" },
+ { 0x1121, "Reflected UI" },
+ { 0x1122, "Basic Printing" },
+ { 0x1123, "Printing Status" },
+ { 0x1124, "Human Interface Device Service" },
+ { 0x1125, "Hardcopy Cable Replacement" },
+ { 0x1126, "HCR Print" },
+ { 0x1127, "HCR Scan" },
+ { 0x1128, "Common ISDN Access" },
+ /* 0x1129 and 0x112a undefined */
+ { 0x112d, "SIM Access" },
+ { 0x112e, "Phonebook Access Client" },
+ { 0x112f, "Phonebook Access Server" },
+ { 0x1130, "Phonebook Access" },
+ { 0x1131, "Headset HS" },
+ { 0x1132, "Message Access Server" },
+ { 0x1133, "Message Notification Server" },
+ { 0x1134, "Message Access Profile" },
+ { 0x1135, "GNSS" },
+ { 0x1136, "GNSS Server" },
+ { 0x1137, "3D Display" },
+ { 0x1138, "3D Glasses" },
+ { 0x1139, "3D Synchronization" },
+ { 0x113a, "MPS Profile" },
+ { 0x113b, "MPS Service" },
+ /* 0x113c to 0x11ff undefined */
+ { 0x1200, "PnP Information" },
+ { 0x1201, "Generic Networking" },
+ { 0x1202, "Generic File Transfer" },
+ { 0x1203, "Generic Audio" },
+ { 0x1204, "Generic Telephony" },
+ { 0x1205, "UPNP Service" },
+ { 0x1206, "UPNP IP Service" },
+ { 0x1300, "UPNP IP PAN" },
+ { 0x1301, "UPNP IP LAP" },
+ { 0x1302, "UPNP IP L2CAP" },
+ { 0x1303, "Video Source" },
+ { 0x1304, "Video Sink" },
+ { 0x1305, "Video Distribution" },
+ /* 0x1306 to 0x13ff undefined */
+ { 0x1400, "HDP" },
+ { 0x1401, "HDP Source" },
+ { 0x1402, "HDP Sink" },
+ /* 0x1403 to 0x17ff undefined */
+ { 0x1800, "Generic Access Profile" },
+ { 0x1801, "Generic Attribute Profile" },
+ { 0x1802, "Immediate Alert" },
+ { 0x1803, "Link Loss" },
+ { 0x1804, "Tx Power" },
+ { 0x1805, "Current Time Service" },
+ { 0x1806, "Reference Time Update Service" },
+ { 0x1807, "Next DST Change Service" },
+ { 0x1808, "Glucose" },
+ { 0x1809, "Health Thermometer" },
+ { 0x180a, "Device Information" },
+ /* 0x180b and 0x180c undefined */
+ { 0x180d, "Heart Rate" },
+ { 0x180e, "Phone Alert Status Service" },
+ { 0x180f, "Battery Service" },
+ { 0x1810, "Blood Pressure" },
+ { 0x1811, "Alert Notification Service" },
+ { 0x1812, "Human Interface Device" },
+ { 0x1813, "Scan Parameters" },
+ { 0x1814, "Running Speed and Cadence" },
+ { 0x1815, "Automation IO" },
+ { 0x1816, "Cycling Speed and Cadence" },
+ /* 0x1817 undefined */
+ { 0x1818, "Cycling Power" },
+ { 0x1819, "Location and Navigation" },
+ { 0x181a, "Environmental Sensing" },
+ { 0x181b, "Body Composition" },
+ { 0x181c, "User Data" },
+ { 0x181d, "Weight Scale" },
+ { 0x181e, "Bond Management" },
+ { 0x181f, "Continuous Glucose Monitoring" },
+ { 0x1820, "Internet Protocol Support" },
+ { 0x1821, "Indoor Positioning" },
+ { 0x1822, "Pulse Oximeter" },
+ { 0x1823, "HTTP Proxy" },
+ { 0x1824, "Transport Discovery" },
+ { 0x1825, "Object Transfer" },
+ { 0x1826, "Fitness Machine" },
+ { 0x1827, "Mesh Provisioning" },
+ { 0x1828, "Mesh Proxy" },
+ /* 0x1829 to 0x27ff undefined */
+ { 0x2800, "Primary Service" },
+ { 0x2801, "Secondary Service" },
+ { 0x2802, "Include" },
+ { 0x2803, "Characteristic" },
+ /* 0x2804 to 0x28ff undefined */
+ { 0x2900, "Characteristic Extended Properties" },
+ { 0x2901, "Characteristic User Description" },
+ { 0x2902, "Client Characteristic Configuration" },
+ { 0x2903, "Server Characteristic Configuration" },
+ { 0x2904, "Characteristic Format" },
+ { 0x2905, "Characteristic Aggregate Formate" },
+ { 0x2906, "Valid Range" },
+ { 0x2907, "External Report Reference" },
+ { 0x2908, "Report Reference" },
+ { 0x2909, "Number of Digitals" },
+ { 0x290a, "Value Trigger Setting" },
+ { 0x290b, "Environmental Sensing Configuration" },
+ { 0x290c, "Environmental Sensing Measurement" },
+ { 0x290d, "Environmental Sensing Trigger Setting" },
+ { 0x290e, "Time Trigger Setting" },
+ /* 0x290f to 0x29ff undefined */
+ { 0x2a00, "Device Name" },
+ { 0x2a01, "Appearance" },
+ { 0x2a02, "Peripheral Privacy Flag" },
+ { 0x2a03, "Reconnection Address" },
+ { 0x2a04, "Peripheral Preferred Connection Parameters" },
+ { 0x2a05, "Service Changed" },
+ { 0x2a06, "Alert Level" },
+ { 0x2a07, "Tx Power Level" },
+ { 0x2a08, "Date Time" },
+ { 0x2a09, "Day of Week" },
+ { 0x2a0a, "Day Date Time" },
+ /* 0x2a0b undefined */
+ { 0x2a0c, "Exact Time 256" },
+ { 0x2a0d, "DST Offset" },
+ { 0x2a0e, "Time Zone" },
+ { 0x2a0f, "Local Time Information" },
+ /* 0x2a10 undefined */
+ { 0x2a11, "Time with DST" },
+ { 0x2a12, "Time Accuracy" },
+ { 0x2a13, "Time Source" },
+ { 0x2a14, "Reference Time Information" },
+ /* 0x2a15 undefined */
+ { 0x2a16, "Time Update Control Point" },
+ { 0x2a17, "Time Update State" },
+ { 0x2a18, "Glucose Measurement" },
+ { 0x2a19, "Battery Level" },
+ /* 0x2a1a and 0x2a1b undefined */
+ { 0x2a1c, "Temperature Measurement" },
+ { 0x2a1d, "Temperature Type" },
+ { 0x2a1e, "Intermediate Temperature" },
+ /* 0x2a1f and 0x2a20 undefined */
+ { 0x2a21, "Measurement Interval" },
+ { 0x2a22, "Boot Keyboard Input Report" },
+ { 0x2a23, "System ID" },
+ { 0x2a24, "Model Number String" },
+ { 0x2a25, "Serial Number String" },
+ { 0x2a26, "Firmware Revision String" },
+ { 0x2a27, "Hardware Revision String" },
+ { 0x2a28, "Software Revision String" },
+ { 0x2a29, "Manufacturer Name String" },
+ { 0x2a2a, "IEEE 11073-20601 Regulatory Cert. Data List" },
+ { 0x2a2b, "Current Time" },
+ { 0x2a2c, "Magnetic Declination" },
+ /* 0x2a2d to 0x2a30 undefined */
+ { 0x2a31, "Scan Refresh" },
+ { 0x2a32, "Boot Keyboard Output Report" },
+ { 0x2a33, "Boot Mouse Input Report" },
+ { 0x2a34, "Glucose Measurement Context" },
+ { 0x2a35, "Blood Pressure Measurement" },
+ { 0x2a36, "Intermediate Cuff Pressure" },
+ { 0x2a37, "Heart Rate Measurement" },
+ { 0x2a38, "Body Sensor Location" },
+ { 0x2a39, "Heart Rate Control Point" },
+ /* 0x2a3a to 0x2a3e undefined */
+ { 0x2a3f, "Alert Status" },
+ { 0x2a40, "Ringer Control Point" },
+ { 0x2a41, "Ringer Setting" },
+ { 0x2a42, "Alert Category ID Bit Mask" },
+ { 0x2a43, "Alert Category ID" },
+ { 0x2a44, "Alert Notification Control Point" },
+ { 0x2a45, "Unread Alert Status" },
+ { 0x2a46, "New Alert" },
+ { 0x2a47, "Supported New Alert Category" },
+ { 0x2a48, "Supported Unread Alert Category" },
+ { 0x2a49, "Blood Pressure Feature" },
+ { 0x2a4a, "HID Information" },
+ { 0x2a4b, "Report Map" },
+ { 0x2a4c, "HID Control Point" },
+ { 0x2a4d, "Report" },
+ { 0x2a4e, "Protocol Mode" },
+ { 0x2a4f, "Scan Interval Window" },
+ { 0x2a50, "PnP ID" },
+ { 0x2a51, "Glucose Feature" },
+ { 0x2a52, "Record Access Control Point" },
+ { 0x2a53, "RSC Measurement" },
+ { 0x2a54, "RSC Feature" },
+ { 0x2a55, "SC Control Point" },
+ { 0x2a56, "Digital" },
+ /* 0x2a57 undefined */
+ { 0x2a58, "Analog" },
+ /* 0x2a59 undefined */
+ { 0x2a5a, "Aggregate" },
+ { 0x2a5b, "CSC Measurement" },
+ { 0x2a5c, "CSC Feature" },
+ { 0x2a5d, "Sensor Location" },
+ /* 0x2a5e to 0x2a62 undefined */
+ { 0x2a63, "Cycling Power Measurement" },
+ { 0x2a64, "Cycling Power Vector" },
+ { 0x2a65, "Cycling Power Feature" },
+ { 0x2a66, "Cycling Power Control Point" },
+ { 0x2a67, "Location and Speed" },
+ { 0x2a68, "Navigation" },
+ { 0x2a69, "Position Quality" },
+ { 0x2a6a, "LN Feature" },
+ { 0x2a6b, "LN Control Point" },
+ { 0x2a6c, "Elevation" },
+ { 0x2a6d, "Pressure" },
+ { 0x2a6e, "Temperature" },
+ { 0x2a6f, "Humidity" },
+ { 0x2a70, "True Wind Speed" },
+ { 0x2a71, "True Wind Direction" },
+ { 0x2a72, "Apparent Wind Speed" },
+ { 0x2a73, "Apparent Wind Direction" },
+ { 0x2a74, "Gust Factor" },
+ { 0x2a75, "Pollen Concentration" },
+ { 0x2a76, "UV Index" },
+ { 0x2a77, "Irradiance" },
+ { 0x2a78, "Rainfall" },
+ { 0x2a79, "Wind Chill" },
+ { 0x2a7a, "Heat Index" },
+ { 0x2a7b, "Dew Point" },
+ { 0x2a7c, "Trend" },
+ { 0x2a7d, "Descriptor Value Changed" },
+ { 0x2a7e, "Aerobic Heart Rate Lower Limit" },
+ { 0x2a7f, "Aerobic Threshold" },
+ { 0x2a80, "Age" },
+ { 0x2a81, "Anaerobic Heart Rate Lower Limit" },
+ { 0x2a82, "Anaerobic Heart Rate Upper Limit" },
+ { 0x2a83, "Anaerobic Threshold" },
+ { 0x2a84, "Aerobic Heart Rate Upper Limit" },
+ { 0x2a85, "Date of Birth" },
+ { 0x2a86, "Date of Threshold Assessment" },
+ { 0x2a87, "Email Address" },
+ { 0x2a88, "Fat Burn Heart Rate Lower Limit" },
+ { 0x2a89, "Fat Burn Heart Rate Upper Limit" },
+ { 0x2a8a, "First Name" },
+ { 0x2a8b, "Five Zone Heart Rate Limits" },
+ { 0x2a8c, "Gender" },
+ { 0x2a8d, "Heart Rate Max" },
+ { 0x2a8e, "Height" },
+ { 0x2a8f, "Hip Circumference" },
+ { 0x2a90, "Last Name" },
+ { 0x2a91, "Maximum Recommended Heart Rate" },
+ { 0x2a92, "Resting Heart Rate" },
+ { 0x2a93, "Sport Type for Aerobic/Anaerobic Thresholds" },
+ { 0x2a94, "Three Zone Heart Rate Limits" },
+ { 0x2a95, "Two Zone Heart Rate Limit" },
+ { 0x2a96, "VO2 Max" },
+ { 0x2a97, "Waist Circumference" },
+ { 0x2a98, "Weight" },
+ { 0x2a99, "Database Change Increment" },
+ { 0x2a9a, "User Index" },
+ { 0x2a9b, "Body Composition Feature" },
+ { 0x2a9c, "Body Composition Measurement" },
+ { 0x2a9d, "Weight Measurement" },
+ { 0x2a9e, "Weight Scale Feature" },
+ { 0x2a9f, "User Control Point" },
+ { 0x2aa0, "Magnetic Flux Density - 2D" },
+ { 0x2aa1, "Magnetic Flux Density - 3D" },
+ { 0x2aa2, "Language" },
+ { 0x2aa3, "Barometric Pressure Trend" },
+ { 0x2aa4, "Bond Management Control Point" },
+ { 0x2aa5, "Bond Management Feature" },
+ { 0x2aa6, "Central Address Resolution" },
+ { 0x2aa7, "CGM Measurement" },
+ { 0x2aa8, "CGM Feature" },
+ { 0x2aa9, "CGM Status" },
+ { 0x2aaa, "CGM Session Start Time" },
+ { 0x2aab, "CGM Session Run Time" },
+ { 0x2aac, "CGM Specific Ops Control Point" },
+ { 0x2aad, "Indoor Positioning Configuration" },
+ { 0x2aae, "Latitude" },
+ { 0x2aaf, "Longitude" },
+ { 0x2ab0, "Local North Coordinate" },
+ { 0x2ab1, "Local East Coordinate" },
+ { 0x2ab2, "Floor Number" },
+ { 0x2ab3, "Altitude" },
+ { 0x2ab4, "Uncertainty" },
+ { 0x2ab5, "Location Name" },
+ { 0x2ab6, "URI" },
+ { 0x2ab7, "HTTP Headers" },
+ { 0x2ab8, "HTTP Status Code" },
+ { 0x2ab9, "HTTP Entity Body" },
+ { 0x2aba, "HTTP Control Point" },
+ { 0x2abb, "HTTPS Security" },
+ { 0x2abc, "TDS Control Point" },
+ { 0x2abd, "OTS Feature" },
+ { 0x2abe, "Object Name" },
+ { 0x2abf, "Object Type" },
+ { 0x2ac0, "Object Size" },
+ { 0x2ac1, "Object First-Created" },
+ { 0x2ac2, "Object Last-Modified" },
+ { 0x2ac3, "Object ID" },
+ { 0x2ac4, "Object Properties" },
+ { 0x2ac5, "Object Action Control Point" },
+ { 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" },
+ { 0x2adb, "Mesh Provisioning Data In" },
+ { 0x2adc, "Mesh Provisioning Data Out" },
+ { 0x2add, "Mesh Proxy Data In" },
+ { 0x2ade, "Mesh Proxy Data Out" },
+ /* vendor defined */
+ { 0xfeff, "GN Netcom" },
+ { 0xfefe, "GN ReSound A/S" },
+ { 0xfefd, "Gimbal, Inc." },
+ { 0xfefc, "Gimbal, Inc." },
+ { 0xfefb, "Stollmann E+V GmbH" },
+ { 0xfefa, "PayPal, Inc." },
+ { 0xfef9, "PayPal, Inc." },
+ { 0xfef8, "Aplix Corporation" },
+ { 0xfef7, "Aplix Corporation" },
+ { 0xfef6, "Wicentric, Inc." },
+ { 0xfef5, "Dialog Semiconductor GmbH" },
+ { 0xfef4, "Google" },
+ { 0xfef3, "Google" },
+ { 0xfef2, "CSR" },
+ { 0xfef1, "CSR" },
+ { 0xfef0, "Intel" },
+ { 0xfeef, "Polar Electro Oy" },
+ { 0xfeee, "Polar Electro Oy" },
+ { 0xfeed, "Tile, Inc." },
+ { 0xfeec, "Tile, Inc." },
+ { 0xfeeb, "Swirl Networks, Inc." },
+ { 0xfeea, "Swirl Networks, Inc." },
+ { 0xfee9, "Quintic Corp." },
+ { 0xfee8, "Quintic Corp." },
+ { 0xfee7, "Tencent Holdings Limited" },
+ { 0xfee6, "Seed Labs, Inc." },
+ { 0xfee5, "Nordic Semiconductor ASA" },
+ { 0xfee4, "Nordic Semiconductor ASA" },
+ { 0xfee3, "Anki, Inc." },
+ { 0xfee2, "Anki, Inc." },
+ { 0xfee1, "Anhui Huami Information Technology Co." },
+ { 0xfee0, "Anhui Huami Information Technology Co." },
+ { 0xfedf, "Design SHIFT" },
+ { 0xfede, "Coin, Inc." },
+ { 0xfedd, "Jawbone" },
+ { 0xfedc, "Jawbone" },
+ { 0xfedb, "Perka, Inc." },
+ { 0xfeda, "ISSC Technologies Corporation" },
+ { 0xfed9, "Pebble Technology Corporation" },
+ { 0xfed8, "Google" },
+ { 0xfed7, "Broadcom Corporation" },
+ { 0xfed6, "Broadcom Corporation" },
+ { 0xfed5, "Plantronics Inc." },
+ { 0xfed4, "Apple, Inc." },
+ { 0xfed3, "Apple, Inc." },
+ { 0xfed2, "Apple, Inc." },
+ { 0xfed1, "Apple, Inc." },
+ { 0xfed0, "Apple, Inc." },
+ { 0xfecf, "Apple, Inc." },
+ { 0xfece, "Apple, Inc." },
+ { 0xfecd, "Apple, Inc." },
+ { 0xfecc, "Apple, Inc." },
+ { 0xfecb, "Apple, Inc." },
+ { 0xfeca, "Apple, Inc." },
+ { 0xfec9, "Apple, Inc." },
+ { 0xfec8, "Apple, Inc." },
+ { 0xfec7, "Apple, Inc." },
+ { 0xfec6, "Kocomojo, LLC" },
+ { 0xfec5, "Realtek Semiconductor Corp." },
+ { 0xfec4, "PLUS Location Systems" },
+ { 0xfec3, "360fly, Inc." },
+ { 0xfec2, "Blue Spark Technologies, Inc." },
+ { 0xfec1, "KDDI Corporation" },
+ { 0xfec0, "KDDI Corporation" },
+ { 0xfebf, "Nod, Inc." },
+ { 0xfebe, "Bose Corporation" },
+ { 0xfebd, "Clover Network, Inc." },
+ { 0xfebc, "Dexcom, Inc." },
+ { 0xfebb, "adafruit industries" },
+ { 0xfeba, "Tencent Holdings Limited" },
+ { 0xfeb9, "LG Electronics" },
+ { 0xfeb8, "Facebook, Inc." },
+ { 0xfeb7, "Facebook, Inc." },
+ { 0xfeb6, "Vencer Co, Ltd" },
+ { 0xfeb5, "WiSilica Inc." },
+ { 0xfeb4, "WiSilica Inc." },
+ { 0xfeb3, "Taobao" },
+ { 0xfeb2, "Microsoft Corporation" },
+ { 0xfeb1, "Electronics Tomorrow Limited" },
+ { 0xfeb0, "Nest Labs Inc." },
+ { 0xfeaf, "Nest Labs Inc." },
+ { 0xfeae, "Nokia Corporation" },
+ { 0xfead, "Nokia Corporation" },
+ { 0xfeac, "Nokia Corporation" },
+ { 0xfeab, "Nokia Corporation" },
+ { 0xfeaa, "Google" },
+ { 0xfea9, "Savant Systems LLC" },
+ { 0xfea8, "Savant Systems LLC" },
+ { 0xfea7, "UTC Fire and Security" },
+ { 0xfea6, "GoPro, Inc." },
+ { 0xfea5, "GoPro, Inc." },
+ { 0xfea4, "Paxton Access Ltd" },
+ { 0xfea3, "ITT Industries" },
+ { 0xfea2, "Intrepid Control Systems, Inc." },
+ { 0xfea1, "Intrepid Control Systems, Inc." },
+ { 0xfea0, "Google" },
+ { 0xfe9f, "Google" },
+ { 0xfe9e, "Dialog Semiconductor B.V." },
+ { 0xfe9d, "Mobiquity Networks Inc" },
+ { 0xfe9c, "GSI Laboratories, Inc." },
+ { 0xfe9b, "Samsara Networks, Inc" },
+ { 0xfe9a, "Estimote" },
+ { 0xfe99, "Currant, Inc." },
+ { 0xfe98, "Currant, Inc." },
+ { 0xfe97, "Tesla Motor Inc." },
+ { 0xfe96, "Tesla Motor Inc." },
+ { 0xfe95, "Xiaomi Inc." },
+ { 0xfe94, "OttoQ Inc." },
+ { 0xfe93, "OttoQ Inc." },
+ { 0xfe92, "Jarden Safety & Security" },
+ { 0xfe91, "Shanghai Imilab Technology Co.,Ltd" },
+ { 0xfe90, "JUMA" },
+ { 0xfe8f, "CSR" },
+ { 0xfe8e, "ARM Ltd" },
+ { 0xfe8d, "Interaxon Inc." },
+ { 0xfe8c, "TRON Forum" },
+ { 0xfe8b, "Apple, Inc." },
+ { 0xfe8a, "Apple, Inc." },
+ { 0xfe89, "B&O Play A/S" },
+ { 0xfe88, "SALTO SYSTEMS S.L." },
+ { 0xfe87, "Qingdao Yeelink Information Technology Co., Ltd. ( 青岛亿联客信息技术有限公司 )" },
+ { 0xfe86, "HUAWEI Technologies Co., Ltd. ( 华为技术有限公司 )" },
+ { 0xfe85, "RF Digital Corp" },
+ { 0xfe84, "RF Digital Corp" },
+ { 0xfe83, "Blue Bite" },
+ { 0xfe82, "Medtronic Inc." },
+ { 0xfe81, "Medtronic Inc." },
+ { 0xfe80, "Doppler Lab" },
+ { 0xfe7f, "Doppler Lab" },
+ { 0xfe7e, "Awear Solutions Ltd" },
+ { 0xfe7d, "Aterica Health Inc." },
+ { 0xfe7c, "Stollmann E+V GmbH" },
+ { 0xfe7b, "Orion Labs, Inc." },
+ { 0xfe7a, "Bragi GmbH" },
+ { 0xfe79, "Zebra Technologies" },
+ { 0xfe78, "Hewlett-Packard Company" },
+ { 0xfe77, "Hewlett-Packard Company" },
+ { 0xfe76, "TangoMe" },
+ { 0xfe75, "TangoMe" },
+ { 0xfe74, "unwire" },
+ { 0xfe73, "St. Jude Medical, Inc." },
+ { 0xfe72, "St. Jude Medical, Inc." },
+ { 0xfe71, "Plume Design Inc" },
+ { 0xfe70, "Beijing Jingdong Century Trading Co., Ltd." },
+ { 0xfe6f, "LINE Corporation" },
+ { 0xfe6e, "The University of Tokyo" },
+ { 0xfe6d, "The University of Tokyo" },
+ { 0xfe6c, "TASER International, Inc." },
+ { 0xfe6b, "TASER International, Inc." },
+ { 0xfe6a, "Kontakt Micro-Location Sp. z o.o." },
+ { 0xfe69, "Qualcomm Life Inc" },
+ { 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)" },
+ { }
+};
+
+static const struct {
+ const char *uuid;
+ const char *str;
+} uuid128_table[] = {
+ { "a3c87500-8ed3-4bdf-8a39-a01bebede295",
+ "Eddystone Configuration Service" },
+ { "a3c87501-8ed3-4bdf-8a39-a01bebede295", "Capabilities" },
+ { "a3c87502-8ed3-4bdf-8a39-a01bebede295", "Active Slot" },
+ { "a3c87503-8ed3-4bdf-8a39-a01bebede295",
+ "Advertising Interval" },
+ { "a3c87504-8ed3-4bdf-8a39-a01bebede295", "Radio Tx Power" },
+ { "a3c87505-8ed3-4bdf-8a39-a01bebede295",
+ "(Advanced) Advertised Tx Power" },
+ { "a3c87506-8ed3-4bdf-8a39-a01bebede295", "Lock State" },
+ { "a3c87507-8ed3-4bdf-8a39-a01bebede295", "Unlock" },
+ { "a3c87508-8ed3-4bdf-8a39-a01bebede295", "Public ECDH Key" },
+ { "a3c87509-8ed3-4bdf-8a39-a01bebede295", "EID Identity Key" },
+ { "a3c8750a-8ed3-4bdf-8a39-a01bebede295", "ADV Slot Data" },
+ { "a3c8750b-8ed3-4bdf-8a39-a01bebede295",
+ "(Advanced) Factory reset" },
+ { "a3c8750c-8ed3-4bdf-8a39-a01bebede295",
+ "(Advanced) Remain Connectable" },
+ /* BBC micro:bit Bluetooth Profiles */
+ { "e95d0753-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Accelerometer Service" },
+ { "e95dca4b-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Accelerometer Data" },
+ { "e95dfb24-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Accelerometer Period" },
+ { "e95df2d8-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Magnetometer Service" },
+ { "e95dfb11-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Magnetometer Data" },
+ { "e95d386c-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Magnetometer Period" },
+ { "e95d9715-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Magnetometer Bearing" },
+ { "e95d9882-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Button Service" },
+ { "e95dda90-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Button A State" },
+ { "e95dda91-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Button B State" },
+ { "e95d127b-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit IO PIN Service" },
+ { "e95d8d00-251d-470a-a062-fa1922dfa9a8", "MicroBit PIN Data" },
+ { "e95d5899-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit PIN AD Configuration" },
+ { "e95dd822-251d-470a-a062-fa1922dfa9a8", "MicroBit PWM Control" },
+ { "e95dd91d-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Service" },
+ { "e95d7b77-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Matrix state" },
+ { "e95d93ee-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Text" },
+ { "e95d0d2d-251d-470a-a062-fa1922dfa9a8", "MicroBit Scrolling Delay" },
+ { "e95d93af-251d-470a-a062-fa1922dfa9a8", "MicroBit Event Service" },
+ { "e95db84c-251d-470a-a062-fa1922dfa9a8", "MicroBit Requirements" },
+ { "e95d9775-251d-470a-a062-fa1922dfa9a8", "MicroBit Event Data" },
+ { "e95d23c4-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Client Requirements" },
+ { "e95d5404-251d-470a-a062-fa1922dfa9a8", "MicroBit Client Events" },
+ { "e95d93b0-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit DFU Control Service" },
+ { "e95d93b1-251d-470a-a062-fa1922dfa9a8", "MicroBit DFU Control" },
+ { "e95d6100-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Temperature Service" },
+ { "e95d1b25-251d-470a-a062-fa1922dfa9a8",
+ "MicroBit Temperature Period" },
+ /* Nordic UART Port Emulation */
+ { "6e400001-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART Service" },
+ { "6e400002-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART TX" },
+ { "6e400003-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART RX" },
+ { }
+};
+
+const char *bt_uuid16_to_str(uint16_t uuid)
+{
+ int i;
+
+ for (i = 0; uuid16_table[i].str; i++) {
+ if (uuid16_table[i].uuid == uuid)
+ return uuid16_table[i].str;
+ }
+
+ return "Unknown";
+}
+
+const char *bt_uuid32_to_str(uint32_t uuid)
+{
+ if ((uuid & 0xffff0000) == 0x0000)
+ return bt_uuid16_to_str(uuid & 0x0000ffff);
+
+ return "Unknown";
+}
+
+const char *bt_uuidstr_to_str(const char *uuid)
+{
+ uint32_t val;
+ size_t len;
+ int i;
+
+ if (!uuid)
+ return NULL;
+
+ len = strlen(uuid);
+
+ if (len < 36) {
+ char *endptr = NULL;
+
+ val = strtol(uuid, &endptr, 0);
+ if (!endptr || *endptr != '\0')
+ return NULL;
+
+ if (val > UINT16_MAX)
+ return bt_uuid32_to_str(val);
+
+ return bt_uuid16_to_str(val);
+ }
+
+ if (len != 36)
+ return NULL;
+
+ for (i = 0; uuid128_table[i].str; i++) {
+ if (strcasecmp(uuid128_table[i].uuid, uuid) == 0)
+ return uuid128_table[i].str;
+ }
+
+ if (strncasecmp(uuid + 8, "-0000-1000-8000-00805f9b34fb", 28))
+ return "Vendor specific";
+
+ if (sscanf(uuid, "%08x-0000-1000-8000-00805f9b34fb", &val) != 1)
+ return NULL;
+
+ return bt_uuid32_to_str(val);
+}
diff --git a/lib/uuid.h b/lib/uuid.h
index 7e13e0fda..f44156096 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -185,6 +185,10 @@ static inline int bt_uuid_len(const bt_uuid_t *uuid)
return uuid->type / 8;
}
+const char *bt_uuid16_to_str(uint16_t uuid);
+const char *bt_uuid32_to_str(uint32_t uuid);
+const char *bt_uuidstr_to_str(const char *uuid);
+
#ifdef __cplusplus
}
#endif
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH BlueZ 2/4] tools: Remove monitor/uuid.{c,h}
2017-12-19 12:40 [PATCH BlueZ 1/4] lib/uuid: Add helpers to decode UUIDs strings Luiz Augusto von Dentz
@ 2017-12-19 12:40 ` Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 4/4] monitor: Use bt_appeartostr Luiz Augusto von Dentz
2 siblings, 0 replies; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2017-12-19 12:40 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Use the lib/uuid.h helpers instead.
---
Makefile.am | 3 +-
Makefile.tools | 8 +-
client/advertising.c | 2 +
client/gatt.c | 11 +-
client/main.c | 7 +-
mesh/main.c | 3 +-
mesh/node.c | 1 -
mesh/prov.c | 1 -
monitor/bnep.c | 4 +-
monitor/l2cap.c | 9 +-
monitor/packet.c | 6 +-
monitor/sdp.c | 6 +-
monitor/uuid.c | 775 ---------------------------------------------------
monitor/uuid.h | 31 ---
src/gatt-database.c | 7 +-
15 files changed, 33 insertions(+), 841 deletions(-)
delete mode 100644 monitor/uuid.c
delete mode 100644 monitor/uuid.h
diff --git a/Makefile.am b/Makefile.am
index cda23e7d6..02f02a100 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,8 +188,7 @@ src_bluetoothd_SOURCES = $(builtin_sources) \
src/gatt-client.h src/gatt-client.c \
src/device.h src/device.c \
src/dbus-common.c src/dbus-common.h \
- src/eir.h src/eir.c \
- monitor/uuid.h monitor/uuid.c
+ src/eir.h src/eir.c
src_bluetoothd_LDADD = lib/libbluetooth-internal.la \
gdbus/libgdbus-internal.la \
src/libshared-glib.la \
diff --git a/Makefile.tools b/Makefile.tools
index 9e56603d8..940edd757 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -7,9 +7,9 @@ client_bluetoothctl_SOURCES = client/main.c \
client/agent.h client/agent.c \
client/advertising.h \
client/advertising.c \
- client/gatt.h client/gatt.c \
- monitor/uuid.h monitor/uuid.c
+ client/gatt.h client/gatt.c
client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
+ lib/libbluetooth-internal.la \
@GLIB_LIBS@ @DBUS_LIBS@ -lreadline
endif
@@ -29,8 +29,7 @@ mesh_meshctl_SOURCES = mesh/main.c \
mesh/prov-db.h mesh/prov-db.c \
mesh/config-model.h mesh/config-client.c \
mesh/config-server.c \
- mesh/onoff-model.h mesh/onoff-model.c \
- monitor/uuid.h monitor/uuid.c
+ mesh/onoff-model.h mesh/onoff-model.c
mesh_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
lib/libbluetooth-internal.la \
@GLIB_LIBS@ @DBUS_LIBS@ -ljson-c -lreadline
@@ -56,7 +55,6 @@ monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
monitor/a2dp.h monitor/a2dp.c \
monitor/rfcomm.h monitor/rfcomm.c \
monitor/bnep.h monitor/bnep.c \
- monitor/uuid.h monitor/uuid.c \
monitor/hwdb.h monitor/hwdb.c \
monitor/keys.h monitor/keys.c \
monitor/analyze.h monitor/analyze.c \
diff --git a/client/advertising.c b/client/advertising.c
index f0fd3599e..ade38ca85 100644
--- a/client/advertising.c
+++ b/client/advertising.c
@@ -31,6 +31,8 @@
#include <stdbool.h>
#include <string.h>
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "gdbus/gdbus.h"
#include "src/shared/shell.h"
#include "advertising.h"
diff --git a/client/gatt.c b/client/gatt.c
index 059cae8f0..f6289353a 100644
--- a/client/gatt.c
+++ b/client/gatt.c
@@ -29,18 +29,19 @@
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
-#include <stdbool.h>
+#include <stdint.h>
#include <sys/uio.h>
#include <fcntl.h>
#include <string.h>
#include <glib.h>
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/queue.h"
#include "src/shared/io.h"
#include "src/shared/shell.h"
#include "gdbus/gdbus.h"
-#include "monitor/uuid.h"
#include "gatt.h"
#define APP_PATH "/org/bluez/app"
@@ -105,7 +106,7 @@ static void print_service(struct service *service, const char *description)
{
const char *text;
- text = uuidstr_to_str(service->uuid);
+ text = bt_uuidstr_to_str(service->uuid);
if (!text)
bt_shell_printf("%s%s%s%s Service\n\t%s\n\t%s\n",
description ? "[" : "",
@@ -172,7 +173,7 @@ static void print_chrc(struct chrc *chrc, const char *description)
{
const char *text;
- text = uuidstr_to_str(chrc->uuid);
+ text = bt_uuidstr_to_str(chrc->uuid);
if (!text)
bt_shell_printf("%s%s%sCharacteristic\n\t%s\n\t%s\n",
description ? "[" : "",
@@ -271,7 +272,7 @@ static void print_desc(struct desc *desc, const char *description)
{
const char *text;
- text = uuidstr_to_str(desc->uuid);
+ text = bt_uuidstr_to_str(desc->uuid);
if (!text)
bt_shell_printf("%s%s%sDescriptor\n\t%s\n\t%s\n",
description ? "[" : "",
diff --git a/client/main.c b/client/main.c
index 3b43ed777..1467eb656 100644
--- a/client/main.c
+++ b/client/main.c
@@ -34,10 +34,11 @@
#include <glib.h>
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/shell.h"
#include "src/shared/util.h"
#include "gdbus/gdbus.h"
-#include "monitor/uuid.h"
#include "agent.h"
#include "gatt.h"
#include "advertising.h"
@@ -329,7 +330,7 @@ static void print_uuid(const char *uuid)
{
const char *text;
- text = uuidstr_to_str(uuid);
+ text = bt_uuidstr_to_str(uuid);
if (text) {
char str[26];
unsigned int n;
@@ -1884,7 +1885,7 @@ static void cmd_attribute_info(int argc, char *argv[])
dbus_message_iter_get_basic(&iter, &uuid);
- text = uuidstr_to_str(uuid);
+ text = bt_uuidstr_to_str(uuid);
if (!text)
text = g_dbus_proxy_get_path(proxy);
diff --git a/mesh/main.c b/mesh/main.c
index 9360481f8..14298b089 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -46,7 +46,6 @@
#include "src/shared/shell.h"
#include "src/shared/util.h"
#include "gdbus/gdbus.h"
-#include "monitor/uuid.h"
#include "mesh/mesh-net.h"
#include "mesh/gatt.h"
#include "mesh/crypto.h"
@@ -526,7 +525,7 @@ static void print_uuids(GDBusProxy *proxy)
dbus_message_iter_get_basic(&value, &uuid);
- text = uuidstr_to_str(uuid);
+ text = bt_uuidstr_to_str(uuid);
if (text) {
char str[26];
unsigned int n;
diff --git a/mesh/node.c b/mesh/node.c
index b682a35f7..0a60e7926 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -39,7 +39,6 @@
#include "src/shared/util.h"
#include "src/shared/shell.h"
#include "gdbus/gdbus.h"
-#include "monitor/uuid.h"
#include "mesh/mesh-net.h"
#include "mesh/config-model.h"
#include "mesh/node.h"
diff --git a/mesh/prov.c b/mesh/prov.c
index 1ff5cedbb..d1b855552 100644
--- a/mesh/prov.c
+++ b/mesh/prov.c
@@ -41,7 +41,6 @@
#include "src/shared/shell.h"
#include "gdbus/gdbus.h"
-#include "monitor/uuid.h"
#include "mesh/node.h"
#include "mesh/gatt.h"
#include "mesh/crypto.h"
diff --git a/monitor/bnep.c b/monitor/bnep.c
index 01392e8eb..38fd1319e 100644
--- a/monitor/bnep.c
+++ b/monitor/bnep.c
@@ -157,9 +157,9 @@ static bool setup_conn_req(struct bnep_frame *bnep_frame, uint8_t indent)
}
print_field("%*cDst: 0x%x(%s)", indent, ' ', dst_uuid,
- uuid32_to_str(dst_uuid));
+ bt_uuid32_to_str(dst_uuid));
print_field("%*cSrc: 0x%x(%s)", indent, ' ', src_uuid,
- uuid32_to_str(src_uuid));
+ bt_uuid32_to_str(src_uuid));
return true;
}
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 59348693e..b8618a070 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
@@ -32,6 +32,7 @@
#include <inttypes.h>
#include "lib/bluetooth.h"
+#include "lib/uuid.h"
#include "src/shared/util.h"
#include "bt.h"
@@ -2006,11 +2007,11 @@ static void print_uuid(const char *label, const void *data, uint16_t size)
switch (size) {
case 2:
- str = uuid16_to_str(get_le16(data));
+ str = bt_uuid16_to_str(get_le16(data));
print_field("%s: %s (0x%4.4x)", label, str, get_le16(data));
break;
case 4:
- str = uuid32_to_str(get_le32(data));
+ str = bt_uuid32_to_str(get_le32(data));
print_field("%s: %s (0x%8.8x)", label, str, get_le32(data));
break;
case 16:
@@ -2018,7 +2019,7 @@ static void print_uuid(const char *label, const void *data, uint16_t size)
get_le32(data + 12), get_le16(data + 10),
get_le16(data + 8), get_le16(data + 6),
get_le32(data + 2), get_le16(data + 0));
- str = uuidstr_to_str(uuidstr);
+ str = bt_uuidstr_to_str(uuidstr);
print_field("%s: %s (%s)", label, str, uuidstr);
break;
default:
@@ -2058,7 +2059,7 @@ static void print_data_list(const char *label, uint8_t length,
static void print_attribute_info(uint16_t type, const void *data, uint16_t len)
{
- const char *str = uuid16_to_str(type);
+ const char *str = bt_uuid16_to_str(type);
print_field("%s: %s (0x%4.4x)", "Attribute type", str, type);
diff --git a/monitor/packet.c b/monitor/packet.c
index ae05647c2..a9f2ab5f2 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -3379,7 +3379,7 @@ static void print_uuid16_list(const char *label, const void *data,
for (i = 0; i < count; i++) {
uint16_t uuid = get_le16(data + (i * 2));
- print_field(" %s (0x%4.4x)", uuid16_to_str(uuid), uuid);
+ print_field(" %s (0x%4.4x)", bt_uuid16_to_str(uuid), uuid);
}
}
@@ -3393,7 +3393,7 @@ static void print_uuid32_list(const char *label, const void *data,
for (i = 0; i < count; i++) {
uint32_t uuid = get_le32(data + (i * 4));
- print_field(" %s (0x%8.8x)", uuid32_to_str(uuid), uuid);
+ print_field(" %s (0x%8.8x)", bt_uuid32_to_str(uuid), uuid);
}
}
@@ -3413,7 +3413,7 @@ static void print_uuid128_list(const char *label, const void *data,
get_le32(&uuid[12]), get_le16(&uuid[10]),
get_le16(&uuid[8]), get_le16(&uuid[6]),
get_le32(&uuid[2]), get_le16(&uuid[0]));
- print_field(" %s (%s)", uuidstr_to_str(uuidstr), uuidstr);
+ print_field(" %s (%s)", bt_uuidstr_to_str(uuidstr), uuidstr);
}
}
diff --git a/monitor/sdp.c b/monitor/sdp.c
index 417a21c7b..f3a67457e 100644
--- a/monitor/sdp.c
+++ b/monitor/sdp.c
@@ -115,11 +115,11 @@ static void print_uuid(uint8_t indent, const uint8_t *data, uint32_t size)
switch (size) {
case 2:
print_field("%*c%s (0x%4.4x)", indent, ' ',
- uuid16_to_str(get_be16(data)), get_be16(data));
+ bt_uuid16_to_str(get_be16(data)), get_be16(data));
break;
case 4:
print_field("%*c%s (0x%8.8x)", indent, ' ',
- uuid32_to_str(get_be32(data)), get_be32(data));
+ bt_uuid32_to_str(get_be32(data)), get_be32(data));
break;
case 16:
/* BASE_UUID = 00000000-0000-1000-8000-00805F9B34FB */
@@ -134,7 +134,7 @@ static void print_uuid(uint8_t indent, const uint8_t *data, uint32_t size)
get_be16(data + 10) == 0x0080 &&
get_be32(data + 12) == 0x5F9B34FB)
print_field("%*c%s", indent, ' ',
- uuid32_to_str(get_be32(data)));
+ bt_uuid32_to_str(get_be32(data)));
break;
default:
packet_hexdump(data, size);
diff --git a/monitor/uuid.c b/monitor/uuid.c
deleted file mode 100644
index bc638a2f3..000000000
--- a/monitor/uuid.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2011-2014 Intel Corporation
- * Copyright (C) 2002-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "uuid.h"
-
-static const struct {
- uint16_t uuid;
- const char *str;
-} uuid16_table[] = {
- { 0x0001, "SDP" },
- { 0x0003, "RFCOMM" },
- { 0x0005, "TCS-BIN" },
- { 0x0007, "ATT" },
- { 0x0008, "OBEX" },
- { 0x000f, "BNEP" },
- { 0x0010, "UPNP" },
- { 0x0011, "HIDP" },
- { 0x0012, "Hardcopy Control Channel" },
- { 0x0014, "Hardcopy Data Channel" },
- { 0x0016, "Hardcopy Notification" },
- { 0x0017, "AVCTP" },
- { 0x0019, "AVDTP" },
- { 0x001b, "CMTP" },
- { 0x001e, "MCAP Control Channel" },
- { 0x001f, "MCAP Data Channel" },
- { 0x0100, "L2CAP" },
- /* 0x0101 to 0x0fff undefined */
- { 0x1000, "Service Discovery Server Service Class" },
- { 0x1001, "Browse Group Descriptor Service Class" },
- { 0x1002, "Public Browse Root" },
- /* 0x1003 to 0x1100 undefined */
- { 0x1101, "Serial Port" },
- { 0x1102, "LAN Access Using PPP" },
- { 0x1103, "Dialup Networking" },
- { 0x1104, "IrMC Sync" },
- { 0x1105, "OBEX Object Push" },
- { 0x1106, "OBEX File Transfer" },
- { 0x1107, "IrMC Sync Command" },
- { 0x1108, "Headset" },
- { 0x1109, "Cordless Telephony" },
- { 0x110a, "Audio Source" },
- { 0x110b, "Audio Sink" },
- { 0x110c, "A/V Remote Control Target" },
- { 0x110d, "Advanced Audio Distribution" },
- { 0x110e, "A/V Remote Control" },
- { 0x110f, "A/V Remote Control Controller" },
- { 0x1110, "Intercom" },
- { 0x1111, "Fax" },
- { 0x1112, "Headset AG" },
- { 0x1113, "WAP" },
- { 0x1114, "WAP Client" },
- { 0x1115, "PANU" },
- { 0x1116, "NAP" },
- { 0x1117, "GN" },
- { 0x1118, "Direct Printing" },
- { 0x1119, "Reference Printing" },
- { 0x111a, "Basic Imaging Profile" },
- { 0x111b, "Imaging Responder" },
- { 0x111c, "Imaging Automatic Archive" },
- { 0x111d, "Imaging Referenced Objects" },
- { 0x111e, "Handsfree" },
- { 0x111f, "Handsfree Audio Gateway" },
- { 0x1120, "Direct Printing Refrence Objects Service" },
- { 0x1121, "Reflected UI" },
- { 0x1122, "Basic Printing" },
- { 0x1123, "Printing Status" },
- { 0x1124, "Human Interface Device Service" },
- { 0x1125, "Hardcopy Cable Replacement" },
- { 0x1126, "HCR Print" },
- { 0x1127, "HCR Scan" },
- { 0x1128, "Common ISDN Access" },
- /* 0x1129 and 0x112a undefined */
- { 0x112d, "SIM Access" },
- { 0x112e, "Phonebook Access Client" },
- { 0x112f, "Phonebook Access Server" },
- { 0x1130, "Phonebook Access" },
- { 0x1131, "Headset HS" },
- { 0x1132, "Message Access Server" },
- { 0x1133, "Message Notification Server" },
- { 0x1134, "Message Access Profile" },
- { 0x1135, "GNSS" },
- { 0x1136, "GNSS Server" },
- { 0x1137, "3D Display" },
- { 0x1138, "3D Glasses" },
- { 0x1139, "3D Synchronization" },
- { 0x113a, "MPS Profile" },
- { 0x113b, "MPS Service" },
- /* 0x113c to 0x11ff undefined */
- { 0x1200, "PnP Information" },
- { 0x1201, "Generic Networking" },
- { 0x1202, "Generic File Transfer" },
- { 0x1203, "Generic Audio" },
- { 0x1204, "Generic Telephony" },
- { 0x1205, "UPNP Service" },
- { 0x1206, "UPNP IP Service" },
- { 0x1300, "UPNP IP PAN" },
- { 0x1301, "UPNP IP LAP" },
- { 0x1302, "UPNP IP L2CAP" },
- { 0x1303, "Video Source" },
- { 0x1304, "Video Sink" },
- { 0x1305, "Video Distribution" },
- /* 0x1306 to 0x13ff undefined */
- { 0x1400, "HDP" },
- { 0x1401, "HDP Source" },
- { 0x1402, "HDP Sink" },
- /* 0x1403 to 0x17ff undefined */
- { 0x1800, "Generic Access Profile" },
- { 0x1801, "Generic Attribute Profile" },
- { 0x1802, "Immediate Alert" },
- { 0x1803, "Link Loss" },
- { 0x1804, "Tx Power" },
- { 0x1805, "Current Time Service" },
- { 0x1806, "Reference Time Update Service" },
- { 0x1807, "Next DST Change Service" },
- { 0x1808, "Glucose" },
- { 0x1809, "Health Thermometer" },
- { 0x180a, "Device Information" },
- /* 0x180b and 0x180c undefined */
- { 0x180d, "Heart Rate" },
- { 0x180e, "Phone Alert Status Service" },
- { 0x180f, "Battery Service" },
- { 0x1810, "Blood Pressure" },
- { 0x1811, "Alert Notification Service" },
- { 0x1812, "Human Interface Device" },
- { 0x1813, "Scan Parameters" },
- { 0x1814, "Running Speed and Cadence" },
- { 0x1815, "Automation IO" },
- { 0x1816, "Cycling Speed and Cadence" },
- /* 0x1817 undefined */
- { 0x1818, "Cycling Power" },
- { 0x1819, "Location and Navigation" },
- { 0x181a, "Environmental Sensing" },
- { 0x181b, "Body Composition" },
- { 0x181c, "User Data" },
- { 0x181d, "Weight Scale" },
- { 0x181e, "Bond Management" },
- { 0x181f, "Continuous Glucose Monitoring" },
- { 0x1820, "Internet Protocol Support" },
- { 0x1821, "Indoor Positioning" },
- { 0x1822, "Pulse Oximeter" },
- { 0x1823, "HTTP Proxy" },
- { 0x1824, "Transport Discovery" },
- { 0x1825, "Object Transfer" },
- { 0x1826, "Fitness Machine" },
- { 0x1827, "Mesh Provisioning" },
- { 0x1828, "Mesh Proxy" },
- /* 0x1829 to 0x27ff undefined */
- { 0x2800, "Primary Service" },
- { 0x2801, "Secondary Service" },
- { 0x2802, "Include" },
- { 0x2803, "Characteristic" },
- /* 0x2804 to 0x28ff undefined */
- { 0x2900, "Characteristic Extended Properties" },
- { 0x2901, "Characteristic User Description" },
- { 0x2902, "Client Characteristic Configuration" },
- { 0x2903, "Server Characteristic Configuration" },
- { 0x2904, "Characteristic Format" },
- { 0x2905, "Characteristic Aggregate Formate" },
- { 0x2906, "Valid Range" },
- { 0x2907, "External Report Reference" },
- { 0x2908, "Report Reference" },
- { 0x2909, "Number of Digitals" },
- { 0x290a, "Value Trigger Setting" },
- { 0x290b, "Environmental Sensing Configuration" },
- { 0x290c, "Environmental Sensing Measurement" },
- { 0x290d, "Environmental Sensing Trigger Setting" },
- { 0x290e, "Time Trigger Setting" },
- /* 0x290f to 0x29ff undefined */
- { 0x2a00, "Device Name" },
- { 0x2a01, "Appearance" },
- { 0x2a02, "Peripheral Privacy Flag" },
- { 0x2a03, "Reconnection Address" },
- { 0x2a04, "Peripheral Preferred Connection Parameters" },
- { 0x2a05, "Service Changed" },
- { 0x2a06, "Alert Level" },
- { 0x2a07, "Tx Power Level" },
- { 0x2a08, "Date Time" },
- { 0x2a09, "Day of Week" },
- { 0x2a0a, "Day Date Time" },
- /* 0x2a0b undefined */
- { 0x2a0c, "Exact Time 256" },
- { 0x2a0d, "DST Offset" },
- { 0x2a0e, "Time Zone" },
- { 0x2a0f, "Local Time Information" },
- /* 0x2a10 undefined */
- { 0x2a11, "Time with DST" },
- { 0x2a12, "Time Accuracy" },
- { 0x2a13, "Time Source" },
- { 0x2a14, "Reference Time Information" },
- /* 0x2a15 undefined */
- { 0x2a16, "Time Update Control Point" },
- { 0x2a17, "Time Update State" },
- { 0x2a18, "Glucose Measurement" },
- { 0x2a19, "Battery Level" },
- /* 0x2a1a and 0x2a1b undefined */
- { 0x2a1c, "Temperature Measurement" },
- { 0x2a1d, "Temperature Type" },
- { 0x2a1e, "Intermediate Temperature" },
- /* 0x2a1f and 0x2a20 undefined */
- { 0x2a21, "Measurement Interval" },
- { 0x2a22, "Boot Keyboard Input Report" },
- { 0x2a23, "System ID" },
- { 0x2a24, "Model Number String" },
- { 0x2a25, "Serial Number String" },
- { 0x2a26, "Firmware Revision String" },
- { 0x2a27, "Hardware Revision String" },
- { 0x2a28, "Software Revision String" },
- { 0x2a29, "Manufacturer Name String" },
- { 0x2a2a, "IEEE 11073-20601 Regulatory Cert. Data List" },
- { 0x2a2b, "Current Time" },
- { 0x2a2c, "Magnetic Declination" },
- /* 0x2a2d to 0x2a30 undefined */
- { 0x2a31, "Scan Refresh" },
- { 0x2a32, "Boot Keyboard Output Report" },
- { 0x2a33, "Boot Mouse Input Report" },
- { 0x2a34, "Glucose Measurement Context" },
- { 0x2a35, "Blood Pressure Measurement" },
- { 0x2a36, "Intermediate Cuff Pressure" },
- { 0x2a37, "Heart Rate Measurement" },
- { 0x2a38, "Body Sensor Location" },
- { 0x2a39, "Heart Rate Control Point" },
- /* 0x2a3a to 0x2a3e undefined */
- { 0x2a3f, "Alert Status" },
- { 0x2a40, "Ringer Control Point" },
- { 0x2a41, "Ringer Setting" },
- { 0x2a42, "Alert Category ID Bit Mask" },
- { 0x2a43, "Alert Category ID" },
- { 0x2a44, "Alert Notification Control Point" },
- { 0x2a45, "Unread Alert Status" },
- { 0x2a46, "New Alert" },
- { 0x2a47, "Supported New Alert Category" },
- { 0x2a48, "Supported Unread Alert Category" },
- { 0x2a49, "Blood Pressure Feature" },
- { 0x2a4a, "HID Information" },
- { 0x2a4b, "Report Map" },
- { 0x2a4c, "HID Control Point" },
- { 0x2a4d, "Report" },
- { 0x2a4e, "Protocol Mode" },
- { 0x2a4f, "Scan Interval Window" },
- { 0x2a50, "PnP ID" },
- { 0x2a51, "Glucose Feature" },
- { 0x2a52, "Record Access Control Point" },
- { 0x2a53, "RSC Measurement" },
- { 0x2a54, "RSC Feature" },
- { 0x2a55, "SC Control Point" },
- { 0x2a56, "Digital" },
- /* 0x2a57 undefined */
- { 0x2a58, "Analog" },
- /* 0x2a59 undefined */
- { 0x2a5a, "Aggregate" },
- { 0x2a5b, "CSC Measurement" },
- { 0x2a5c, "CSC Feature" },
- { 0x2a5d, "Sensor Location" },
- /* 0x2a5e to 0x2a62 undefined */
- { 0x2a63, "Cycling Power Measurement" },
- { 0x2a64, "Cycling Power Vector" },
- { 0x2a65, "Cycling Power Feature" },
- { 0x2a66, "Cycling Power Control Point" },
- { 0x2a67, "Location and Speed" },
- { 0x2a68, "Navigation" },
- { 0x2a69, "Position Quality" },
- { 0x2a6a, "LN Feature" },
- { 0x2a6b, "LN Control Point" },
- { 0x2a6c, "Elevation" },
- { 0x2a6d, "Pressure" },
- { 0x2a6e, "Temperature" },
- { 0x2a6f, "Humidity" },
- { 0x2a70, "True Wind Speed" },
- { 0x2a71, "True Wind Direction" },
- { 0x2a72, "Apparent Wind Speed" },
- { 0x2a73, "Apparent Wind Direction" },
- { 0x2a74, "Gust Factor" },
- { 0x2a75, "Pollen Concentration" },
- { 0x2a76, "UV Index" },
- { 0x2a77, "Irradiance" },
- { 0x2a78, "Rainfall" },
- { 0x2a79, "Wind Chill" },
- { 0x2a7a, "Heat Index" },
- { 0x2a7b, "Dew Point" },
- { 0x2a7c, "Trend" },
- { 0x2a7d, "Descriptor Value Changed" },
- { 0x2a7e, "Aerobic Heart Rate Lower Limit" },
- { 0x2a7f, "Aerobic Threshold" },
- { 0x2a80, "Age" },
- { 0x2a81, "Anaerobic Heart Rate Lower Limit" },
- { 0x2a82, "Anaerobic Heart Rate Upper Limit" },
- { 0x2a83, "Anaerobic Threshold" },
- { 0x2a84, "Aerobic Heart Rate Upper Limit" },
- { 0x2a85, "Date of Birth" },
- { 0x2a86, "Date of Threshold Assessment" },
- { 0x2a87, "Email Address" },
- { 0x2a88, "Fat Burn Heart Rate Lower Limit" },
- { 0x2a89, "Fat Burn Heart Rate Upper Limit" },
- { 0x2a8a, "First Name" },
- { 0x2a8b, "Five Zone Heart Rate Limits" },
- { 0x2a8c, "Gender" },
- { 0x2a8d, "Heart Rate Max" },
- { 0x2a8e, "Height" },
- { 0x2a8f, "Hip Circumference" },
- { 0x2a90, "Last Name" },
- { 0x2a91, "Maximum Recommended Heart Rate" },
- { 0x2a92, "Resting Heart Rate" },
- { 0x2a93, "Sport Type for Aerobic/Anaerobic Thresholds" },
- { 0x2a94, "Three Zone Heart Rate Limits" },
- { 0x2a95, "Two Zone Heart Rate Limit" },
- { 0x2a96, "VO2 Max" },
- { 0x2a97, "Waist Circumference" },
- { 0x2a98, "Weight" },
- { 0x2a99, "Database Change Increment" },
- { 0x2a9a, "User Index" },
- { 0x2a9b, "Body Composition Feature" },
- { 0x2a9c, "Body Composition Measurement" },
- { 0x2a9d, "Weight Measurement" },
- { 0x2a9e, "Weight Scale Feature" },
- { 0x2a9f, "User Control Point" },
- { 0x2aa0, "Magnetic Flux Density - 2D" },
- { 0x2aa1, "Magnetic Flux Density - 3D" },
- { 0x2aa2, "Language" },
- { 0x2aa3, "Barometric Pressure Trend" },
- { 0x2aa4, "Bond Management Control Point" },
- { 0x2aa5, "Bond Management Feature" },
- { 0x2aa6, "Central Address Resolution" },
- { 0x2aa7, "CGM Measurement" },
- { 0x2aa8, "CGM Feature" },
- { 0x2aa9, "CGM Status" },
- { 0x2aaa, "CGM Session Start Time" },
- { 0x2aab, "CGM Session Run Time" },
- { 0x2aac, "CGM Specific Ops Control Point" },
- { 0x2aad, "Indoor Positioning Configuration" },
- { 0x2aae, "Latitude" },
- { 0x2aaf, "Longitude" },
- { 0x2ab0, "Local North Coordinate" },
- { 0x2ab1, "Local East Coordinate" },
- { 0x2ab2, "Floor Number" },
- { 0x2ab3, "Altitude" },
- { 0x2ab4, "Uncertainty" },
- { 0x2ab5, "Location Name" },
- { 0x2ab6, "URI" },
- { 0x2ab7, "HTTP Headers" },
- { 0x2ab8, "HTTP Status Code" },
- { 0x2ab9, "HTTP Entity Body" },
- { 0x2aba, "HTTP Control Point" },
- { 0x2abb, "HTTPS Security" },
- { 0x2abc, "TDS Control Point" },
- { 0x2abd, "OTS Feature" },
- { 0x2abe, "Object Name" },
- { 0x2abf, "Object Type" },
- { 0x2ac0, "Object Size" },
- { 0x2ac1, "Object First-Created" },
- { 0x2ac2, "Object Last-Modified" },
- { 0x2ac3, "Object ID" },
- { 0x2ac4, "Object Properties" },
- { 0x2ac5, "Object Action Control Point" },
- { 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" },
- { 0x2adb, "Mesh Provisioning Data In" },
- { 0x2adc, "Mesh Provisioning Data Out" },
- { 0x2add, "Mesh Proxy Data In" },
- { 0x2ade, "Mesh Proxy Data Out" },
- /* vendor defined */
- { 0xfeff, "GN Netcom" },
- { 0xfefe, "GN ReSound A/S" },
- { 0xfefd, "Gimbal, Inc." },
- { 0xfefc, "Gimbal, Inc." },
- { 0xfefb, "Stollmann E+V GmbH" },
- { 0xfefa, "PayPal, Inc." },
- { 0xfef9, "PayPal, Inc." },
- { 0xfef8, "Aplix Corporation" },
- { 0xfef7, "Aplix Corporation" },
- { 0xfef6, "Wicentric, Inc." },
- { 0xfef5, "Dialog Semiconductor GmbH" },
- { 0xfef4, "Google" },
- { 0xfef3, "Google" },
- { 0xfef2, "CSR" },
- { 0xfef1, "CSR" },
- { 0xfef0, "Intel" },
- { 0xfeef, "Polar Electro Oy" },
- { 0xfeee, "Polar Electro Oy" },
- { 0xfeed, "Tile, Inc." },
- { 0xfeec, "Tile, Inc." },
- { 0xfeeb, "Swirl Networks, Inc." },
- { 0xfeea, "Swirl Networks, Inc." },
- { 0xfee9, "Quintic Corp." },
- { 0xfee8, "Quintic Corp." },
- { 0xfee7, "Tencent Holdings Limited" },
- { 0xfee6, "Seed Labs, Inc." },
- { 0xfee5, "Nordic Semiconductor ASA" },
- { 0xfee4, "Nordic Semiconductor ASA" },
- { 0xfee3, "Anki, Inc." },
- { 0xfee2, "Anki, Inc." },
- { 0xfee1, "Anhui Huami Information Technology Co." },
- { 0xfee0, "Anhui Huami Information Technology Co." },
- { 0xfedf, "Design SHIFT" },
- { 0xfede, "Coin, Inc." },
- { 0xfedd, "Jawbone" },
- { 0xfedc, "Jawbone" },
- { 0xfedb, "Perka, Inc." },
- { 0xfeda, "ISSC Technologies Corporation" },
- { 0xfed9, "Pebble Technology Corporation" },
- { 0xfed8, "Google" },
- { 0xfed7, "Broadcom Corporation" },
- { 0xfed6, "Broadcom Corporation" },
- { 0xfed5, "Plantronics Inc." },
- { 0xfed4, "Apple, Inc." },
- { 0xfed3, "Apple, Inc." },
- { 0xfed2, "Apple, Inc." },
- { 0xfed1, "Apple, Inc." },
- { 0xfed0, "Apple, Inc." },
- { 0xfecf, "Apple, Inc." },
- { 0xfece, "Apple, Inc." },
- { 0xfecd, "Apple, Inc." },
- { 0xfecc, "Apple, Inc." },
- { 0xfecb, "Apple, Inc." },
- { 0xfeca, "Apple, Inc." },
- { 0xfec9, "Apple, Inc." },
- { 0xfec8, "Apple, Inc." },
- { 0xfec7, "Apple, Inc." },
- { 0xfec6, "Kocomojo, LLC" },
- { 0xfec5, "Realtek Semiconductor Corp." },
- { 0xfec4, "PLUS Location Systems" },
- { 0xfec3, "360fly, Inc." },
- { 0xfec2, "Blue Spark Technologies, Inc." },
- { 0xfec1, "KDDI Corporation" },
- { 0xfec0, "KDDI Corporation" },
- { 0xfebf, "Nod, Inc." },
- { 0xfebe, "Bose Corporation" },
- { 0xfebd, "Clover Network, Inc." },
- { 0xfebc, "Dexcom, Inc." },
- { 0xfebb, "adafruit industries" },
- { 0xfeba, "Tencent Holdings Limited" },
- { 0xfeb9, "LG Electronics" },
- { 0xfeb8, "Facebook, Inc." },
- { 0xfeb7, "Facebook, Inc." },
- { 0xfeb6, "Vencer Co, Ltd" },
- { 0xfeb5, "WiSilica Inc." },
- { 0xfeb4, "WiSilica Inc." },
- { 0xfeb3, "Taobao" },
- { 0xfeb2, "Microsoft Corporation" },
- { 0xfeb1, "Electronics Tomorrow Limited" },
- { 0xfeb0, "Nest Labs Inc." },
- { 0xfeaf, "Nest Labs Inc." },
- { 0xfeae, "Nokia Corporation" },
- { 0xfead, "Nokia Corporation" },
- { 0xfeac, "Nokia Corporation" },
- { 0xfeab, "Nokia Corporation" },
- { 0xfeaa, "Google" },
- { 0xfea9, "Savant Systems LLC" },
- { 0xfea8, "Savant Systems LLC" },
- { 0xfea7, "UTC Fire and Security" },
- { 0xfea6, "GoPro, Inc." },
- { 0xfea5, "GoPro, Inc." },
- { 0xfea4, "Paxton Access Ltd" },
- { 0xfea3, "ITT Industries" },
- { 0xfea2, "Intrepid Control Systems, Inc." },
- { 0xfea1, "Intrepid Control Systems, Inc." },
- { 0xfea0, "Google" },
- { 0xfe9f, "Google" },
- { 0xfe9e, "Dialog Semiconductor B.V." },
- { 0xfe9d, "Mobiquity Networks Inc" },
- { 0xfe9c, "GSI Laboratories, Inc." },
- { 0xfe9b, "Samsara Networks, Inc" },
- { 0xfe9a, "Estimote" },
- { 0xfe99, "Currant, Inc." },
- { 0xfe98, "Currant, Inc." },
- { 0xfe97, "Tesla Motor Inc." },
- { 0xfe96, "Tesla Motor Inc." },
- { 0xfe95, "Xiaomi Inc." },
- { 0xfe94, "OttoQ Inc." },
- { 0xfe93, "OttoQ Inc." },
- { 0xfe92, "Jarden Safety & Security" },
- { 0xfe91, "Shanghai Imilab Technology Co.,Ltd" },
- { 0xfe90, "JUMA" },
- { 0xfe8f, "CSR" },
- { 0xfe8e, "ARM Ltd" },
- { 0xfe8d, "Interaxon Inc." },
- { 0xfe8c, "TRON Forum" },
- { 0xfe8b, "Apple, Inc." },
- { 0xfe8a, "Apple, Inc." },
- { 0xfe89, "B&O Play A/S" },
- { 0xfe88, "SALTO SYSTEMS S.L." },
- { 0xfe87, "Qingdao Yeelink Information Technology Co., Ltd. ( 青岛亿联客信息技术有限公司 )" },
- { 0xfe86, "HUAWEI Technologies Co., Ltd. ( 华为技术有限公司 )" },
- { 0xfe85, "RF Digital Corp" },
- { 0xfe84, "RF Digital Corp" },
- { 0xfe83, "Blue Bite" },
- { 0xfe82, "Medtronic Inc." },
- { 0xfe81, "Medtronic Inc." },
- { 0xfe80, "Doppler Lab" },
- { 0xfe7f, "Doppler Lab" },
- { 0xfe7e, "Awear Solutions Ltd" },
- { 0xfe7d, "Aterica Health Inc." },
- { 0xfe7c, "Stollmann E+V GmbH" },
- { 0xfe7b, "Orion Labs, Inc." },
- { 0xfe7a, "Bragi GmbH" },
- { 0xfe79, "Zebra Technologies" },
- { 0xfe78, "Hewlett-Packard Company" },
- { 0xfe77, "Hewlett-Packard Company" },
- { 0xfe76, "TangoMe" },
- { 0xfe75, "TangoMe" },
- { 0xfe74, "unwire" },
- { 0xfe73, "St. Jude Medical, Inc." },
- { 0xfe72, "St. Jude Medical, Inc." },
- { 0xfe71, "Plume Design Inc" },
- { 0xfe70, "Beijing Jingdong Century Trading Co., Ltd." },
- { 0xfe6f, "LINE Corporation" },
- { 0xfe6e, "The University of Tokyo" },
- { 0xfe6d, "The University of Tokyo" },
- { 0xfe6c, "TASER International, Inc." },
- { 0xfe6b, "TASER International, Inc." },
- { 0xfe6a, "Kontakt Micro-Location Sp. z o.o." },
- { 0xfe69, "Qualcomm Life Inc" },
- { 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)" },
- { }
-};
-
-static const struct {
- const char *uuid;
- const char *str;
-} uuid128_table[] = {
- { "a3c87500-8ed3-4bdf-8a39-a01bebede295",
- "Eddystone Configuration Service" },
- { "a3c87501-8ed3-4bdf-8a39-a01bebede295", "Capabilities" },
- { "a3c87502-8ed3-4bdf-8a39-a01bebede295", "Active Slot" },
- { "a3c87503-8ed3-4bdf-8a39-a01bebede295",
- "Advertising Interval" },
- { "a3c87504-8ed3-4bdf-8a39-a01bebede295", "Radio Tx Power" },
- { "a3c87505-8ed3-4bdf-8a39-a01bebede295",
- "(Advanced) Advertised Tx Power" },
- { "a3c87506-8ed3-4bdf-8a39-a01bebede295", "Lock State" },
- { "a3c87507-8ed3-4bdf-8a39-a01bebede295", "Unlock" },
- { "a3c87508-8ed3-4bdf-8a39-a01bebede295", "Public ECDH Key" },
- { "a3c87509-8ed3-4bdf-8a39-a01bebede295", "EID Identity Key" },
- { "a3c8750a-8ed3-4bdf-8a39-a01bebede295", "ADV Slot Data" },
- { "a3c8750b-8ed3-4bdf-8a39-a01bebede295",
- "(Advanced) Factory reset" },
- { "a3c8750c-8ed3-4bdf-8a39-a01bebede295",
- "(Advanced) Remain Connectable" },
- /* BBC micro:bit Bluetooth Profiles */
- { "e95d0753-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Accelerometer Service" },
- { "e95dca4b-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Accelerometer Data" },
- { "e95dfb24-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Accelerometer Period" },
- { "e95df2d8-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Magnetometer Service" },
- { "e95dfb11-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Magnetometer Data" },
- { "e95d386c-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Magnetometer Period" },
- { "e95d9715-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Magnetometer Bearing" },
- { "e95d9882-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Button Service" },
- { "e95dda90-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Button A State" },
- { "e95dda91-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Button B State" },
- { "e95d127b-251d-470a-a062-fa1922dfa9a8",
- "MicroBit IO PIN Service" },
- { "e95d8d00-251d-470a-a062-fa1922dfa9a8", "MicroBit PIN Data" },
- { "e95d5899-251d-470a-a062-fa1922dfa9a8",
- "MicroBit PIN AD Configuration" },
- { "e95dd822-251d-470a-a062-fa1922dfa9a8", "MicroBit PWM Control" },
- { "e95dd91d-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Service" },
- { "e95d7b77-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Matrix state" },
- { "e95d93ee-251d-470a-a062-fa1922dfa9a8", "MicroBit LED Text" },
- { "e95d0d2d-251d-470a-a062-fa1922dfa9a8", "MicroBit Scrolling Delay" },
- { "e95d93af-251d-470a-a062-fa1922dfa9a8", "MicroBit Event Service" },
- { "e95db84c-251d-470a-a062-fa1922dfa9a8", "MicroBit Requirements" },
- { "e95d9775-251d-470a-a062-fa1922dfa9a8", "MicroBit Event Data" },
- { "e95d23c4-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Client Requirements" },
- { "e95d5404-251d-470a-a062-fa1922dfa9a8", "MicroBit Client Events" },
- { "e95d93b0-251d-470a-a062-fa1922dfa9a8",
- "MicroBit DFU Control Service" },
- { "e95d93b1-251d-470a-a062-fa1922dfa9a8", "MicroBit DFU Control" },
- { "e95d6100-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Temperature Service" },
- { "e95d1b25-251d-470a-a062-fa1922dfa9a8",
- "MicroBit Temperature Period" },
- /* Nordic UART Port Emulation */
- { "6e400001-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART Service" },
- { "6e400002-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART TX" },
- { "6e400003-b5a3-f393-e0a9-e50e24dcca9e", "Nordic UART RX" },
- { }
-};
-
-const char *uuid16_to_str(uint16_t uuid)
-{
- int i;
-
- for (i = 0; uuid16_table[i].str; i++) {
- if (uuid16_table[i].uuid == uuid)
- return uuid16_table[i].str;
- }
-
- return "Unknown";
-}
-
-const char *uuid32_to_str(uint32_t uuid)
-{
- if ((uuid & 0xffff0000) == 0x0000)
- return uuid16_to_str(uuid & 0x0000ffff);
-
- return "Unknown";
-}
-
-const char *uuidstr_to_str(const char *uuid)
-{
- uint32_t val;
- size_t len;
- int i;
-
- if (!uuid)
- return NULL;
-
- len = strlen(uuid);
-
- if (len < 36) {
- char *endptr = NULL;
-
- val = strtol(uuid, &endptr, 0);
- if (!endptr || *endptr != '\0')
- return NULL;
-
- if (val > UINT16_MAX)
- return uuid32_to_str(val);
-
- return uuid16_to_str(val);
- }
-
- if (len != 36)
- return NULL;
-
- for (i = 0; uuid128_table[i].str; i++) {
- if (strcasecmp(uuid128_table[i].uuid, uuid) == 0)
- return uuid128_table[i].str;
- }
-
- if (strncasecmp(uuid + 8, "-0000-1000-8000-00805f9b34fb", 28))
- return "Vendor specific";
-
- if (sscanf(uuid, "%08x-0000-1000-8000-00805f9b34fb", &val) != 1)
- return NULL;
-
- return uuid32_to_str(val);
-}
diff --git a/monitor/uuid.h b/monitor/uuid.h
deleted file mode 100644
index 22d2363b8..000000000
--- a/monitor/uuid.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * BlueZ - Bluetooth protocol stack for Linux
- *
- * Copyright (C) 2011-2014 Intel Corporation
- * Copyright (C) 2002-2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#include <stdint.h>
-
-#define MAX_LEN_UUID_STR 37
-
-const char *uuid16_to_str(uint16_t uuid);
-const char *uuid32_to_str(uint32_t uuid);
-const char *uuidstr_to_str(const char *uuid);
diff --git a/src/gatt-database.c b/src/gatt-database.c
index 143f2aa7f..9a33ae7f9 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -30,7 +30,6 @@
#include "lib/sdp.h"
#include "lib/sdp_lib.h"
#include "lib/uuid.h"
-#include "monitor/uuid.h"
#include "btio/btio.h"
#include "gdbus/gdbus.h"
#include "src/shared/util.h"
@@ -729,16 +728,16 @@ static void database_add_record(struct btd_gatt_database *database,
switch (uuid.type) {
case BT_UUID16:
- name = uuid16_to_str(uuid.value.u16);
+ name = bt_uuid16_to_str(uuid.value.u16);
sdp_uuid16_create(&svc, uuid.value.u16);
break;
case BT_UUID32:
- name = uuid32_to_str(uuid.value.u32);
+ name = bt_uuid32_to_str(uuid.value.u32);
sdp_uuid32_create(&svc, uuid.value.u32);
break;
case BT_UUID128:
bt_uuid_to_string(&uuid, uuidstr, sizeof(uuidstr));
- name = uuidstr_to_str(uuidstr);
+ name = bt_uuidstr_to_str(uuidstr);
sdp_uuid128_create(&svc, (void *) &uuid.value.u128);
break;
case BT_UUID_UNSPEC:
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr
2017-12-19 12:40 [PATCH BlueZ 1/4] lib/uuid: Add helpers to decode UUIDs strings Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 2/4] tools: Remove monitor/uuid.{c,h} Luiz Augusto von Dentz
@ 2017-12-19 12:40 ` Luiz Augusto von Dentz
2017-12-19 17:29 ` Marcel Holtmann
2017-12-19 12:40 ` [PATCH BlueZ 4/4] monitor: Use bt_appeartostr Luiz Augusto von Dentz
2 siblings, 1 reply; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2017-12-19 12:40 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds bt_appeartostr which can decode the appearance code to a
human readable string.
---
lib/bluetooth.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/bluetooth.h | 1 +
2 files changed, 88 insertions(+)
diff --git a/lib/bluetooth.c b/lib/bluetooth.c
index 3276b68a5..75d94dbfa 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -32,6 +32,7 @@
#include <ctype.h>
#include <stdarg.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <string.h>
#include <sys/socket.h>
@@ -2343,3 +2344,89 @@ const char *bt_compidtostr(int compid)
return "not assigned";
}
}
+
+static const struct {
+ uint16_t val;
+ bool generic;
+ const char *str;
+} appearance_table[] = {
+ { 0, true, "Unknown" },
+ { 64, true, "Phone" },
+ { 128, true, "Computer" },
+ { 192, true, "Watch" },
+ { 193, false, "Sports Watch" },
+ { 256, true, "Clock" },
+ { 320, true, "Display" },
+ { 384, true, "Remote Control" },
+ { 448, true, "Eye-glasses" },
+ { 512, true, "Tag" },
+ { 576, true, "Keyring" },
+ { 640, true, "Media Player" },
+ { 704, true, "Barcode Scanner" },
+ { 768, true, "Thermometer" },
+ { 769, false, "Thermometer: Ear" },
+ { 832, true, "Heart Rate Sensor" },
+ { 833, false, "Heart Rate Belt" },
+ { 896, true, "Blood Pressure" },
+ { 897, false, "Blood Pressure: Arm" },
+ { 898, false, "Blood Pressure: Wrist" },
+ { 960, true, "Human Interface Device" },
+ { 961, false, "Keyboard" },
+ { 962, false, "Mouse" },
+ { 963, false, "Joystick" },
+ { 964, false, "Gamepad" },
+ { 965, false, "Digitizer Tablet" },
+ { 966, false, "Card Reader" },
+ { 967, false, "Digital Pen" },
+ { 968, false, "Barcode Scanner" },
+ { 1024, true, "Glucose Meter" },
+ { 1088, true, "Running Walking Sensor" },
+ { 1089, false, "Running Walking Sensor: In-Shoe" },
+ { 1090, false, "Running Walking Sensor: On-Shoe" },
+ { 1091, false, "Running Walking Sensor: On-Hip" },
+ { 1152, true, "Cycling" },
+ { 1153, false, "Cycling: Cycling Computer" },
+ { 1154, false, "Cycling: Speed Sensor" },
+ { 1155, false, "Cycling: Cadence Sensor" },
+ { 1156, false, "Cycling: Power Sensor" },
+ { 1157, false, "Cycling: Speed and Cadence Sensor" },
+ { 1216, true, "Undefined" },
+
+ { 3136, true, "Pulse Oximeter" },
+ { 3137, false, "Pulse Oximeter: Fingertip" },
+ { 3138, false, "Pulse Oximeter: Wrist Worn" },
+ { 3200, true, "Weight Scale" },
+ { 3264, true, "Undefined" },
+
+ { 5184, true, "Outdoor Sports Activity" },
+ { 5185, false, "Location Display Device" },
+ { 5186, false, "Location and Navigation Display Device" },
+ { 5187, false, "Location Pod" },
+ { 5188, false, "Location and Navigation Pod" },
+ { 5248, true, "Undefined" },
+ { }
+};
+
+const char *bt_appeartostr(uint16_t appearance)
+{
+ const char *str = NULL;
+ int i, type = 0;
+
+ for (i = 0; appearance_table[i].str; i++) {
+ if (appearance_table[i].generic) {
+ if (appearance < appearance_table[i].val)
+ break;
+ type = i;
+ }
+
+ if (appearance_table[i].val == appearance) {
+ str = appearance_table[i].str;
+ break;
+ }
+ }
+
+ if (!str)
+ str = appearance_table[type].str;
+
+ return str;
+}
diff --git a/lib/bluetooth.h b/lib/bluetooth.h
index eb279260e..23d048cf6 100644
--- a/lib/bluetooth.h
+++ b/lib/bluetooth.h
@@ -339,6 +339,7 @@ void bt_free(void *ptr);
int bt_error(uint16_t code);
const char *bt_compidtostr(int id);
+const char *bt_appeartostr(uint16_t appearance);
typedef struct {
uint8_t data[16];
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH BlueZ 4/4] monitor: Use bt_appeartostr
2017-12-19 12:40 [PATCH BlueZ 1/4] lib/uuid: Add helpers to decode UUIDs strings Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 2/4] tools: Remove monitor/uuid.{c,h} Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr Luiz Augusto von Dentz
@ 2017-12-19 12:40 ` Luiz Augusto von Dentz
2 siblings, 0 replies; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2017-12-19 12:40 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Remove appearance table used to decode appearance.
---
monitor/packet.c | 84 ++------------------------------------------------------
1 file changed, 2 insertions(+), 82 deletions(-)
diff --git a/monitor/packet.c b/monitor/packet.c
index a9f2ab5f2..0e1e41f49 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -1081,90 +1081,10 @@ static void print_dev_class(const uint8_t *dev_class)
" Unknown service class (0x%2.2x)", mask);
}
-static const struct {
- uint16_t val;
- bool generic;
- const char *str;
-} appearance_table[] = {
- { 0, true, "Unknown" },
- { 64, true, "Phone" },
- { 128, true, "Computer" },
- { 192, true, "Watch" },
- { 193, false, "Sports Watch" },
- { 256, true, "Clock" },
- { 320, true, "Display" },
- { 384, true, "Remote Control" },
- { 448, true, "Eye-glasses" },
- { 512, true, "Tag" },
- { 576, true, "Keyring" },
- { 640, true, "Media Player" },
- { 704, true, "Barcode Scanner" },
- { 768, true, "Thermometer" },
- { 769, false, "Thermometer: Ear" },
- { 832, true, "Heart Rate Sensor" },
- { 833, false, "Heart Rate Belt" },
- { 896, true, "Blood Pressure" },
- { 897, false, "Blood Pressure: Arm" },
- { 898, false, "Blood Pressure: Wrist" },
- { 960, true, "Human Interface Device" },
- { 961, false, "Keyboard" },
- { 962, false, "Mouse" },
- { 963, false, "Joystick" },
- { 964, false, "Gamepad" },
- { 965, false, "Digitizer Tablet" },
- { 966, false, "Card Reader" },
- { 967, false, "Digital Pen" },
- { 968, false, "Barcode Scanner" },
- { 1024, true, "Glucose Meter" },
- { 1088, true, "Running Walking Sensor" },
- { 1089, false, "Running Walking Sensor: In-Shoe" },
- { 1090, false, "Running Walking Sensor: On-Shoe" },
- { 1091, false, "Running Walking Sensor: On-Hip" },
- { 1152, true, "Cycling" },
- { 1153, false, "Cycling: Cycling Computer" },
- { 1154, false, "Cycling: Speed Sensor" },
- { 1155, false, "Cycling: Cadence Sensor" },
- { 1156, false, "Cycling: Power Sensor" },
- { 1157, false, "Cycling: Speed and Cadence Sensor" },
- { 1216, true, "Undefined" },
-
- { 3136, true, "Pulse Oximeter" },
- { 3137, false, "Pulse Oximeter: Fingertip" },
- { 3138, false, "Pulse Oximeter: Wrist Worn" },
- { 3200, true, "Weight Scale" },
- { 3264, true, "Undefined" },
-
- { 5184, true, "Outdoor Sports Activity" },
- { 5185, false, "Location Display Device" },
- { 5186, false, "Location and Navigation Display Device" },
- { 5187, false, "Location Pod" },
- { 5188, false, "Location and Navigation Pod" },
- { 5248, true, "Undefined" },
- { }
-};
-
static void print_appearance(uint16_t appearance)
{
- const char *str = NULL;
- int i, type = 0;
-
- for (i = 0; appearance_table[i].str; i++) {
- if (appearance_table[i].generic) {
- if (appearance < appearance_table[i].val)
- break;
- type = i;
- }
-
- if (appearance_table[i].val == appearance) {
- str = appearance_table[i].str;
- break;
- }
- }
-
- if (!str)
- str = appearance_table[type].str;
-
- print_field("Appearance: %s (0x%4.4x)", str, appearance);
+ print_field("Appearance: %s (0x%4.4x)", bt_appeartostr(appearance),
+ appearance);
}
static void print_num_broadcast_retrans(uint8_t num_retrans)
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr
2017-12-19 12:40 ` [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr Luiz Augusto von Dentz
@ 2017-12-19 17:29 ` Marcel Holtmann
2017-12-19 17:38 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 6+ messages in thread
From: Marcel Holtmann @ 2017-12-19 17:29 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
> This adds bt_appeartostr which can decode the appearance code to a
> human readable string.
> ---
> lib/bluetooth.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> lib/bluetooth.h | 1 +
> 2 files changed, 88 insertions(+)
>
> diff --git a/lib/bluetooth.c b/lib/bluetooth.c
> index 3276b68a5..75d94dbfa 100644
> --- a/lib/bluetooth.c
> +++ b/lib/bluetooth.c
I really do not want to extend libbluetooth.so anymore with new functionality. If you want to do some things in src/shared/ then fine, but nothing is going to move into lib/ anymore.
Regards
Marcel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr
2017-12-19 17:29 ` Marcel Holtmann
@ 2017-12-19 17:38 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 6+ messages in thread
From: Luiz Augusto von Dentz @ 2017-12-19 17:38 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth
Hi Marcel,
On Tue, Dec 19, 2017 at 3:29 PM, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Luiz,
>
>> This adds bt_appeartostr which can decode the appearance code to a
>> human readable string.
>> ---
>> lib/bluetooth.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> lib/bluetooth.h | 1 +
>> 2 files changed, 88 insertions(+)
>>
>> diff --git a/lib/bluetooth.c b/lib/bluetooth.c
>> index 3276b68a5..75d94dbfa 100644
>> --- a/lib/bluetooth.c
>> +++ b/lib/bluetooth.c
>
> I really do not want to extend libbluetooth.so anymore with new functionality. If you want to do some things in src/shared/ then fine, but nothing is going to move into lib/ anymore.
Fair enough, I guess I will put these under shared/util.h then.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-19 17:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-19 12:40 [PATCH BlueZ 1/4] lib/uuid: Add helpers to decode UUIDs strings Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 2/4] tools: Remove monitor/uuid.{c,h} Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 3/4] lib: Introduce bt_appeartostr Luiz Augusto von Dentz
2017-12-19 17:29 ` Marcel Holtmann
2017-12-19 17:38 ` Luiz Augusto von Dentz
2017-12-19 12:40 ` [PATCH BlueZ 4/4] monitor: Use bt_appeartostr Luiz Augusto von Dentz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.