commit 43b7f416783ccc98952a4eb5f9274907442b03e5
author Felix Singer <felixsinger@posteo.net> Mon Mar 07 04:34:52 2022 +0100
committer Felix Singer <felixsinger@posteo.net> Mon Mar 07 08:32:09 2022 +0000
tree 86a45336e809bee5d2891f2be9cf00184da9bb18
parent 2c423441c054d7a8c93cc814b9db5f8f7185bd0f

src: Make PCI ID define names shorter

Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with
PCI_{DID,VID}_ using the commands below, which also take care of some
spacing issues. An additional clean up of pci_ids.h is done in
CB:61531.

Used commands:
* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g'

* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g'

Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>

src/soc/intel/alderlake/cpu.c

diff --git a/src/soc/intel/alderlake/cpu.c b/src/soc/intel/alderlake/cpu.c
index 426f621..66db16b 100644
--- a/src/soc/intel/alderlake/cpu.c
+++ b/src/soc/intel/alderlake/cpu.c
@@ -174,43 +174,43 @@
 enum adl_cpu_type get_adl_cpu_type(void)
 {
 	const uint16_t adl_m_mch_ids[] = {
-		PCI_DEVICE_ID_INTEL_ADL_M_ID_1,
-		PCI_DEVICE_ID_INTEL_ADL_M_ID_2,
+		PCI_DID_INTEL_ADL_M_ID_1,
+		PCI_DID_INTEL_ADL_M_ID_2,
 	};
 	const uint16_t adl_p_mch_ids[] = {
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_1,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_3,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_4,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_5,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_6,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_7,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_8,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_9,
-		PCI_DEVICE_ID_INTEL_ADL_P_ID_10
+		PCI_DID_INTEL_ADL_P_ID_1,
+		PCI_DID_INTEL_ADL_P_ID_3,
+		PCI_DID_INTEL_ADL_P_ID_4,
+		PCI_DID_INTEL_ADL_P_ID_5,
+		PCI_DID_INTEL_ADL_P_ID_6,
+		PCI_DID_INTEL_ADL_P_ID_7,
+		PCI_DID_INTEL_ADL_P_ID_8,
+		PCI_DID_INTEL_ADL_P_ID_9,
+		PCI_DID_INTEL_ADL_P_ID_10
 	};
 	const uint16_t adl_s_mch_ids[] = {
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_1,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_2,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_3,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_4,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_5,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_6,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_7,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_8,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_9,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_10,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_11,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_12,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_13,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_14,
-		PCI_DEVICE_ID_INTEL_ADL_S_ID_15,
+		PCI_DID_INTEL_ADL_S_ID_1,
+		PCI_DID_INTEL_ADL_S_ID_2,
+		PCI_DID_INTEL_ADL_S_ID_3,
+		PCI_DID_INTEL_ADL_S_ID_4,
+		PCI_DID_INTEL_ADL_S_ID_5,
+		PCI_DID_INTEL_ADL_S_ID_6,
+		PCI_DID_INTEL_ADL_S_ID_7,
+		PCI_DID_INTEL_ADL_S_ID_8,
+		PCI_DID_INTEL_ADL_S_ID_9,
+		PCI_DID_INTEL_ADL_S_ID_10,
+		PCI_DID_INTEL_ADL_S_ID_11,
+		PCI_DID_INTEL_ADL_S_ID_12,
+		PCI_DID_INTEL_ADL_S_ID_13,
+		PCI_DID_INTEL_ADL_S_ID_14,
+		PCI_DID_INTEL_ADL_S_ID_15,
 	};
 
 	const uint16_t adl_n_mch_ids[] = {
-		PCI_DEVICE_ID_INTEL_ADL_N_ID_1,
-		PCI_DEVICE_ID_INTEL_ADL_N_ID_2,
-		PCI_DEVICE_ID_INTEL_ADL_N_ID_3,
-		PCI_DEVICE_ID_INTEL_ADL_N_ID_4,
+		PCI_DID_INTEL_ADL_N_ID_1,
+		PCI_DID_INTEL_ADL_N_ID_2,
+		PCI_DID_INTEL_ADL_N_ID_3,
+		PCI_DID_INTEL_ADL_N_ID_4,
 	};
 
 	const uint16_t mchid = pci_s_read_config16(PCI_DEV(0, PCI_SLOT(SA_DEVFN_ROOT),