[Midnightbsd-cvs] src [10749] trunk/usr.sbin/fwcontrol: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 18:14:53 EDT 2018
Revision: 10749
http://svnweb.midnightbsd.org/src/?rev=10749
Author: laffer1
Date: 2018-06-09 18:14:52 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/usr.sbin/fwcontrol/Makefile
trunk/usr.sbin/fwcontrol/fwcontrol.8
trunk/usr.sbin/fwcontrol/fwcontrol.c
trunk/usr.sbin/fwcontrol/fwdv.c
trunk/usr.sbin/fwcontrol/fwmethods.h
trunk/usr.sbin/fwcontrol/fwmpegts.c
Property Changed:
----------------
trunk/usr.sbin/fwcontrol/fwcontrol.8
Modified: trunk/usr.sbin/fwcontrol/Makefile
===================================================================
--- trunk/usr.sbin/fwcontrol/Makefile 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/Makefile 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/fwcontrol/Makefile 204585 2010-03-02 16:58:04Z uqs $
PROG= fwcontrol
SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c
Modified: trunk/usr.sbin/fwcontrol/fwcontrol.8
===================================================================
--- trunk/usr.sbin/fwcontrol/fwcontrol.8 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/fwcontrol.8 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 2002 Hidetoshi Shimokawa
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/fwcontrol/fwcontrol.8 236500 2012-06-03 06:57:47Z joel $
.\"
.Dd September 12, 2008
.Dt FWCONTROL 8
@@ -144,7 +145,7 @@
.Xr eui64 5 .
.El
.Sh FILES
-.Bl -tag
+.Bl -tag -width "Pa /dev/fw0.0"
.It Pa /dev/fw0.0
.El
.Sh EXAMPLES
@@ -171,7 +172,7 @@
with
.Dq Li bs=144000 .
.Pp
-.Dl "fwcontrol -R file.m2t
+.Dl "fwcontrol -R file.m2t"
.Pp
Receive an MPEG TS stream from a camera producing MPEG transport stream.
This has been tested with SONY HDR-FX1E camera that produces HD MPEG-2
@@ -179,7 +180,7 @@
.Pp
To send the stream from the camera over the network using TCP (which
surprisingly works better with vlc), you can use
-.Dl "fwcontrol -R - | nc 192.168.10.11 9000
+.Dl "fwcontrol -R - | nc 192.168.10.11 9000"
with
.Nm netcat
from ports and to receive the stream, use
@@ -190,7 +191,7 @@
program from ports, since vlc is not fast enough to read UDP packets from
buffers and thus it experiences dropouts when run directly.
The sending side can use
-.Dl "fwcontrol -R - | nc 192.168.10.11 9000
+.Dl "fwcontrol -R - | nc 192.168.10.11 9000"
and to receive the stream, use
.Dl nc -l -u -p 9000 | buffer -s 10k -b 1000 -m 20m -p 5 | vlc -
.Pp
Property changes on: trunk/usr.sbin/fwcontrol/fwcontrol.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/fwcontrol/fwcontrol.c
===================================================================
--- trunk/usr.sbin/fwcontrol/fwcontrol.c 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/fwcontrol.c 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2002
* Hidetoshi Shimokawa. All rights reserved.
@@ -32,9 +33,9 @@
* SUCH DAMAGE.
*/
-#if defined(__MidnightBSD__)
+#if defined(__FreeBSD__)
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/fwcontrol/fwcontrol.c 228990 2011-12-30 10:58:14Z uqs $");
#endif
#include <sys/param.h>
@@ -44,7 +45,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#if defined(__MidnightBSD__)
+#if defined(__FreeBSD__)
#include <sys/eui64.h>
#include <dev/firewire/firewire.h>
#include <dev/firewire/iec13213.h>
@@ -1025,7 +1026,7 @@
if (set_fwmem_target) {
eui.hi = ntohl(*(u_int32_t*)&(target.octet[0]));
eui.lo = ntohl(*(u_int32_t*)&(target.octet[4]));
-#if defined(__MidnightBSD__)
+#if defined(__FreeBSD__)
sysctl_set_int("hw.firewire.fwmem.eui64_hi", eui.hi);
sysctl_set_int("hw.firewire.fwmem.eui64_lo", eui.lo);
#elif defined(__NetBSD__)
@@ -1056,7 +1057,7 @@
show_topology_map(fd);
/*
- * Recieve data file from node "-R"
+ * Receive data file from node "-R"
*/
#define TAG (1<<6)
#define CHANNEL 63
Modified: trunk/usr.sbin/fwcontrol/fwdv.c
===================================================================
--- trunk/usr.sbin/fwcontrol/fwdv.c 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/fwdv.c 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -31,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/fwcontrol/fwdv.c 216948 2011-01-04 02:52:22Z emaste $
*/
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -39,7 +40,9 @@
#include <sys/types.h>
#include <sys/uio.h>
+#if __FreeBSD_version >= 500000
#include <arpa/inet.h>
+#endif
#include <err.h>
#include <errno.h>
Modified: trunk/usr.sbin/fwcontrol/fwmethods.h
===================================================================
--- trunk/usr.sbin/fwcontrol/fwmethods.h 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/fwmethods.h 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,7 +1,8 @@
+/* $MidnightBSD$ */
/*-
* This file is in the public domain.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/fwcontrol/fwmethods.h 163712 2006-10-26 22:33:38Z imp $
*/
typedef void (fwmethod)(int dev_fd, const char *filename, char ich, int count);
Modified: trunk/usr.sbin/fwcontrol/fwmpegts.c
===================================================================
--- trunk/usr.sbin/fwcontrol/fwmpegts.c 2018-06-09 22:14:31 UTC (rev 10748)
+++ trunk/usr.sbin/fwcontrol/fwmpegts.c 2018-06-09 22:14:52 UTC (rev 10749)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) 2005
* Petr Holub, Hidetoshi Shimokawa. All rights reserved.
@@ -31,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/fwcontrol/fwmpegts.c 293290 2016-01-07 00:40:51Z bdrewery $
*/
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -39,7 +40,9 @@
#include <sys/types.h>
#include <sys/uio.h>
+#if __FreeBSD_version >= 500000
#include <arpa/inet.h>
+#endif
#include <err.h>
#include <errno.h>
@@ -50,7 +53,7 @@
#include <string.h>
#include <sysexits.h>
-#if defined(__MidnightBSD__)
+#if defined(__FreeBSD__)
#include <dev/firewire/firewire.h>
#include <dev/firewire/iec68113.h>
#elif defined(__NetBSD__)
@@ -92,7 +95,7 @@
N.b. that CRCs are removed by firewire layer!
-The following fiels are fixed for IEEE-1394:
+The following fields are fixed for IEEE-1394:
tag = 01b
tcode = 1010b
The length is payload length, i.e. includes CIP header and data size.
@@ -117,7 +120,7 @@
2) 1.5 < R < 3 Mbps: db0/db1 or db2/db3 or db4/db5 or db6/db7 is payload,
3) 3 < R < 6 Mbps: db0/db1/db2/db3 or db4/db5/db6/db7 is payload,
4) R > 6 Mbps: all db0..db7 contain the payload.
-Curently, only case (4) is supported in fwmpegts.c
+Currently, only case (4) is supported in fwmpegts.c
Each packet may contain N MPEG TS data blocks with timestamp header,
which are (4+188)B long. Experimentally, the N ranges from 0 through 3.
More information about the Midnightbsd-cvs
mailing list