[akhaldi] 55475: [CLASSPNP] * Rename class.spec to classpnp.spec and adjust the build files accordingly. [DISK_NEW] * Fix the build files (cmake and rbuild). * Fix InitSafeBootMode use. * Add disk_...
Author: akhaldi Date: Mon Feb 6 22:48:17 2012 New Revision: 55475
URL: http://svn.reactos.org/svn/reactos?rev=55475&view=rev Log: [CLASSPNP] * Rename class.spec to classpnp.spec and adjust the build files accordingly. [DISK_NEW] * Fix the build files (cmake and rbuild). * Fix InitSafeBootMode use. * Add disk_new to build.
Added: branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.spec - copied unchanged from r55470, branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec Removed: branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec Modified: branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild
Modified: branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -2,4 +2,5 @@ add_subdirectory(cdrom) add_subdirectory(class2) add_subdirectory(disk) +add_subdirectory(disk_new) add_subdirectory(ramdisk)
Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -1,16 +1,12 @@ include_directories(..)
-add_library(disk SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) +add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc)
-if(ARCH MATCHES i386) - add_target_compile_flags(disk "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") +target_link_libraries(disk_new libcntpr wdmguid) +if(NOT MSVC AND ARCH MATCHES i386) + add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif()
-set_module_type(disk kernelmodedriver) -add_importlibs(disk - classpnp - scsiport - ntoskrnl - hal) - -add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) +set_module_type(disk_new kernelmodedriver) +add_importlibs(disk_new classpnp ntoskrnl hal) +add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all)
Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -22,7 +22,7 @@
#include "disk.h"
-extern PULONG InitSafeBootMode; +extern NTSYSAPI ULONG InitSafeBootMode;
#ifdef ALLOC_PRAGMA
@@ -500,7 +500,7 @@ // and enable failure prediction polling. //
- if (*InitSafeBootMode == 0) + if (InitSafeBootMode == 0) { DiskDetectFailurePrediction(fdoExtension, &diskData->FailurePredictionCapability);
Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -17,7 +17,7 @@ endif() endif()
-spec2def(classpnp.sys class.spec) +spec2def(classpnp.sys classpnp.spec)
list(APPEND SOURCE autorun.c @@ -35,12 +35,12 @@ utils.c xferpkt.c class.rc - ${CMAKE_CURRENT_BINARY_DIR}/class.def) + ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def)
add_library(classpnp SHARED ${SOURCE}) add_pch(classpnp classp.h) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) -add_importlib_target(class.spec) +add_importlib_target(classpnp.spec) add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all)
Removed: branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec (removed) @@ -1,59 +1,0 @@ - - @ stdcall ClassInitialize(ptr ptr ptr) - @ stdcall ClassInitializeEx(ptr ptr ptr) - @ stdcall ClassGetDescriptor(ptr ptr ptr) - @ stdcall ClassReadDriveCapacity(ptr) - @ stdcall ClassReleaseQueue(ptr) - @ stdcall ClassAsynchronousCompletion(ptr ptr ptr) - @ stdcall ClassSplitRequest(ptr ptr long) - @ stdcall ClassDeviceControl(ptr ptr) - @ stdcall ClassIoComplete(ptr ptr ptr) - @ stdcall ClassIoCompleteAssociated(ptr ptr ptr) - @ stdcall ClassInterpretSenseInfo(ptr ptr long long long ptr ptr) - @ stdcall ClassSendDeviceIoControlSynchronous(long ptr ptr long long long ptr) - @ stdcall ClassSendIrpSynchronous(ptr ptr) - @ stdcall ClassForwardIrpSynchronous(ptr ptr) - @ stdcall ClassSendSrbSynchronous(ptr ptr ptr long long) - @ stdcall ClassSendSrbAsynchronous(ptr ptr ptr ptr long long) - @ stdcall ClassBuildRequest(ptr ptr) - @ stdcall ClassModeSense(ptr ptr long long) - @ stdcall ClassFindModePage(ptr long long long) - @ stdcall ClassClaimDevice(ptr long) - @ stdcall ClassInternalIoControl(ptr ptr) - @ stdcall ClassCreateDeviceObject(ptr ptr ptr long ptr) - @ stdcall ClassRemoveDevice(ptr long) - @ stdcall ClassInitializeSrbLookasideList(ptr long) - @ stdcall ClassDeleteSrbLookasideList(ptr) - @ stdcall ClassQueryTimeOutRegistryValue(ptr) - @ stdcall ClassInvalidateBusRelations(ptr) - @ stdcall ClassMarkChildrenMissing(ptr) - @ stdcall ClassMarkChildMissing(ptr long) - @ varargs ClassDebugPrint(long long) - @ stdcall ClassGetDriverExtension(ptr) - @ stdcall ClassCompleteRequest(ptr ptr long) - @ stdcall ClassReleaseRemoveLock(ptr ptr) - @ stdcall ClassAcquireRemoveLockEx(ptr ptr ptr long) - @ stdcall ClassUpdateInformationInRegistry(ptr ptr long ptr long) - @ stdcall ClassWmiCompleteRequest(ptr ptr long long long) - @ stdcall ClassWmiFireEvent(ptr ptr long long ptr) - @ stdcall ClassGetVpb(ptr) - @ stdcall ClassSetFailurePredictionPoll(ptr long long) - @ stdcall ClassNotifyFailurePredicted(ptr ptr long long long long long long) - @ stdcall ClassInitializeTestUnitPolling(ptr long) - @ stdcall ClassSignalCompletion(ptr ptr ptr) - @ stdcall ClassSendStartUnit(ptr) - @ stdcall ClassSetMediaChangeState(ptr long long) - @ stdcall ClassResetMediaChangeTimer(ptr) - @ stdcall ClassCheckMediaState(ptr) - @ stdcall ClassInitializeMediaChangeDetection(ptr ptr) - @ stdcall ClassCleanupMediaChangeDetection(ptr) - @ stdcall ClassEnableMediaChangeDetection(ptr) - @ stdcall ClassDisableMediaChangeDetection(ptr) - @ stdcall ClassSpinDownPowerHandler(ptr ptr) - @ stdcall ClassStopUnitPowerHandler(ptr ptr) - @ stdcall ClassAcquireChildLock(ptr) - @ stdcall ClassReleaseChildLock(ptr) - @ stdcall ClassScanForSpecial(ptr ptr ptr) - @ stdcall ClassSetDeviceParameter(ptr ptr ptr long) - @ stdcall ClassGetDeviceParameter(ptr ptr ptr ptr) -
Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/storag... ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys"> <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> - <importlibrary definition="class.spec" /> + <importlibrary definition="classpnp.spec" /> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library>
-
akhaldi＠svn.reactos.org