wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove trailing whitespace

Browse Source 
Signed-off-by: Stefan Wahren <info@lategoodbye.de>
This commit is contained in:
Stefan Wahren
2013-09-13 17:53:33 +02:00
parent 654905a94d
commit 55d4c0fba2
25 changed files with 1168 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
bin/mbus-tcp-scan.c
View File

@ -2,7 +2,7 @@
// Copyright (C) 2011, Robert Johansson, Raditex AB
// All rights reserved.
//
// rSCADA
// rSCADA
// http://www.rSCADA.se
// info@rscada.se
//
@ -18,7 +18,7 @@ static int debug = 0;
int ping_address(mbus_handle *handle, mbus_frame *reply, int address)
{
int i, ret = MBUS_RECV_RESULT_ERROR;
memset((void *)reply, 0, sizeof(mbus_frame));
for (i = 0; i <= handle->max_retry; i++)
@ -28,21 +28,21 @@ int ping_address(mbus_handle *handle, mbus_frame *reply, int address)
printf("%d ", address);
fflush(stdout);
}
if (mbus_send_ping_frame(handle, address, 0) == -1)
{
fprintf(stderr,"Scan failed. Could not send ping frame: %s\n", mbus_error_str());
return MBUS_RECV_RESULT_ERROR;
}
}
ret = mbus_recv_frame(handle, reply);
if (ret != MBUS_RECV_RESULT_TIMEOUT)
{
return ret;
}
}
return ret;
}
@ -60,26 +60,26 @@ main(int argc, char **argv)
if (argc == 3)
{
host = argv[1];
host = argv[1];
port = atol(argv[2]);
}
else if (argc == 4 && strcmp(argv[1], "-d") == 0)
{
debug = 1;
host = argv[2];
host = argv[2];
port = atol(argv[3]);
}
else if (argc == 5 && strcmp(argv[1], "-r") == 0)
{
retries = atoi(argv[2]);
host = argv[3];
retries = atoi(argv[2]);
host = argv[3];
port = atol(argv[4]);
}
else if (argc == 6 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-r") == 0)
{
debug = 1;
retries = atoi(argv[3]);
host = argv[4];
retries = atoi(argv[3]);
host = argv[4];
port = atol(argv[5]);
}
else
@ -87,19 +87,19 @@ main(int argc, char **argv)
fprintf(stderr,"usage: %s [-d] [-r RETRIES] host port\n", argv[0]);
return 0;
}
if ((port < 0) || (port > 0xFFFF))
{
fprintf(stderr, "Invalid port: %ld\n", port);
return 1;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_context_tcp(host, port)) == NULL)
{
fprintf(stderr,"Scan failed: Could not initialize M-Bus context: %s\n", mbus_error_str());
@ -111,7 +111,7 @@ main(int argc, char **argv)
fprintf(stderr,"Scan failed: Could not setup connection to M-bus gateway: %s\n", mbus_error_str());
return 1;
}
if (mbus_context_set_option(handle, MBUS_OPTION_MAX_RETRY, retries) == -1)
{
fprintf(stderr,"Failed to set retry count\n");
@ -126,19 +126,19 @@ main(int argc, char **argv)
mbus_frame reply;
ret = ping_address(handle, &reply, address);
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
continue;
}
if (ret == MBUS_RECV_RESULT_INVALID)
{
/* check for more data (collision) */
mbus_purge_frames(handle);
printf("Collision at address %d\n", address);
continue;
}
}
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{