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

Store size of shading table in ASIC structure.

merge-requests/1/head
Jan Hauffa 2011-04-23 18:08:28 +02:00 zatwierdzone przez m. allan noah
rodzic ed1997b22f
commit 60a244ed1e
2 zmienionych plików z 16 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

33
backend/mustek_usb2_asic.c
Wyświetl plik

@ -1674,25 +1674,25 @@ SetPackAddress (ASIC * chip, unsigned short wWidth, unsigned short wX,
/* set pack end address */ /* set pack end address */
SendData (chip, ES01_1A7_PACK_AREA_R_END_ADDR_BYTE0, SendData (chip, ES01_1A7_PACK_AREA_R_END_ADDR_BYTE0,
BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 -1))); BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 - 1)));
SendData (chip, ES01_1A8_PACK_AREA_R_END_ADDR_BYTE1, SendData (chip, ES01_1A8_PACK_AREA_R_END_ADDR_BYTE1,
BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 -1))); BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 - 1)));
SendData (chip, ES01_1A9_PACK_AREA_R_END_ADDR_BYTE2, SendData (chip, ES01_1A9_PACK_AREA_R_END_ADDR_BYTE2,
BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 -1))); BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2 - 1)));
SendData (chip, ES01_1AA_PACK_AREA_G_END_ADDR_BYTE0, SendData (chip, ES01_1AA_PACK_AREA_G_END_ADDR_BYTE0,
BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 -1))); BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 - 1)));
SendData (chip, ES01_1AB_PACK_AREA_G_END_ADDR_BYTE1, SendData (chip, ES01_1AB_PACK_AREA_G_END_ADDR_BYTE1,
BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 -1))); BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 - 1)));
SendData (chip, ES01_1AC_PACK_AREA_G_END_ADDR_BYTE2, SendData (chip, ES01_1AC_PACK_AREA_G_END_ADDR_BYTE2,
BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 -1))); BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 4 - 1)));
SendData (chip, ES01_1AD_PACK_AREA_B_END_ADDR_BYTE0, SendData (chip, ES01_1AD_PACK_AREA_B_END_ADDR_BYTE0,
BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 -1))); BYTE0 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 - 1)));
SendData (chip, ES01_1AE_PACK_AREA_B_END_ADDR_BYTE1, SendData (chip, ES01_1AE_PACK_AREA_B_END_ADDR_BYTE1,
BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 -1))); BYTE1 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 - 1)));
SendData (chip, ES01_1AF_PACK_AREA_B_END_ADDR_BYTE2, SendData (chip, ES01_1AF_PACK_AREA_B_END_ADDR_BYTE2,
BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 -1))); BYTE2 (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 6 - 1)));
DBG (DBG_ASIC, "PACK_AREA_START_ADDRESS + (ValidPixelNumber*2)=%d\n", DBG (DBG_ASIC, "PACK_AREA_START_ADDRESS + (ValidPixelNumber*2)=%d\n",
(PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2))); (PACK_AREA_START_ADDRESS + (ValidPixelNumber * 2)));
@ -2323,10 +2323,7 @@ Asic_SetWindow (ASIC * chip, SCANSOURCE lsLightSource,
((RealTableSize + (TABLE_BASE_SIZE - 1)) & ((RealTableSize + (TABLE_BASE_SIZE - 1)) &
~(TABLE_BASE_SIZE - 1)); ~(TABLE_BASE_SIZE - 1));
/* TODO: table size should be stored in ASIC structure */ status = SetShadingTable (chip, dwTableBaseAddr, chip->dwShadingTableSize,
RealTableSize = sizeof (unsigned short) *
ShadingTableSize ((int) ((wWidth + 4) * XRatioAdderDouble));
status = SetShadingTable (chip, dwTableBaseAddr, RealTableSize,
chip->pShadingTable); chip->pShadingTable);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
return status; return status;
@ -2657,7 +2654,6 @@ Asic_SetShadingTable (ASIC * chip, unsigned short * pWhiteShading,
unsigned short i, j, n; unsigned short i, j, n;
unsigned short wValidPixelNumber; unsigned short wValidPixelNumber;
double dbXRatioAdderDouble; double dbXRatioAdderDouble;
unsigned int wShadingTableSize;
DBG_ASIC_ENTER (); DBG_ASIC_ENTER ();
if (chip->firmwarestate != FS_OPENED) if (chip->firmwarestate != FS_OPENED)
@ -2674,15 +2670,14 @@ Asic_SetShadingTable (ASIC * chip, unsigned short * pWhiteShading,
wValidPixelNumber = (unsigned short) ((wWidth + 4) * dbXRatioAdderDouble); wValidPixelNumber = (unsigned short) ((wWidth + 4) * dbXRatioAdderDouble);
DBG (DBG_ASIC, "wValidPixelNumber=%d\n", wValidPixelNumber); DBG (DBG_ASIC, "wValidPixelNumber=%d\n", wValidPixelNumber);
/* Clear old shading table, if present. /* Free old shading table, if present.
First 4 and last 5 elements of shading table cannot be used. */ First 4 and last 5 elements of shading table cannot be used. */
wShadingTableSize = ShadingTableSize (wValidPixelNumber) * chip->dwShadingTableSize = ShadingTableSize (wValidPixelNumber) *
sizeof (unsigned short); sizeof (unsigned short);
free (chip->pShadingTable); free (chip->pShadingTable);
DBG (DBG_ASIC, "allocating a new shading table, size=%d byte\n", DBG (DBG_ASIC, "allocating a new shading table, size=%d byte\n",
wShadingTableSize); chip->dwShadingTableSize);
chip->pShadingTable = malloc (wShadingTableSize); chip->pShadingTable = malloc (chip->dwShadingTableSize);
if (!chip->pShadingTable) if (!chip->pShadingTable)
{ {
DBG (DBG_ASIC, "pShadingTable == NULL\n"); DBG (DBG_ASIC, "pShadingTable == NULL\n");

2
backend/mustek_usb2_asic.h
Wyświetl plik

@ -203,6 +203,8 @@ typedef struct
ADConverter AD; ADConverter AD;
SANE_Byte isMotorMoveToFirstLine; SANE_Byte isMotorMoveToFirstLine;
unsigned int dwShadingTableSize;
unsigned short * pShadingTable; unsigned short * pShadingTable;
SANE_Byte RegisterBankStatus; SANE_Byte RegisterBankStatus;