Skip to contentSkip to conversation

build: Remove AMP related functionality

PATCH Applied Luiz Augusto von Dentz 3 participants 3 messages Jan 31, 2025

Subsystems (3)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH 1/1 build: Remove AMP related functionality

From: Luiz Augusto von Dentz <[email protected]>

High Speed, Alternate MAC and PHY (AMP) extension, has been removed from Bluetooth Core specification on 5.3:

https://www.bluetooth.com/blog/new-core-specification-v5-3-feature-enhancements/

The kernel already have undergone similar changes starting with e7b02296fb40 ("Bluetooth: Remove BT_HS").

---
 Makefile.am          |    2 +-
 Makefile.tools       |    6 +-
 emulator/amp.c       | 1041 ------------------------------------------
 emulator/amp.h       |   19 -
 emulator/main.c      |   23 +-
 lib/a2mp.h           |  136 ------
 lib/amp.h            |  164 -------
 tools/amptest.c      |  655 --------------------------
 tools/parser/amp.c   |  114 -----
 tools/parser/hci.c   |   53 ---
 tools/parser/l2cap.c |  339 --------------
 11 files changed, 4 insertions(+), 2548 deletions(-)
 delete mode 100644 emulator/amp.c
 delete mode 100644 emulator/amp.h
 delete mode 100644 lib/a2mp.h
 delete mode 100644 lib/amp.h
 delete mode 100644 tools/amptest.c
 delete mode 100644 tools/parser/amp.c
Makefile.am +1 -1
index 29018a91cbb4..0821530e68df 100644
@@ -78,7 +78,7 @@ lib_headers = lib/bluetooth.h lib/hci.h lib/hci_lib.h \
 		lib/sco.h lib/l2cap.h lib/sdp.h lib/sdp_lib.h \
 		lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h
 
-extra_headers = lib/mgmt.h lib/uuid.h lib/a2mp.h lib/amp.h lib/iso.h
+extra_headers = lib/mgmt.h lib/uuid.h lib/iso.h
 extra_sources = lib/uuid.c
 
 local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file)))
Makefile.tools +1 -5
index 0dca43327fdd..e60c31b1d907 100644
@@ -97,7 +97,6 @@ emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
 				emulator/bthost.h emulator/bthost.c \
 				emulator/smp.c \
 				emulator/phy.h emulator/phy.c \
-				emulator/amp.h emulator/amp.c \
 				emulator/le.h emulator/le.c
 emulator_btvirt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
 
@@ -229,7 +228,7 @@ bin_PROGRAMS += tools/rctest tools/l2test tools/l2ping tools/bluemoon \
 		tools/hex2hcd tools/mpris-proxy tools/btattach tools/isotest
 
 noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
-			tools/scotest tools/amptest tools/hwdb \
+			tools/scotest tools/hwdb \
 			tools/hcieventmask tools/hcisecfilter \
 			tools/btinfo tools/btconfig \
 			tools/btsnoop tools/btproxy \
@@ -251,8 +250,6 @@ tools_avtest_LDADD = lib/libbluetooth-internal.la
 
 tools_scotest_LDADD = lib/libbluetooth-internal.la
 
-tools_amptest_LDADD = lib/libbluetooth-internal.la
-
 tools_hwdb_LDADD = lib/libbluetooth-internal.la
 
 tools_hcieventmask_LDADD = lib/libbluetooth-internal.la
@@ -436,7 +433,6 @@ tools_hcidump_SOURCES = tools/hcidump.c \
 				tools/parser/lmp.c \
 				tools/parser/hci.c \
 				tools/parser/l2cap.h tools/parser/l2cap.c \
-				tools/parser/amp.c \
 				tools/parser/smp.c \
 				tools/parser/att.c \
 				tools/parser/sdp.h tools/parser/sdp.c \
emulator/amp.c deleted +0 -1041

1,041 lines not on this page · raw message

