forked from Lainports/freebsd-ports
ad8f895194
Updates to comms/cutecomm: 1. Update source version from 0.14.1 to 0.14.2 2. Add #include <sys/params.h> so that __FreeBSD_version is detected correctly. 3. Add USB-serial devices /dev/cuaU0 and /dev/cuaU1 to default device list. 4. Make default device sensitive to OS version. (cuad for 6 and later) PR: ports/122804 Submitted by: Jason Bacon <jwbacon@tds.net> Approved by: maintainer timeout
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
--- qcppdialogimpl.cpp.orig 2008-03-10 17:53:45.000000000 -0500
|
|
+++ qcppdialogimpl.cpp 2008-04-15 17:43:27.000000000 -0500
|
|
@@ -49,6 +49,7 @@
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <sys/select.h>
|
|
+#include <sys/param.h>
|
|
#include <fcntl.h>
|
|
|
|
void millisleep(int ms)
|
|
@@ -234,11 +235,27 @@
|
|
bool entryFound=false;
|
|
QStringList devices=settings.readListEntry("/cutecom/AllDevices", &entryFound);
|
|
if (!entryFound)
|
|
+#ifdef __FreeBSD__
|
|
+#if __FreeBSD_version < 600000
|
|
+ devices<<"/dev/cuaa0"<<"/dev/cuaa1"<<"/dev/cuaa2"<<"/dev/cuaa3"<<"/dev/cuaU0"<<"/dev/cuaU1";
|
|
+#else
|
|
+ devices<<"/dev/cuad0"<<"/dev/cuad1"<<"/dev/cuad2"<<"/dev/cuad3"<<"/dev/cuaU0"<<"/dev/cuaU1";
|
|
+#endif
|
|
+#else
|
|
devices<<"/dev/ttyS0"<<"/dev/ttyS1"<<"/dev/ttyS2"<<"/dev/ttyS3";
|
|
+#endif
|
|
|
|
m_deviceCb->insertStringList(devices);
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#if __FreeBSD_version < 600000
|
|
+ m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/cuaa0"));
|
|
+#else
|
|
+ m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/cuad0"));
|
|
+#endif
|
|
+#else
|
|
m_deviceCb->setCurrentText(settings.readEntry("/cutecom/CurrentDevice", "/dev/ttyS0"));
|
|
+#endif
|
|
|
|
QStringList history=settings.readListEntry("/cutecom/History");
|
|
|
|
@@ -350,7 +367,7 @@
|
|
m_sz->addArgument("sh");
|
|
m_sz->addArgument("-c");
|
|
// QString tmp=QString("sx -vv \"")+filename+"\" < "+m_deviceCb->currentText()+" > "+m_deviceCb->currentText();
|
|
- QString tmp=QString("sz ");
|
|
+ QString tmp=QString("lsz ");
|
|
if (m_protoPb->currentText()=="XModem")
|
|
tmp+="--xmodem ";
|
|
else if (m_protoPb->currentText()=="YModem")
|
|
@@ -472,7 +489,7 @@
|
|
|
|
void QCPPDialogImpl::sendDone()
|
|
{
|
|
- cerr<<"sx exited"<<endl;
|
|
+ cerr<<"lsx exited"<<endl;
|
|
}
|
|
|
|
bool QCPPDialogImpl::eventFilter(QObject* watched, QEvent *e)
|
|
@@ -915,15 +932,21 @@
|
|
case 230400:
|
|
_baud=B230400;
|
|
break;
|
|
+#if !defined(__FreeBSD__) || (_FreeBSD_version > 500000)
|
|
case 460800:
|
|
_baud=B460800;
|
|
break;
|
|
+#endif
|
|
+#ifndef __FreeBSD__
|
|
case 576000:
|
|
_baud=B576000;
|
|
break;
|
|
+#endif
|
|
+#if !defined(__FreeBSD__) || (_FreeBSD_version >= 500000)
|
|
case 921600:
|
|
_baud=B921600;
|
|
break;
|
|
+#endif
|
|
// case 128000:
|
|
// _baud=B128000;
|
|
// break;
|