github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-05-05 23:55:01 +00:00
Code Issues Releases Wiki Activity

ensure that defaulted scheme visible in displayed open urls

Browse Source 
- pass default scheme to RparseUrl in Open()
- add Open() overloads for Rw11VirtDiskFile and Rw11VirtDiskOver
This commit is contained in:
Walter F.J. Mueller
2017-04-16 15:12:20 +02:00
parent 3e6b02f9cf
commit 8b97e62314
14 changed files with 64 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/src/librlink/RlinkPortCuff.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RlinkPortCuff.cpp 858 2017-03-05 17:41:37Z mueller $
// $Id: RlinkPortCuff.cpp 875 2017-04-15 21:58:50Z mueller $
//
// Copyright 2012-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2017-04-15 875 1.1.5 Open(): set default scheme
// 2017-03-04 858 1.1.4 use clock_gettime instead of gettimeofday
// 2015-04-12 666 1.1.3 add noinit attribute
// 2014-08-22 584 1.1.2 use nullptr
@@ -26,7 +27,7 @@
/*!
\file
\version $Id: RlinkPortCuff.cpp 858 2017-03-05 17:41:37Z mueller $
\version $Id: RlinkPortCuff.cpp 875 2017-04-15 21:58:50Z mueller $
\brief Implemenation of RlinkPortCuff.
*/
@@ -98,7 +99,7 @@ bool RlinkPortCuff::Open(const std::string& url, RerrMsg& emsg)
if (IsOpen()) Close();
if (!fUrl.Set(url, "|trace|noinit|", emsg)) return false;
if (!fUrl.Set(url, "|trace|noinit|", "cuff", emsg)) return false;
// initialize USB context
irc = libusb_init(&fpUsbContext);

9
tools/src/librlink/RlinkPortFifo.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkPortFifo.cpp 666 2015-04-12 21:17:54Z mueller $
// $Id: RlinkPortFifo.cpp 875 2017-04-15 21:58:50Z mueller $
//
// Copyright 2011-2015 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2017-04-15 875 1.2.1 Open(): set default scheme
// 2015-04-12 666 1.2 add xon,noinit attributes
// 2013-02-23 492 1.1 use RparseUrl
// 2011-03-27 374 1.0 Initial version
@@ -21,7 +22,7 @@
/*!
\file
\version $Id: RlinkPortFifo.cpp 666 2015-04-12 21:17:54Z mueller $
\version $Id: RlinkPortFifo.cpp 875 2017-04-15 21:58:50Z mueller $
\brief Implemenation of RlinkPortFifo.
*/
@@ -65,7 +66,7 @@ bool RlinkPortFifo::Open(const std::string& url, RerrMsg& emsg)
{
if (IsOpen()) Close();
if (!fUrl.Set(url, "|keep|xon|noinit|", emsg)) return false;
if (!fUrl.Set(url, "|keep|xon|noinit|", "fifo", emsg)) return false;
// Note: _rx fifo must be opened before the _tx fifo, otherwise the test
// bench might close with EOF on read prematurely (is a race condition).

7
tools/src/librlink/RlinkPortTerm.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RlinkPortTerm.cpp 868 2017-04-07 20:09:33Z mueller $
// $Id: RlinkPortTerm.cpp 875 2017-04-15 21:58:50Z mueller $
//
// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2017-04-15 875 1.3.2 Open(): set default scheme
// 2017-04-07 868 1.3.1 Dump(): add detail arg
// 2015-04-12 666 1.3 drop xon/xoff excaping; add noinit attribute
// 2015-02-01 641 1.2 support custom baud rates (5M,6M,10M,12M)
@@ -28,7 +29,7 @@
/*!
\file
\version $Id: RlinkPortTerm.cpp 868 2017-04-07 20:09:33Z mueller $
\version $Id: RlinkPortTerm.cpp 875 2017-04-15 21:58:50Z mueller $
\brief Implemenation of RlinkPortTerm.
*/
@@ -83,7 +84,7 @@ bool RlinkPortTerm::Open(const std::string& url, RerrMsg& emsg)
{
Close();
if (!fUrl.Set(url, "|baud=|break|cts|xon|noinit|", emsg)) return false;
if (!fUrl.Set(url, "|baud=|break|cts|xon|noinit|", "term", emsg)) return false;
// if path doesn't start with a '/' prepend a '/dev/tty'
if (fUrl.Path().substr(0,1) != "/") {