From e510811de7b9468dcef1b41015ac1c0cf5e089b7 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Sun, 21 Nov 1999 23:48:14 +0000 Subject: [PATCH] Some fixes in the TDI initial files. svn path=/trunk/; revision=791 --- reactos/drivers/net/tdi/Makefile | 26 +++++---- reactos/drivers/net/tdi/cte/stubs.c | 10 ++-- reactos/drivers/net/tdi/misc/tdi.def | 80 +++++++++++++------------- reactos/drivers/net/tdi/misc/tdi.edf | 47 +++++++++++++++ reactos/drivers/net/tdi/tdi/obsolete.c | 4 +- reactos/drivers/net/tdi/tdi/stubs.c | 28 ++++----- 6 files changed, 123 insertions(+), 72 deletions(-) create mode 100644 reactos/drivers/net/tdi/misc/tdi.edf diff --git a/reactos/drivers/net/tdi/Makefile b/reactos/drivers/net/tdi/Makefile index d008c38aa81..12a854ca8dc 100644 --- a/reactos/drivers/net/tdi/Makefile +++ b/reactos/drivers/net/tdi/Makefile @@ -1,14 +1,14 @@ -# $Id: Makefile,v 1.1 1999/11/20 20:41:28 ea Exp $ +# $Id: Makefile,v 1.2 1999/11/21 23:48:13 ea Exp $ # # TDI.SYS build spec # TARGETNAME=tdi -BASE_CFLAGS = -I../../include +BASE_CFLAGS = -I../../../include -OBJECTS_CTE = cte/stubs.o -OBJECTS_TDI = tdi/stubs.o tdi/obsolete.o +OBJECTS_CTE = cte/stubs.o cte/string.o +OBJECTS_TDI = tdi/stubs.o tdi/obsolete.o tdi/handler.o OBJECTS_MISC = misc/main.o misc/$(TARGETNAME).coff @@ -32,12 +32,13 @@ CLEAN_FILES = \ $(TARGETNAME).sys $(TARGETNAME).sym endif -$(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def +$(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def $(LD) -r $(OBJECTS) -o $(TARGETNAME).o $(DLLTOOL) \ --dllname $(TARGETNAME).sys \ - --def $(TARGETNAME).def \ - --output-lib $(TARGETNAME).a + --def misc/$(TARGETNAME).def \ + --output-lib $(TARGETNAME).a \ + --kill-at $(CC) \ --subsystem=native \ -mdll \ @@ -51,14 +52,15 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def -Wl,--defsym,_edata=__data_end__ \ -Wl,--defsym,_etext=etext \ -Wl,--base-file,base.tmp $(TARGETNAME).o \ - -specs=../../specs \ - ../../ntoskrnl/ntoskrnl.a + -specs=../../../specs \ + ../../../ntoskrnl/ntoskrnl.a - $(RM) junk.tmp $(DLLTOOL) \ --dllname $(TARGETNAME).sys \ --base-file base.tmp \ --output-exp temp.exp \ - --def $(TARGETNAME).def + --def misc/$(TARGETNAME).def \ + --kill-at - $(RM) base.tmp $(CC) \ --subsystem=native \ @@ -67,7 +69,7 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def -e _DllMain@8 \ -o $(TARGETNAME).sys \ $(TARGETNAME).o \ - ../../ntoskrnl/ntoskrnl.a \ + ../../../ntoskrnl/ntoskrnl.a \ -Wl,--image-base,0x0 \ -Wl,--file-alignment,0x1000 \ -Wl,--section-alignment,0x1000 \ @@ -75,7 +77,7 @@ $(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def -Wl,--defsym,_edata=__data_end__ \ -Wl,--defsym,_etext=etext \ -Wl,temp.exp \ - -specs=../../specs + -specs=../../../specs - $(RM) temp.exp $(NM) --numeric-sort $(TARGETNAME).sys > $(TARGETNAME).sym diff --git a/reactos/drivers/net/tdi/cte/stubs.c b/reactos/drivers/net/tdi/cte/stubs.c index 4d2526ec949..710db6ee025 100644 --- a/reactos/drivers/net/tdi/cte/stubs.c +++ b/reactos/drivers/net/tdi/cte/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.1 1999/11/20 20:41:29 ea Exp $ +/* $Id: stubs.c,v 1.2 1999/11/21 23:48:13 ea Exp $ * */ #include @@ -98,10 +98,10 @@ CTESignal ( BOOLEAN STDCALL CTEStartTimer ( - DOWRD Unknown0, - DOWRD Unknown1, - DOWRD Unknown2, - DOWRD Unknown3 + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3 ) { return FALSE; diff --git a/reactos/drivers/net/tdi/misc/tdi.def b/reactos/drivers/net/tdi/misc/tdi.def index 4614a14e2e5..0568b787738 100644 --- a/reactos/drivers/net/tdi/misc/tdi.def +++ b/reactos/drivers/net/tdi/misc/tdi.def @@ -1,47 +1,47 @@ -; $Id: tdi.def,v 1.1 1999/11/20 10:21:18 ea Exp $ +; $Id: tdi.def,v 1.2 1999/11/21 23:48:13 ea Exp $ ; ; TDI.SYS Kernel Module - ReactOS Operating System ; LIBRARY TDI.SYS EXPORTS -CTEAllocateString -CTEBlock -CTEInitEvent -CTEInitString -CTEInitTimer -CTEInitialize -CTELogEvent -CTEScheduleEvent -CTESignal -CTEStartTimer -CTESystemUpTime -TdiBuildNetbiosAddress -TdiBuildNetbiosAddressEa -TdiCopyBufferToMdl -TdiCopyMdlToBuffer -TdiDefaultChainedRcvDatagramHandler -TdiDefaultChainedRcvExpeditedHandler -TdiDefaultChainedReceiveHandler -TdiDefaultConnectHandler -TdiDefaultDisconnectHandler -TdiDefaultErrorHandler -TdiDefaultRcvDatagramHandler -TdiDefaultRcvExpeditedHandler -TdiDefaultReceiveHandler -TdiDefaultSendPossibleHandler -TdiDeregisterAddressChangeHandler -TdiDeregisterDeviceObject -TdiDeregisterNetAddress -TdiDeregisterNotificationHandler -TdiInitialize -TdiMapBuffer -TdiMapUserRequest -TdiOpenNetbiosAddress -TdiRegisterAddressChangeHandler -TdiRegisterDeviceObject -TdiRegisterNetAddress -TdiRegisterNotificationHandler -TdiReturnChainedReceives -TdiUnmapBuffer +CTEAllocateString@8 +CTEBlock@4 +CTEInitEvent@8 +CTEInitString@8 +CTEInitTimer@4 +CTEInitialize@0 +CTELogEvent@28 +CTEScheduleEvent@8 +CTESignal@8 +CTEStartTimer@16 +CTESystemUpTime@0 +TdiBuildNetbiosAddress@12 +TdiBuildNetbiosAddressEa@12 +TdiCopyBufferToMdl@24 +TdiCopyMdlToBuffer@24 +TdiDefaultChainedRcvDatagramHandler@40 +TdiDefaultChainedRcvExpeditedHandler@28 +TdiDefaultChainedReceiveHandler@28 +TdiDefaultConnectHandler@36 +TdiDefaultDisconnectHandler@28 +TdiDefaultErrorHandler@8 +TdiDefaultRcvDatagramHandler@44 +TdiDefaultRcvExpeditedHandler@32 +TdiDefaultReceiveHandler@32 +TdiDefaultSendPossibleHandler@12 +TdiDeregisterAddressChangeHandler@4 +TdiDeregisterDeviceObject@4 +TdiDeregisterNetAddress@4 +TdiDeregisterNotificationHandler@4 +TdiInitialize@0 +TdiMapBuffer@4 +TdiMapUserRequest@12 +TdiOpenNetbiosAddress@16 +TdiRegisterAddressChangeHandler@12 +TdiRegisterDeviceObject@8 +TdiRegisterNetAddress@8 +TdiRegisterNotificationHandler@12 +TdiReturnChainedReceives@8 +TdiUnmapBuffer@4 ; EOF diff --git a/reactos/drivers/net/tdi/misc/tdi.edf b/reactos/drivers/net/tdi/misc/tdi.edf new file mode 100644 index 00000000000..2c001a443db --- /dev/null +++ b/reactos/drivers/net/tdi/misc/tdi.edf @@ -0,0 +1,47 @@ +; $Id: tdi.edf,v 1.1 1999/11/21 23:48:13 ea Exp $ +; +; TDI.SYS Kernel Module - ReactOS Operating System +; +LIBRARY TDI.SYS + +EXPORTS +CTEAllocateString=CTEAllocateString@8 +CTEBlock=CTEBlock@4 +CTEInitEvent=CTEInitEvent@8 +CTEInitString=CTEInitString@8 +CTEInitTimer=CTEInitTimer@4 +CTEInitialize=CTEInitialize@0 +CTELogEvent=CTELogEvent@28 +CTEScheduleEvent=CTEScheduleEvent@8 +CTESignal=CTESignal@8 +CTEStartTimer=CTEStartTimer@16 +CTESystemUpTime=CTESystemUpTime@0 +TdiBuildNetbiosAddress=TdiBuildNetbiosAddress@12 +TdiBuildNetbiosAddressEa=TdiBuildNetbiosAddressEa@12 +TdiCopyBufferToMdl=TdiCopyBufferToMdl@24 +TdiCopyMdlToBuffer=TdiCopyMdlToBuffer@24 +TdiDefaultChainedRcvDatagramHandler=TdiDefaultChainedRcvDatagramHandler@40 +TdiDefaultChainedRcvExpeditedHandler=TdiDefaultChainedRcvExpeditedHandler@28 +TdiDefaultChainedReceiveHandler=TdiDefaultChainedReceiveHandler@28 +TdiDefaultConnectHandler=TdiDefaultConnectHandler@36 +TdiDefaultDisconnectHandler=TdiDefaultDisconnectHandler@28 +TdiDefaultErrorHandler=TdiDefaultErrorHandler@8 +TdiDefaultRcvDatagramHandler=TdiDefaultRcvDatagramHandler@44 +TdiDefaultRcvExpeditedHandler=TdiDefaultRcvExpeditedHandler@32 +TdiDefaultReceiveHandler=TdiDefaultReceiveHandler@32 +TdiDefaultSendPossibleHandler=TdiDefaultSendPossibleHandler@12 +TdiDeregisterAddressChangeHandler=TdiDeregisterAddressChangeHandler@4 +TdiDeregisterDeviceObject=TdiDeregisterDeviceObject@4 +TdiDeregisterNetAddress=TdiDeregisterNetAddress@4 +TdiDeregisterNotificationHandler=TdiDeregisterNotificationHandler@4 +TdiInitialize=TdiInitialize@0 +TdiMapBuffer=TdiMapBuffer@4 +TdiMapUserRequest=TdiMapUserRequest@12 +TdiOpenNetbiosAddress=TdiOpenNetbiosAddress@16 +TdiRegisterAddressChangeHandler=TdiRegisterAddressChangeHandler@12 +TdiRegisterDeviceObject=TdiRegisterDeviceObject@8 +TdiRegisterNetAddress=TdiRegisterNetAddress@8 +TdiRegisterNotificationHandler=TdiRegisterNotificationHandler@12 +TdiReturnChainedReceives=TdiReturnChainedReceives@8 +TdiUnmapBuffer=TdiUnmapBuffer@4 +; EOF diff --git a/reactos/drivers/net/tdi/tdi/obsolete.c b/reactos/drivers/net/tdi/tdi/obsolete.c index 43d4146ff8f..82f8c5dbd9d 100644 --- a/reactos/drivers/net/tdi/tdi/obsolete.c +++ b/reactos/drivers/net/tdi/tdi/obsolete.c @@ -1,9 +1,10 @@ -/* $Id: obsolete.c,v 1.1 1999/11/20 20:41:29 ea Exp $ +/* $Id: obsolete.c,v 1.2 1999/11/21 23:48:14 ea Exp $ * */ VOID STDCALL TdiMapBuffer ( + DWORD Unknown0 ) { /* This function is absolete */ @@ -13,6 +14,7 @@ TdiMapBuffer ( VOID STDCALL TdiUnmapBuffer ( + DWORD Unknown0 ) { /* This function is obsolete */ diff --git a/reactos/drivers/net/tdi/tdi/stubs.c b/reactos/drivers/net/tdi/tdi/stubs.c index 00486190532..45db59e7626 100644 --- a/reactos/drivers/net/tdi/tdi/stubs.c +++ b/reactos/drivers/net/tdi/tdi/stubs.c @@ -1,4 +1,4 @@ -/* $Id: stubs.c,v 1.1 1999/11/20 20:41:29 ea Exp $ +/* $Id: stubs.c,v 1.2 1999/11/21 23:48:14 ea Exp $ * */ #include @@ -30,12 +30,12 @@ NTSTATUS STDCALL TdiCopyBufferToMdl ( IN PVOID SourceBuffer, - IN ULONG SourceOffset, - IN ULONG SourceBytesToCopy, - IN PMDL DestinationMdlChain, - IN ULONG DestinationOffset, - IN PULONG BytesCopied - ) + IN ULONG SourceOffset, + IN ULONG SourceBytesToCopy, + IN PMDL DestinationMdlChain, + IN ULONG DestinationOffset, + IN PULONG BytesCopied + ) { return STATUS_NOT_IMPLEMENTED; } @@ -44,13 +44,13 @@ TdiCopyBufferToMdl ( NTSTATUS STDCALL TdiCopyMdlToBuffer ( - IN PMDL SourceMdlChain, - IN ULONG SourceOffset, - IN PVOID DestinationBuffer, - IN ULONG DestinationOffset, - IN ULONG DestinationBufferSize, - OUT PULONG BytesCopied - ) + IN PMDL SourceMdlChain, + IN ULONG SourceOffset, + IN PVOID DestinationBuffer, + IN ULONG DestinationOffset, + IN ULONG DestinationBufferSize, + OUT PULONG BytesCopied + ) { return STATUS_NOT_IMPLEMENTED; }