mirror of
https://github.com/reactos/reactos.git
synced 2024-07-10 14:45:06 +00:00
[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. svn path=/branches/usb-bringup-trunk/; revision=55475
This commit is contained in:
parent
6fe69b972d
commit
60e9668112
|
@ -2,4 +2,5 @@
|
|||
add_subdirectory(cdrom)
|
||||
add_subdirectory(class2)
|
||||
add_subdirectory(disk)
|
||||
add_subdirectory(disk_new)
|
||||
add_subdirectory(ramdisk)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -22,7 +22,7 @@ Revision History:
|
|||
|
||||
#include "disk.h"
|
||||
|
||||
extern PULONG InitSafeBootMode;
|
||||
extern NTSYSAPI ULONG InitSafeBootMode;
|
||||
|
||||
#ifdef ALLOC_PRAGMA
|
||||
|
||||
|
@ -500,7 +500,7 @@ Return Value:
|
|||
// and enable failure prediction polling.
|
||||
//
|
||||
|
||||
if (*InitSafeBootMode == 0)
|
||||
if (InitSafeBootMode == 0)
|
||||
{
|
||||
DiskDetectFailurePrediction(fdoExtension,
|
||||
&diskData->FailurePredictionCapability);
|
||||
|
|
|
@ -17,7 +17,7 @@ if(ARCH MATCHES i386)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
spec2def(classpnp.sys class.spec)
|
||||
spec2def(classpnp.sys classpnp.spec)
|
||||
|
||||
list(APPEND SOURCE
|
||||
autorun.c
|
||||
|
@ -35,12 +35,12 @@ list(APPEND SOURCE
|
|||
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)
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue