Commit 382e2024 authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard

SendASPI32Command32 has to be __cdecl.

Updated documentation/aspi and reverted an ERR back to WARN.
parent cb5effa2
...@@ -221,7 +221,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) ...@@ -221,7 +221,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
fd = ASPI_OpenDevice16(lpPRB); fd = ASPI_OpenDevice16(lpPRB);
if (fd == -1) { if (fd == -1) {
ERR(aspi, "Failed: could not open device. Device permissions !?\n"); WARN(aspi, "Failed: could not open device. Device permissions !?\n");
lpPRB->SRB_Status = SS_ERR; lpPRB->SRB_Status = SS_ERR;
return SS_ERR; return SS_ERR;
} }
......
...@@ -333,7 +333,7 @@ DWORD WINAPI GetASPI32SupportInfo32() ...@@ -333,7 +333,7 @@ DWORD WINAPI GetASPI32SupportInfo32()
/*********************************************************************** /***********************************************************************
* SendASPI32Command32 (WNASPI32.1) * SendASPI32Command32 (WNASPI32.1)
*/ */
DWORD WINAPI SendASPI32Command32(LPSRB32 lpSRB) DWORD __cdecl SendASPI32Command32(LPSRB32 lpSRB)
{ {
#ifdef linux #ifdef linux
switch (lpSRB->common.SRB_Cmd) { switch (lpSRB->common.SRB_Cmd) {
......
...@@ -14,6 +14,9 @@ completely bogus commands to the wrong device - An example would be ...@@ -14,6 +14,9 @@ completely bogus commands to the wrong device - An example would be
formatting your hard drives (assuming the device gave you permission - formatting your hard drives (assuming the device gave you permission -
if you're running as root, all bets are off). if you're running as root, all bets are off).
So please make sure that **all** SCSI devices that the program won't need
have their permissions set as restricted as possible !
Cookbook for setting up scanner: (At least how mine is to work) Cookbook for setting up scanner: (At least how mine is to work)
================================ ================================
...@@ -33,6 +36,8 @@ LINUX requirements: ...@@ -33,6 +36,8 @@ LINUX requirements:
============================================================ ============================================================
0) Your scsi card must be supported under linux. This will not work with 0) Your scsi card must be supported under linux. This will not work with
an unknown scsi card. an unknown scsi card.
Even for cheap'n crappy "scanner only" controllers some special Linux drivers
exist on the net.
1) Compile generic scsi drivers into your kernel. 1) Compile generic scsi drivers into your kernel.
...@@ -70,15 +75,16 @@ ipplus.exe <---> (TWAIN INTERFACE) <---> (TWAIN DATA SOURCE . ASPI) -> WINASPI ...@@ -70,15 +75,16 @@ ipplus.exe <---> (TWAIN INTERFACE) <---> (TWAIN DATA SOURCE . ASPI) -> WINASPI
NOTES/BUGS: NOTES/BUGS:
=========== ===========
The biggest is that it only works under linux at the moment. The biggest is that it only works under linux at the moment.
The ASPI code was only tested using a Mustek 800SP with a Buslogic
controller under Linux.
The ASPI code has only been tested with: The ASPI code has only been tested with:
- a Mustek 800SP with a Buslogic controller under Linux [BM] - a Mustek 800SP with a Buslogic controller under Linux [BM]
- a Siemens Nixdorf 9036 with Adaptec AVA-1505 under Linux - a Siemens Nixdorf 9036 with Adaptec AVA-1505 under Linux
accessed via DOSASPI. accessed via DOSASPI.
Note that I had color problems, though (barely readable result). [AM] Note that I had color problems, though (barely readable result) [AM]
- a Fujitsu M2513A MO drive (640MB) using generic scsi drivers.
Formatting and ejecting worked perfectly.
Thanks to Uwe Bonnes for access to the hardware ! [AM]
I make no warranty to the aspi code. It makes my scanner work. Your scanner I make no warranty to the aspi code. It makes my scanner work. Your devices
may explode. I have no way of determining this. I take zero responsibility! may explode. I have no way of determining this. I take zero responsibility!
......
...@@ -2,5 +2,5 @@ name wnaspi32 ...@@ -2,5 +2,5 @@ name wnaspi32
type win32 type win32
0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo32 0 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo32
1 stdcall SendASPI32Command(ptr) SendASPI32Command32 1 cdecl SendASPI32Command(ptr) SendASPI32Command32
3 stub GetASPI32DLLVersion 3 stub GetASPI32DLLVersion
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment