Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMIPCI]

Browse source 
- Use correct calling convention for some callbacks
 - Actually use DriverEntry as entry point
CORE-7094 CORE-7668 #Comment Please retest after r61331

svn path=/trunk/; revision=61331
This commit is contained in:
Jérôme Gardou 2013-12-22 15:26:17 +00:00
parent fa1dfebfeb
commit 52dbb0a1ec
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt
View file

@ -20,7 +20,7 @@ add_library(cmipci SHARED
target_link_libraries(cmipci stdunk libcntpr) target_link_libraries(cmipci stdunk libcntpr)
set_module_type(cmipci wdmdriver UNICODE ENTRYPOINT 0) set_module_type(cmipci wdmdriver UNICODE)
add_importlibs(cmipci portcls hal ntoskrnl) add_importlibs(cmipci portcls hal ntoskrnl)

26
reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp
View file

@ -33,7 +33,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma code_seg("PAGE") #pragma code_seg("PAGE")
#endif #endif
NTSTATUS InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, REFGUID PortClassId, REFGUID MiniportClassId, PFNCREATEINSTANCE MiniportCreate, PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, REFGUID PortInterfaceId, PUNKNOWN* OutPortUnknown) static
NTSTATUS
InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, REFGUID PortClassId, REFGUID MiniportClassId, PFNCREATEINSTANCE MiniportCreate, PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, REFGUID PortInterfaceId, PUNKNOWN* OutPortUnknown)
{ {
PAGED_CODE(); PAGED_CODE();
DBGPRINT(("InstallSubdevice()")); DBGPRINT(("InstallSubdevice()"));
@ -76,8 +78,9 @@ NTSTATUS InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, RE
return ntStatus; return ntStatus;
} }
static
NTSTATUS ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourceList) NTSTATUS
ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourceList)
{ {
PAGED_CODE(); PAGED_CODE();
ASSERT(ResourceList); ASSERT(ResourceList);
@ -107,7 +110,9 @@ NTSTATUS ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourc
} }
NTSTATUS StartDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PRESOURCELIST ResourceList) NTSTATUS
NTAPI
StartDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PRESOURCELIST ResourceList)
{ {
PAGED_CODE(); PAGED_CODE();
ASSERT(DeviceObject); ASSERT(DeviceObject);
@ -256,10 +261,12 @@ extern "C" NTSTATUS NTAPI AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT
PAGED_CODE(); PAGED_CODE();
DBGPRINT(("AddDevice()")); DBGPRINT(("AddDevice()"));
return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, (PCPFNSTARTDEVICE)StartDevice, MAX_MINIPORTS, 0); return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, StartDevice, MAX_MINIPORTS, 0);
} }
bool CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOURCE_DESCRIPTOR pOutResDescriptor) static
bool
CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOURCE_DESCRIPTOR pOutResDescriptor)
{ {
PAGED_CODE(); PAGED_CODE();
ASSERT(pInResDescriptor); ASSERT(pInResDescriptor);
@ -302,7 +309,7 @@ bool CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOUR
#endif #endif
} }
extern "C" NTSTATUS AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp) extern "C" NTSTATUS NTAPI AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp)
{ {
PAGED_CODE(); PAGED_CODE();
ASSERT(pDeviceObject); ASSERT(pDeviceObject);
@ -390,7 +397,10 @@ extern "C" NTSTATUS AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp)
return ntStatus; return ntStatus;
} }
extern "C" NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName) extern "C"
NTSTATUS
NTAPI
DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName)
{ {
PAGED_CODE(); PAGED_CODE();
DBGPRINT(("DriverEntry()")); DBGPRINT(("DriverEntry()"));

2
reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp
View file

@ -62,7 +62,7 @@ extern NTSTATUS NewCMIAdapter
IN POOL_TYPE PoolType IN POOL_TYPE PoolType
); );
extern "C" NTSTATUS AdapterDispatchPnp extern "C" NTSTATUS NTAPI AdapterDispatchPnp
( (
IN PDEVICE_OBJECT pDeviceObject, IN PDEVICE_OBJECT pDeviceObject,
IN PIRP pIrp IN PIRP pIrp