mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

Check bus:address and vid:pid validity.

Browse Source
This commit is contained in:
Aurelien Jacobs 2014-06-11 17:21:51 +02:00
parent e33dcf90a0
commit 65172beffe
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serialport.c
View File

@ -148,6 +148,8 @@ enum sp_return sp_get_port_usb_bus_address(const struct sp_port *port,
RETURN_ERROR(SP_ERR_ARG, "Null port"); RETURN_ERROR(SP_ERR_ARG, "Null port");
if (port->transport != SP_TRANSPORT_USB) if (port->transport != SP_TRANSPORT_USB)
RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport"); RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport");
if (port->usb_bus < 0 || port->usb_address < 0)
RETURN_ERROR(SP_ERR_SUPP, "Bus and address values are not available");
if (usb_bus) *usb_bus = port->usb_bus; if (usb_bus) *usb_bus = port->usb_bus;
if (usb_address) *usb_address = port->usb_address; if (usb_address) *usb_address = port->usb_address;
@ -164,6 +166,8 @@ enum sp_return sp_get_port_usb_vid_pid(const struct sp_port *port,
RETURN_ERROR(SP_ERR_ARG, "Null port"); RETURN_ERROR(SP_ERR_ARG, "Null port");
if (port->transport != SP_TRANSPORT_USB) if (port->transport != SP_TRANSPORT_USB)
RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport"); RETURN_ERROR(SP_ERR_ARG, "Port does not use USB transport");
if (port->usb_vid < 0 || port->usb_pid < 0)
RETURN_ERROR(SP_ERR_SUPP, "VID:PID values are not available");
if (usb_vid) *usb_vid = port->usb_vid; if (usb_vid) *usb_vid = port->usb_vid;
if (usb_pid) *usb_pid = port->usb_pid; if (usb_pid) *usb_pid = port->usb_pid;