Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

various fixes

Browse source 
sb16_ks now builds, but cannot be built

svn path=/trunk/; revision=26132
This commit is contained in:
Sylvain Petreolle 2007-03-18 15:38:04 +00:00
parent 87bde6d032
commit 8c680affb1
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/multimedia/sb16_ks/adapter.cpp
View file

@ -114,6 +114,12 @@ CAdapterSB16::ResetMixer()
} }
STDMETHODIMP_(void)
SetWaveMiniport(
IN PWAVEMINIPORTSB16 Miniport)
{
}
/* /*
STDMETHODIMP_(void) STDMETHODIMP_(void)
CAdapterSB16::PowerChangeState( CAdapterSB16::PowerChangeState(

44
reactos/drivers/multimedia/sb16_ks/main.cpp
View file

@ -31,6 +31,7 @@ DetectPlatform(
{ {
/* ASSERT(Port); */ /* ASSERT(Port); */
#if 0
PPORTCLSVERSION portcls_version; PPORTCLSVERSION portcls_version;
PDRMPORT drm_port; PDRMPORT drm_port;
PPORTEVENTS port_events; PPORTEVENTS port_events;
@ -70,6 +71,9 @@ DetectPlatform(
} }
return version; return version;
#else
return kVersionWin98;
#endif
} }
@ -102,6 +106,7 @@ DetectFeatures(
} }
break; break;
}
case 2 : case 2 :
{ {
@ -198,26 +203,26 @@ AssignResources(
/* Wave I/O resources */ /* Wave I/O resources */
status = PcNewResourceSublist(Resources->Wave, status = PcNewResourceSublist(&Resources->Wave,
NULL, NULL,
PagedPool, PagedPool,
ResourceList, ResourceList,
ResourceList->NumberOfDmas() + ResourceList->NumberOfDmas() +
ResourceList->NumberOfInterrupts + 1); ResourceList->NumberOfInterrupts() + 1);
if ( NT_SUCCESS(status) ) if ( NT_SUCCESS(status) )
{ {
ULONG i; ULONG i;
/* Base port address */ /* Base port address */
status = (*Resources->Wave)->AddPortFromParent(ResourceList, 0); status = (*Resources->Wave).AddPortFromParent(ResourceList, 0);
/* DMA channels */ /* DMA channels */
if ( NT_SUCCESS(status) ) if ( NT_SUCCESS(status) )
{ {
for ( i = 0; i < ResourceList->NumberOfDmas(); i ++ ) for ( i = 0; i < ResourceList->NumberOfDmas(); i ++ )
{ {
status = (*Resources->Wave)->AddDmaFromParent(ResourceList, i); status = (*Resources->Wave).AddDmaFromParent(ResourceList, i);
if ( ! NT_SUCCESS(status) ) if ( ! NT_SUCCESS(status) )
break; break;
@ -229,7 +234,7 @@ AssignResources(
{ {
for ( i = 0; i < ResourceList->NumberOfInterrupts(); i ++ ) for ( i = 0; i < ResourceList->NumberOfInterrupts(); i ++ )
{ {
status = (*Resources->Wave)->AddInterruptFromParent(ResourceList, i); status = (*Resources->Wave).AddInterruptFromParent(ResourceList, i);
if ( ! NT_SUCCESS(status) ) if ( ! NT_SUCCESS(status) )
break; break;
@ -255,7 +260,7 @@ AssignResources(
if ( NT_SUCCESS(status) ) if ( NT_SUCCESS(status) )
{ {
status = PcNewResourceSublist(Resources->Adapter, status = PcNewResourceSublist(&Resources->Adapter,
NULL, NULL,
PagedPool, PagedPool,
ResourceList, ResourceList,
@ -263,12 +268,12 @@ AssignResources(
if ( NT_SUCCESS(status) ) if ( NT_SUCCESS(status) )
{ {
status = (*Resources->Adapter)->AddInterruptFromParent(ResourceList, 0); status = (*Resources->Adapter).AddInterruptFromParent(ResourceList, 0);
} }
if ( NT_SUCCESS(status) ) if ( NT_SUCCESS(status) )
{ {
status = (*Resources->Adapter)->AddPortFromParent(ResourceList, 0); status = (*Resources->Adapter).AddPortFromParent(ResourceList, 0);
} }
if ( NT_SUCCESS(status) && HasUart ) if ( NT_SUCCESS(status) && HasUart )
@ -281,16 +286,16 @@ AssignResources(
if ( ! NT_SUCCESS(status) ) if ( ! NT_SUCCESS(status) )
{ {
if ( *Resources->Wave ) if ( (*Resources).Wave != NULL )
{ {
(*Resources->Wave)->Release(); (*Resources->Wave).Release();
*Resources->Wave = NULL; (*Resources).Wave = NULL;
} }
if ( *Resources->Adapter ) if ( (*Resources).Adapter != NULL )
{ {
(*Resources->Adapter)->Release(); (*Resources->Adapter).Release();
*Resources->Adapter = NULL; (*Resources).Adapter = NULL;
} }
} }
@ -310,10 +315,10 @@ StartDevice(
PUNKNOWN UnknownTopology = NULL; PUNKNOWN UnknownTopology = NULL;
PUNKNOWN UnknownWave = NULL; PUNKNOWN UnknownWave = NULL;
PUNKNOWN UnknownWaveTable = NUL; PUNKNOWN UnknownWaveTable = NULL;
PUNKNOWN UnknownFmSynth = NULL; PUNKNOWN UnknownFmSynth = NULL;
PADAPTERCOMMON AdapterCommon = NULL; // PADAPTERCOMMON AdapterCommon = NULL;
PUNKNOWN UnknownCommon = NULL; PUNKNOWN UnknownCommon = NULL;
status = AssignResources(ResourceList, &DeviceResources); status = AssignResources(ResourceList, &DeviceResources);
@ -326,7 +331,7 @@ StartDevice(
} }
extern "C" extern "C"
NSTATUS NTSTATUS
AddDevice( AddDevice(
IN PDRIVER_OBJECT DriverObject, IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT PhysicalDeviceObject) IN PDEVICE_OBJECT PhysicalDeviceObject)
@ -348,9 +353,10 @@ DriverEntry(
status = PcInitializeAdapterDriver(DriverObject, status = PcInitializeAdapterDriver(DriverObject,
RegistryPathName, RegistryPathName,
AddDevice); (PDRIVER_ADD_DEVICE) AddDevice);
/* TODO: Add our own IRP handlers here */ /* TODO: Add our own IRP handlers here */
return status; return status;
} }