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

extend baudrate from int to long

Browse Source 
because 38400 baud could be bigger than INT_MAX
This commit is contained in:
Stefan Wahren 2013-05-12 16:23:27 +02:00
parent b0dff87093
commit ddd15c0373
10 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/mbus-serial-request-data-multi-reply.c
View File

@ -55,7 +55,8 @@ main(int argc, char **argv)
mbus_handle *handle = NULL;
char *device, *addr_str, *xml_result;
int address, baudrate = 9600;
int address;
long baudrate = 9600;
memset((void *)&reply, 0, sizeof(mbus_frame));
memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
@ -73,13 +74,13 @@ main(int argc, char **argv)
}
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
addr_str = argv[4];
}
else if (argc == 6 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
device = argv[4];
addr_str = argv[5];
debug = 1;

7
bin/mbus-serial-request-data.c
View File

@ -26,7 +26,8 @@ main(int argc, char **argv)
mbus_handle *handle = NULL;
char *device, *addr_str, *xml_result;
int address, baudrate = 9600;
int address;
long baudrate = 9600;
memset((void *)&reply, 0, sizeof(mbus_frame));
memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
@ -44,13 +45,13 @@ main(int argc, char **argv)
}
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
addr_str = argv[4];
}
else if (argc == 6 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
device = argv[4];
addr_str = argv[5];
debug = 1;

10
bin/mbus-serial-scan-secondary.c
View File

@ -52,7 +52,7 @@ int
main(int argc, char **argv)
{
char *device, *addr_mask = NULL;
int baudrate = 9600;
long baudrate = 9600;
mbus_handle *handle = NULL;
mbus_frame *frame = NULL, reply;
@ -82,26 +82,26 @@ main(int argc, char **argv)
}
else if (argc == 4 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
}
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
device = argv[4];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
debug = 1;
}
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
addr_mask = strdup(argv[4]);
}
else if (argc == 6 && strcmp(argv[1], "-d") == 0)
{
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
device = argv[4];
addr_mask = strdup(argv[5]);
debug = 1;

11
bin/mbus-serial-scan.c
View File

@ -54,7 +54,8 @@ main(int argc, char **argv)
{
mbus_handle *handle;
char *device;
int address, baudrate = 9600, retries = 0;
int address, retries = 0;
long baudrate = 9600;
int ret;
if (argc == 2)
@ -68,7 +69,7 @@ main(int argc, char **argv)
}
else if (argc == 4 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
}
else if (argc == 4 && strcmp(argv[1], "-r") == 0)
@ -79,7 +80,7 @@ main(int argc, char **argv)
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
debug = 1;
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
device = argv[4];
}
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-r") == 0)
@ -90,14 +91,14 @@ main(int argc, char **argv)
}
else if (argc == 6 && strcmp(argv[1], "-b") == 0 && strcmp(argv[3], "-r") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
retries = atoi(argv[4]);
device = argv[5];
}
else if (argc == 7 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0 && strcmp(argv[4], "-r") == 0)
{
debug = 1;
baudrate = atoi(argv[3]);
baudrate = atol(argv[3]);
retries = atoi(argv[5]);
device = argv[6];
}

5
bin/mbus-serial-select-secondary.c
View File

@ -23,7 +23,8 @@ main(int argc, char **argv)
mbus_handle *handle;
mbus_frame reply;
char *device, *addr = NULL;
int ret, baudrate = 9600;
int ret;
long baudrate = 9600;
if (argc == 3)
{
@ -32,7 +33,7 @@ main(int argc, char **argv)
}
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
baudrate = atol(argv[2]);
device = argv[3];
addr = strdup(argv[4]);
}

8
bin/mbus-serial-switch-baudrate.c
View File

@ -27,20 +27,20 @@ main(int argc, char **argv)
mbus_frame reply;
char *device;
int address, ret;
int source_baudrate = 9600, target_baudrate;
long source_baudrate = 9600, target_baudrate;
if (argc == 4)
{
device = argv[1];
address = atoi(argv[2]);
target_baudrate = atoi(argv[3]);
target_baudrate = atol(argv[3]);
}
else if (argc == 6 && strcmp(argv[1], "-b") == 0)
{
source_baudrate = atoi(argv[2]);
source_baudrate = atol(argv[2]);
device = argv[3];
address = atoi(argv[4]);
target_baudrate = atoi(argv[5]);
target_baudrate = atol(argv[5]);
}
else
{

2
mbus/mbus-protocol-aux.c
View File

@ -1655,7 +1655,7 @@ mbus_send_select_frame(mbus_handle * handle, const char *secondary_addr_str)
// adressed slave(s) switch to the given baudrate
//------------------------------------------------------------------------------
int
mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, int baudrate)
mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baudrate)
{
int retval = 0;
int control_information = 0;

2
mbus/mbus-protocol-aux.h
View File

@ -275,7 +275,7 @@ int mbus_send_application_reset_frame(mbus_handle * handle, int address, int sub
*
* @return Zero when successful.
*/
int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, int baudrate);
int mbus_send_switch_baudrate_frame(mbus_handle * handle, int address, long baudrate);
/**
* Sends request frame (REQ_UD2) to given slave using "unified" handle

2
mbus/mbus-serial.c
View File

@ -95,7 +95,7 @@ mbus_serial_connect(mbus_handle *handle)
// Set baud rate for serial connection
//------------------------------------------------------------------------------
int
mbus_serial_set_baudrate(mbus_handle *handle, int baudrate)
mbus_serial_set_baudrate(mbus_handle *handle, long baudrate)
{
speed_t speed;
mbus_serial_data *serial_data;

2
mbus/mbus-serial.h
View File

@ -37,7 +37,7 @@ int mbus_serial_connect(mbus_handle *handle);
int mbus_serial_disconnect(mbus_handle *handle);
int mbus_serial_send_frame(mbus_handle *handle, mbus_frame *frame);
int mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame);
int mbus_serial_set_baudrate(mbus_handle *handle, int baudrate);
int mbus_serial_set_baudrate(mbus_handle *handle, long baudrate);
void mbus_serial_data_free(mbus_handle *handle);
#ifdef __cplusplus