From 74fd0300b8d4a58d3838963f60c9f16451d1db78 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 26 Oct 2020 19:08:42 +1100 Subject: [PATCH] internal.c: De-maze the pre-processor wraps a little This makes it again easier to parse internal.c by consolidating some processor wraps and labeling the ends of others. BUG=none BRANCH=none TEST=builds Change-Id: I32fb1a3fff7afa671f08fb2cc2ad406772f5e10f Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/46815 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- internal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/internal.c b/internal.c index 5d74f92c2..4390b452f 100644 --- a/internal.c +++ b/internal.c @@ -113,7 +113,7 @@ int register_superio(struct superio s) return 0; } -#endif +#endif /* IS_X86 */ static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) @@ -281,9 +281,7 @@ int internal_init(void) msg_pinfo("Continuing anyway.\n"); } } -#endif -#if IS_X86 is_laptop = 2; /* Assume that we don't know by default. */ dmi_init(); @@ -299,7 +297,7 @@ int internal_init(void) * FIXME: Find a replacement for DMI on non-x86. * FIXME: Enable Super I/O probing once port I/O is possible. */ -#endif +#endif /* IS_X86 */ /* Check laptop whitelist. */ board_handle_before_laptop(); @@ -333,7 +331,7 @@ int internal_init(void) ret = 1; goto internal_init_exit; } -#endif +#endif /* IS_X86 */ if (internal_buses_supported & BUS_NONSPI) register_par_master(&par_master_internal, internal_buses_supported);