[ros-diffs] [tkreuzer] 49689: [SCSIPORT] Convert to spec

Author: tkreuzer
Date: Sun Nov 21 14:28:52 2010
New Revision: 49689

URL: http://svn.reactos.org/svn/reactos?rev=49689&view=rev
Log:
[SCSIPORT]
Convert to spec

Added:
    branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec
      - copied, changed from r49669,
branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec
Removed:
    branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec
Modified:
    branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt

Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s…
==============================================================================
--- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Sun Nov 21
14:28:52 2010
@@ -1,5 +1,11 @@
 
-add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc)
+spec2def(scsiport.sys scsiport.spec)
+
+add_library(scsiport SHARED
+            scsiport.c
+            stubs.c
+            scsiport.rc
+            )
 
 target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def)
 
@@ -8,3 +14,4 @@
 
 add_minicd_target(scsiport reactos scsiport.sys)
 add_livecd_target(scsiport reactos/system32/drivers)
+add_importlib_target(scsiport.spec)

Removed: branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s…
==============================================================================
--- branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec (removed)
@@ -1,51 +1,0 @@
-#ifdef __x86_64__
-#define MAYBEFWD(x)
-#else
-#define MAYBEFWD(x) x
-#endif
-
-@ cdecl ScsiDebugPrint()
-@ stdcall ScsiPortCompleteRequest(ptr long long long long)
-@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long)
-@ stdcall ScsiPortConvertUlongToPhysicalAddress(long)
MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger)
-@ stdcall ScsiPortFlushDma(ptr)
-@ stdcall ScsiPortFreeDeviceBase(ptr ptr)
-@ stdcall ScsiPortGetBusData(ptr long long long ptr long)
-@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long)
-@ stdcall ScsiPortGetLogicalUnit(ptr long long long)
-@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long)
-@ stdcall ScsiPortGetSrb(ptr long long long long)
-@ stdcall ScsiPortGetUncachedExtension(ptr ptr long)
-@ stdcall ScsiPortGetVirtualAddress(ptr long long)
-@ stdcall ScsiPortInitialize(ptr ptr ptr ptr)
-@ stdcall ScsiPortIoMapTransfer(ptr ptr long long)
-@ stdcall ScsiPortLogError(ptr ptr long long long long long)
-@ stdcall ScsiPortMoveMemory(ptr ptr long)
-@ cdecl ScsiPortNotification()
-@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR)
-@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long)
MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT)
-@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG)
-@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR)
-@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT)
-@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG)
-@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR)
-@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT)
-@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG)
-@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR)
-@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT)
-@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG)
-@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long)
-@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor
-@ stdcall ScsiPortValidateRange(ptr long long long long long long)
-@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR)
-@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT)
-@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG)
-@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR)
-@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT)
-@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG)
-@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR)
-@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT)
-@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG)
-@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR)
-@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT)
-@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG)

Copied: branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec (from r49669,
branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec)
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s…
==============================================================================
--- branches/cmake-bringup/drivers/storage/scsiport/scsiport.pspec [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/scsiport/scsiport.spec [iso-8859-1] Sun Nov 21
14:28:52 2010
@@ -1,13 +1,8 @@
-#ifdef __x86_64__
-#define MAYBEFWD(x)
-#else
-#define MAYBEFWD(x) x
-#endif
-
 @ cdecl ScsiDebugPrint()
 @ stdcall ScsiPortCompleteRequest(ptr long long long long)
 @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long)
-@ stdcall ScsiPortConvertUlongToPhysicalAddress(long)
MAYBEFWD(NTOSKRNL.RtlConvertUlongToLargeInteger)
+@ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long)
NTOSKRNL.RtlConvertUlongToLargeInteger
+@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long)
 @ stdcall ScsiPortFlushDma(ptr)
 @ stdcall ScsiPortFreeDeviceBase(ptr ptr)
 @ stdcall ScsiPortGetBusData(ptr long long long ptr long)
@@ -22,30 +17,54 @@
 @ stdcall ScsiPortLogError(ptr ptr long long long long long)
 @ stdcall ScsiPortMoveMemory(ptr ptr long)
 @ cdecl ScsiPortNotification()
