From cd84b8de7664c3b278310c558521f8e94e3128e0 Mon Sep 17 00:00:00 2001 From: Peter Stuge Date: Sun, 11 Dec 2022 04:02:10 +0100 Subject: serial: Call set_custom_baudrate() thrice Call the function before tcsetattr() settings are known, then again with settings prepared but not yet applied and finally a third time after tcsetattr(). Darwin support needs this change; there custom_baud code must be called to modify the settings passed to tcsetattr() and then again after tcsetattr() returns. The change should be non-functional on all currently supported systems; current code calls set_custom_baudrate() before any tcsetattr() settings are prepared, so we have three stages in total. This change originates from discussion of the macOS patch proposed by Denis Ahrens in https://review.coreboot.org/c/flashrom/+/67822 Change-Id: I40cc443cfb7bf6b212b31826d437b898cc13c427 Signed-off-by: Peter Stuge Reviewed-on: https://review.coreboot.org/c/flashrom/+/70569 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen --- custom_baud_linux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'custom_baud_linux.c') diff --git a/custom_baud_linux.c b/custom_baud_linux.c index 2d5f261d..761d4961 100644 --- a/custom_baud_linux.c +++ b/custom_baud_linux.c @@ -29,9 +29,13 @@ * for more info. */ -int set_custom_baudrate(int fd, unsigned int baud) +int set_custom_baudrate(int fd, unsigned int baud, const enum custom_baud_stage stage, void *tio_wanted) { struct termios2 tio; + + if (stage != BEFORE_FLAGS) + return 0; + if (ioctl(fd, TCGETS2, &tio)) { return -1; } -- cgit v1.2.3