mirrors
/
libserialport
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor whitespace- and consistency fixes.

This commit is contained in:
Uwe Hermann 2020-01-26 21:18:49 +01:00
parent 42b3cf3b98
commit 78c3db9bfb
6 changed files with 109 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/await_events.c
View File

@ -33,7 +33,6 @@ int main(int argc, char **argv)
/* Open and configure each port, and then add its RX event /* Open and configure each port, and then add its RX event
* to the event set. */ * to the event set. */
for (int i = 0; i < num_ports; i++) { for (int i = 0; i < num_ports; i++) {
printf("Looking for port %s.\n", port_names[i]); printf("Looking for port %s.\n", port_names[i]);
check(sp_get_port_by_name(port_names[i], &ports[i])); check(sp_get_port_by_name(port_names[i], &ports[i]));
@ -79,23 +78,24 @@ int check(enum sp_return result)
{ {
/* For this example we'll just exit on any error by calling abort(). */ /* For this example we'll just exit on any error by calling abort(). */
char *error_message; char *error_message;
switch (result) { switch (result) {
case SP_ERR_ARG: case SP_ERR_ARG:
printf("Error: Invalid argument.\n"); printf("Error: Invalid argument.\n");
abort(); abort();
case SP_ERR_FAIL: case SP_ERR_FAIL:
error_message = sp_last_error_message(); error_message = sp_last_error_message();
printf("Error: Failed: %s\n", error_message); printf("Error: Failed: %s\n", error_message);
sp_free_error_message(error_message); sp_free_error_message(error_message);
abort(); abort();
case SP_ERR_SUPP: case SP_ERR_SUPP:
printf("Error: Not supported.\n"); printf("Error: Not supported.\n");
abort(); abort();
case SP_ERR_MEM: case SP_ERR_MEM:
printf("Error: Couldn't allocate memory.\n"); printf("Error: Couldn't allocate memory.\n");
abort(); abort();
case SP_OK: case SP_OK:
default: default:
return result; return result;
} }
} }

101
examples/handle_errors.c
View File

@ -31,6 +31,7 @@ int check(enum sp_return result)
{ {
int error_code; int error_code;
char *error_message; char *error_message;
switch (result) { switch (result) {
/* Handle each of the four negative error codes that can be returned. /* Handle each of the four negative error codes that can be returned.
@ -38,61 +39,61 @@ int check(enum sp_return result)
* In this example, we will end the program on any error, using * In this example, we will end the program on any error, using
* a different return code for each possible class of error. */ * a different return code for each possible class of error. */
case SP_ERR_ARG: case SP_ERR_ARG:
/* When SP_ERR_ARG is returned, there was a problem with one /* When SP_ERR_ARG is returned, there was a problem with one
* or more of the arguments passed to the function, e.g. a null * or more of the arguments passed to the function, e.g. a null
* pointer or an invalid value. This generally implies a bug in * pointer or an invalid value. This generally implies a bug in
* the calling code. */ * the calling code. */
printf("Error: Invalid argument.\n"); printf("Error: Invalid argument.\n");
end_program(1); end_program(1);
case SP_ERR_FAIL: case SP_ERR_FAIL:
/* When SP_ERR_FAIL is returned, there was an error from the OS, /* When SP_ERR_FAIL is returned, there was an error from the OS,
* which we can obtain the error code and message for. These * which we can obtain the error code and message for. These
* calls must be made in the same thread as the call that * calls must be made in the same thread as the call that
* returned SP_ERR_FAIL, and before any other system functions * returned SP_ERR_FAIL, and before any other system functions
* are called in that thread, or they may not return the * are called in that thread, or they may not return the
* correct results. */ * correct results. */
error_code = sp_last_error_code(); error_code = sp_last_error_code();
error_message = sp_last_error_message(); error_message = sp_last_error_message();
printf("Error: Failed: OS error code: %d, message: '%s'\n", printf("Error: Failed: OS error code: %d, message: '%s'\n",
error_code, error_message); error_code, error_message);
/* The error message should be freed after use. */ /* The error message should be freed after use. */
sp_free_error_message(error_message); sp_free_error_message(error_message);
end_program(2); end_program(2);
case SP_ERR_SUPP: case SP_ERR_SUPP:
/* When SP_ERR_SUPP is returned, the function was asked to do /* When SP_ERR_SUPP is returned, the function was asked to do
* something that isn't supported by the current OS or device, * something that isn't supported by the current OS or device,
* or that libserialport doesn't know how to do in the current * or that libserialport doesn't know how to do in the current
* version. */ * version. */
printf("Error: Not supported.\n"); printf("Error: Not supported.\n");
end_program(3); end_program(3);
case SP_ERR_MEM: case SP_ERR_MEM:
/* When SP_ERR_MEM is returned, libserialport wasn't able to /* When SP_ERR_MEM is returned, libserialport wasn't able to
* allocate some memory it needed. Since the library doesn't * allocate some memory it needed. Since the library doesn't
* normally use any large data structures, this probably means * normally use any large data structures, this probably means
* the system is critically low on memory and recovery will * the system is critically low on memory and recovery will
* require very careful handling. The library itself will * require very careful handling. The library itself will
* always try to handle any allocation failure safely. * always try to handle any allocation failure safely.
* *
* In this example, we'll just try to exit gracefully without * In this example, we'll just try to exit gracefully without
* calling printf, which might need to allocate further memory. */ * calling printf, which might need to allocate further memory. */
end_program(4); end_program(4);
case SP_OK: case SP_OK:
default: default:
/* A return value of SP_OK, defined as zero, means that the /* A return value of SP_OK, defined as zero, means that the
* operation succeeded. */ * operation succeeded. */
printf("Operation succeeded.\n"); printf("Operation succeeded.\n");
/* Some fuctions can also return a value greater than zero to /* Some fuctions can also return a value greater than zero to
* indicate a numeric result, such as the number of bytes read by * indicate a numeric result, such as the number of bytes read by
* sp_blocking_read(). So when writing an error handling wrapper * sp_blocking_read(). So when writing an error handling wrapper
* function like this one, it's helpful to return the result so * function like this one, it's helpful to return the result so
* that it can be used. */ * that it can be used. */
return result; return result;
} }
} }

6
examples/list_ports.c
View File

@ -17,8 +17,7 @@ int main(int argc, char **argv)
* pointer will be updated to refer to the array created. */ * pointer will be updated to refer to the array created. */
enum sp_return result = sp_list_ports(&port_list); enum sp_return result = sp_list_ports(&port_list);
if (result != SP_OK) if (result != SP_OK) {
{
printf("sp_list_ports() failed!\n"); printf("sp_list_ports() failed!\n");
return -1; return -1;
} }
@ -26,8 +25,7 @@ int main(int argc, char **argv)
/* Iterate through the ports. When port_list[i] is NULL /* Iterate through the ports. When port_list[i] is NULL
* this indicates the end of the list. */ * this indicates the end of the list. */
int i; int i;
for (i = 0; port_list[i] != NULL; i++) for (i = 0; port_list[i] != NULL; i++) {
{
struct sp_port *port = port_list[i]; struct sp_port *port = port_list[i];
/* Get the name of the port. */ /* Get the name of the port. */

56
examples/port_config.c
View File

@ -130,24 +130,25 @@ int check(enum sp_return result)
{ {
/* For this example we'll just exit on any error by calling abort(). */ /* For this example we'll just exit on any error by calling abort(). */
char *error_message; char *error_message;
switch (result) { switch (result) {
case SP_ERR_ARG: case SP_ERR_ARG:
printf("Error: Invalid argument.\n"); printf("Error: Invalid argument.\n");
abort(); abort();
case SP_ERR_FAIL: case SP_ERR_FAIL:
error_message = sp_last_error_message(); error_message = sp_last_error_message();
printf("Error: Failed: %s\n", error_message); printf("Error: Failed: %s\n", error_message);
sp_free_error_message(error_message); sp_free_error_message(error_message);
abort(); abort();
case SP_ERR_SUPP: case SP_ERR_SUPP:
printf("Error: Not supported.\n"); printf("Error: Not supported.\n");
abort(); abort();
case SP_ERR_MEM: case SP_ERR_MEM:
printf("Error: Couldn't allocate memory.\n"); printf("Error: Couldn't allocate memory.\n");
abort(); abort();
case SP_OK: case SP_OK:
default: default:
return result; return result;
} }
} }
@ -155,12 +156,19 @@ int check(enum sp_return result)
const char *parity_name(enum sp_parity parity) const char *parity_name(enum sp_parity parity)
{ {
switch (parity) { switch (parity) {
case SP_PARITY_INVALID: return "(Invalid)"; case SP_PARITY_INVALID:
case SP_PARITY_NONE: return "None"; return "(Invalid)";
case SP_PARITY_ODD: return "Odd"; case SP_PARITY_NONE:
case SP_PARITY_EVEN: return "Even"; return "None";
case SP_PARITY_MARK: return "Mark"; case SP_PARITY_ODD:
case SP_PARITY_SPACE: return "Space"; return "Odd";
default: return NULL; case SP_PARITY_EVEN:
return "Even";
case SP_PARITY_MARK:
return "Mark";
case SP_PARITY_SPACE:
return "Space";
default:
return NULL;
} }
} }

14
examples/port_info.c
View File

@ -24,8 +24,7 @@ int main(int argc, char **argv)
* pointer will be updated to refer to the port found. */ * pointer will be updated to refer to the port found. */
enum sp_return result = sp_get_port_by_name(port_name, &port); enum sp_return result = sp_get_port_by_name(port_name, &port);
if (result != SP_OK) if (result != SP_OK) {
{
printf("sp_get_port_by_name() failed!\n"); printf("sp_get_port_by_name() failed!\n");
return -1; return -1;
} }
@ -38,14 +37,11 @@ int main(int argc, char **argv)
* e.g. native port, USB or Bluetooth. */ * e.g. native port, USB or Bluetooth. */
enum sp_transport transport = sp_get_port_transport(port); enum sp_transport transport = sp_get_port_transport(port);
if (transport == SP_TRANSPORT_NATIVE) if (transport == SP_TRANSPORT_NATIVE) {
{
/* This is a "native" port, usually directly connected /* This is a "native" port, usually directly connected
* to the system rather than some external interface. */ * to the system rather than some external interface. */
printf("Type: Native\n"); printf("Type: Native\n");
} } else if (transport == SP_TRANSPORT_USB) {
else if (transport == SP_TRANSPORT_USB)
{
/* This is a USB to serial converter of some kind. */ /* This is a USB to serial converter of some kind. */
printf("Type: USB\n"); printf("Type: USB\n");
@ -63,9 +59,7 @@ int main(int argc, char **argv)
int usb_bus, usb_address; int usb_bus, usb_address;
sp_get_port_usb_bus_address(port, &usb_bus, &usb_address); sp_get_port_usb_bus_address(port, &usb_bus, &usb_address);
printf("Bus: %d Address: %d\n", usb_bus, usb_address); printf("Bus: %d Address: %d\n", usb_bus, usb_address);
} } else if (transport == SP_TRANSPORT_BLUETOOTH) {
else if (transport == SP_TRANSPORT_BLUETOOTH)
{
/* This is a Bluetooth serial port. */ /* This is a Bluetooth serial port. */
printf("Type: Bluetooth\n"); printf("Type: Bluetooth\n");

2
test_timing.c
View File

@ -11,6 +11,7 @@ int main(int argc, char *argv[])
struct time a, b, c; struct time a, b, c;
struct timeval tv; struct timeval tv;
struct timeout to; struct timeout to;
printf("Testing arithmetic\n"); printf("Testing arithmetic\n");
time_set_ms(&a, 10050); time_set_ms(&a, 10050);
time_set_ms(&b, 100); time_set_ms(&b, 100);
@ -63,5 +64,6 @@ int main(int argc, char *argv[])
timeout_update(&to); timeout_update(&to);
assert(timeout_check(&to)); assert(timeout_check(&to));
printf("Timeout expired\n"); printf("Timeout expired\n");
return 0; return 0;
} }