BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial.c: Cosmetics, coding-style.

This commit is contained in:
Uwe Hermann 2013-11-13 19:04:54 +01:00
parent 0d4405ce5e
commit a0dfaa6c4c
1 changed files with 54 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
hardware/common/serial.c
View File

@ -63,16 +63,15 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
ret = sp_open(serial->data, flags); ret = sp_open(serial->data, flags);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Attempt to open serial port with invalid parameters.");
sr_err("Attempt to open serial port with invalid parameters."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Error opening port: %s.", error);
sr_err("Error opening port: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
#ifndef _WIN32 #ifndef _WIN32
@ -113,16 +112,15 @@ SR_PRIV int serial_close(struct sr_serial_dev_inst *serial)
ret = sp_close(serial->data); ret = sp_close(serial->data);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Attempt to close an invalid serial port.");
sr_err("Attempt to close an invalid serial port."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Error closing port: %s.", error);
sr_err("Error closing port: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
serial->fd = -1; serial->fd = -1;
@ -157,16 +155,15 @@ SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial)
ret = sp_flush(serial->data); ret = sp_flush(serial->data);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Attempt to flush an invalid serial port.");
sr_err("Attempt to flush an invalid serial port."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Error flushing port: %s.", error);
sr_err("Error flushing port: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
return ret; return ret;
@ -200,16 +197,15 @@ SR_PRIV int serial_write(struct sr_serial_dev_inst *serial,
ret = sp_write(serial->data, buf, count); ret = sp_write(serial->data, buf, count);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Attempted serial port write with invalid arguments.");
sr_err("Attempted serial port write with invalid arguments."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Write error: %s.", error);
sr_err("Write error: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
sr_spew("Wrote %d/%d bytes (fd %d).", ret, count, serial->fd); sr_spew("Wrote %d/%d bytes (fd %d).", ret, count, serial->fd);
@ -245,16 +241,15 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
ret = sp_read(serial->data, buf, count); ret = sp_read(serial->data, buf, count);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Attempted serial port read with invalid arguments.");
sr_err("Attempted serial port read with invalid arguments."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Read error: %s.", error);
sr_err("Read error: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd); sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
@ -299,16 +294,15 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
ret = sp_set_params(serial->data, baudrate, bits, parity, stopbits, ret = sp_set_params(serial->data, baudrate, bits, parity, stopbits,
flowcontrol, rts, dtr); flowcontrol, rts, dtr);
switch (ret) switch (ret) {
{ case SP_ERR_ARG:
case SP_ERR_ARG: sr_err("Invalid arguments for setting serial port parameters.");
sr_err("Invalid arguments for setting serial port parameters."); return SR_ERR_ARG;
return SR_ERR_ARG; case SP_ERR_FAIL:
case SP_ERR_FAIL: error = sp_last_error_message();
error = sp_last_error_message(); sr_err("Error setting serial port parameters: %s.", error);
sr_err("Error setting serial port parameters: %s.", error); sp_free_error_message(error);
sp_free_error_message(error); return SR_ERR;
return SR_ERR;
} }
return SR_OK; return SR_OK;