emulator/amp.h deleted +0 -19
deleted file mode 100644
index cee360c44e0f..000000000000
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2011-2012  Intel Corporation
- *  Copyright (C) 2004-2010  Marcel Holtmann <[email protected]>
- *
- *
- */
-
-#include <stdbool.h>
-
-struct bt_amp;
-
-struct bt_amp *bt_amp_new(void);
-
-struct bt_amp *bt_amp_ref(struct bt_amp *amp);
-void bt_amp_unref(struct bt_amp *amp);
emulator/main.c +2 -21
index bd9831449767..92858825413c 100644
@@ -26,7 +26,6 @@
 #include "server.h"
 #include "btdev.h"
 #include "vhci.h"
-#include "amp.h"
 #include "le.h"
 
 static void signal_callback(int signum, void *user_data)
@@ -66,7 +65,6 @@ static const struct option main_options[] = {
 	{ "bredr",   no_argument,       NULL, 'B' },
 	{ "amp",     no_argument,       NULL, 'A' },
 	{ "letest",  optional_argument, NULL, 'U' },
-	{ "amptest", optional_argument, NULL, 'T' },
 	{ "version", no_argument,	NULL, 'v' },
 	{ "help",    no_argument,	NULL, 'h' },
 	{ }
@@ -90,7 +88,6 @@ int main(int argc, char *argv[])
 	bool server_enabled = false;
 	bool serial_enabled = false;
 	int letest_count = 0;
-	int amptest_count = 0;
 	int vhci_count = 0;
 	enum btdev_type type = BTDEV_TYPE_BREDRLE52;
 	int i;
@@ -136,12 +133,6 @@ int main(int argc, char *argv[])
 			else
 				letest_count = 1;
 			break;
-		case 'T':
-			if (optarg)
-				amptest_count = atoi(optarg);
-			else
-				amptest_count = 1;
-			break;
 		case 'v':
 			printf("%s\n", VERSION);
 			return EXIT_SUCCESS;
@@ -153,8 +144,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (letest_count < 1 && amptest_count < 1 &&
-			vhci_count < 1 && !server_enabled && !serial_enabled) {
+	if (letest_count < 1 && vhci_count < 1 && !server_enabled &&
+						!serial_enabled) {
 		fprintf(stderr, "No emulator specified\n");
 		return EXIT_FAILURE;
 	}
@@ -171,16 +162,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	for (i = 0; i < amptest_count; i++) {
-		struct bt_amp *amp;
-
-		amp = bt_amp_new();
-		if (!amp) {
-			fprintf(stderr, "Failed to create AMP controller\n");
-			return EXIT_FAILURE;
-		}
-	}
-
 	for (i = 0; i < vhci_count; i++) {
 		struct vhci *vhci;
 
lib/a2mp.h deleted +0 -136

136 lines not on this page · raw message

lib/amp.h deleted +0 -164

164 lines not on this page · raw message

tools/amptest.c deleted +0 -655

655 lines not on this page · raw message

tools/parser/amp.c deleted +0 -114

114 lines not on this page · raw message

tools/parser/hci.c +0 -53

83 lines not on this page · raw message

tools/parser/l2cap.c +0 -339

369 lines not on this page · raw message

Signature · 1 line
2.48.1
#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=929557

---Test result---

Test Summary:

CheckPatch                    PENDING   0.19 seconds
GitLint                       PENDING   0.23 seconds
BuildEll                      PASS      20.30 seconds
BluezMake                     PASS      1474.04 seconds
MakeCheck                     PASS      13.10 seconds
MakeDistcheck                 PASS      159.94 seconds
CheckValgrind                 PASS      215.76 seconds
CheckSmatch                   PASS      272.65 seconds
bluezmakeextell               PASS      98.31 seconds
IncrementalBuild              PENDING   0.27 seconds
ScanBuild                     PASS      864.78 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:

---
Regards,
Linux Bluetooth

#2 lore raw
In reply to Luiz Augusto von Dentz
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:

Hello:

This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:

Quoted 8 lines · On Fri, 31 Jan 2025 12:17:59 -0500 you wrote:

From: Luiz Augusto von Dentz <[email protected]>

High Speed, Alternate MAC and PHY (AMP) extension, has been removed from Bluetooth Core specification on 5.3:

https://www.bluetooth.com/blog/new-core-specification-v5-3-feature-enhancements/

[...]

Here is the summary with links:
- [BlueZ,v1] build: Remove AMP related functionality

    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=1474c11618bc

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html