UPSTREAM: dummyflasher.c: Use BUS_NONSPI where appropriate
The BUS_NONSPI is short-hand and is intended to be
the collection, therefore use it.
BUG=none
BRANCH=none
TEST=builds
Original-Change-Id: I368e8865c446d9b9ffd580c90eac034850dd53d8
Original-Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/54356
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Original-Reviewed-by: Sam McNally <sammc@google.com>
(cherry picked from commit 6c9dfdc971e42c1017a5edcab8012c8fcfaefacc)
Change-Id: I9154750a1a7f1345b14658f9e0f8ea8a47f8a8bc
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2908275
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/dummyflasher.c b/dummyflasher.c
index d434eec..e19e46c 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -175,7 +175,7 @@
static struct emu_data* get_data_from_context(const struct flashctx *flash)
{
- if (dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH))
+ if (dummy_buses_supported & BUS_NONSPI)
return (struct emu_data *)flash->mst->par.data;
else if (dummy_buses_supported & BUS_SPI)
return (struct emu_data *)flash->mst->spi.data;
@@ -1025,9 +1025,9 @@
free(data);
return 1;
}
- if (dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH))
+ if (dummy_buses_supported & BUS_NONSPI)
register_par_master(&par_master_dummy,
- dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH));
+ dummy_buses_supported & BUS_NONSPI);
if (dummy_buses_supported & BUS_SPI)
register_spi_master(&spi_master_dummyflasher, data);