[ros-diffs] [hpoussin] 32229: Use a generic .spec file, instead of a .def file per architecture

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Fri Feb 8 20:46:18 CET 2008 

Author: hpoussin
Date: Fri Feb  8 22:46:17 2008
New Revision: 32229

URL: http://svn.reactos.org/svn/reactos?rev=32229&view=rev
Log:
Use a generic .spec file, instead of a .def file per architecture

Added:
    trunk/reactos/drivers/storage/scsiport/scsiport.spec   (with props)
Removed:
    trunk/reactos/drivers/storage/scsiport/scsiport_arm.def
    trunk/reactos/drivers/storage/scsiport/scsiport_i386.def
Modified:
    trunk/reactos/drivers/storage/scsiport/scsiport.rbuild

Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.rbuild?rev=32229&r1=32228&r2=32229&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Fri Feb  8 22:46:17 2008
@@ -3,10 +3,11 @@
 <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="_SCSIPORT_" />
-	<importlibrary definition="scsiport_$(ARCH).def" />
+	<importlibrary definition="scsiport.spec.def" />
 	<include base="scsiport">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>scsiport.c</file>
 	<file>scsiport.rc</file>
+	<file>scsiport.spec</file>
 </module>

Added: trunk/reactos/drivers/storage/scsiport/scsiport.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.spec?rev=32229&view=auto
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport.spec (added)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.spec Fri Feb  8 22:46:17 2008
@@ -1,0 +1,45 @@
+@ cdecl ScsiDebugPrint()
+@ stdcall ScsiPortCompleteRequest(ptr long long long long)
+@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long)
+@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) 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) HAL.READ_PORT_BUFFER_UCHAR
+@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT
+@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG
+@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR
+@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT
+@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG
+@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
+@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT
+@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG
+@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR
+@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT
+@ stdcall ScsiPortReadRegisterUlong(ptr) 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) HAL.WRITE_PORT_BUFFER_UCHAR
+@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT
+@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG
+@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR
+@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT
+@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG
+@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
+@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
+@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
+@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR
+@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT
+@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG

Propchange: trunk/reactos/drivers/storage/scsiport/scsiport.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/drivers/storage/scsiport/scsiport_arm.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport_arm.def?rev=32228&view=auto
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport_arm.def (removed)
@@ -1,51 +1,0 @@
-;
-; scsiport.def - export definition file for scsiport driver
-;
-LIBRARY SCSIPORT.SYS
-EXPORTS
-ScsiDebugPrint
-ScsiPortCompleteRequest
-ScsiPortConvertPhysicalAddressToUlong
-ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger
-ScsiPortFlushDma
-ScsiPortFreeDeviceBase
-ScsiPortGetBusData
-ScsiPortGetDeviceBase
-ScsiPortGetLogicalUnit
-ScsiPortGetPhysicalAddress
-ScsiPortGetSrb
-ScsiPortGetUncachedExtension
-ScsiPortGetVirtualAddress
-ScsiPortInitialize
-ScsiPortIoMapTransfer
-ScsiPortLogError
-ScsiPortMoveMemory
-ScsiPortNotification
-ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR
-ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT
-ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG
-ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR
-ScsiPortReadPortUshort=HAL.READ_PORT_USHORT
-ScsiPortReadPortUlong=HAL.READ_PORT_ULONG
-ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
-ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT
-ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG
-ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR
-ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT
-ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG
-ScsiPortSetBusDataByOffset
-ScsiPortStallExecution=HAL.KeStallExecutionProcessor
-ScsiPortValidateRange
-ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR
-ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT
-ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG
-ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR
-ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT
-ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG
-ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
-ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
-ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
-ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR
-ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT
-ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG
-;EOF

Removed: trunk/reactos/drivers/storage/scsiport/scsiport_i386.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport_i386.def?rev=32228&view=auto
==============================================================================
--- trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport_i386.def (removed)
@@ -1,51 +1,0 @@
-;
-; scsiport.def - export definition file for scsiport driver
-;
-LIBRARY SCSIPORT.SYS
-EXPORTS
-ScsiDebugPrint
-ScsiPortCompleteRequest at 20
-ScsiPortConvertPhysicalAddressToUlong at 8
-ScsiPortConvertUlongToPhysicalAddress at 4=NTOSKRNL.RtlConvertUlongToLargeInteger
-ScsiPortFlushDma at 4
-ScsiPortFreeDeviceBase at 8
-ScsiPortGetBusData at 24
-ScsiPortGetDeviceBase at 28
-ScsiPortGetLogicalUnit at 16
-ScsiPortGetPhysicalAddress at 16
-ScsiPortGetSrb at 20
-ScsiPortGetUncachedExtension at 12
-ScsiPortGetVirtualAddress at 12
-ScsiPortInitialize at 16
-ScsiPortIoMapTransfer at 16
-ScsiPortLogError at 28
-ScsiPortMoveMemory at 12
-ScsiPortNotification
-ScsiPortReadPortBufferUchar at 12=HAL.READ_PORT_BUFFER_UCHAR
-ScsiPortReadPortBufferUshort at 12=HAL.READ_PORT_BUFFER_USHORT
-ScsiPortReadPortBufferUlong at 12=HAL.READ_PORT_BUFFER_ULONG
-ScsiPortReadPortUchar at 4=HAL.READ_PORT_UCHAR
-ScsiPortReadPortUshort at 4=HAL.READ_PORT_USHORT
-ScsiPortReadPortUlong at 4=HAL.READ_PORT_ULONG
-ScsiPortReadRegisterBufferUchar at 12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
-ScsiPortReadRegisterBufferUshort at 12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT
-ScsiPortReadRegisterBufferUlong at 12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG
-ScsiPortReadRegisterUchar at 4=NTOSKRNL.READ_REGISTER_UCHAR
-ScsiPortReadRegisterUshort at 4=NTOSKRNL.READ_REGISTER_USHORT
-ScsiPortReadRegisterUlong at 4=NTOSKRNL.READ_REGISTER_ULONG
-ScsiPortSetBusDataByOffset at 28
-ScsiPortStallExecution at 4=HAL.KeStallExecutionProcessor
-ScsiPortValidateRange at 28
-ScsiPortWritePortUchar at 8=HAL.WRITE_PORT_UCHAR
-ScsiPortWritePortUshort at 8=HAL.WRITE_PORT_USHORT
-ScsiPortWritePortUlong at 8=HAL.WRITE_PORT_ULONG
-ScsiPortWritePortBufferUchar at 12=HAL.WRITE_PORT_BUFFER_UCHAR
-ScsiPortWritePortBufferUshort at 12=HAL.WRITE_PORT_BUFFER_USHORT
-ScsiPortWritePortBufferUlong at 12=HAL.WRITE_PORT_BUFFER_ULONG
-ScsiPortWriteRegisterBufferUchar at 12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
-ScsiPortWriteRegisterBufferUshort at 12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
-ScsiPortWriteRegisterBufferUlong at 12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
-ScsiPortWriteRegisterUchar at 8=NTOSKRNL.WRITE_REGISTER_UCHAR
-ScsiPortWriteRegisterUshort at 8=NTOSKRNL.WRITE_REGISTER_USHORT
-ScsiPortWriteRegisterUlong at 8=NTOSKRNL.WRITE_REGISTER_ULONG
-;EOF

More information about the Ros-diffs mailing list