Commit 527c6ee25506b2796a2e2128189933673c37bfe2
2013-06-25T21:35:21
usbutils optional cps IO control - but not enabled
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 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
diff --git a/driver-icarus.c b/driver-icarus.c
index bfa78c0..5c10248 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -255,6 +255,9 @@ static void icarus_initialise(struct cgpu_info *icarus, int baud)
if (icarus->usbinfo.nodev)
return;
+ usb_set_cps(icarus, baud / 10);
+// usb_enable_cps(icarus);
+
switch (icarus->usbdev->ident) {
case IDENT_BLT:
case IDENT_LLT:
diff --git a/usbutils.c b/usbutils.c
index 620a108..2d5b6f4 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2312,6 +2312,21 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
}
got = 0;
+ if (first && usbdev->usecps) {
+ if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) {
+ struct timeval now;
+ double need;
+
+ cgtime(&now);
+ need = (double)(usbdev->last_write_siz) /
+ (double)(usbdev->cps) -
+ tdiff(&(usbdev->last_write_tv), &now);
+
+ // Simple error condition check/avoidance '< 1.0'
+ if (need > 0.0 && need < 1.0)
+ nmsleep((unsigned int)(need * 1000.0));
+ }
+ }
STATS_TIMEVAL(&tv_start);
err = usb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep,
@@ -2403,6 +2418,21 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
usbbufread = bufleft;
}
got = 0;
+ if (first && usbdev->usecps) {
+ if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) {
+ struct timeval now;
+ double need;
+
+ cgtime(&now);
+ need = (double)(usbdev->last_write_siz) /
+ (double)(usbdev->cps) -
+ tdiff(&(usbdev->last_write_tv), &now);
+
+ // Simple error condition check/avoidance '< 1.0'
+ if (need > 0.0 && need < 1.0)
+ nmsleep((unsigned int)(need * 1000.0));
+ }
+ }
STATS_TIMEVAL(&tv_start);
err = usb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep, ptr,
@@ -2531,6 +2561,23 @@ int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pr
cgtime(&read_start);
while (bufsiz > 0) {
sent = 0;
+ if (usbdev->usecps) {
+ if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) {
+ struct timeval now;
+ double need;
+
+ cgtime(&now);
+ need = (double)(usbdev->last_write_siz) /
+ (double)(usbdev->cps) -
+ tdiff(&(usbdev->last_write_tv), &now);
+
+ // Simple error condition check/avoidance '< 1.0'
+ if (need > 0.0 && need < 1.0)
+ nmsleep((unsigned int)(need * 1000.0));
+ }
+ cgtime(&(usbdev->last_write_tv));
+ usbdev->last_write_siz = bufsiz;
+ }
STATS_TIMEVAL(&tv_start);
err = usb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep,
@@ -2608,6 +2655,23 @@ int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bReques
USBDEBUG("USB debug: @_usb_transfer() buf=%s", bin2hex((unsigned char *)buf, (size_t)siz));
+ if (usbdev->usecps) {
+ if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) {
+ struct timeval now;
+ double need;
+
+ cgtime(&now);
+ need = (double)(usbdev->last_write_siz) /
+ (double)(usbdev->cps) -
+ tdiff(&(usbdev->last_write_tv), &now);
+
+ // Simple error condition check/avoidance '< 1.0'
+ if (need > 0.0 && need < 1.0)
+ nmsleep((unsigned int)(need * 1000.0));
+ }
+ cgtime(&(usbdev->last_write_tv));
+ usbdev->last_write_siz = siz;
+ }
STATS_TIMEVAL(&tv_start);
cg_rlock(&cgusb_fd_lock);
err = libusb_control_transfer(usbdev->handle, request_type,
@@ -2665,6 +2729,21 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe
*amount = 0;
+ if (usbdev->usecps) {
+ if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) {
+ struct timeval now;
+ double need;
+
+ cgtime(&now);
+ need = (double)(usbdev->last_write_siz) /
+ (double)(usbdev->cps) -
+ tdiff(&(usbdev->last_write_tv), &now);
+
+ // Simple error condition check/avoidance '< 1.0'
+ if (need > 0.0 && need < 1.0)
+ nmsleep((unsigned int)(need * 1000.0));
+ }
+ }
STATS_TIMEVAL(&tv_start);
cg_rlock(&cgusb_fd_lock);
err = libusb_control_transfer(usbdev->handle, request_type,
@@ -2814,6 +2893,42 @@ uint32_t usb_buffer_size(struct cgpu_info *cgpu)
return ret;
}
+void usb_set_cps(struct cgpu_info *cgpu, int cps)
+{
+ int pstate;
+
+ DEVLOCK(cgpu, pstate);
+
+ if (cgpu->usbdev)
+ cgpu->usbdev->cps = cps;
+
+ DEVUNLOCK(cgpu, pstate);
+}
+
+void usb_enable_cps(struct cgpu_info *cgpu)
+{
+ int pstate;
+
+ DEVLOCK(cgpu, pstate);
+
+ if (cgpu->usbdev)
+ cgpu->usbdev->usecps = true;
+
+ DEVUNLOCK(cgpu, pstate);
+}
+
+void usb_disable_cps(struct cgpu_info *cgpu)
+{
+ int pstate;
+
+ DEVLOCK(cgpu, pstate);
+
+ if (cgpu->usbdev)
+ cgpu->usbdev->usecps = false;
+
+ DEVUNLOCK(cgpu, pstate);
+}
+
// Need to set all devices with matching usbdev
void usb_set_dev_start(struct cgpu_info *cgpu)
{
diff --git a/usbutils.h b/usbutils.h
index 0b8406a..e2cd05a 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -168,6 +168,7 @@ struct cg_usb_device {
enum sub_ident ident;
uint16_t usbver;
int cps;
+ bool usecps;
char *prod_string;
char *manuf_string;
char *serial_string;
@@ -177,6 +178,8 @@ struct cg_usb_device {
uint32_t bufsiz;
uint32_t bufamt;
uint16_t PrefPacketSize;
+ struct timeval last_write_tv;
+ size_t last_write_siz;
};
#define USB_NOSTAT 0
@@ -298,6 +301,9 @@ void usb_buffer_enable(struct cgpu_info *cgpu);
void usb_buffer_disable(struct cgpu_info *cgpu);
void usb_buffer_clear(struct cgpu_info *cgpu);
uint32_t usb_buffer_size(struct cgpu_info *cgpu);
+void usb_set_cps(struct cgpu_info *cgpu, int cps);
+void usb_enable_cps(struct cgpu_info *cgpu);
+void usb_disable_cps(struct cgpu_info *cgpu);
void usb_set_dev_start(struct cgpu_info *cgpu);
void usb_cleanup();
void usb_initialise();