-@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_UCHAR)
-@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long)
MAYBEFWD(HAL.READ_PORT_BUFFER_USHORT)
-@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) MAYBEFWD(HAL.READ_PORT_BUFFER_ULONG)
-@ stdcall ScsiPortReadPortUchar(ptr) MAYBEFWD(HAL.READ_PORT_UCHAR)
-@ stdcall ScsiPortReadPortUshort(ptr) MAYBEFWD(HAL.READ_PORT_USHORT)
-@ stdcall ScsiPortReadPortUlong(ptr) MAYBEFWD(HAL.READ_PORT_ULONG)
-@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_UCHAR)
-@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_USHORT)
-@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long)
MAYBEFWD(NTOSKRNL.READ_REGISTER_BUFFER_ULONG)
-@ stdcall ScsiPortReadRegisterUchar(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_UCHAR)
-@ stdcall ScsiPortReadRegisterUshort(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_USHORT)
-@ stdcall ScsiPortReadRegisterUlong(ptr) MAYBEFWD(NTOSKRNL.READ_REGISTER_ULONG)
+@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long)
HAL.READ_PORT_BUFFER_UCHAR
+@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long)
HAL.READ_PORT_BUFFER_USHORT
+@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long)
HAL.READ_PORT_BUFFER_ULONG
+@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR
+@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT
+@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG
+@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
+@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_USHORT
+@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long)
NTOSKRNL.READ_REGISTER_BUFFER_ULONG
+@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR
+@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT
+@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG
+@ stdcall -arch=x86_64 ScsiPortReadPortBufferUchar(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadPortBufferUshort(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadPortBufferUlong(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadPortUchar(ptr)
+@ stdcall -arch=x86_64 ScsiPortReadPortUshort(ptr)
+@ stdcall -arch=x86_64 ScsiPortReadPortUlong(ptr)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUchar(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUshort(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterBufferUlong(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterUchar(ptr)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterUshort(ptr)
+@ stdcall -arch=x86_64 ScsiPortReadRegisterUlong(ptr)
 @ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long)
 @ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor
 @ stdcall ScsiPortValidateRange(ptr long long long long long long)
-@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_UCHAR)
-@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_USHORT)
-@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long)
MAYBEFWD(HAL.WRITE_PORT_BUFFER_ULONG)
-@ stdcall ScsiPortWritePortUchar(ptr long) MAYBEFWD(HAL.WRITE_PORT_UCHAR)
-@ stdcall ScsiPortWritePortUshort(ptr long) MAYBEFWD(HAL.WRITE_PORT_USHORT)
-@ stdcall ScsiPortWritePortUlong(ptr long) MAYBEFWD(HAL.WRITE_PORT_ULONG)
-@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR)
-@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT)
-@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long)
MAYBEFWD(NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG)
-@ stdcall ScsiPortWriteRegisterUchar(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_UCHAR)
-@ stdcall ScsiPortWriteRegisterUshort(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_USHORT)
-@ stdcall ScsiPortWriteRegisterUlong(ptr long) MAYBEFWD(NTOSKRNL.WRITE_REGISTER_ULONG)
+@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long)
HAL.WRITE_PORT_BUFFER_UCHAR
+@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long)
HAL.WRITE_PORT_BUFFER_USHORT
+@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long)
HAL.WRITE_PORT_BUFFER_ULONG
+@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR
+@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT
+@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG
+@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
+@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
+@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long)
NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
+@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR
+@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long)
NTOSKRNL.WRITE_REGISTER_USHORT
+@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG
+@ stdcall -arch=x86_64 ScsiPortWritePortBufferUchar(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWritePortBufferUshort(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWritePortBufferUlong(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWritePortUchar(ptr long)
+@ stdcall -arch=x86_64 ScsiPortWritePortUshort(ptr long)
+@ stdcall -arch=x86_64 ScsiPortWritePortUlong(ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUchar(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUshort(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterBufferUlong(ptr ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterUchar(ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterUshort(ptr long)
+@ stdcall -arch=x86_64 ScsiPortWriteRegisterUlong(ptr long)