Fix few macros to work with the corrected declarations.

svn path=/trunk/; revision=17496
This commit is contained in:
Filip Navara 2005-08-24 00:04:21 +00:00
parent b696000363
commit f68e4fcc28

View file

@ -4413,11 +4413,7 @@ struct _NDIS_MINIPORT_BLOCK {
USHORT CFHangCurrentTick; USHORT CFHangCurrentTick;
NDIS_STATUS ResetStatus; NDIS_STATUS ResetStatus;
NDIS_HANDLE ResetOpen; NDIS_HANDLE ResetOpen;
#ifdef __cplusplus
FILTERDBS FilterDbs;
#else
FILTERDBS_S FILTERDBS_S
#endif
FILTER_PACKET_INDICATION_HANDLER PacketIndicateHandler; FILTER_PACKET_INDICATION_HANDLER PacketIndicateHandler;
NDIS_M_SEND_COMPLETE_HANDLER SendCompleteHandler; NDIS_M_SEND_COMPLETE_HANDLER SendCompleteHandler;
NDIS_M_SEND_RESOURCES_HANDLER SendResourcesHandler; NDIS_M_SEND_RESOURCES_HANDLER SendResourcesHandler;
@ -4705,7 +4701,7 @@ NdisMAllocateMapRegisters(
Length) \ Length) \
{ \ { \
ArcFilterDprIndicateReceive( \ ArcFilterDprIndicateReceive( \
(((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.ArcDB), \ (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->ArcDB), \
(HeaderBuffer), \ (HeaderBuffer), \
(DataBuffer), \ (DataBuffer), \
(Length)); \ (Length)); \
@ -4782,7 +4778,7 @@ NdisMDeregisterIoPortRange(
PacketSize) \ PacketSize) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxIndicateHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxIndicateHandler)( \
((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.EthDB, \ ((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthDB, \
(MiniportReceiveContext), \ (MiniportReceiveContext), \
(HeaderBuffer), \ (HeaderBuffer), \
(HeaderBuffer), \ (HeaderBuffer), \
@ -4800,7 +4796,7 @@ NdisMDeregisterIoPortRange(
#define NdisMEthIndicateReceiveComplete(MiniportAdapterHandle) \ #define NdisMEthIndicateReceiveComplete(MiniportAdapterHandle) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxCompleteHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxCompleteHandler)( \
((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.EthDB); \ ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->EthDB); \
} }
/* /*
@ -4823,7 +4819,7 @@ NdisMDeregisterIoPortRange(
PacketSize) \ PacketSize) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxIndicateHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxIndicateHandler)( \
(((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.FddiDB), \ (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiDB), \
(MiniportReceiveContext), \ (MiniportReceiveContext), \
(PUCHAR)(HeaderBuffer) + 1, \ (PUCHAR)(HeaderBuffer) + 1, \
(((*(PUCHAR*)(HeaderBuffer)) & 0x40) ? \ (((*(PUCHAR*)(HeaderBuffer)) & 0x40) ? \
@ -4846,7 +4842,7 @@ NdisMDeregisterIoPortRange(
#define NdisMFddiIndicateReceiveComplete(MiniportAdapterHandle) \ #define NdisMFddiIndicateReceiveComplete(MiniportAdapterHandle) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxCompleteHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxCompleteHandler)( \
((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.FddiDB); \ ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FddiDB); \
} }
NDISAPI NDISAPI
@ -5122,7 +5118,7 @@ NdisMSynchronizeWithInterrupt(
PacketSize) \ PacketSize) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxIndicateHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxIndicateHandler)( \
(((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.TrDB), \ (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrDB), \
(MiniportReceiveContext), \ (MiniportReceiveContext), \
(HeaderBuffer), \ (HeaderBuffer), \
(HeaderBuffer), \ (HeaderBuffer), \
@ -5140,7 +5136,7 @@ NdisMSynchronizeWithInterrupt(
#define NdisMTrIndicateReceiveComplete(MiniportAdapterHandle) \ #define NdisMTrIndicateReceiveComplete(MiniportAdapterHandle) \
{ \ { \
(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxCompleteHandler)( \ (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxCompleteHandler)( \
((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.TrDB); \ ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->TrDB); \
} }
NDISAPI NDISAPI