diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
| commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/sm3600-scanusb.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/sm3600-scanusb.c')
| -rw-r--r-- | backend/sm3600-scanusb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backend/sm3600-scanusb.c b/backend/sm3600-scanusb.c index 3ca9a8a..7ae90d3 100644 --- a/backend/sm3600-scanusb.c +++ b/backend/sm3600-scanusb.c @@ -61,7 +61,7 @@ TransferControlMsg() static int TransferControlMsg(TInstance *this, int nReqType, - int nRequest, + int nRequest, int nValue, int nIndex, void *pBuffer, @@ -302,7 +302,7 @@ int BulkRead(TInstance *this, FILE *fhOut, unsigned int cchBulk) { int cchChunk; int cchReal; - + cchChunk=cchBulk; if (cchChunk>0x1000) cchChunk=0x1000; @@ -366,7 +366,7 @@ int BulkReadBuffer(TInstance *this, { int cchChunk; int cchReal; - + cchChunk=cchBulk; if (cchChunk>0x1000) cchChunk=0x1000; @@ -391,7 +391,7 @@ int BulkReadBuffer(TInstance *this, ); } dprintf(DEBUG_COMM,"writing %d bytes\n",cchRead); - + if (!rc && puchBufferOut) memcpy(puchBufferOut,pchBuffer,cchRead); free(pchBuffer); @@ -440,4 +440,3 @@ unsigned int RegRead(TInstance *this, int iRegister, int cch) SetError(this,SANE_STATUS_IO_ERROR,"error during register read"); return 0; } - |