mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

big endian hadling rewrite

merge-requests/1/head
Stphane Voltz 2011-03-28 17:13:23 +02:00
rodzic cd376be4af
commit 709885ccaf
1 zmienionych plików z 10 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
backend/genesys_low.c
Wyświetl plik

@ -65,15 +65,6 @@
#include "../include/_stdint.h" #include "../include/_stdint.h"
#include "genesys_low.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 */ /* functions calling ASIC specific functions */
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
@ -259,11 +250,11 @@ SANE_Status
sanei_genesys_read_hregister (Genesys_Device * dev, uint8_t reg, uint8_t * val) sanei_genesys_read_hregister (Genesys_Device * dev, uint8_t reg, uint8_t * val)
{ {
SANE_Status status; SANE_Status status;
uint16_t value; SANE_Byte value[2];
status = status =
sanei_usb_control_msg (dev->dn, REQUEST_TYPE_IN, REQUEST_BUFFER, sanei_usb_control_msg (dev->dn, REQUEST_TYPE_IN, REQUEST_BUFFER,
0x100 | VALUE_GET_REGISTER, 0x22+(reg<<8), 2, (SANE_Byte *)&value); 0x100 | VALUE_GET_REGISTER, 0x22+(reg<<8), 2, value);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
DBG (DBG_error, DBG (DBG_error,
@ -271,11 +262,11 @@ sanei_genesys_read_hregister (Genesys_Device * dev, uint8_t reg, uint8_t * val)
reg, sane_strstatus (status)); reg, sane_strstatus (status));
return status; return status;
} }
*val=bsuint16(value) & 0xff; *val=value[0];
DBG( DBG_io2, "sanei_genesys_read_hregister(0x%02x)=0x%02x\n",reg,value & 0xff); DBG( DBG_io2, "sanei_genesys_read_hregister(0x%02x)=0x%02x\n",reg,*val);
/* check usb link status */ /* check usb link status */
if((bsuint16(value) & 0xff00) != 0x5500) if((value[1] & 0xff) != 0x55)
{ {
DBG (DBG_error,"sanei_genesys_read_hregister: invalid read, scanner unplugged ?\n"); DBG (DBG_error,"sanei_genesys_read_hregister: invalid read, scanner unplugged ?\n");
status=SANE_STATUS_IO_ERROR; status=SANE_STATUS_IO_ERROR;
@ -381,11 +372,11 @@ static SANE_Status
sanei_genesys_read_gl847_register (Genesys_Device * dev, uint8_t reg, uint8_t * val) sanei_genesys_read_gl847_register (Genesys_Device * dev, uint8_t reg, uint8_t * val)
{ {
SANE_Status status; SANE_Status status;
uint16_t value; SANE_Byte value[2];
status = status =
sanei_usb_control_msg (dev->dn, REQUEST_TYPE_IN, REQUEST_BUFFER, sanei_usb_control_msg (dev->dn, REQUEST_TYPE_IN, REQUEST_BUFFER,
VALUE_GET_REGISTER, 0x22+(reg<<8), 2, (SANE_Byte *)&value); VALUE_GET_REGISTER, 0x22+(reg<<8), 2, value);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
{ {
DBG (DBG_error, DBG (DBG_error,
@ -393,11 +384,11 @@ sanei_genesys_read_gl847_register (Genesys_Device * dev, uint8_t reg, uint8_t *
reg, sane_strstatus (status)); reg, sane_strstatus (status));
return status; return status;
} }
*val=bsuint16(value) & 0xff; *val=value[0];
DBG( DBG_io2, "sanei_genesys_read_gl847_register(0x%02x)=0x%02x\n",reg,value & 0xff); DBG( DBG_io2, "sanei_genesys_read_gl847_register(0x%02x)=0x%02x\n",reg,*val);
/* check usb link status */ /* check usb link status */
if((bsuint16(value) & 0xff00) != 0x5500) if((value[1] & 0xff) != 0x55)
{ {
DBG (DBG_error,"sanei_genesys_read_gl847_register: invalid read, scanner unplugged ?\n"); DBG (DBG_error,"sanei_genesys_read_gl847_register: invalid read, scanner unplugged ?\n");
status=SANE_STATUS_IO_ERROR; status=SANE_STATUS_IO_ERROR;