usbutils extra message requirements
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/usbutils.c b/usbutils.c
index 1394147..69bd72e 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -195,6 +195,8 @@ extern struct device_drv avalon_drv;
#define STRBUFLEN 256
static const char *BLANK = "";
+static const char *space = " ";
+static const char *nodatareturned = "no data returned ";
// For device limits by driver
static struct driver_count {
@@ -286,6 +288,12 @@ static const char *C_PURGETX_S = "PurgeTx";
static const char *C_FLASHREPLY_S = "FlashReply";
static const char *C_REQUESTDETAILS_S = "RequestDetails";
static const char *C_GETDETAILS_S = "GetDetails";
+static const char *C_REQUESTRESULTS_S = "RequestResults";
+static const char *C_GETRESULTS_S = "GetResults";
+static const char *C_REQUESTQUEJOB_S = "RequestQueJob";
+static const char *C_REQUESTQUEJOBSTATUS_S = "RequestQueJobStatus";
+static const char *C_QUEJOB_S = "QueJob";
+static const char *C_QUEJOBSTATUS_S = "QueJobStatus";
#ifdef EOL
#undef EOL
@@ -745,6 +753,12 @@ static void cgusb_check_init()
usb_commands[C_FLASHREPLY] = C_FLASHREPLY_S;
usb_commands[C_REQUESTDETAILS] = C_REQUESTDETAILS_S;
usb_commands[C_GETDETAILS] = C_GETDETAILS_S;
+ usb_commands[C_REQUESTRESULTS] = C_REQUESTRESULTS_S;
+ usb_commands[C_GETRESULTS] = C_GETRESULTS_S;
+ usb_commands[C_REQUESTQUEJOB] = C_REQUESTQUEJOB_S;
+ usb_commands[C_REQUESTQUEJOBSTATUS] = C_REQUESTQUEJOBSTATUS_S;
+ usb_commands[C_QUEJOB] = C_QUEJOB_S;
+ usb_commands[C_QUEJOBSTATUS] = C_QUEJOBSTATUS_S;
stats_initialised = true;
}
@@ -759,6 +773,21 @@ const char *usb_cmdname(enum usb_cmds cmd)
return usb_commands[cmd];
}
+void usb_applog(struct cgpu_info *cgpu, enum usb_cmds cmd, char *msg, int amount, int err)
+{
+ if (msg && !*msg)
+ msg = NULL;
+
+ if (!msg && amount == 0 && err == LIBUSB_SUCCESS)
+ msg = (char *)nodatareturned;
+
+ applog(LOG_ERR, "%s%i: %s failed%s%s (err=%d amt%d)",
+ cgpu->drv->name, cgpu->device_id,
+ usb_cmdname(cmd),
+ msg ? space : BLANK, msg ? msg : BLANK,
+ err, amount);
+}
+
#ifndef WIN32
#include <errno.h>
#include <unistd.h>
diff --git a/usbutils.h b/usbutils.h
index 7cacc43..8e34d81 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -125,6 +125,12 @@ enum usb_cmds {
C_FLASHREPLY,
C_REQUESTDETAILS,
C_GETDETAILS,
+ C_REQUESTRESULTS,
+ C_GETRESULTS,
+ C_REQUESTQUEJOB,
+ C_REQUESTQUEJOBSTATUS,
+ C_QUEJOB,
+ C_QUEJOBSTATUS,
C_MAX
};
@@ -133,6 +139,7 @@ struct cgpu_info;
void usb_all(int level);
const char *usb_cmdname(enum usb_cmds cmd);
+void usb_applog(struct cgpu_info *bflsc, enum usb_cmds cmd, char *msg, int amount, int err);
void usb_uninit(struct cgpu_info *cgpu);
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 *));