Date: Tue, 18 Jun 2019 02:29:26 +0000 (UTC) From: Stephen Hurd <shurd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504463 - in head/comms/quisk: . files Message-ID: <201906180229.x5I2TQUL002864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: shurd Date: Tue Jun 18 02:29:26 2019 New Revision: 504463 URL: https://svnweb.freebsd.org/changeset/ports/504463 Log: Fix SDR-IQ Support Previously, only if the device name started with the literal string "/dev/ttyUSB" was the device treated as a tty. The new patch uses isatty() to decide if the device is a tty. Added: head/comms/quisk/files/patch-sdriqpkg_sdriq.c (contents, props changed) Modified: head/comms/quisk/Makefile Modified: head/comms/quisk/Makefile ============================================================================== --- head/comms/quisk/Makefile Tue Jun 18 02:01:23 2019 (r504462) +++ head/comms/quisk/Makefile Tue Jun 18 02:29:26 2019 (r504463) @@ -3,6 +3,7 @@ PORTNAME= quisk DISTVERSION= 4.1.40 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= CHEESESHOP Added: head/comms/quisk/files/patch-sdriqpkg_sdriq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/quisk/files/patch-sdriqpkg_sdriq.c Tue Jun 18 02:29:26 2019 (r504463) @@ -0,0 +1,41 @@ +--- sdriqpkg/sdriq.c.orig 2018-08-02 14:01:30 UTC ++++ sdriqpkg/sdriq.c +@@ -629,14 +658,14 @@ static void quisk_open_sdriq_dev(const c + { + struct termios newtio; + +- if (!strncmp(name, "/dev/ttyUSB", 11)) { // use ftdi_sio driver +- quisk_sdriq_fd = open(name, O_RDWR | O_NOCTTY); +- if (quisk_sdriq_fd < 0) { +- strncpy(buf, "Open SDR-IQ : ", bufsize); +- strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); +- quisk_sdriq_fd = INVALID_HANDLE_VALUE; +- return; +- } ++ quisk_sdriq_fd = open(name, O_RDWR | O_NOCTTY | O_NONBLOCK); ++ if (quisk_sdriq_fd < 0) { ++ strncpy(buf, "Open SDR-IQ : ", bufsize); ++ strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); ++ quisk_sdriq_fd = INVALID_HANDLE_VALUE; ++ return; ++ } ++ if (isatty(quisk_sdriq_fd)) { + bzero(&newtio, sizeof(newtio)); + newtio.c_cflag = CS8 | CLOCAL | CREAD; + newtio.c_iflag = IGNPAR; +@@ -649,15 +678,6 @@ static void quisk_open_sdriq_dev(const c + tcflush(quisk_sdriq_fd, TCIFLUSH); + tcsetattr(quisk_sdriq_fd, TCSANOW, &newtio); + } +- else { // use ft245 or similar driver +- quisk_sdriq_fd = open(name, O_RDWR | O_NONBLOCK); +- if (quisk_sdriq_fd < 0) { +- strncpy(buf, "Open SDR-IQ: ", bufsize); +- strncat(buf, strerror(errno), bufsize - strlen(buf) - 1); +- quisk_sdriq_fd = INVALID_HANDLE_VALUE; +- return; +- } +- } + return; + } + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906180229.x5I2TQUL002864>