Imported Upstream version 5.12upstream/5.12

3 files changed, 35 insertions, 0 deletions

diff --git a/lib/bluetooth.c b/lib/bluetooth.c
index 5598ccfd..17ee2c1d 100644
--- a/lib/bluetooth.c
+++ b/lib/bluetooth.c
@@ -793,6 +793,30 @@ const char *bt_compidtostr(int compid)
 		return "Atus BV";
 	case 266:
 		return "Codegate Ltd.";
+	case 267:
+		return "ERi, Inc.";
+	case 268:
+		return "Transducers Direct, LLC";
+	case 269:
+		return "Fujitsu Ten Limited";
+	case 270:
+		return "Audi AG";
+	case 271:
+		return "HiSilicon Technologies Co., Ltd.";
+	case 272:
+		return "Nippon Seiki Co., Ltd.";
+	case 273:
+		return "Steelseries ApS";
+	case 274:
+		return "vyzybl Inc.";
+	case 275:
+		return "Openbrain Technologies, Co., Ltd.";
+	case 276:
+		return "Xensr";
+	case 277:
+		return "e.solutions";
+	case 278:
+		return "1OAK Technologies";
 	case 65535:
 		return "internal use";
 	default:
diff --git a/lib/bluetooth.h b/lib/bluetooth.h
index 012fde40..61c1f9ac 100644
--- a/lib/bluetooth.h
+++ b/lib/bluetooth.h
@@ -77,6 +77,13 @@ struct bt_security {
 #define BT_FLUSHABLE_OFF	0
 #define BT_FLUSHABLE_ON		1
 
+#define BT_POWER		9
+struct bt_power {
+	uint8_t force_active;
+};
+#define BT_POWER_FORCE_ACTIVE_OFF 0
+#define BT_POWER_FORCE_ACTIVE_ON  1
+
 #define BT_CHANNEL_POLICY	10
 
 /* BR/EDR only (default policy)
@@ -109,6 +116,9 @@ struct bt_voice {
 	uint16_t setting;
 };
 
+#define BT_SNDMTU		12
+#define BT_RCVMTU		13
+
 #define BT_VOICE_TRANSPARENT			0x0003
 #define BT_VOICE_CVSD_16BIT			0x0060
 
diff --git a/lib/hci.c b/lib/hci.c
index 6e378367..005578a3 100644
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -649,6 +649,7 @@ static hci_map ver_map[] = {
 	{ "2.1",	0x04 },
 	{ "3.0",	0x05 },
 	{ "4.0",	0x06 },
+	{ "4.1",	0x07 },
 	{ NULL }
 };