GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 10:04:33 +00:00
Code Issues Releases Wiki Activity

usbutils allow call of usb_all() from other code

Browse Source
This commit is contained in:
Kano 2013-03-13 11:04:05 +11:00
parent 6d629d6856
commit 154e4f4b61
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usbutils.c
View File

@ -411,7 +411,7 @@ static bool setgetdes(ssize_t count, libusb_device *dev, struct libusb_device_ha
return true; return true;
} }
static void usb_full(ssize_t count, libusb_device *dev, char **buf, size_t *off, size_t *len) static void usb_full(ssize_t count, libusb_device *dev, char **buf, size_t *off, size_t *len, int level)
{ {
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
uint8_t bus_number; uint8_t bus_number;
@ -437,7 +437,7 @@ static void usb_full(ssize_t count, libusb_device *dev, char **buf, size_t *off,
bus_number = libusb_get_bus_number(dev); bus_number = libusb_get_bus_number(dev);
device_address = libusb_get_device_address(dev); device_address = libusb_get_device_address(dev);
if (opt_usbdump == 0) { if (level == 0) {
sprintf(tmp, EOL ".USB dev %d: Bus %d Device %d ID: %04x:%04x", sprintf(tmp, EOL ".USB dev %d: Bus %d Device %d ID: %04x:%04x",
(int)count, (int)bus_number, (int)device_address, (int)count, (int)bus_number, (int)device_address,
desc.idVendor, desc.idProduct); desc.idVendor, desc.idProduct);
@ -471,7 +471,7 @@ static void usb_full(ssize_t count, libusb_device *dev, char **buf, size_t *off,
if (err < 0) if (err < 0)
sprintf((char *)prod, "** err(%d)", err); sprintf((char *)prod, "** err(%d)", err);
if (opt_usbdump == 0) { if (level == 0) {
libusb_close(handle); libusb_close(handle);
sprintf(tmp, EOL " Manufacturer: '%s'" EOL " Product: '%s'", man, prod); sprintf(tmp, EOL " Manufacturer: '%s'" EOL " Product: '%s'", man, prod);
append(buf, tmp, off, len); append(buf, tmp, off, len);
@ -556,7 +556,7 @@ static void usb_full(ssize_t count, libusb_device *dev, char **buf, size_t *off,
} }
// Function to dump all USB devices // Function to dump all USB devices
static void usb_all() void usb_all(int level)
{ {
libusb_device **list; libusb_device **list;
ssize_t count, i; ssize_t count, i;
@ -581,7 +581,7 @@ static void usb_all()
off = strlen(buf); off = strlen(buf);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
usb_full(i, list[i], &buf, &off, &len); usb_full(i, list[i], &buf, &off, &len, level);
applog(LOG_WARNING, "%s", buf); applog(LOG_WARNING, "%s", buf);
@ -599,7 +599,7 @@ static void cgusb_check_init()
// N.B. environment LIBUSB_DEBUG also sets libusb_set_debug() // N.B. environment LIBUSB_DEBUG also sets libusb_set_debug()
if (opt_usbdump >= 0) { if (opt_usbdump >= 0) {
libusb_set_debug(NULL, opt_usbdump); libusb_set_debug(NULL, opt_usbdump);
usb_all(); usb_all(opt_usbdump);
} }
usb_commands = malloc(sizeof(*usb_commands) * C_MAX); usb_commands = malloc(sizeof(*usb_commands) * C_MAX);

1
usbutils.h
View File

@ -129,6 +129,7 @@ enum usb_cmds {
struct device_drv; struct device_drv;
struct cgpu_info; struct cgpu_info;
void usb_all(int level);
void usb_uninit(struct cgpu_info *cgpu); void usb_uninit(struct cgpu_info *cgpu);
bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found); bool usb_init(struct cgpu_info *cgpu, struct libusb_device *dev, struct usb_find_devices *found);
void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *)); void usb_detect(struct device_drv *drv, bool (*device_detect)(struct libusb_device *, struct usb_find_devices *));