mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
[DSOUND_NEW][HDAUDBUS] Replace meaningless YDEBUG (#5857)
and move debug.h after all includes. Addendum to60b0afc3a
(PR #5818) dsound_new: Addendum to5974fe1
(r45584). hdaudbus: Addendum tocf7fc81
(r68311).
This commit is contained in:
parent
b3194e320c
commit
31876ba8c2
2 changed files with 12 additions and 18 deletions
|
@ -15,8 +15,6 @@
|
||||||
#include <dsconf.h>
|
#include <dsconf.h>
|
||||||
#include <vfwmsgs.h>
|
#include <vfwmsgs.h>
|
||||||
#include <setupapi.h>
|
#include <setupapi.h>
|
||||||
#define YDEBUG
|
|
||||||
#include <debug.h>
|
|
||||||
#include <ks.h>
|
#include <ks.h>
|
||||||
#include <ksmedia.h>
|
#include <ksmedia.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
@ -24,6 +22,8 @@
|
||||||
|
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
|
// #define NDEBUG
|
||||||
|
#include <debug.h>
|
||||||
|
|
||||||
/* factory method */
|
/* factory method */
|
||||||
typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
|
typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
|
||||||
|
@ -35,7 +35,6 @@ typedef struct
|
||||||
LPFNCREATEINSTANCE lpfnCI;
|
LPFNCREATEINSTANCE lpfnCI;
|
||||||
} INTERFACE_TABLE;
|
} INTERFACE_TABLE;
|
||||||
|
|
||||||
|
|
||||||
typedef struct tagFILTERINFO
|
typedef struct tagFILTERINFO
|
||||||
{
|
{
|
||||||
SP_DEVINFO_DATA DeviceData;
|
SP_DEVINFO_DATA DeviceData;
|
||||||
|
@ -74,7 +73,6 @@ IClassFactory_fnConstructor(
|
||||||
PLONG pcRefDll,
|
PLONG pcRefDll,
|
||||||
REFIID riidInst);
|
REFIID riidInst);
|
||||||
|
|
||||||
|
|
||||||
/* devicelist.c */
|
/* devicelist.c */
|
||||||
|
|
||||||
HRESULT
|
HRESULT
|
||||||
|
@ -107,7 +105,6 @@ NewDirectSound(
|
||||||
REFIID riid,
|
REFIID riid,
|
||||||
LPVOID* ppvObject);
|
LPVOID* ppvObject);
|
||||||
|
|
||||||
|
|
||||||
/* misc.c */
|
/* misc.c */
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
@ -136,7 +133,6 @@ CreateCompatiblePin(
|
||||||
OUT LPWAVEFORMATEX WaveFormatOut,
|
OUT LPWAVEFORMATEX WaveFormatOut,
|
||||||
OUT PHANDLE hPin);
|
OUT PHANDLE hPin);
|
||||||
|
|
||||||
|
|
||||||
DWORD
|
DWORD
|
||||||
SyncOverlappedDeviceIoControl(
|
SyncOverlappedDeviceIoControl(
|
||||||
IN HANDLE Handle,
|
IN HANDLE Handle,
|
||||||
|
@ -153,7 +149,6 @@ PrimaryDirectSoundBuffer_Write(
|
||||||
LPVOID Buffer,
|
LPVOID Buffer,
|
||||||
DWORD BufferSize);
|
DWORD BufferSize);
|
||||||
|
|
||||||
|
|
||||||
DWORD
|
DWORD
|
||||||
OpenPin(
|
OpenPin(
|
||||||
HANDLE hFilter,
|
HANDLE hFilter,
|
||||||
|
@ -229,6 +224,7 @@ NewSecondarySoundBuffer(
|
||||||
LPDIRECTSOUNDBUFFER8 PrimaryBuffer);
|
LPDIRECTSOUNDBUFFER8 PrimaryBuffer);
|
||||||
|
|
||||||
/* property.c */
|
/* property.c */
|
||||||
|
|
||||||
HRESULT
|
HRESULT
|
||||||
CALLBACK
|
CALLBACK
|
||||||
NewKsPropertySet(
|
NewKsPropertySet(
|
||||||
|
@ -245,8 +241,8 @@ NewDirectSoundCapture(
|
||||||
REFIID riid,
|
REFIID riid,
|
||||||
LPVOID* ppvObject);
|
LPVOID* ppvObject);
|
||||||
|
|
||||||
|
|
||||||
/* capturebuffer.c */
|
/* capturebuffer.c */
|
||||||
|
|
||||||
HRESULT
|
HRESULT
|
||||||
NewDirectSoundCaptureBuffer(
|
NewDirectSoundCaptureBuffer(
|
||||||
LPDIRECTSOUNDCAPTUREBUFFER8 *OutBuffer,
|
LPDIRECTSOUNDCAPTUREBUFFER8 *OutBuffer,
|
||||||
|
@ -254,6 +250,7 @@ NewDirectSoundCaptureBuffer(
|
||||||
LPCDSCBUFFERDESC lpcDSBufferDesc);
|
LPCDSCBUFFERDESC lpcDSBufferDesc);
|
||||||
|
|
||||||
/* notify.c */
|
/* notify.c */
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
DoNotifyPositionEvents(
|
DoNotifyPositionEvents(
|
||||||
LPDIRECTSOUNDNOTIFY iface,
|
LPDIRECTSOUNDNOTIFY iface,
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define YDEBUG
|
|
||||||
#include <ntddk.h>
|
#include <ntddk.h>
|
||||||
#include <debug.h>
|
|
||||||
#include <initguid.h>
|
#include <initguid.h>
|
||||||
#include <hdaudio.h>
|
#include <hdaudio.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ntstrsafe.h>
|
#include <ntstrsafe.h>
|
||||||
|
|
||||||
#define TAG_HDA 'bADH'
|
// Include Haiku headers
|
||||||
|
|
||||||
|
|
||||||
// include Haiku headers
|
|
||||||
#include "driver.h"
|
#include "driver.h"
|
||||||
|
|
||||||
|
// #define NDEBUG
|
||||||
|
#include <debug.h>
|
||||||
|
|
||||||
|
#define TAG_HDA 'bADH'
|
||||||
|
|
||||||
#define MAKE_RATE(base, multiply, divide) \
|
#define MAKE_RATE(base, multiply, divide) \
|
||||||
((base == 44100 ? FORMAT_44_1_BASE_RATE : 0) \
|
((base == 44100 ? FORMAT_44_1_BASE_RATE : 0) \
|
||||||
| ((multiply - 1) << FORMAT_MULTIPLY_RATE_SHIFT) \
|
| ((multiply - 1) << FORMAT_MULTIPLY_RATE_SHIFT) \
|
||||||
|
@ -29,7 +29,6 @@
|
||||||
|
|
||||||
#define ALIGN(size, align) (((size) + align - 1) & ~(align - 1))
|
#define ALIGN(size, align) (((size) + align - 1) & ~(align - 1))
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ULONG response;
|
ULONG response;
|
||||||
ULONG flags;
|
ULONG flags;
|
||||||
|
@ -61,7 +60,6 @@ typedef struct
|
||||||
|
|
||||||
}HDA_CODEC_ENTRY, *PHDA_CODEC_ENTRY;
|
}HDA_CODEC_ENTRY, *PHDA_CODEC_ENTRY;
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
BOOLEAN IsFDO;
|
BOOLEAN IsFDO;
|
||||||
|
@ -92,7 +90,6 @@ typedef struct
|
||||||
PDEVICE_OBJECT FDO;
|
PDEVICE_OBJECT FDO;
|
||||||
}HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION;
|
}HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION;
|
||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ULONG device : 16;
|
ULONG device : 16;
|
||||||
ULONG vendor : 16;
|
ULONG vendor : 16;
|
||||||
|
@ -107,7 +104,6 @@ typedef struct {
|
||||||
ULONG _reserved2 : 8;
|
ULONG _reserved2 : 8;
|
||||||
}CODEC_RESPONSE, *PCODEC_RESPONSE;
|
}CODEC_RESPONSE, *PCODEC_RESPONSE;
|
||||||
|
|
||||||
|
|
||||||
PVOID
|
PVOID
|
||||||
AllocateItem(
|
AllocateItem(
|
||||||
IN POOL_TYPE PoolType,
|
IN POOL_TYPE PoolType,
|
||||||
|
@ -118,6 +114,7 @@ FreeItem(
|
||||||
IN PVOID Item);
|
IN PVOID Item);
|
||||||
|
|
||||||
/* fdo.cpp */
|
/* fdo.cpp */
|
||||||
|
|
||||||
KSERVICE_ROUTINE HDA_InterruptService;
|
KSERVICE_ROUTINE HDA_InterruptService;
|
||||||
IO_DPC_ROUTINE HDA_DpcForIsr;
|
IO_DPC_ROUTINE HDA_DpcForIsr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue