kopia lustrzana https://gitlab.com/sane-project/backends
big endian fixes for gl847/gl124 based scanners
rodzic
a0a2697bdb
commit
d581aec7ad
|
@ -1,3 +1,7 @@
|
|||
2011-03-17 Stéphane Voltz <stef.dev@free.fr>
|
||||
* backend/genesys_low.c: big endian fixes for gl847/gl124 based
|
||||
scanners. Patch by Olaf Zimmermann <oez@pt.lu> .
|
||||
|
||||
2011-03-15 Stéphane Voltz <stef.dev@free.fr>
|
||||
* backend/Makefile.in backend/canon_dr.[ch]: fixes to allow full
|
||||
static build under cygwin
|
||||
|
|
|
@ -65,6 +65,15 @@
|
|||
#include "../include/_stdint.h"
|
||||
#include "genesys_low.h"
|
||||
|
||||
uint16_t bsuint16(uint16_t v)
|
||||
{
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
return (v << 8) | (v >> 8);
|
||||
#else
|
||||
return(v);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
/* functions calling ASIC specific functions */
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
@ -262,11 +271,11 @@ sanei_genesys_read_hregister (Genesys_Device * dev, uint8_t reg, uint8_t * val)
|
|||
reg, sane_strstatus (status));
|
||||
return status;
|
||||
}
|
||||
*val=value & 0xff;
|
||||
*val=bsuint16(value) & 0xff;
|
||||
DBG( DBG_io2, "sanei_genesys_read_hregister(0x%02x)=0x%02x\n",reg,value & 0xff);
|
||||
|
||||
/* check usb link status */
|
||||
if((value & 0xff00) != 0x5500)
|
||||
if((bsuint16(value) & 0xff00) != 0x5500)
|
||||
{
|
||||
DBG (DBG_error,"sanei_genesys_read_hregister: invalid read, scanner unplugged ?\n");
|
||||
status=SANE_STATUS_IO_ERROR;
|
||||
|
@ -384,11 +393,11 @@ sanei_genesys_read_gl847_register (Genesys_Device * dev, uint8_t reg, uint8_t *
|
|||
reg, sane_strstatus (status));
|
||||
return status;
|
||||
}
|
||||
*val=value & 0xff;
|
||||
*val=bsuint16(value) & 0xff;
|
||||
DBG( DBG_io2, "sanei_genesys_read_gl847_register(0x%02x)=0x%02x\n",reg,value & 0xff);
|
||||
|
||||
/* check usb link status */
|
||||
if((value & 0xff00) != 0x5500)
|
||||
if((bsuint16(value) & 0xff00) != 0x5500)
|
||||
{
|
||||
DBG (DBG_error,"sanei_genesys_read_gl847_register: invalid read, scanner unplugged ?\n");
|
||||
status=SANE_STATUS_IO_ERROR;
|
||||
|
|
Ładowanie…
Reference in New Issue