[akhaldi] 48330: [DXSDK] - atsmedia.h : Add proper header inclusion and apply a consistent formatting. - bdamedia.h : Rename BDAMEDIA_H__ to _BDAMEDIA_, add some missing inclusions, add __MINGW_EXTENSION and apply a consistent formatting. - bdatypes.h : Apply a consistent formatting.
Author: akhaldi Date: Wed Jul 28 13:59:28 2010 New Revision: 48330
URL: http://svn.reactos.org/svn/reactos?rev=48330&view=rev Log: [DXSDK] - atsmedia.h : Add proper header inclusion and apply a consistent formatting. - bdamedia.h : Rename BDAMEDIA_H__ to _BDAMEDIA_, add some missing inclusions, add __MINGW_EXTENSION and apply a consistent formatting. - bdatypes.h : Apply a consistent formatting.
Modified: trunk/reactos/include/dxsdk/atsmedia.h trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/dxsdk/bdatypes.h
Modified: trunk/reactos/include/dxsdk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/atsmedia.h?re... ============================================================================== --- trunk/reactos/include/dxsdk/atsmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/atsmedia.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -18,19 +18,14 @@
#pragma once
-#if !defined(_BDAMEDIA_) - #error BDAMEDIA.H must be included before ATSCMEDIA.H -#endif - -#if !defined(_KSMEDIA_) - #error KSMEDIA.H must be included before BDAMEDIA.H -#endif - -#if !defined(_ATSCMEDIA_) +#ifndef _ATSCMEDIA_ #define _ATSCMEDIA_
+#include <bdamedia.h> + #define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) -#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 +#define STATIC_BDANETWORKTYPE_ATSC \ + 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); -#endif
+#endif /* _ATSCMEDIA_ */
Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?re... ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -15,207 +15,201 @@ * */
-#ifndef BDAMEDIA_H__ -#define BDAMEDIA_H__ +#ifndef _BDAMEDIA_ +#define _BDAMEDIA_ + +#include <ksmedia.h> +#include <bdatypes.h>
typedef struct _KSP_BDA_NODE_PIN { - KSPROPERTY Property; - ULONG ulNodeType; - ULONG ulInputPinId; - ULONG ulOutputPinId; + KSPROPERTY Property; + ULONG ulNodeType; + ULONG ulInputPinId; + ULONG ulOutputPinId; } KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN;
-typedef struct _KSM_BDA_PIN -{ - KSMETHOD Method; - union - { - ULONG PinId; - ULONG PinType; - }; - ULONG Reserved; -} KSM_BDA_PIN, * PKSM_BDA_PIN; - -typedef struct _KSM_BDA_PIN_PAIR -{ - KSMETHOD Method; - union - { - ULONG InputPinId; - ULONG InputPinType; - }; - union - { - ULONG OutputPinId; - ULONG OutputPinType; - }; -} KSM_BDA_PIN_PAIR, * PKSM_BDA_PIN_PAIR; +typedef struct _KSM_BDA_PIN { + KSMETHOD Method; + __MINGW_EXTENSION union { + ULONG PinId; + ULONG PinType; + }; + ULONG Reserved; +} KSM_BDA_PIN, *PKSM_BDA_PIN; + +typedef struct _KSM_BDA_PIN_PAIR { + KSMETHOD Method; + __MINGW_EXTENSION union { + ULONG InputPinId; + ULONG InputPinType; + }; + __MINGW_EXTENSION union { + ULONG OutputPinId; + ULONG OutputPinType; + }; +} KSM_BDA_PIN_PAIR, *PKSM_BDA_PIN_PAIR; +
/* ------------------------------------------------------------ BDA Topology Property Set {A14EE835-0A23-11d3-9CC7-00C04F7971E0} */
#define STATIC_KSPROPSETID_BdaTopology \ - 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0xa14ee835, 0x0a23, 0x11d3, 0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("A14EE835-0A23-11d3-9CC7-00C04F7971E0", KSPROPSETID_BdaTopology); + #define KSPROPSETID_BdaTopology DEFINE_GUIDNAMED(KSPROPSETID_BdaTopology)
typedef enum { - KSPROPERTY_BDA_NODE_TYPES, - KSPROPERTY_BDA_PIN_TYPES, - KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, - KSPROPERTY_BDA_NODE_METHODS, - KSPROPERTY_BDA_NODE_PROPERTIES, - KSPROPERTY_BDA_NODE_EVENTS, - KSPROPERTY_BDA_CONTROLLING_PIN_ID, - KSPROPERTY_BDA_NODE_DESCRIPTORS - }KSPROPERTY_BDA_TOPOLOGY; - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_TYPES,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_TYPES,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_TEMPLATE_CONNECTIONS,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - sizeof( BDA_TEMPLATE_CONNECTION),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_METHODS,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_PROPERTIES,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_EVENTS,\ - (GetHandler),\ - sizeof(KSP_NODE),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_CONTROLLING_PIN_ID,\ - (GetHandler),\ - sizeof(KSP_BDA_NODE_PIN),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_NODE_DESCRIPTORS,\ - (GetHandler),\ - sizeof(KSPROPERTY),\ - 0,\ - FALSE,\ - NULL, 0, NULL, NULL, 0) + KSPROPERTY_BDA_NODE_TYPES, + KSPROPERTY_BDA_PIN_TYPES, + KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, + KSPROPERTY_BDA_NODE_METHODS, + KSPROPERTY_BDA_NODE_PROPERTIES, + KSPROPERTY_BDA_NODE_EVENTS, + KSPROPERTY_BDA_CONTROLLING_PIN_ID, + KSPROPERTY_BDA_NODE_DESCRIPTORS +} KSPROPERTY_BDA_TOPOLOGY; + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_TYPES, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_TYPES, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_TEMPLATE_CONNECTIONS, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + sizeof( BDA_TEMPLATE_CONNECTION), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_METHODS, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_PROPERTIES, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_EVENTS, \ + (GetHandler), \ + sizeof(KSP_NODE), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_CONTROLLING_PIN_ID, \ + (GetHandler), \ + sizeof(KSP_BDA_NODE_PIN), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_NODE_DESCRIPTORS, \ + (GetHandler), \ + sizeof(KSPROPERTY), \ + 0, \ + FALSE, \ + NULL, 0, NULL, NULL, 0) +
/* ------------------------------------------------------------ BDA Device Configuration Method Set {71985F45-1CA1-11d3-9CC8-00C04F7971E0} */
#define STATIC_KSMETHODSETID_BdaDeviceConfiguration \ - 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f45, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F45-1CA1-11d3-9CC8-00C04F7971E0", KSMETHODSETID_BdaDeviceConfiguration); + #define KSMETHODSETID_BdaDeviceConfiguration DEFINE_GUIDNAMED(KSMETHODSETID_BdaDeviceConfiguration)
typedef enum { - KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, - KSMETHOD_BDA_DELETE_PIN_FACTORY, - KSMETHOD_BDA_CREATE_TOPOLOGY + KSMETHOD_BDA_CREATE_PIN_FACTORY = 0, + KSMETHOD_BDA_DELETE_PIN_FACTORY, + KSMETHOD_BDA_CREATE_TOPOLOGY } KSMETHOD_BDA_DEVICE_CONFIGURATION;
-#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CREATE_PIN_FACTORY,\ - KSMETHOD_TYPE_READ,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN),\ - sizeof(ULONG),\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_DELETE_PIN_FACTORY,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CREATE_TOPOLOGY,\ - KSMETHOD_TYPE_WRITE,\ - (MethodHandler),\ - sizeof(KSM_BDA_PIN_PAIR),\ - 0,\ - SupportHandler) +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CREATE_PIN_FACTORY, \ + KSMETHOD_TYPE_READ, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN), \ + sizeof(ULONG), \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_DELETE_PIN_FACTORY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_DELETE_PIN_FACTORY, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CREATE_TOPOLOGY, \ + KSMETHOD_TYPE_WRITE, \ + (MethodHandler), \ + sizeof(KSM_BDA_PIN_PAIR), \ + 0, \ + SupportHandler) +
/* ------------------------------------------------------------ BDA Pin Control Property {0DED49D5-A8B7-4d5d-97A1-12B0C195874D} */
#define STATIC_KSPROPSETID_BdaPinControl \ - 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d + 0xded49d5, 0xa8b7, 0x4d5d, 0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d + DEFINE_GUIDSTRUCT("0DED49D5-A8B7-4d5d-97A1-12B0C195874D", KSPROPSETID_BdaPinControl); + #define KSPROPSETID_BdaPinControl DEFINE_GUIDNAMED(KSPROPSETID_BdaPinControl)
typedef enum { - KSPROPERTY_BDA_PIN_ID = 0, - KSPROPERTY_BDA_PIN_TYPE + KSPROPERTY_BDA_PIN_ID = 0, + KSPROPERTY_BDA_PIN_TYPE } KSPROPERTY_BDA_PIN_CONTROL;
-#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_ID,\ - (GetHandler),\ - sizeof( KSPROPERTY),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) - -#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler)\ - DEFINE_KSPROPERTY_ITEM(\ - KSPROPERTY_BDA_PIN_TYPE,\ - (GetHandler),\ - sizeof( KSPROPERTY),\ - sizeof( ULONG),\ - FALSE,\ - NULL, 0, NULL, NULL, 0) +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_ID, \ + (GetHandler), \ + sizeof( KSPROPERTY), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(GetHandler, SetHandler) \ + DEFINE_KSPROPERTY_ITEM(KSPROPERTY_BDA_PIN_TYPE, \ + (GetHandler), \ + sizeof( KSPROPERTY), \ + sizeof( ULONG), \ + FALSE, \ + NULL, 0, NULL, NULL, 0)
/* ------------------------------------------------------------ @@ -223,198 +217,214 @@ */
#define STATIC_KSMETHODSETID_BdaChangeSync \ - 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} + 0xfd0a5af3, 0xb41d, 0x11d2, {0x9c, 0x95, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0} + DEFINE_GUIDSTRUCT("FD0A5AF3-B41D-11d2-9C95-00C04F7971E0", KSMETHODSETID_BdaChangeSync); + #define KSMETHODSETID_BdaChangeSync DEFINE_GUIDNAMED(KSMETHODSETID_BdaChangeSync)
typedef enum { - KSMETHOD_BDA_START_CHANGES = 0, - KSMETHOD_BDA_CHECK_CHANGES, - KSMETHOD_BDA_COMMIT_CHANGES, - KSMETHOD_BDA_GET_CHANGE_STATE + KSMETHOD_BDA_START_CHANGES = 0, + KSMETHOD_BDA_CHECK_CHANGES, + KSMETHOD_BDA_COMMIT_CHANGES, + KSMETHOD_BDA_GET_CHANGE_STATE } KSMETHOD_BDA_CHANGE_SYNC;
-#define DEFINE_KSMETHOD_ITEM_BDA_START_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_START_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_CHECK_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_CHECK_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_COMMIT_CHANGES(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_COMMIT_CHANGES,\ - KSMETHOD_TYPE_NONE,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) - -#define DEFINE_KSMETHOD_ITEM_BDA_GET_CHANGE_STATE(MethodHandler, SupportHandler)\ - DEFINE_KSMETHOD_ITEM(\ - KSMETHOD_BDA_GET_CHANGE_STATE,\ - KSMETHOD_TYPE_READ,\ - (MethodHandler),\ - sizeof(KSMETHOD),\ - 0,\ - SupportHandler) +#define DEFINE_KSMETHOD_ITEM_BDA_START_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_START_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_CHECK_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_CHECK_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_COMMIT_CHANGES(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_COMMIT_CHANGES, \ + KSMETHOD_TYPE_NONE, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler) + +#define DEFINE_KSMETHOD_ITEM_BDA_GET_CHANGE_STATE(MethodHandler, SupportHandler) \ + DEFINE_KSMETHOD_ITEM(KSMETHOD_BDA_GET_CHANGE_STATE, \ + KSMETHOD_TYPE_READ, \ + (MethodHandler), \ + sizeof(KSMETHOD), \ + 0, \ + SupportHandler)
#define STATIC_KSPROPSETID_BdaFrequencyFilter \ - 0x71985f47, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f47, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F47-1CA1-11d3-9CC8-00C04F7971E0", KSPROPSETID_BdaFrequencyFilter); + #define KSPROPSETID_BdaFrequencyFilter DEFINE_GUIDNAMED(KSPROPSETID_BdaFrequencyFilter)
typedef enum { - KSPROPERTY_BDA_RF_TUNER_FREQUENCY = 0, - KSPROPERTY_BDA_RF_TUNER_POLARITY, - KSPROPERTY_BDA_RF_TUNER_RANGE, - KSPROPERTY_BDA_RF_TUNER_TRANSPONDER, - KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, - KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, - KSPROPERTY_BDA_RF_TUNER_CAPS, - KSPROPERTY_BDA_RF_TUNER_SCAN_STATUS, - KSPROPERTY_BDA_RF_TUNER_STANDARD, - KSPROPERTY_BDA_RF_TUNER_STANDARD_MODE -}KSPROPERTY_BDA_FREQUENCY_FILTER; - + KSPROPERTY_BDA_RF_TUNER_FREQUENCY = 0, + KSPROPERTY_BDA_RF_TUNER_POLARITY, + KSPROPERTY_BDA_RF_TUNER_RANGE, + KSPROPERTY_BDA_RF_TUNER_TRANSPONDER, + KSPROPERTY_BDA_RF_TUNER_BANDWIDTH, + KSPROPERTY_BDA_RF_TUNER_FREQUENCY_MULTIPLIER, + KSPROPERTY_BDA_RF_TUNER_CAPS, + KSPROPERTY_BDA_RF_TUNER_SCAN_STATUS, + KSPROPERTY_BDA_RF_TUNER_STANDARD, + KSPROPERTY_BDA_RF_TUNER_STANDARD_MODE +} KSPROPERTY_BDA_FREQUENCY_FILTER;
#define STATIC_KSPROPSETID_BdaDigitalDemodulator \ - 0xef30f379, 0x985b, 0x4d10, 0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x4, 0xe1, 0xe0 + 0xef30f379, 0x985b, 0x4d10, 0xb6, 0x40, 0xa7, 0x9d, 0x5e, 0x4, 0xe1, 0xe0 + DEFINE_GUIDSTRUCT("EF30F379-985B-4d10-B640-A79D5E04E1E0", KSPROPSETID_BdaDigitalDemodulator); + #define KSPROPSETID_BdaDigitalDemodulator DEFINE_GUIDNAMED(KSPROPSETID_BdaDigitalDemodulator)
typedef enum { - KSPROPERTY_BDA_MODULATION_TYPE = 0, - KSPROPERTY_BDA_INNER_FEC_TYPE, - KSPROPERTY_BDA_INNER_FEC_RATE, - KSPROPERTY_BDA_OUTER_FEC_TYPE, - KSPROPERTY_BDA_OUTER_FEC_RATE, - KSPROPERTY_BDA_SYMBOL_RATE, - KSPROPERTY_BDA_SPECTRAL_INVERSION, - KSPROPERTY_BDA_GUARD_INTERVAL, - KSPROPERTY_BDA_TRANSMISSION_MODE, - KSPROPERTY_BDA_ROLL_OFF, - KSPROPERTY_BDA_PILOT, - KSPROPERTY_BDA_SIGNALTIMEOUTS -}KSPROPERTY_BDA_DIGITAL_DEMODULATOR; + KSPROPERTY_BDA_MODULATION_TYPE = 0, + KSPROPERTY_BDA_INNER_FEC_TYPE, + KSPROPERTY_BDA_INNER_FEC_RATE, + KSPROPERTY_BDA_OUTER_FEC_TYPE, + KSPROPERTY_BDA_OUTER_FEC_RATE, + KSPROPERTY_BDA_SYMBOL_RATE, + KSPROPERTY_BDA_SPECTRAL_INVERSION, + KSPROPERTY_BDA_GUARD_INTERVAL, + KSPROPERTY_BDA_TRANSMISSION_MODE, + KSPROPERTY_BDA_ROLL_OFF, + KSPROPERTY_BDA_PILOT, + KSPROPERTY_BDA_SIGNALTIMEOUTS +} KSPROPERTY_BDA_DIGITAL_DEMODULATOR;
#define STATIC_KSPROPSETID_BdaLNBInfo \ - 0x992cf102, 0x49f9, 0x4719, 0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x8, 0xf4 + 0x992cf102, 0x49f9, 0x4719, 0xa6, 0x64, 0xc4, 0xf2, 0x3e, 0x24, 0x8, 0xf4 + DEFINE_GUIDSTRUCT("992CF102-49F9-4719-A664-C4F23E2408F4", KSPROPSETID_BdaLNBInfo); + #define KSPROPSETID_BdaLNBInfo DEFINE_GUIDNAMED(KSPROPSETID_BdaLNBInfo)
typedef enum { - KSPROPERTY_BDA_LNB_LOF_LOW_BAND = 0, - KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, - KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY -}KSPROPERTY_BDA_LNB_INFO; + KSPROPERTY_BDA_LNB_LOF_LOW_BAND = 0, + KSPROPERTY_BDA_LNB_LOF_HIGH_BAND, + KSPROPERTY_BDA_LNB_SWITCH_FREQUENCY +} KSPROPERTY_BDA_LNB_INFO;
#define STATIC_KSPROPSETID_BdaSignalStats \ - 0x1347d106, 0xcf3a, 0x428a, 0xa5, 0xcb, 0xac, 0xd, 0x9a, 0x2a, 0x43, 0x38 + 0x1347d106, 0xcf3a, 0x428a, 0xa5, 0xcb, 0xac, 0xd, 0x9a, 0x2a, 0x43, 0x38 + DEFINE_GUIDSTRUCT("1347D106-CF3A-428a-A5CB-AC0D9A2A4338", KSPROPSETID_BdaSignalStats); + #define KSPROPSETID_BdaSignalStats DEFINE_GUIDNAMED(KSPROPSETID_BdaSignalStats)
typedef enum { - KSPROPERTY_BDA_SIGNAL_STRENGTH = 0, - KSPROPERTY_BDA_SIGNAL_QUALITY, - KSPROPERTY_BDA_SIGNAL_PRESENT, - KSPROPERTY_BDA_SIGNAL_LOCKED, - KSPROPERTY_BDA_SAMPLE_TIME -}KSPROPERTY_BDA_SIGNAL_STATS; + KSPROPERTY_BDA_SIGNAL_STRENGTH = 0, + KSPROPERTY_BDA_SIGNAL_QUALITY, + KSPROPERTY_BDA_SIGNAL_PRESENT, + KSPROPERTY_BDA_SIGNAL_LOCKED, + KSPROPERTY_BDA_SAMPLE_TIME +} KSPROPERTY_BDA_SIGNAL_STATS;
typedef struct tagBDA_TRANSPORT_INFO { - ULONG ulcbPhyiscalPacket; - ULONG ulcbPhyiscalFrame; - ULONG ulcbPhyiscalFrameAlignment; - REFERENCE_TIME AvgTimePerFrame; - + ULONG ulcbPhyiscalPacket; + ULONG ulcbPhyiscalFrame; + ULONG ulcbPhyiscalFrameAlignment; + REFERENCE_TIME AvgTimePerFrame; } BDA_TRANSPORT_INFO, *PBDA_TRANSPORT_INFO;
-typedef struct tagKS_DATARANGE_BDA_TRANSPORT -{ - KSDATARANGE DataRange; - BDA_TRANSPORT_INFO BdaTransportInfo; +typedef struct tagKS_DATARANGE_BDA_TRANSPORT { + KSDATARANGE DataRange; + BDA_TRANSPORT_INFO BdaTransportInfo; } KS_DATARANGE_BDA_TRANSPORT, *PKS_DATARANGE_BDA_TRANSPORT; +
/* ------------------------------------------------------------ BDA Stream Format GUIDs */
#define STATIC_KSDATAFORMAT_TYPE_BDA_ANTENNA\ - 0x71985f41, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + 0x71985f41, 0x1ca1, 0x11d3, 0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0 + DEFINE_GUIDSTRUCT("71985F41-1CA1-11d3-9CC8-00C04F7971E0", KSDATAFORMAT_TYPE_BDA_ANTENNA); + #define KSDATAFORMAT_TYPE_BDA_ANTENNA DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_BDA_ANTENNA)
- #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT\ - 0xf4aeb342, 0x0329, 0x4fdd, 0xa8, 0xfd, 0x4a, 0xff, 0x49, 0x26, 0xc9, 0x78 + 0xf4aeb342, 0x0329, 0x4fdd, 0xa8, 0xfd, 0x4a, 0xff, 0x49, 0x26, 0xc9, 0x78 + DEFINE_GUIDSTRUCT("F4AEB342-0329-4fdd-A8FD-4AFF4926C978", KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT); + #define KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_MPEG2_TRANSPORT)
- #define STATIC_KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT\ - 0x8deda6fd, 0xac5f, 0x4334, 0x8e, 0xcf, 0xa4, 0xba, 0x8f, 0xa7, 0xd0, 0xf0 + 0x8deda6fd, 0xac5f, 0x4334, 0x8e, 0xcf, 0xa4, 0xba, 0x8f, 0xa7, 0xd0, 0xf0 + DEFINE_GUIDSTRUCT("8DEDA6FD-AC5F-4334-8ECF-A4BA8FA7D0F0", KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT); + #define KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_BDA_TRANSPORT)
- #define STATIC_KSDATAFORMAT_TYPE_BDA_IF_SIGNAL\ - 0x61be0b47, 0xa5eb, 0x499b, 0x9a, 0x85, 0x5b, 0x16, 0xc0, 0x7f, 0x12, 0x58 + 0x61be0b47, 0xa5eb, 0x499b, 0x9a, 0x85, 0x5b, 0x16, 0xc0, 0x7f, 0x12, 0x58 + DEFINE_GUIDSTRUCT("61BE0B47-A5EB-499b-9A85-5B16C07F1258", KSDATAFORMAT_TYPE_BDA_IF_SIGNAL); + #define KSDATAFORMAT_TYPE_BDA_IF_SIGNAL DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_BDA_IF_SIGNAL)
- #define STATIC_KSDATAFORMAT_TYPE_MPEG2_SECTIONS\ - 0x455f176c, 0x4b06, 0x47ce, 0x9a, 0xef, 0x8c, 0xae, 0xf7, 0x3d, 0xf7, 0xb5 + 0x455f176c, 0x4b06, 0x47ce, 0x9a, 0xef, 0x8c, 0xae, 0xf7, 0x3d, 0xf7, 0xb5 + DEFINE_GUIDSTRUCT("455F176C-4B06-47CE-9AEF-8CAEF73DF7B5", KSDATAFORMAT_TYPE_MPEG2_SECTIONS); + #define KSDATAFORMAT_TYPE_MPEG2_SECTIONS DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_MPEG2_SECTIONS)
- #define STATIC_KSDATAFORMAT_SUBTYPE_ATSC_SI\ - 0xb3c7397c, 0xd303, 0x414d, 0xb3, 0x3c, 0x4e, 0xd2, 0xc9, 0xd2, 0x97, 0x33 + 0xb3c7397c, 0xd303, 0x414d, 0xb3, 0x3c, 0x4e, 0xd2, 0xc9, 0xd2, 0x97, 0x33 + DEFINE_GUIDSTRUCT("B3C7397C-D303-414D-B33C-4ED2C9D29733", KSDATAFORMAT_SUBTYPE_ATSC_SI); + #define KSDATAFORMAT_SUBTYPE_ATSC_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ATSC_SI)
- #define STATIC_KSDATAFORMAT_SUBTYPE_DVB_SI\ - 0xe9dd31a3, 0x221d, 0x4adb, 0x85, 0x32, 0x9a, 0xf3, 0x9, 0xc1, 0xa4, 0x8 + 0xe9dd31a3, 0x221d, 0x4adb, 0x85, 0x32, 0x9a, 0xf3, 0x9, 0xc1, 0xa4, 0x8 + DEFINE_GUIDSTRUCT("e9dd31a3-221d-4adb-8532-9af309c1a408", KSDATAFORMAT_SUBTYPE_DVB_SI); + #define KSDATAFORMAT_SUBTYPE_DVB_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DVB_SI)
- #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP\ - 0x762e3f66, 0x336f, 0x48d1, 0xbf, 0x83, 0x2b, 0x0, 0x35, 0x2c, 0x11, 0xf0 + 0x762e3f66, 0x336f, 0x48d1, 0xbf, 0x83, 0x2b, 0x0, 0x35, 0x2c, 0x11, 0xf0 + DEFINE_GUIDSTRUCT("762E3F66-336F-48d1-BF83-2B00352C11F0", KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP); + #define KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_PSIP)
- #define STATIC_KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP\ - 0x951727db, 0xd2ce, 0x4528, 0x96, 0xf6, 0x33, 0x1, 0xfa, 0xbb, 0x2d, 0xe0 + 0x951727db, 0xd2ce, 0x4528, 0x96, 0xf6, 0x33, 0x1, 0xfa, 0xbb, 0x2d, 0xe0 + DEFINE_GUIDSTRUCT("951727DB-D2CE-4528-96F6-3301FABB2DE0", KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP); + #define KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_BDA_OPENCABLE_OOB_PSIP)
- #define STATIC_KSDATAFORMAT_SUBTYPE_ISDB_SI\ - 0x4a2eeb99, 0x6458, 0x4538, 0xb1, 0x87, 0x04, 0x01, 0x7c, 0x41, 0x41, 0x3f + 0x4a2eeb99, 0x6458, 0x4538, 0xb1, 0x87, 0x04, 0x01, 0x7c, 0x41, 0x41, 0x3f + DEFINE_GUIDSTRUCT("4a2eeb99-6458-4538-b187-04017c41413f", KSDATAFORMAT_SUBTYPE_ISDB_SI); + #define KSDATAFORMAT_SUBTYPE_ISDB_SI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ISDB_SI)
- #define STATIC_KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW\ - 0x0d7aed42, 0xcb9a, 0x11db, 0x97, 0x05, 0x00, 0x50, 0x56, 0xc0, 0x00, 0x08 + 0x0d7aed42, 0xcb9a, 0x11db, 0x97, 0x05, 0x00, 0x50, 0x56, 0xc0, 0x00, 0x08 + DEFINE_GUIDSTRUCT("0d7AED42-CB9A-11DB-9705-005056C00008", KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW); + #define KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_PBDA_TRANSPORT_RAW)
-#endif +#endif /* _BDAMEDIA_ */
Modified: trunk/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatypes.h?re... ============================================================================== --- trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] Wed Jul 28 13:59:28 2010 @@ -16,10 +16,9 @@ */
#ifndef _BDATYPES_ - #define _BDATYPES_ 1 + #define MIN_DIMENSION 1 -
#ifdef __midl #define V1_ENUM [v1_enum] @@ -27,365 +26,305 @@ #define V1_ENUM #endif
-#define BDA_FREQUENCY_NOT_SET -1 -#define BDA_FREQUENCY_NOT_DEFINED 0 -#define BDA_RANGE_NOT_SET -1 -#define BDA_RANGE_NOT_DEFINED 0 -#define BDA_CHAN_BANDWITH_NOT_SET -1 -#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 -#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 +#define BDA_FREQUENCY_NOT_SET -1 +#define BDA_FREQUENCY_NOT_DEFINED 0 +#define BDA_RANGE_NOT_SET -1 +#define BDA_RANGE_NOT_DEFINED 0 +#define BDA_CHAN_BANDWITH_NOT_SET -1 +#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 +#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 #define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0
- -typedef struct _BDA_TEMPLATE_CONNECTION -{ - ULONG FromNodeType; - ULONG FromNodePinType; - ULONG ToNodeType; - ULONG ToNodePinType; -}BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; - - -typedef struct _BDA_TEMPLATE_PIN_JOINT -{ - ULONG uliTemplateConnection; - ULONG ulcInstancesMax; -}BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; - - -typedef struct tagKS_BDA_FRAME_INFO -{ - ULONG ExtendedHeaderSize; - DWORD dwFrameFlags; - ULONG ulEvent; - ULONG ulChannelNumber; - ULONG ulSubchannelNumber; - ULONG ulReason; +typedef struct _BDA_TEMPLATE_CONNECTION { + ULONG FromNodeType; + ULONG FromNodePinType; + ULONG ToNodeType; + ULONG ToNodePinType; +} BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; + +typedef struct _BDA_TEMPLATE_PIN_JOINT { + ULONG uliTemplateConnection; + ULONG ulcInstancesMax; +} BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; + +typedef struct tagKS_BDA_FRAME_INFO { + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + ULONG ulEvent; + ULONG ulChannelNumber; + ULONG ulSubchannelNumber; + ULONG ulReason; } KS_BDA_FRAME_INFO, *PKS_BDA_FRAME_INFO;
-typedef enum -{ - BDA_EVENT_SIGNAL_LOSS = 0, - BDA_EVENT_SIGNAL_LOCK, - BDA_EVENT_DATA_START, - BDA_EVENT_DATA_STOP, - BDA_EVENT_CHANNEL_ACQUIRED, - BDA_EVENT_CHANNEL_LOST, - BDA_EVENT_CHANNEL_SOURCE_CHANGED, - BDA_EVENT_CHANNEL_ACTIVATED, - BDA_EVENT_CHANNEL_DEACTIVATED, - BDA_EVENT_SUBCHANNEL_ACQUIRED, - BDA_EVENT_SUBCHANNEL_LOST, - BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, - BDA_EVENT_SUBCHANNEL_ACTIVATED, - BDA_EVENT_SUBCHANNEL_DEACTIVATED, - BDA_EVENT_ACCESS_GRANTED, - BDA_EVENT_ACCESS_DENIED, - BDA_EVENT_OFFER_EXTENDED, - BDA_EVENT_PURCHASE_COMPLETED, - BDA_EVENT_SMART_CARD_INSERTED, - BDA_EVENT_SMART_CARD_REMOVED +typedef enum { + BDA_EVENT_SIGNAL_LOSS = 0, + BDA_EVENT_SIGNAL_LOCK, + BDA_EVENT_DATA_START, + BDA_EVENT_DATA_STOP, + BDA_EVENT_CHANNEL_ACQUIRED, + BDA_EVENT_CHANNEL_LOST, + BDA_EVENT_CHANNEL_SOURCE_CHANGED, + BDA_EVENT_CHANNEL_ACTIVATED, + BDA_EVENT_CHANNEL_DEACTIVATED, + BDA_EVENT_SUBCHANNEL_ACQUIRED, + BDA_EVENT_SUBCHANNEL_LOST, + BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, + BDA_EVENT_SUBCHANNEL_ACTIVATED, + BDA_EVENT_SUBCHANNEL_DEACTIVATED, + BDA_EVENT_ACCESS_GRANTED, + BDA_EVENT_ACCESS_DENIED, + BDA_EVENT_OFFER_EXTENDED, + BDA_EVENT_PURCHASE_COMPLETED, + BDA_EVENT_SMART_CARD_INSERTED, + BDA_EVENT_SMART_CARD_REMOVED } BDA_EVENT_ID, *PBDA_EVENT_ID;
- - -typedef struct _BDA_ETHERNET_ADDRESS -{ - BYTE rgbAddress[6]; +typedef struct _BDA_ETHERNET_ADDRESS { + BYTE rgbAddress[6]; } BDA_ETHERNET_ADDRESS, *PBDA_ETHERNET_ADDRESS;
typedef struct _BDA_ETHERNET_ADDRESS_LIST { - ULONG ulcAddresses; - BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; + ULONG ulcAddresses; + BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; } BDA_ETHERNET_ADDRESS_LIST, *PBDA_ETHERNET_ADDRESS_LIST;
-typedef enum -{ - BDA_PROMISCUOUS_MULTICAST = 0, - BDA_FILTERED_MULTICAST, - BDA_NO_MULTICAST +typedef enum { + BDA_PROMISCUOUS_MULTICAST = 0, + BDA_FILTERED_MULTICAST, + BDA_NO_MULTICAST } BDA_MULTICAST_MODE, *PBDA_MULTICAST_MODE;
-typedef struct _BDA_IPv4_ADDRESS -{ - BYTE rgbAddress[4]; +typedef struct _BDA_IPv4_ADDRESS { + BYTE rgbAddress[4]; } BDA_IPv4_ADDRESS, *PBDA_IPv4_ADDRESS;
-typedef struct _BDA_IPv4_ADDRESS_LIST -{ - ULONG ulcAddresses; - BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; -} BDA_IPv4_ADDRESS_LIST, * PBDA_IPv4_ADDRESS_LIST; - - -typedef struct _BDA_IPv6_ADDRESS -{ - BYTE rgbAddress[6]; +typedef struct _BDA_IPv4_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv4_ADDRESS_LIST, *PBDA_IPv4_ADDRESS_LIST; + +typedef struct _BDA_IPv6_ADDRESS { + BYTE rgbAddress[6]; } BDA_IPv6_ADDRESS, *PBDA_IPv6_ADDRESS;
-typedef struct _BDA_IPv6_ADDRESS_LIST -{ - ULONG ulcAddresses; - BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; +typedef struct _BDA_IPv6_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; } BDA_IPv6_ADDRESS_LIST, *PBDA_IPv6_ADDRESS_LIST;
- -typedef enum -{ - BDA_CHANGES_COMPLETE = 0, - BDA_CHANGES_PENDING - -} BDA_CHANGE_STATE, * PBDA_CHANGE_STATE; - -typedef enum -{ - BDA_SIGNAL_UNAVAILABLE = 0, - BDA_SIGNAL_INACTIVE, - BDA_SIGNAL_ACTIVE -} BDA_SIGNAL_STATE, * PBDA_SIGNAL_STATE; - - - - - -typedef struct _BDANODE_DESCRIPTOR -{ - ULONG ulBdaNodeType; - GUID guidFunction; - GUID guidName; +typedef enum { + BDA_CHANGES_COMPLETE = 0, + BDA_CHANGES_PENDING +} BDA_CHANGE_STATE, *PBDA_CHANGE_STATE; + +typedef enum { + BDA_SIGNAL_UNAVAILABLE = 0, + BDA_SIGNAL_INACTIVE, + BDA_SIGNAL_ACTIVE +} BDA_SIGNAL_STATE, *PBDA_SIGNAL_STATE; + +typedef struct _BDANODE_DESCRIPTOR { + ULONG ulBdaNodeType; + GUID guidFunction; + GUID guidName; } BDANODE_DESCRIPTOR, *PBDANODE_DESCRIPTOR;
-typedef enum -{ - MEDIA_TRANSPORT_PACKET, - MEDIA_ELEMENTARY_STREAM, - MEDIA_MPEG2_PSI, - MEDIA_TRANSPORT_PAYLOAD -} MEDIA_SAMPLE_CONTENT ; - -typedef struct _BDA_TABLE_SECTION -{ - ULONG ulPrimarySectionId; - ULONG ulSecondarySectionId; - ULONG ulcbSectionLength; - ULONG argbSectionData[MIN_DIMENSION]; +typedef enum { + MEDIA_TRANSPORT_PACKET, + MEDIA_ELEMENTARY_STREAM, + MEDIA_MPEG2_PSI, + MEDIA_TRANSPORT_PAYLOAD +} MEDIA_SAMPLE_CONTENT; + +typedef struct _BDA_TABLE_SECTION { + ULONG ulPrimarySectionId; + ULONG ulSecondarySectionId; + ULONG ulcbSectionLength; + ULONG argbSectionData[MIN_DIMENSION]; } BDA_TABLE_SECTION, *PBDA_TABLE_SECTION;
- -typedef struct -{ - ULONG ulPID ; - MEDIA_SAMPLE_CONTENT MediaSampleContent ; -} PID_MAP ; - -typedef struct _BDA_PID_MAP -{ - MEDIA_SAMPLE_CONTENT MediaSampleContent; - ULONG ulcPIDs; - ULONG aulPIDs[MIN_DIMENSION]; +typedef struct { + ULONG ulPID; + MEDIA_SAMPLE_CONTENT MediaSampleContent ; +} PID_MAP; + +typedef struct _BDA_PID_MAP { + MEDIA_SAMPLE_CONTENT MediaSampleContent; + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; } BDA_PID_MAP, *PBDA_PID_MAP;
-typedef struct _BDA_PID_UNMAP -{ - ULONG ulcPIDs; - ULONG aulPIDs[MIN_DIMENSION]; +typedef struct _BDA_PID_UNMAP { + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; } BDA_PID_UNMAP, *PBDA_PID_UNMAP;
- -typedef enum DVBSystemType -{ - DVB_Cable, - DVB_Terrestrial, - DVB_Satellite, +typedef enum DVBSystemType { + DVB_Cable, + DVB_Terrestrial, + DVB_Satellite, } DVBSystemType;
-typedef struct _BDA_CA_MODULE_UI -{ - ULONG ulFormat; - ULONG ulbcDesc; - ULONG ulDesc[MIN_DIMENSION]; +typedef struct _BDA_CA_MODULE_UI { + ULONG ulFormat; + ULONG ulbcDesc; + ULONG ulDesc[MIN_DIMENSION]; } BDA_CA_MODULE_UI, *PBDA_CA_MODULE_UI;
-typedef struct _BDA_PROGRAM_PID_LIST -{ - ULONG ulProgramNumber; - ULONG ulcPIDs; - ULONG ulPID[MIN_DIMENSION]; +typedef struct _BDA_PROGRAM_PID_LIST { + ULONG ulProgramNumber; + ULONG ulcPIDs; + ULONG ulPID[MIN_DIMENSION]; } BDA_PROGRAM_PID_LIST, *PBDA_PROGRAM_PID_LIST;
- -V1_ENUM enum -{ - BDA_UNDEFINED_CHANNEL = -1, +V1_ENUM enum { + BDA_UNDEFINED_CHANNEL = -1, };
-typedef V1_ENUM enum ComponentCategory -{ - CategoryNotSet = -1, - CategoryOther = 0, - CategoryVideo, - CategoryAudio, - CategoryText, - CategoryData, +typedef V1_ENUM enum ComponentCategory { + CategoryNotSet = -1, + CategoryOther = 0, + CategoryVideo, + CategoryAudio, + CategoryText, + CategoryData, } ComponentCategory;
-typedef enum ComponentStatus -{ - StatusActive, - StatusInactive, - StatusUnavailable, +typedef enum ComponentStatus { + StatusActive, + StatusInactive, + StatusUnavailable, } ComponentStatus;
-typedef enum ATSCComponentTypeFlags -{ - ATSCCT_AC3 = 0x00000001, +typedef enum ATSCComponentTypeFlags { + ATSCCT_AC3 = 0x00000001, } ATSCComponentTypeFlags;
-typedef V1_ENUM enum MPEG2StreamType -{ - BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, - Reserved1 = 0x0, - ISO_IEC_11172_2_VIDEO = Reserved1 + 1, - ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, - ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, - ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, - ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, - ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, - ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, - ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, - ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, - ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, - ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, - ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, - ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, - ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, - ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, - USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 +typedef V1_ENUM enum MPEG2StreamType { + BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, + Reserved1 = 0x0, + ISO_IEC_11172_2_VIDEO = Reserved1 + 1, + ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, + ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, + ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, + ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, + ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, + ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, + ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, + ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, + ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, + ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, + ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, + ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, + ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, + ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, + USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 } MPEG2StreamType;
-typedef struct _MPEG2_TRANSPORT_STRIDE -{ - DWORD dwOffset ; - DWORD dwPacketLength ; - DWORD dwStride ; -} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE ; - - - - - -typedef V1_ENUM enum BinaryConvolutionCodeRate -{ - BDA_BCC_RATE_NOT_SET = -1, - BDA_BCC_RATE_NOT_DEFINED = 0, - BDA_BCC_RATE_1_2 = 1, - BDA_BCC_RATE_2_3, - BDA_BCC_RATE_3_4, - BDA_BCC_RATE_3_5, - BDA_BCC_RATE_4_5, - BDA_BCC_RATE_5_6, - BDA_BCC_RATE_5_11, - BDA_BCC_RATE_7_8, - BDA_BCC_RATE_MAX, +typedef struct _MPEG2_TRANSPORT_STRIDE { + DWORD dwOffset; + DWORD dwPacketLength; + DWORD dwStride; +} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE; + +typedef V1_ENUM enum BinaryConvolutionCodeRate { + BDA_BCC_RATE_NOT_SET = -1, + BDA_BCC_RATE_NOT_DEFINED = 0, + BDA_BCC_RATE_1_2 = 1, + BDA_BCC_RATE_2_3, + BDA_BCC_RATE_3_4, + BDA_BCC_RATE_3_5, + BDA_BCC_RATE_4_5, + BDA_BCC_RATE_5_6, + BDA_BCC_RATE_5_11, + BDA_BCC_RATE_7_8, + BDA_BCC_RATE_MAX, } BinaryConvolutionCodeRate;
-typedef V1_ENUM enum SpectralInversion -{ - BDA_SPECTRAL_INVERSION_NOT_SET = -1, - BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, - BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, - BDA_SPECTRAL_INVERSION_NORMAL, - BDA_SPECTRAL_INVERSION_INVERTED, - BDA_SPECTRAL_INVERSION_MAX +typedef V1_ENUM enum SpectralInversion { + BDA_SPECTRAL_INVERSION_NOT_SET = -1, + BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, + BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, + BDA_SPECTRAL_INVERSION_NORMAL, + BDA_SPECTRAL_INVERSION_INVERTED, + BDA_SPECTRAL_INVERSION_MAX } SpectralInversion;
-typedef V1_ENUM enum FECMethod -{ - BDA_FEC_METHOD_NOT_SET = -1, - BDA_FEC_METHOD_NOT_DEFINED = 0, - BDA_FEC_VITERBI = 1, - BDA_FEC_RS_204_188, - BDA_FEC_MAX, +typedef V1_ENUM enum FECMethod { + BDA_FEC_METHOD_NOT_SET = -1, + BDA_FEC_METHOD_NOT_DEFINED = 0, + BDA_FEC_VITERBI = 1, + BDA_FEC_RS_204_188, + BDA_FEC_MAX, } FECMethod;
-typedef V1_ENUM enum ModulationType -{ - BDA_MOD_NOT_SET = -1, - BDA_MOD_NOT_DEFINED = 0, - BDA_MOD_16QAM = 1, - BDA_MOD_32QAM, - BDA_MOD_64QAM, - BDA_MOD_80QAM, - BDA_MOD_96QAM, - BDA_MOD_112QAM, - BDA_MOD_128QAM, - BDA_MOD_160QAM, - BDA_MOD_192QAM, - BDA_MOD_224QAM, - BDA_MOD_256QAM, - BDA_MOD_320QAM, - BDA_MOD_384QAM, - BDA_MOD_448QAM, - BDA_MOD_512QAM, - BDA_MOD_640QAM, - BDA_MOD_768QAM, - BDA_MOD_896QAM, - BDA_MOD_1024QAM, - BDA_MOD_QPSK, - BDA_MOD_BPSK, - BDA_MOD_OQPSK, - BDA_MOD_8VSB, - BDA_MOD_16VSB, - BDA_MOD_ANALOG_AMPLITUDE, - BDA_MOD_ANALOG_FREQUENCY, - BDA_MOD_MAX, +typedef V1_ENUM enum ModulationType { + BDA_MOD_NOT_SET = -1, + BDA_MOD_NOT_DEFINED = 0, + BDA_MOD_16QAM = 1, + BDA_MOD_32QAM, + BDA_MOD_64QAM, + BDA_MOD_80QAM, + BDA_MOD_96QAM, + BDA_MOD_112QAM, + BDA_MOD_128QAM, + BDA_MOD_160QAM, + BDA_MOD_192QAM, + BDA_MOD_224QAM, + BDA_MOD_256QAM, + BDA_MOD_320QAM, + BDA_MOD_384QAM, + BDA_MOD_448QAM, + BDA_MOD_512QAM, + BDA_MOD_640QAM, + BDA_MOD_768QAM, + BDA_MOD_896QAM, + BDA_MOD_1024QAM, + BDA_MOD_QPSK, + BDA_MOD_BPSK, + BDA_MOD_OQPSK, + BDA_MOD_8VSB, + BDA_MOD_16VSB, + BDA_MOD_ANALOG_AMPLITUDE, + BDA_MOD_ANALOG_FREQUENCY, + BDA_MOD_MAX, } ModulationType;
- - -typedef V1_ENUM enum TransmissionMode -{ - BDA_XMIT_MODE_NOT_SET = -1, - BDA_XMIT_MODE_NOT_DEFINED = 0, - BDA_XMIT_MODE_2K = 1, - BDA_XMIT_MODE_8K, - BDA_XMIT_MODE_MAX, +typedef V1_ENUM enum TransmissionMode { + BDA_XMIT_MODE_NOT_SET = -1, + BDA_XMIT_MODE_NOT_DEFINED = 0, + BDA_XMIT_MODE_2K = 1, + BDA_XMIT_MODE_8K, + BDA_XMIT_MODE_MAX, } TransmissionMode;
- -typedef V1_ENUM enum Polarisation -{ - BDA_POLARISATION_NOT_SET = -1, - BDA_POLARISATION_NOT_DEFINED = 0, - BDA_POLARISATION_LINEAR_H = 1, - BDA_POLARISATION_LINEAR_V, - BDA_POLARISATION_CIRCULAR_L, - BDA_POLARISATION_CIRCULAR_R, - BDA_POLARISATION_MAX, +typedef V1_ENUM enum Polarisation { + BDA_POLARISATION_NOT_SET = -1, + BDA_POLARISATION_NOT_DEFINED = 0, + BDA_POLARISATION_LINEAR_H = 1, + BDA_POLARISATION_LINEAR_V, + BDA_POLARISATION_CIRCULAR_L, + BDA_POLARISATION_CIRCULAR_R, + BDA_POLARISATION_MAX, } Polarisation;
-typedef V1_ENUM enum GuardInterval -{ - BDA_GUARD_NOT_SET = -1, - BDA_GUARD_NOT_DEFINED = 0, - BDA_GUARD_1_32 = 1, - BDA_GUARD_1_16, - BDA_GUARD_1_8, - BDA_GUARD_1_4, - BDA_GUARD_MAX, +typedef V1_ENUM enum GuardInterval { + BDA_GUARD_NOT_SET = -1, + BDA_GUARD_NOT_DEFINED = 0, + BDA_GUARD_1_32 = 1, + BDA_GUARD_1_16, + BDA_GUARD_1_8, + BDA_GUARD_1_4, + BDA_GUARD_MAX, } GuardInterval;
-typedef V1_ENUM enum HierarchyAlpha -{ - BDA_HALPHA_NOT_SET = -1, - BDA_HALPHA_NOT_DEFINED = 0, - BDA_HALPHA_1 = 1, - BDA_HALPHA_2, - BDA_HALPHA_4, - BDA_HALPHA_MAX, +typedef V1_ENUM enum HierarchyAlpha { + BDA_HALPHA_NOT_SET = -1, + BDA_HALPHA_NOT_DEFINED = 0, + BDA_HALPHA_1 = 1, + BDA_HALPHA_2, + BDA_HALPHA_4, + BDA_HALPHA_MAX, } HierarchyAlpha;
- - -#endif - +#endif /* _BDATYPES_ */
-
akhaldi＠svn.reactos.org