From 032a43b7ee3a71e63c0e320f2c24fb7d50708bfd Mon Sep 17 00:00:00 2001 From: Bjorn Andersson Date: Fri, 22 Jan 2021 18:07:26 -0600 Subject: [PATCH] conmux: Use "control_dev" instead of "cdb_serial" It seems more suitable to use the "control_dev" to denote the target conmux than "cdb_serial". Further more this makes it possible drop the "cdb_serial" member in an upcoming commit. Signed-off-by: Bjorn Andersson --- conmux.c | 2 +- device_parser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conmux.c b/conmux.c index 669e180..32c40f3 100644 --- a/conmux.c +++ b/conmux.c @@ -235,7 +235,7 @@ void *conmux_open(struct device *dev) struct sockaddr_in saddr; struct conmux *conmux; struct hostent *hent; - const char *service = dev->cdb_serial; + const char *service = dev->control_dev; const char *user; ssize_t n; char req[256]; diff --git a/device_parser.c b/device_parser.c index 83b38a6..56216c2 100644 --- a/device_parser.c +++ b/device_parser.c @@ -106,7 +106,7 @@ static void parse_board(struct device_parser *dp) dev->fastboot_key = cdb_fastboot_key; dev->send_break = cdb_send_break; } else if (!strcmp(key, "conmux")) { - dev->cdb_serial = strdup(value); + dev->control_dev = strdup(value); dev->open = conmux_open; dev->power_on = conmux_power_on;