From 87ad99ecf22e2fb25fd0da78539386f05c291278 Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Fri, 22 Jan 2021 18:06:26 -0600 Subject: [PATCH] alpaca: Rename device member holding control device path By renaming the "alpaca_dev" to "control_dev" is can be reused in the other implementations as well. Signed-off-by: Bjorn Andersson --- alpaca.c | 4 ++-- device.h | 2 +- device_parser.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpaca.c b/alpaca.c index b292621..ec13ea8 100644 --- a/alpaca.c +++ b/alpaca.c @@ -68,9 +68,9 @@ void *alpaca_open(struct device *dev) alpaca = calloc(1, sizeof(*alpaca)); - alpaca->alpaca_fd = tty_open(dev->alpaca_dev, &alpaca->alpaca_tios); + alpaca->alpaca_fd = tty_open(dev->control_dev, &alpaca->alpaca_tios); if (alpaca->alpaca_fd < 0) - err(1, "failed to open %s", dev->alpaca_dev); + err(1, "failed to open %s", dev->control_dev); alpaca_device_power(alpaca, 0); diff --git a/device.h b/device.h index 0e94b1c..8aa3bb7 100644 --- a/device.h +++ b/device.h @@ -11,7 +11,7 @@ struct fastboot_ops; struct device { char *board; char *cdb_serial; - char *alpaca_dev; + char *control_dev; char *console_dev; char *name; char *serial; diff --git a/device_parser.c b/device_parser.c index 9fe0202..83b38a6 100644 --- a/device_parser.c +++ b/device_parser.c @@ -113,7 +113,7 @@ static void parse_board(struct device_parser *dp) dev->power_off = conmux_power_off; dev->write = conmux_write; } else if (!strcmp(key, "alpaca")) { - dev->alpaca_dev = strdup(value); + dev->control_dev = strdup(value); dev->open = alpaca_open; dev->power_on = alpaca_power_on;