[ros-diffs] [fireball] 26186: - Remove old crap files - Put new .def, add .rbuild

Author: fireball
Date: Tue Mar 27 14:12:59 2007
New Revision: 26186

URL: http://svn.reactos.org/svn/reactos?rev=26186&view=rev
Log:
- Remove old crap files
- Put new .def, add .rbuild

Added:
    trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild
Removed:
    trunk/reactos/drivers/storage/scsiport-new/.cvsignore
    trunk/reactos/drivers/storage/scsiport-new/makefile
    trunk/reactos/drivers/storage/scsiport-new/scsiport.edf
Modified:
    trunk/reactos/drivers/storage/scsiport-new/scsiport.def
    trunk/reactos/drivers/storage/scsiport-new/scsiport.rc

Removed: trunk/reactos/drivers/storage/scsiport-new/.cvsignore
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/.cvsignore (original)
+++ trunk/reactos/drivers/storage/scsiport-new/.cvsignore (removed)
@@ -1,8 +1,0 @@
-base.tmp
-junk.tmp
-temp.exp
-scsiport.coff
-*.o
-*.sym
-*.sys
-*.map

Removed: trunk/reactos/drivers/storage/scsiport-new/makefile
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/makefile (original)
+++ trunk/reactos/drivers/storage/scsiport-new/makefile (removed)
@@ -1,17 +1,0 @@
-# $Id: makefile,v 1.6 2003/11/13 14:20:03 ekohl Exp $
-
-PATH_TO_TOP = ../../..
-
-TARGET_BOOTSTRAP = yes
-
-TARGET_TYPE = export_driver
-
-TARGET_NAME = scsiport
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Werror -Wall
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/scsiport.def (original)
+++ trunk/reactos/drivers/storage/scsiport-new/scsiport.def Tue Mar 27 14:12:59 2007
@@ -1,4 +1,4 @@
-; $Id: scsiport.def,v 1.2 2001/07/23 06:13:48 ekohl Exp $
+; $Id$
 ;
 ; scsiport.def - export definition file for scsiport driver
 ;
@@ -7,7 +7,7 @@
 ScsiDebugPrint
 ScsiPortCompleteRequest@20
 ScsiPortConvertPhysicalAddressToUlong@8
-ScsiPortConvertUlongToPhysicalAddress@4
+ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger
 ScsiPortFlushDma@4
 ScsiPortFreeDeviceBase@8
 ScsiPortGetBusData@24
@@ -22,31 +22,31 @@
 ScsiPortLogError@28
 ScsiPortMoveMemory@12
 ScsiPortNotification
-ScsiPortReadPortBufferUchar@12
-ScsiPortReadPortBufferUshort@12
-ScsiPortReadPortBufferUlong@12
-ScsiPortReadPortUchar@4
-ScsiPortReadPortUshort@4
-ScsiPortReadPortUlong@4
-ScsiPortReadRegisterBufferUchar@12
-ScsiPortReadRegisterBufferUshort@12
-ScsiPortReadRegisterBufferUlong@12
-ScsiPortReadRegisterUchar@4
-ScsiPortReadRegisterUshort@4
-ScsiPortReadRegisterUlong@4
+ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR
+ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT
+ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG
+ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR
+ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT
+ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG
+ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
+ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT
+ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG
+ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR
+ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT
+ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG
 ScsiPortSetBusDataByOffset@28
-ScsiPortStallExecution@4
+ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor
 ScsiPortValidateRange@28
-ScsiPortWritePortBufferUchar@12
-ScsiPortWritePortBufferUshort@12
-ScsiPortWritePortBufferUlong@12
-ScsiPortWritePortUchar@8
-ScsiPortWritePortUshort@8
-ScsiPortWritePortUlong@8
-ScsiPortWriteRegisterBufferUchar@12
-ScsiPortWriteRegisterBufferUshort@12
-ScsiPortWriteRegisterBufferUlong@12
-ScsiPortWriteRegisterUchar@8
-ScsiPortWriteRegisterUshort@8
-ScsiPortWriteRegisterUlong@8
+ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR
+ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT
+ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG
+ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR
+ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT
+ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG
+ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
+ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
+ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
+ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR
+ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT
+ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG
 ;EOF

Removed: trunk/reactos/drivers/storage/scsiport-new/scsiport.edf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/scsiport.edf (original)
+++ trunk/reactos/drivers/storage/scsiport-new/scsiport.edf (removed)
@@ -1,52 +1,0 @@
-; $Id: scsiport.edf,v 1.5 2002/06/26 18:39:50 hbirr Exp $
-;
-; scsiport.def - export definition file for scsiport driver
-;
-LIBRARY SCSIPORT.SYS
-EXPORTS
-ScsiDebugPrint
-ScsiPortCompleteRequest=ScsiPortCompleteRequest@20
-ScsiPortConvertPhysicalAddressToUlong=ScsiPortConvertPhysicalAddressToUlong@8
-ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger
-ScsiPortFlushDma=ScsiPortFlushDma@4
-ScsiPortFreeDeviceBase=ScsiPortFreeDeviceBase@8
-ScsiPortGetBusData=ScsiPortGetBusData@24
-ScsiPortGetDeviceBase=ScsiPortGetDeviceBase@28
-ScsiPortGetLogicalUnit=ScsiPortGetLogicalUnit@16
-ScsiPortGetPhysicalAddress=ScsiPortGetPhysicalAddress@16
-ScsiPortGetSrb=ScsiPortGetSrb@20
-ScsiPortGetUncachedExtension=ScsiPortGetUncachedExtension@12
-ScsiPortGetVirtualAddress=ScsiPortGetVirtualAddress@12
-ScsiPortInitialize=ScsiPortInitialize@16
-ScsiPortIoMapTransfer=ScsiPortIoMapTransfer@16
-ScsiPortLogError=ScsiPortLogError@28
-ScsiPortMoveMemory=ScsiPortMoveMemory@12
-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=ScsiPortSetBusDataByOffset@28
-ScsiPortStallExecution=HAL.KeStallExecutionProcessor
-ScsiPortValidateRange=ScsiPortValidateRange@28
-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

Added: trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild (added)
+++ trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild Tue Mar 27 14:12:59 2007
@@ -1,0 +1,11 @@
+<module name="scsiport-new" type="exportdriver"
installbase="system32/drivers" installname="scsiport.sys">
+	<bootstrap base="$(CDOUTPUT)" />
+	<define name="__USE_W32API" />
+	<define name="_SCSIPORT_" />
+	<importlibrary definition="scsiport.def" />
+	<include base="scsiport">.</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<file>scsiport.c</file>
+	<file>scsiport.rc</file>
+</module>

Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n…
==============================================================================
--- trunk/reactos/drivers/storage/scsiport-new/scsiport.rc (original)
+++ trunk/reactos/drivers/storage/scsiport-new/scsiport.rc Tue Mar 27 14:12:59 2007
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id$ */
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-VS_VERSION_INFO VERSIONINFO
-	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
-	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
-	FILEFLAGSMASK	0x3fL
-#ifdef _DEBUG
-	FILEFLAGS	0x1L
-#else
-	FILEFLAGS	0x0L
-#endif
-	FILEOS		0x40004L
-	FILETYPE	0x2L
-	FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",	RES_STR_COMPANY_NAME
-            VALUE "FileDescription",	"SCSI Port Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"scsiport\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"scsiport.sys\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"SCSI Port Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"scsiport\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"scsiport.sys\0"
+#include <reactos/version.rc>