linuxmsm/cdba
0
0
Fork 0
mirror of https://github.com/linux-msm/cdba.git synced 2026-02-25 13:11:56 -08:00
Code Issues Packages Projects Releases Wiki Activity

cdba-server: Move tty_open() to common file

Browse Source 
The cdb_assist implementation of tty_open() can be reused by other
files, so let's move it to cdba-server.c.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson
2020-06-27 22:34:13 -07:00
parent 50706c5f74
commit ee62217745
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cdb_assist.c
View File

@@ -47,8 +47,8 @@
struct cdb_assist {
char serial[9];
char control_uart[20];
char target_uart[20];
char control_uart[32];
char target_uart[32];
int control_tty;
int target_tty;
@@ -158,12 +158,15 @@ static struct cdb_assist *enumerate_cdb_assists()
}
}
if (strcmp(interface, "Control UART") == 0)
strcpy(cdb->control_uart, de->d_name);
else if (strcmp(interface, "Target UART") == 0)
strcpy(cdb->target_uart, de->d_name);
else
if (strcmp(interface, "Control UART") == 0) {
strcpy(cdb->control_uart, "/dev/");
strcat(cdb->control_uart, de->d_name);
} else if (strcmp(interface, "Target UART") == 0) {
strcpy(cdb->target_uart, "/dev/");
strcat(cdb->target_uart, de->d_name);
} else {
errx(1, "tty is neither control nor target\n");
}
close_fd:
close(fd);
@@ -190,36 +193,6 @@ static struct cdb_assist *cdb_assist_find(const char *serial)
return NULL;
}
static int tty_open(const char *tty, struct termios *old)
{
struct termios tios;
char buf[80] = "/dev/";
int ret;
int fd;
strcat(buf, tty);
fd = open(buf, O_RDWR | O_NOCTTY | O_EXCL);
if (fd < 0)
err(1, "unable to open \"%s\"", tty);
ret = tcgetattr(fd, old);
if (ret < 0)
err(1, "unable to retrieve \"%s\" tios", tty);
memset(&tios, 0, sizeof(tios));
tios.c_cflag = B115200 | CRTSCTS | CS8 | CLOCAL | CREAD;
tios.c_iflag = IGNPAR;
tios.c_oflag = 0;
tcflush(fd, TCIFLUSH);
ret = tcsetattr(fd, TCSANOW, &tios);
if (ret < 0)
err(1, "unable to update \"%s\" tios", tty);
return fd;
}
enum {
STATE_,
STATE_key,

28
cdba-server.c
View File

@@ -49,6 +49,34 @@ static bool quit_invoked;
struct device *selected_device;
int tty_open(const char *tty, struct termios *old)
{
struct termios tios;
int ret;
int fd;
fd = open(tty, O_RDWR | O_NOCTTY | O_EXCL);
if (fd < 0)
err(1, "unable to open \"%s\"", tty);
ret = tcgetattr(fd, old);
if (ret < 0)
err(1, "unable to retrieve \"%s\" tios", tty);
memset(&tios, 0, sizeof(tios));
tios.c_cflag = B115200 | CS8 | CLOCAL | CREAD;
tios.c_iflag = IGNPAR;
tios.c_oflag = 0;
tcflush(fd, TCIFLUSH);
ret = tcsetattr(fd, TCSANOW, &tios);
if (ret < 0)
err(1, "unable to update \"%s\" tios", tty);
return fd;
}
static void fastboot_opened(struct fastboot *fb, void *data)
{
const uint8_t one = 1;

3
cdba-server.h
View File

@@ -2,6 +2,7 @@
#define __BAD_H__
#include <stdbool.h>
#include <termios.h>
#include "cdba.h"
@@ -11,4 +12,6 @@ int watch_add_timer(void (*cb)(void*), void *data, unsigned interval, bool repea
void watch_quit(void);
int watch_run(void);
int tty_open(const char *tty, struct termios *old);
#endif