* backend/genesys_gl841.c: use an intermediate u_int8_t buffer

for register write (bug #303681).
merge-requests/1/head
Pierre Willenbrock 2006-07-30 16:59:09 +00:00
rodzic ce8dbc6847
commit b0f67f1f83
2 zmienionych plików z 13 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2006-07-30 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys_gl841.c: use an intermediate u_int8_t buffer
for register write (bug #303681).
2006-07-30 Stephane Voltz <stefdev@modulonet.fr>
* backend/genesys_gl646.c: use an intermediate char buffer

Wyświetl plik

@ -395,10 +395,15 @@ gl841_bulk_write_register (Genesys_Device * dev,
(u_long) size);
for (i = 0; i < size / 2; i++) {
u_int8_t msg[2];
msg[0] = reg[i].address;
msg[1] = reg[i].value;
status =
sanei_usb_control_msg (dev->dn, REQUEST_TYPE_OUT, REQUEST_BUFFER,
VALUE_SET_REGISTER, INDEX, 2, &(((u_int8_t *) reg)[2 * i]));
VALUE_SET_REGISTER, INDEX, 2, msg);
if (status != SANE_STATUS_GOOD)
{
DBG (DBG_error,
@ -407,8 +412,8 @@ gl841_bulk_write_register (Genesys_Device * dev,
return status;
}
DBG (DBG_io2, "reg[0x%02x] = 0x%02x\n", ((u_int8_t *) reg)[2 * i],
((u_int8_t *) reg)[2 * i + 1]);
DBG (DBG_io2, "reg[0x%02x] = 0x%02x\n", msg[0],
msg[1]);
}