can-utils: AOSP build clean up

[sojka/can-utils.git] / isotpsend.c

diff --git a/isotpsend.c b/isotpsend.c
index bcaa35ba7ff3e690853ee7b85e5fa0ea115a26b2..3bb8282b2c50d6c4f7163bfc78a345c719de59e3 100644 (file)
--- a/isotpsend.c
+++ b/isotpsend.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * isotpsend.c
  *
@@ -41,7 +37,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -69,7 +65,8 @@ void print_usage(char *prg)
        fprintf(stderr, "         -x <addr>    (extended addressing mode. Use 'any' for all addresses)\n");
        fprintf(stderr, "         -p <byte>    (set and enable padding byte)\n");
        fprintf(stderr, "         -P <mode>    (check padding in FC. (l)ength (c)ontent (a)ll)\n");
-       fprintf(stderr, "         -t <time ns> (transmit time in nanosecs)\n");
+       fprintf(stderr, "         -t <time ns> (frame transmit time (N_As) in nanosecs)\n");
+       fprintf(stderr, "         -f <time ns> (ignore FC and force local tx stmin value in nanosecs)\n");
        fprintf(stderr, "\nCAN IDs and addresses are given and expected in hexadecimal values.\n");
        fprintf(stderr, "The pdu data is expected on STDIN in space separated ASCII hex values.\n");
        fprintf(stderr, "\n");
@@ -83,12 +80,13 @@ int main(int argc, char **argv)
     static struct can_isotp_options opts;
     int opt;
     extern int optind, opterr, optopt;
+    __u32 force_tx_stmin = 0;
     unsigned char buf[4096];
     int buflen = 0;
 
     addr.can_addr.tp.tx_id = addr.can_addr.tp.rx_id = NO_CAN_ID;
 
-    while ((opt = getopt(argc, argv, "s:d:x:p:P:t:?")) != -1) {
+    while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:?")) != -1) {
            switch (opt) {
            case 's':
                    addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16);
@@ -130,6 +128,11 @@ int main(int argc, char **argv)
                    opts.frame_txtime = strtoul(optarg, (char **)NULL, 10);
                    break;
 
+           case 'f':
+                   opts.flags |= CAN_ISOTP_FORCE_TXSTMIN;
+                   force_tx_stmin = strtoul(optarg, (char **)NULL, 10);
+                   break;
+
            case '?':
                    print_usage(basename(argv[0]));
                    exit(0);
@@ -157,6 +160,9 @@ int main(int argc, char **argv)
 
     setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_OPTS, &opts, sizeof(opts));
 
+    if (opts.flags & CAN_ISOTP_FORCE_TXSTMIN)
+           setsockopt(s, SOL_CAN_ISOTP, CAN_ISOTP_TX_STMIN, &force_tx_stmin, sizeof(force_tx_stmin));
+
     addr.can_family = AF_CAN;
     strcpy(ifr.ifr_name, argv[optind]);
     ioctl(s, SIOCGIFINDEX, &ifr);