From 0568ff9b20722c39f461999b7ef082e4c72fb469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 8 Feb 2008 19:46:17 +0000 Subject: [PATCH] Use a generic .spec file, instead of a .def file per architecture svn path=/trunk/; revision=32229 --- .../drivers/storage/scsiport/scsiport.rbuild | 3 +- .../drivers/storage/scsiport/scsiport.spec | 45 ++++++++++++++++ .../drivers/storage/scsiport/scsiport_arm.def | 51 ------------------- .../storage/scsiport/scsiport_i386.def | 51 ------------------- 4 files changed, 47 insertions(+), 103 deletions(-) create mode 100644 reactos/drivers/storage/scsiport/scsiport.spec delete mode 100644 reactos/drivers/storage/scsiport/scsiport_arm.def delete mode 100644 reactos/drivers/storage/scsiport/scsiport_i386.def diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild index 2e0cf30ee33..98e4707fe50 100644 --- a/reactos/drivers/storage/scsiport/scsiport.rbuild +++ b/reactos/drivers/storage/scsiport/scsiport.rbuild @@ -3,10 +3,11 @@ - + . ntoskrnl hal scsiport.c scsiport.rc + scsiport.spec diff --git a/reactos/drivers/storage/scsiport/scsiport.spec b/reactos/drivers/storage/scsiport/scsiport.spec new file mode 100644 index 00000000000..b779b1ee557 --- /dev/null +++ b/reactos/drivers/storage/scsiport/scsiport.spec @@ -0,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 diff --git a/reactos/drivers/storage/scsiport/scsiport_arm.def b/reactos/drivers/storage/scsiport/scsiport_arm.def deleted file mode 100644 index c9df508e0de..00000000000 --- a/reactos/drivers/storage/scsiport/scsiport_arm.def +++ /dev/null @@ -1,51 +0,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 diff --git a/reactos/drivers/storage/scsiport/scsiport_i386.def b/reactos/drivers/storage/scsiport/scsiport_i386.def deleted file mode 100644 index 96cf535b9ee..00000000000 --- a/reactos/drivers/storage/scsiport/scsiport_i386.def +++ /dev/null @@ -1,51 +0,0 @@ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest@20 -ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress@4=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma@4 -ScsiPortFreeDeviceBase@8 -ScsiPortGetBusData@24 -ScsiPortGetDeviceBase@28 -ScsiPortGetLogicalUnit@16 -ScsiPortGetPhysicalAddress@16 -ScsiPortGetSrb@20 -ScsiPortGetUncachedExtension@12 -ScsiPortGetVirtualAddress@12 -ScsiPortInitialize@16 -ScsiPortIoMapTransfer@16 -ScsiPortLogError@28 -ScsiPortMoveMemory@12 -ScsiPortNotification -ScsiPortReadPortBufferUchar@12=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort@12=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong@12=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar@4=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort@4=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong@4=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar@12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort@12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong@12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar@4=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort@4=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong@4=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution@4=HAL.KeStallExecutionProcessor -ScsiPortValidateRange@28 -ScsiPortWritePortUchar@8=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort@8=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong@8=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar@12=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort@12=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong@12=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar@12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort@12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong@12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar@8=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort@8=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong@8=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF