Commit 40df4807 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

usb: Drop ununsed eot argument to qdl_write



qdl_write() is always called with eot=true, so drop the parameter.

As a length of 0 means we're not entering the loop and we're now always
entering the conditonal block at the end we can remove the first chunk.
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 91e609b6
......@@ -190,7 +190,7 @@ static int firehose_write(struct qdl_device *qdl, xmlDoc *doc)
if (qdl_debug)
fprintf(stderr, "FIREHOSE WRITE: %s\n", s);
ret = qdl_write(qdl, s, len, true);
ret = qdl_write(qdl, s, len);
saved_errno = errno;
xmlFree(s);
return ret < 0 ? -saved_errno : 0;
......@@ -404,7 +404,7 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
if (n < max_payload_size)
memset(buf + n, 0, max_payload_size - n);
n = qdl_write(qdl, buf, chunk_size * program->sector_size, true);
n = qdl_write(qdl, buf, chunk_size * program->sector_size);
if (n < 0)
err(1, "failed to write");
......
......@@ -351,7 +351,7 @@ int qdl_read(struct qdl_device *qdl, void *buf, size_t len, unsigned int timeout
return ioctl(qdl->fd, USBDEVFS_BULK, &bulk);
}
int qdl_write(struct qdl_device *qdl, const void *buf, size_t len, bool eot)
int qdl_write(struct qdl_device *qdl, const void *buf, size_t len)
{
unsigned char *data = (unsigned char*) buf;
......@@ -360,21 +360,6 @@ int qdl_write(struct qdl_device *qdl, const void *buf, size_t len, bool eot)
size_t len_orig = len;
int n;
if(len == 0) {
bulk.ep = qdl->out_ep;
bulk.len = 0;
bulk.data = data;
bulk.timeout = 1000;
n = ioctl(qdl->fd, USBDEVFS_BULK, &bulk);
if(n != 0) {
fprintf(stderr,"ERROR: n = %d, errno = %d (%s)\n",
n, errno, strerror(errno));
return -1;
}
return 0;
}
while(len > 0) {
int xfer;
xfer = (len > qdl->out_maxpktsize) ? qdl->out_maxpktsize : len;
......@@ -395,7 +380,7 @@ int qdl_write(struct qdl_device *qdl, const void *buf, size_t len, bool eot)
data += xfer;
}
if (eot && (len_orig % qdl->out_maxpktsize) == 0) {
if (len_orig % qdl->out_maxpktsize == 0) {
bulk.ep = qdl->out_ep;
bulk.len = 0;
bulk.data = NULL;
......
......@@ -10,7 +10,7 @@
struct qdl_device;
int qdl_read(struct qdl_device *qdl, void *buf, size_t len, unsigned int timeout);
int qdl_write(struct qdl_device *qdl, const void *buf, size_t len, bool eot);
int qdl_write(struct qdl_device *qdl, const void *buf, size_t len);
int firehose_run(struct qdl_device *qdl, const char *incdir, const char *storage);
int sahara_run(struct qdl_device *qdl, char *prog_mbn);
......
......@@ -101,7 +101,7 @@ static void sahara_hello(struct qdl_device *qdl, struct sahara_pkt *pkt)
resp.hello_resp.status = 0;
resp.hello_resp.mode = pkt->hello_req.mode;
qdl_write(qdl, &resp, resp.length, true);
qdl_write(qdl, &resp, resp.length);
}
static int sahara_read_common(struct qdl_device *qdl, const char *mbn, off_t offset, size_t len)
......@@ -126,7 +126,7 @@ static int sahara_read_common(struct qdl_device *qdl, const char *mbn, off_t off
goto out;
}
n = qdl_write(qdl, buf, n, true);
n = qdl_write(qdl, buf, n);
if (n != len)
err(1, "failed to write %zu bytes to sahara", len);
......@@ -180,7 +180,7 @@ static void sahara_eoi(struct qdl_device *qdl, struct sahara_pkt *pkt)
done.cmd = 5;
done.length = 0x8;
qdl_write(qdl, &done, done.length, true);
qdl_write(qdl, &done, done.length);
}
static int sahara_done(struct qdl_device *qdl, struct sahara_pkt *pkt)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment