Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mtempel] 13044: Initial commit of USB support. These are just stubs. They build, but that is about it. Expect heavy development in usbport, and usbuhci.
by mtempel＠svn.reactos.com 14 Jan '05

14 Jan '05

Initial commit of USB support. These are just stubs. They build, but that is about it. Expect heavy development in usbport, and usbuhci. Added: trunk/reactos/drivers/usb/ Added: trunk/reactos/drivers/usb/Makefile Added: trunk/reactos/drivers/usb/miniport/ Added: trunk/reactos/drivers/usb/miniport/usbehci/ Added: trunk/reactos/drivers/usb/miniport/usbehci/makefile Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.c Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.rc Added: trunk/reactos/drivers/usb/miniport/usbohci/ Added: trunk/reactos/drivers/usb/miniport/usbohci/makefile Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.c Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.rc Added: trunk/reactos/drivers/usb/miniport/usbuhci/ Added: trunk/reactos/drivers/usb/miniport/usbuhci/makefile Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.rc Added: trunk/reactos/drivers/usb/usbhub/ Added: trunk/reactos/drivers/usb/usbhub/makefile Added: trunk/reactos/drivers/usb/usbhub/usbhub.c Added: trunk/reactos/drivers/usb/usbhub/usbhub.def Added: trunk/reactos/drivers/usb/usbhub/usbhub.h Added: trunk/reactos/drivers/usb/usbhub/usbhub.rc Added: trunk/reactos/drivers/usb/usbport/ Added: trunk/reactos/drivers/usb/usbport/makefile Added: trunk/reactos/drivers/usb/usbport/usbport.c Added: trunk/reactos/drivers/usb/usbport/usbport.def Added: trunk/reactos/drivers/usb/usbport/usbport.h Added: trunk/reactos/drivers/usb/usbport/usbport.rc _____ Added: trunk/reactos/drivers/usb/Makefile --- trunk/reactos/drivers/usb/Makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/Makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,50 @@ +# +# ReactOS USB Drivers +# + +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +DRIVERS = usbport miniport/usbuhci miniport/usbehci miniport/usbohci usbhub + +all: $(DRIVERS) + +depends: + +implib: $(DRIVERS:%=%_implib) + +clean: $(DRIVERS:%=%_clean) + +install: $(DRIVERS:%=%_install) + +bootcd: $(DRIVERS:%=%_bootcd) + +.PHONY: all depends implib clean install bootcd + + +# +# USB DRIVERS +# +$(DRIVERS): %: + $(MAKE) -C $* + +$(DRIVERS:%=%_implib): %_implib: + $(MAKE) -C $* implib + +$(DRIVERS:%=%_clean): %_clean: + $(MAKE) -C $* clean + +$(DRIVERS:%=%_install): %_install: + $(MAKE) -C $* install + +$(DRIVERS:%=%_bootcd): %_bootcd: + $(MAKE) -C $* bootcd + +.PHONY: $(DRIVERS) $(DRIVERS:%=%_implib) $(DRIVERS:%=%_clean) $(DRIVERS:%=%_install) $(DRIVERS:%=%_bootcd) + + +etags: + find . -name "*.[ch]" -print | etags --language=c - + +# EOF _____ Added: trunk/reactos/drivers/usb/miniport/usbehci/makefile --- trunk/reactos/drivers/usb/miniport/usbehci/makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbehci/makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,16 @@ +PATH_TO_TOP = ../../../.. + +TARGET_TYPE = driver + +TARGET_NAME = usbehci + +TARGET_DDKLIBS = ntoskrnl.a usbport.a + +TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API + +TARGET_OBJECTS = \ + usbehci.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.c --- trunk/reactos/drivers/usb/miniport/usbehci/usbehci.c 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbehci/usbehci.c 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,41 @@ +/* + * ReactOS USB EHCI miniport driver + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* INCLUDES *******************************************************************/ + +#include "usbehci.h" +#include "../../usbport/usbport.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +NTSTATUS STDCALL +DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) +{ + PUSB_CONTROLLER_INTERFACE ControllerInterface; + + USBPORT_AllocateUsbControllerInterface(&ControllerInterface); + + /* + * Set up the list of callbacks here. + * TODO TODO TODO + */ + + return USBPORT_RegisterUSBPortDriver(DriverObject, 0, ControllerInterface); +} _____ Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h --- trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbehci/usbehci.h 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,45 @@ +/* + * ReactOS USB EHCI miniport driver + * + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef USBEHCI_H +#define USBEHCI_H + +/* INCLUDES *******************************************************************/ + +#include "stddef.h" +#include "windef.h" +//#include <ddk/miniport.h> +#include <ddk/ntapi.h> + +#ifdef DBG +#define DPRINT(arg) DbgPrint arg; +#else +#define DPRINT(arg) +#endif + +// Export funcs here +/* +BOOL FASTCALL +VBESetColorRegisters( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_CLUT ColorLookUpTable, + PSTATUS_BLOCK StatusBlock); +*/ +#endif /* USBEHCI_H */ _____ Added: trunk/reactos/drivers/usb/miniport/usbehci/usbehci.rc --- trunk/reactos/drivers/usb/miniport/usbehci/usbehci.rc 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbehci/usbehci.rc 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB EHCI miniport Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbehci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbehci.sys\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/drivers/usb/miniport/usbohci/makefile --- trunk/reactos/drivers/usb/miniport/usbohci/makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbohci/makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,16 @@ +PATH_TO_TOP = ../../../.. + +TARGET_TYPE = driver + +TARGET_NAME = usbohci + +TARGET_DDKLIBS = ntoskrnl.a usbport.a + +TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API + +TARGET_OBJECTS = \ + usbohci.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.c --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.c 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.c 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,41 @@ +/* + * ReactOS USB OpenHCI miniport driver + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* INCLUDES *******************************************************************/ + +#include "usbohci.h" +#include "../../usbport/usbport.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +NTSTATUS STDCALL +DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) +{ + PUSB_CONTROLLER_INTERFACE ControllerInterface; + + USBPORT_AllocateUsbControllerInterface(&ControllerInterface); + + /* + * Set up the list of callbacks here. + * TODO TODO TODO + */ + + return USBPORT_RegisterUSBPortDriver(DriverObject, 0, ControllerInterface); +} _____ Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.h 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,45 @@ +/* + * ReactOS USB OpenHCI miniport driver + * + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef USBOHCI_H +#define USBOHCI_H + +/* INCLUDES *******************************************************************/ + +#include "stddef.h" +#include "windef.h" +//#include <ddk/miniport.h> +#include <ddk/ntapi.h> + +#ifdef DBG +#define DPRINT(arg) DbgPrint arg; +#else +#define DPRINT(arg) +#endif + +// Export funcs here +/* +BOOL FASTCALL +VBESetColorRegisters( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_CLUT ColorLookUpTable, + PSTATUS_BLOCK StatusBlock); +*/ +#endif /* USBOHCI_H */ _____ Added: trunk/reactos/drivers/usb/miniport/usbohci/usbohci.rc --- trunk/reactos/drivers/usb/miniport/usbohci/usbohci.rc 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbohci/usbohci.rc 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB OpenHCI miniport Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbohci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbohci.sys\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/drivers/usb/miniport/usbuhci/makefile --- trunk/reactos/drivers/usb/miniport/usbuhci/makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbuhci/makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,16 @@ +PATH_TO_TOP = ../../../.. + +TARGET_TYPE = driver + +TARGET_NAME = usbuhci + +TARGET_DDKLIBS = ntoskrnl.a usbport.a + +TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API + +TARGET_OBJECTS = \ + usbuhci.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,41 @@ +/* + * ReactOS USB UHCI miniport driver + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* INCLUDES *******************************************************************/ + +#include "usbuhci.h" +#include "../../usbport/usbport.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +NTSTATUS STDCALL +DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) +{ + PUSB_CONTROLLER_INTERFACE ControllerInterface; + + USBPORT_AllocateUsbControllerInterface(&ControllerInterface); + + /* + * Set up the list of callbacks here. + * TODO TODO TODO + */ + + return USBPORT_RegisterUSBPortDriver(DriverObject, 0, ControllerInterface); +} _____ Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,45 @@ +/* + * ReactOS USB UHCI miniport driver + * + * Copyright (C) 2004 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef USBUHCI_H +#define USBUHCI_H + +/* INCLUDES *******************************************************************/ + +#include "stddef.h" +#include "windef.h" +//#include <ddk/miniport.h> +#include <ddk/ntapi.h> + +#ifdef DBG +#define DPRINT(arg) DbgPrint arg; +#else +#define DPRINT(arg) +#endif + +// Export funcs here +/* +BOOL FASTCALL +VBESetColorRegisters( + PVBE_DEVICE_EXTENSION DeviceExtension, + PVIDEO_CLUT ColorLookUpTable, + PSTATUS_BLOCK StatusBlock); +*/ +#endif /* USBUHCI_H */ _____ Added: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.rc --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.rc 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.rc 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB UHCI miniport Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbuhci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbuhci.sys\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/drivers/usb/usbhub/makefile --- trunk/reactos/drivers/usb/usbhub/makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbhub/makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,16 @@ +PATH_TO_TOP = ../../.. + +TARGET_TYPE = driver + +TARGET_NAME = usbhub + +TARGET_DDKLIBS = ntoskrnl.a + +TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API + +TARGET_OBJECTS = \ + usbhub.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/usbhub/usbhub.c --- trunk/reactos/drivers/usb/usbhub/usbhub.c 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,38 @@ +/* + * ReactOS USB hub driver + * Copyright (C) 2004 Aleksey Bragin + * (C) 2005 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* INCLUDES *******************************************************************/ +#include <stddef.h> +#include <windef.h> +#include <ddk/ntddk.h> +#include "..\usbport\usbport.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +/* + * Standard DriverEntry method. + */ +NTSTATUS STDCALL +DriverEntry(IN PVOID Context1, IN PVOID Context2) +{ + return STATUS_SUCCESS; +} + _____ Added: trunk/reactos/drivers/usb/usbhub/usbhub.def --- trunk/reactos/drivers/usb/usbhub/usbhub.def 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbhub/usbhub.def 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,4 @@ +; +; Exports definition file for usbhub.sys +; +EXPORTS _____ Added: trunk/reactos/drivers/usb/usbhub/usbhub.h --- trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,10 @@ +/* + * Declarations for undocumented usbport.sys calls + * + * Written by Mark Tempel + */ + +#ifndef _USBHUB_H +#define _USBHUB_H + +#endif /* _USBHUB_H */ _____ Added: trunk/reactos/drivers/usb/usbhub/usbhub.rc --- trunk/reactos/drivers/usb/usbhub/usbhub.rc 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbhub/usbhub.rc 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB Hub Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbhub\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbhub.sys\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/drivers/usb/usbport/makefile --- trunk/reactos/drivers/usb/usbport/makefile 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbport/makefile 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,16 @@ +PATH_TO_TOP = ../../.. + +TARGET_TYPE = export_driver + +TARGET_NAME = usbport + +TARGET_DDKLIBS = ntoskrnl.a + +TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API + +TARGET_OBJECTS = \ + usbport.o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/usbport/usbport.c --- trunk/reactos/drivers/usb/usbport/usbport.c 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbport/usbport.c 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,81 @@ +/* + * ReactOS USB Port driver + * Copyright (C) 2004 Aleksey Bragin + * (C) 2005 Mark Tempel + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * STATUS: + * 19-Dec-2004 - just a stub for now, but with useful info by Filip + */ + +/* INCLUDES *******************************************************************/ +#include <stddef.h> +#include <windef.h> +#include <ddk/ntddk.h> +#include "usbport.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +/* +** Standard DriverEntry method. +** We do nothing here. All real work is done in USBPRORT_RegisterUSBPortDriver. +*/ +NTSTATUS STDCALL +DriverEntry(IN PVOID Context1, IN PVOID Context2) +{ + return STATUS_SUCCESS; +} +/* + * This method is used by miniports to connect set up + */ +NTSTATUS STDCALL +USBPORT_RegisterUSBPortDriver(PDRIVER_OBJECT DriverObject, DWORD Unknown1, + PUSB_CONTROLLER_INTERFACE Interface) +{ + ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +USBPORT_GetHciMn(VOID) +{ + return 0x10000001; +} +/* + * This method is to allow miniports to create + */ +NTSTATUS STDCALL +USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface) +{ + ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + ASSERT(0 != ControllerObject); + + *pControllerInterface = (PUSB_CONTROLLER_INTERFACE)ExAllocatePoolWithTag(PagedPool, sizeof(USB_CONTROLLER_INTERFACE),USB_CONTROLLER_INTERFACE_TAG); + RtlZeroMemory(*pControllerInterface, sizeof(USB_CONTROLLER_INTERFACE)); + + return STATUS_SUCCESS; +} + +NTSTATUS STDCALL +USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface) +{ + ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + + ExFreePool(ControllerInterface); + + return STATUS_SUCCESS; +} _____ Added: trunk/reactos/drivers/usb/usbport/usbport.def --- trunk/reactos/drivers/usb/usbport/usbport.def 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbport/usbport.def 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,8 @@ +; +; Exports definition file for usbport.sys +; +EXPORTS +USBPORT_RegisterUSBPortDriver@12 +USBPORT_GetHciMn@0 +USBPORT_AllocateUsbControllerInterface@4 +USBPORT_FreeUsbControllerInterface@4 \ No newline at end of file _____ Added: trunk/reactos/drivers/usb/usbport/usbport.h --- trunk/reactos/drivers/usb/usbport/usbport.h 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbport/usbport.h 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,130 @@ +/* + * Declarations for undocumented usbport.sys calls + * + * Written by Filip Navara <xnavara(a)volny.cz> + * Updates by Mark Tempel + */ + +#ifndef _USBPORT_H +#define _USBPORT_H + +#define USB_CONTROLLER_INTERFACE_TAG 0x001E1E10 + +/**** B E G I N M S I N T E R N A L P R O T O C O L ****/ +typedef DWORD (*POPEN_ENDPOINT)( + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3 +); + +typedef NTSTATUS (*PPOKE_ENDPOINT)( + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3 +); + +typedef DWORD (*PQUERY_ENDPOINT_REQUIREMENTS)( + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3 +); + +typedef VOID (*PCLOSE_ENDPOINT)( + DWORD Unknown1, + DWORD Unknown2 +); + + + +typedef struct { + DWORD Unknown1; /* 2 (UHCI), 3 (EHCI) */ + DWORD Unknown2; /* 2C3 (UHCI), 95 (EHCI) */ + DWORD Unknown3; /* 2EE0 (UHCI), 61A80 (EHCI) */ + DWORD Unknown4; /* - */ + DWORD Unknown5; /* 164 (UHCI), 178 (EHCI) */ + DWORD Unknown6; /* 8C (UHCI), A0 (EHCI) */ + DWORD Unknown7; /* 1C (UHCI), 30 (EHCI) */ /* Offset: 118 */ + DWORD Unknown8; /* - */ + DWORD Unknown9; /* - */ + DWORD Unknown10; /* 2280 (UHCI), 2C800 (EHCI) */ /* Offset: 124 */ + POPEN_ENDPOINT OpenEndpoint; + PPOKE_ENDPOINT PokeEndpoint; + PQUERY_ENDPOINT_REQUIREMENTS QueryEndpointRequirements; + PCLOSE_ENDPOINT CloseEndpoint; + PVOID StartController; /* P00010A1C (2) */ /* Offset: 138 */ + PVOID StopController; /* P00010952 */ /* Offset: 13C */ + PVOID SuspendController; /* P00011584 */ /* Offset: 140 */ + PVOID ResumeController; /* P0001164C */ /* Offset: 144 */ + PVOID InterruptService; /* P00013C72 */ /* Offset: 148 */ + PVOID InterruptDpc; /* P00013D8E */ /* Offset: 14C */ + PVOID SubmitTransfer; /* P00011010 */ /* Offset: 150 */ + PVOID IsochTransfer; /* P000136E8 */ /* Offset: 154 */ + PVOID AbortTransfer; /* P00011092 */ /* Offset: 158 */ + PVOID GetEndpointState; /* P00010F48 */ /* Offset: 15C */ + PVOID SetEndpointState; /* P00010EFA */ /* Offset: 160 */ + PVOID PollEndpoint; /* P00010D32 */ /* Offset: 164 */ + PVOID CheckController; /* P00011794 */ /* Offset: 168 */ + PVOID Get32BitFrameNumber; /* P00010F86 */ /* Offset: 16C */ + PVOID InterruptNextSOF; /* P00013F56 */ /* Offset: 170 */ + PVOID EnableInterrupts; /* P00013ED0 */ /* Offset: 174 */ + PVOID DisableInterrupts; /* P00013E18 */ /* Offset: 178 */ + PVOID PollController; /* P00010FF2 */ /* Offset: 17C */ + PVOID SetEndpointDataToggle; /* P000110E6 */ /* Offset: 180 */ + PVOID GetEndpointStatus; /* P00010ECE */ /* Offset: 184 */ + PVOID SetEndpointStatus; /* P00010E52 */ /* Offset: 188 */ + DWORD Unknown36; /* - */ + PVOID RHGetRootHubData; /* P00011AC6 */ /* Offset: 190 */ + PVOID RHGetStatus; /* P00011B1A */ /* Offset: 194 */ + PVOID RHGetPortStatus; /* P00011BBA */ /* Offset: 198 */ + PVOID RHGetHubStatus; /* P00011B28 */ /* Offset: 19C */ + PVOID RHSetFeaturePortReset; /* P00011F84 */ /* Offset: 1A0 */ + PVOID RHSetFeaturePortPower; /* P00011BB4 */ /* Offset: 1A4 */ + PVOID RHSetFeaturePortEnable; /* P00011BA2 */ /* Offset: 1A8 */ + PVOID RHSetFeaturePortSuspend; /* P00011FF8 */ /* Offset: 1AC */ + PVOID RHClearFeaturePortEnable; /* P00011B90 */ /* Offset: 1B0 */ + PVOID RHClearFeaturePortPower; /* P00011BB4 */ /* Offset: 1B4 */ + PVOID RHClearFeaturePortSuspend; /* P0001210E */ /* Offset: 1B8 */ + PVOID RHClearFeaturePortEnableChange; /* P00012236 */ /* Offset: 1BC */ + PVOID RHClearFeaturePortConnectChange; /* P000121DE */ /* Offset: 1C0 */ + PVOID RHClearFeaturePortResetChange; /* P00012284 */ /* Offset: 1C4 */ + PVOID RHClearFeaturePortSuspendChange; /* P0001229C */ /* Offset: 1C8 */ + PVOID RHClearFeaturePortOvercurrentChange; /* P000122B4 */ /* Offset: 1CC */ + PVOID RHDisableIrq; /* P00013F52 */ /* Offset: 1D0 */ + PVOID RHDisableIrq2; /* P00013F52 */ /* Offset: 1D4 */ + PVOID StartSendOnePacket; /* P00011144 */ /* Offset: 1D8 */ + PVOID EndSendOnePacket; /* P000119B6 */ /* Offset: 1DC */ + PVOID PassThru; /* P000110E0 */ /* Offset: 1E0 */ + DWORD Unknown58[17]; /* - */ + PVOID FlushInterrupts; /* P00013EA0 */ /* Offset: 228 */ + /* ... */ +} USB_CONTROLLER_INTERFACE, *PUSB_CONTROLLER_INTERFACE; +/**** E N D M S I N T E R N A L P R O T O C O L ****/ + +/* + * With this call USB miniport driver registers itself with usbport.sys + * + * Unknown1 - Could be 0x64 or 0xC8. (0x9A also ?) + * Unknown2 - Pointer to structure which contains function entry points + */ +NTSTATUS STDCALL +USBPORT_RegisterUSBPortDriver(PDRIVER_OBJECT DriverObject, DWORD Unknown1, + PUSB_CONTROLLER_INTERFACE Interface); + +/* + * This function always returns 0x10000001 in Windows XP SP1 + */ +NTSTATUS STDCALL +USBPORT_GetHciMn(VOID); + +/* + * This method is provided for miniports to use to allocate their USB_CONTROLLER_INTERFACEs. + */ +NTSTATUS STDCALL +USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface); + +/* + * We can't have an allocate without a free. + */ +NTSTATUS STDCALL +USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface); +#endif /* _USBPORT_H */ _____ Added: trunk/reactos/drivers/usb/usbport/usbport.rc --- trunk/reactos/drivers/usb/usbport/usbport.rc 2005-01-14 16:10:07 UTC (rev 13043) +++ trunk/reactos/drivers/usb/usbport/usbport.rc 2005-01-14 16:12:34 UTC (rev 13044) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB Port Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbport\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbport.sys\0" +#include <reactos/version.rc>

1 0

[blight] 13043: Add STATUS_FLOAT_MULTIPLE_TRAPS/FAULTS.
by blight＠svn.reactos.com 14 Jan '05

14 Jan '05

Add STATUS_FLOAT_MULTIPLE_TRAPS/FAULTS. Modified: trunk/reactos/include/ddk/status.h _____ Modified: trunk/reactos/include/ddk/status.h --- trunk/reactos/include/ddk/status.h 2005-01-14 14:47:03 UTC (rev 13042) +++ trunk/reactos/include/ddk/status.h 2005-01-14 16:10:07 UTC (rev 13043) @@ -669,6 +669,9 @@ #define STATUS_RANGE_NOT_FOUND ((NTSTATUS)0xC000028C) +#define STATUS_FLOAT_MULTIPLE_FAULTS ((NTSTATUS)0xC00002B4L) +#define STATUS_FLOAT_MULTIPLE_TRAPS ((NTSTATUS)0xC00002B5L) + #define STATUS_SAM_INIT_FAILURE ((NTSTATUS)0xC00002CB)

1 0

[blight] 13042: Fix MmAllocatePageForMdl when it cannot allocate as much memory as requested.
by blight＠svn.reactos.com 14 Jan '05

14 Jan '05

Fix MmAllocatePageForMdl when it cannot allocate as much memory as requested. Modified: trunk/reactos/ntoskrnl/mm/mdl.c _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-14 14:11:13 UTC (rev 13041) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-14 14:47:03 UTC (rev 13042) @@ -637,10 +637,9 @@ memory. When a driver wants to access physical memory described by a sub-MDL it must map the sub-MDL using MmGetSystemAddressForMdlSafe. - Konstantin Gusev + Konstantin Gusev + */ -*/ - PMDL Mdl; PPFN_TYPE Pages; ULONG NumberOfPagesWanted, NumberOfPagesAllocated; @@ -652,7 +651,11 @@ SkipBytes.QuadPart, Totalbytes); /* SkipBytes must be a multiple of the page size */ - ASSERT((SkipBytes.QuadPart % PAGE_SIZE) == 0); + if ((SkipBytes.QuadPart % PAGE_SIZE) != 0) + { + DPRINT1("Warning: SkipBytes is not a multiple of PAGE_SIZE\n"); + return NULL; + } /* Allocate memory for the MDL */ Mdl = MmCreateMdl(NULL, 0, Totalbytes); @@ -690,6 +693,11 @@ ExFreePool(Mdl); Mdl = NULL; } + else if (NumberOfPagesWanted > 0) + { + Mdl->ByteCount = (ULONG)(NumberOfPagesAllocated * PAGE_SIZE); + /* FIXME: I don't know if Mdl->Size should also be changed -- blight */ + } return Mdl; }

1 0

[navaraf] 13041: We're not supposed to build elf.c, it's template file.
by navaraf＠svn.reactos.com 14 Jan '05

14 Jan '05

We're not supposed to build elf.c, it's template file. Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-14 14:10:41 UTC (rev 13040) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-14 14:11:13 UTC (rev 13041) @@ -6,7 +6,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="__3GB__" /> - <define name="__ELF_WORD_SIZE">32</define> <include base="kjs">include</include> <include base="ntoskrnl">include</include> <library>csq</library> @@ -259,7 +258,6 @@ <file>drvlck.c</file> <file>elf32.c</file> <file>elf64.c</file> - <file>elf.c</file> <file>freelist.c</file> <file>iospace.c</file> <file>kmap.c</file>

1 0

[royce] 13040: better config.template.xml
by royce＠svn.reactos.com 14 Jan '05

14 Jan '05

better config.template.xml Modified: branches/xmlbuildsystem/reactos/config.template.xml _____ Modified: branches/xmlbuildsystem/reactos/config.template.xml --- branches/xmlbuildsystem/reactos/config.template.xml 2005-01-14 13:29:27 UTC (rev 13039) +++ branches/xmlbuildsystem/reactos/config.template.xml 2005-01-14 14:10:41 UTC (rev 13040) @@ -0,0 +1,67 @@ + + +<property name="ARCH" value="i386" /> + + + + +<property name="OARCH" value="i486" /> + + + + + + + + + + + +<property name="OPTIMIZED" value="0" /> + + + + +<property name="MP" value="0" /> + + + + +<property name="ACPI" value="0" /> + + + + +<property name="_3GB" value="1" /> + + +

1 0

[royce] 13039: add csq library to ntoskrnl
by royce＠svn.reactos.com 14 Jan '05

14 Jan '05

add csq library to ntoskrnl Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/lib/csq/csq.xml Added: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-14 06:51:37 UTC (rev 13038) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-14 13:29:27 UTC (rev 13039) @@ -20,6 +20,9 @@ <include>include</include> <include>w32api/include</include> + <directory name="drivers"> + <xi:include href="drivers/directory.xml" /> + </directory> <directory name="tools"> <xi:include href="tools/tools.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-14 06:51:37 UTC (rev 13038) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-14 13:29:27 UTC (rev 13039) @@ -0,0 +1,3 @@ +<directory name="lib"> + <xi:include href="lib/directory.xml" /> +</directory> \ No newline at end of file _____ Added: branches/xmlbuildsystem/reactos/drivers/lib/csq/csq.xml --- branches/xmlbuildsystem/reactos/drivers/lib/csq/csq.xml 2005-01-14 06:51:37 UTC (rev 13038) +++ branches/xmlbuildsystem/reactos/drivers/lib/csq/csq.xml 2005-01-14 13:29:27 UTC (rev 13039) @@ -0,0 +1,3 @@ +<module name="csq" type="staticlibrary"> + <file>csq.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/lib/directory.xml --- branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-14 06:51:37 UTC (rev 13038) +++ branches/xmlbuildsystem/reactos/drivers/lib/directory.xml 2005-01-14 13:29:27 UTC (rev 13039) @@ -0,0 +1,3 @@ +<directory name="csq"> + <xi:include href="csq/csq.xml" /> +</directory> \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-14 06:51:37 UTC (rev 13038) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-14 13:29:27 UTC (rev 13039) @@ -9,6 +9,7 @@ <define name="__ELF_WORD_SIZE">32</define> <include base="kjs">include</include> <include base="ntoskrnl">include</include> + <library>csq</library> <library>hal</library> <library>kjs</library> <library>pseh</library> @@ -24,6 +25,58 @@ <outputfile switches="-o">bugcodes.rc</outputfile> </output> </invoke> + + <directory name="ke">  + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>multiboot.S</file>  + <file>bios.c</file> + <file>brkpoint.c</file> + <file>bthread.S</file> + <file>exp.c</file> + <file>fpu.c</file> + <file>gdt.c</file> + <file>i386-mcount.S</file> + <file>idt.c</file> + <file>irq.c</file> + <file>irqhand.s</file> + <file>kernel.c</file> + <file>ldt.c</file> + <file>stkswitch.S</file> + <file>syscall.S</file> + <file>thread.c</file> + <file>tlbflush.S</file> + <file>trap.S</file> + <file>tskswitch.S</file> + <file>tss.c</file> + <file>usercall.c</file> + <file>usertrap.c</file> + <file>v86m.c</file> + <file>v86m_sup.S</file> + </directory> + </if> + <file>apc.c</file> + <file>bug.c</file> + <file>catch.c</file> + <file>critical.c</file> + <file>device.c</file> + <file>dpc.c</file> + <file>error.c</file> + <file>event.c</file> + <file>gmutex.c</file> + <file>ipi.c</file> + <file>kqueue.c</file> + <file>kthread.c</file> + <file>main.c</file> + <file>mutex.c</file> + <file>process.c</file> + <file>profile.c</file> + <file>queue.c</file> + <file>sem.c</file> + <file>spinlock.c</file> + <file>timer.c</file> + <file>wait.c</file> + </directory> <directory name="cc"> <file>cacheman.c</file> <file>copy.c</file> @@ -170,57 +223,6 @@ <file>mda.c</file> <file>service.c</file> </directory> - <directory name="ke"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>bios.c</file> - <file>brkpoint.c</file> - <file>bthread.S</file> - <file>exp.c</file> - <file>fpu.c</file> - <file>gdt.c</file> - <file>i386-mcount.S</file> - <file>idt.c</file> - <file>irq.c</file> - <file>irqhand.s</file> - <file>kernel.c</file> - <file>ldt.c</file> - <file>multiboot.S</file> - <file>stkswitch.S</file> - <file>syscall.S</file> - <file>thread.c</file> - <file>tlbflush.S</file> - <file>trap.S</file> - <file>tskswitch.S</file> - <file>tss.c</file> - <file>usercall.c</file> - <file>usertrap.c</file> - <file>v86m.c</file> - <file>v86m_sup.S</file> - </directory> - </if> - <file>apc.c</file> - <file>bug.c</file> - <file>catch.c</file> - <file>critical.c</file> - <file>device.c</file> - <file>dpc.c</file> - <file>error.c</file> - <file>event.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>kqueue.c</file> - <file>kthread.c</file> - <file>main.c</file> - <file>mutex.c</file> - <file>process.c</file> - <file>profile.c</file> - <file>queue.c</file> - <file>sem.c</file> - <file>spinlock.c</file> - <file>timer.c</file> - <file>wait.c</file> - </directory> <directory name="ldr"> <file>init.c</file> <file>loader.c</file> @@ -337,7 +339,17 @@ <directory name="rtl"> <if property="ARCH" value="i386"> <directory name="i386"> + <file>alldiv.s</file> + <file>allmul.s</file> + <file>allrem.s</file> + <file>allshl.s</file> + <file>allshr.s</file> + <file>aulldiv.s</file> + <file>aullrem.s</file> + <file>aullshr.s</file> + <file>except.s</file> <file>exception.c</file> + <file>seh.s</file> </directory> </if> <file>atom.c</file>

1 0

[royce] 13038: use ntoskrnl's def file when running dlltool, otherwise not all of ntoskrnl's exports make it into final executable.
by royce＠svn.reactos.com 14 Jan '05

14 Jan '05

use ntoskrnl's def file when running dlltool, otherwise not all of ntoskrnl's exports make it into final executable. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-14 03:29:47 UTC (rev 13037) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-14 06:51:37 UTC (rev 13038) @@ -795,10 +795,11 @@ "\t${rm} %s\n", junk_tmp.c_str () ); fprintf ( fMakefile, - "\t${dlltool} --dllname %s --base-file %s --output-exp %s --kill-at\n", + "\t${dlltool} --dllname %s --base-file %s --def ntoskrnl/ntoskrnl.def --output-exp %s --kill-at\n", target.c_str (), base_tmp.c_str (), - temp_exp.c_str ()); + //FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + temp_exp.c_str () ); fprintf ( fMakefile, "\t${rm} %s\n", base_tmp.c_str () );

1 0

[sedwards] 13037: added some missing license headers
by sedwards＠svn.reactos.com 14 Jan '05

14 Jan '05

added some missing license headers Modified: trunk/reactos/lib/msvcrt/conio/cgets.c Modified: trunk/reactos/lib/msvcrt/conio/cprintf.c Modified: trunk/reactos/lib/msvcrt/conio/cscanf.c Modified: trunk/reactos/lib/msvcrt/ctype/ctype.c Modified: trunk/reactos/lib/msvcrt/ctype/iscntrl.c Modified: trunk/reactos/lib/msvcrt/ctype/isctype.c Modified: trunk/reactos/lib/msvcrt/ctype/isdigit.c Modified: trunk/reactos/lib/msvcrt/ctype/isgraph.c Modified: trunk/reactos/lib/msvcrt/ctype/islower.c Modified: trunk/reactos/lib/msvcrt/ctype/isprint.c Modified: trunk/reactos/lib/msvcrt/ctype/ispunct.c Modified: trunk/reactos/lib/msvcrt/ctype/isupper.c Modified: trunk/reactos/lib/msvcrt/ctype/isxdigit.c Modified: trunk/reactos/lib/msvcrt/ctype/toascii.c Modified: trunk/reactos/lib/msvcrt/ctype/tolower.c Modified: trunk/reactos/lib/msvcrt/ctype/toupper.c _____ Modified: trunk/reactos/lib/msvcrt/conio/cgets.c --- trunk/reactos/lib/msvcrt/conio/cgets.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/conio/cgets.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/conio/cgets.c + * PURPOSE: C Runtime + * PROGRAMMER: Eric Kohl (Imported from DJGPP) + */ + #include <msvcrt/conio.h> #include <msvcrt/stdlib.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/msvcrt/conio/cprintf.c --- trunk/reactos/lib/msvcrt/conio/cprintf.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/conio/cprintf.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/conio/cprintf.c + * PURPOSE: C Runtime + * PROGRAMMER: Eric Kohl (Imported from DJGPP) + */ + #include <msvcrt/stdio.h> #include <msvcrt/conio.h> _____ Modified: trunk/reactos/lib/msvcrt/conio/cscanf.c --- trunk/reactos/lib/msvcrt/conio/cscanf.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/conio/cscanf.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/conio/cscanf.c + * PURPOSE: C Runtime + * PROGRAMMER: Eric Kohl (Imported from DJGPP) + */ + #include <msvcrt/conio.h> #include <msvcrt/stdarg.h> #include <msvcrt/stdio.h> _____ Modified: trunk/reactos/lib/msvcrt/ctype/ctype.c --- trunk/reactos/lib/msvcrt/ctype/ctype.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/ctype.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/ctype.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> unsigned short _ctype[] = { _____ Modified: trunk/reactos/lib/msvcrt/ctype/iscntrl.c --- trunk/reactos/lib/msvcrt/ctype/iscntrl.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/iscntrl.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/iscntrl.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> - #undef iscntrl /* * @implemented _____ Modified: trunk/reactos/lib/msvcrt/ctype/isctype.c --- trunk/reactos/lib/msvcrt/ctype/isctype.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isctype.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isctype.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> _____ Modified: trunk/reactos/lib/msvcrt/ctype/isdigit.c --- trunk/reactos/lib/msvcrt/ctype/isdigit.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isdigit.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isdigit.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> _____ Modified: trunk/reactos/lib/msvcrt/ctype/isgraph.c --- trunk/reactos/lib/msvcrt/ctype/isgraph.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isgraph.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isgraph.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> #undef isgraph _____ Modified: trunk/reactos/lib/msvcrt/ctype/islower.c --- trunk/reactos/lib/msvcrt/ctype/islower.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/islower.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/islower.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> _____ Modified: trunk/reactos/lib/msvcrt/ctype/isprint.c --- trunk/reactos/lib/msvcrt/ctype/isprint.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isprint.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isprint.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> #undef isprint _____ Modified: trunk/reactos/lib/msvcrt/ctype/ispunct.c --- trunk/reactos/lib/msvcrt/ctype/ispunct.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/ispunct.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/ispunct.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> - #undef ispunct /* * @implemented _____ Modified: trunk/reactos/lib/msvcrt/ctype/isupper.c --- trunk/reactos/lib/msvcrt/ctype/isupper.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isupper.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isupper.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> - #undef isupper /* * @implemented _____ Modified: trunk/reactos/lib/msvcrt/ctype/isxdigit.c --- trunk/reactos/lib/msvcrt/ctype/isxdigit.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/isxdigit.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/isxdigit.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> - #undef isxdigit /* * @implemented _____ Modified: trunk/reactos/lib/msvcrt/ctype/toascii.c --- trunk/reactos/lib/msvcrt/ctype/toascii.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/toascii.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,8 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/toascii.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ #include <msvcrt/ctype.h> - /* * @implemented */ _____ Modified: trunk/reactos/lib/msvcrt/ctype/tolower.c --- trunk/reactos/lib/msvcrt/ctype/tolower.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/tolower.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,4 +1,11 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/tolower.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> #undef tolower _____ Modified: trunk/reactos/lib/msvcrt/ctype/toupper.c --- trunk/reactos/lib/msvcrt/ctype/toupper.c 2005-01-13 23:47:10 UTC (rev 13036) +++ trunk/reactos/lib/msvcrt/ctype/toupper.c 2005-01-14 03:29:47 UTC (rev 13037) @@ -1,7 +1,13 @@ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: msvcrt/ctype/toupper.c + * PURPOSE: C Runtime + * PROGRAMMER: Copyright (C) 1995 DJ Delorie + */ + #include <msvcrt/ctype.h> - #undef toupper /* * @implemented

1 0

[blight] 13036: MmMapLockedPagesSpecifyCache: Raise STATUS_ACCESS_VIOLATION instead of bugchecking when mapping into usermode.
by blight＠svn.reactos.com 13 Jan '05

13 Jan '05

MmMapLockedPagesSpecifyCache: Raise STATUS_ACCESS_VIOLATION instead of bugchecking when mapping into usermode. Modified: trunk/reactos/ntoskrnl/mm/mdl.c _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-13 22:43:10 UTC (rev 13035) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-13 23:47:10 UTC (rev 13036) @@ -788,8 +788,9 @@ return NULL; } - /* FIXME: Raise an exception instead of bugchecking */ - KEBUGCHECK(0); + /* Throw exception */ + ExRaiseStatus(STATUS_ACCESS_VIOLATION); + ASSERT(0); } Mdl->Process = CurrentProcess;

1 0

[gvg] 13035: Small sync to Wine
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Small sync to Wine Modified: trunk/reactos/lib/msi/sql.tab.c Modified: trunk/reactos/lib/msi/sql.y _____ Modified: trunk/reactos/lib/msi/sql.tab.c --- trunk/reactos/lib/msi/sql.tab.c 2005-01-13 21:03:02 UTC (rev 13034) +++ trunk/reactos/lib/msi/sql.tab.c 2005-01-13 22:43:10 UTC (rev 13035) @@ -422,7 +422,7 @@ static struct expr * EXPR_column( LPWSTR ); static struct expr * EXPR_ival( struct sql_str *, int sign); static struct expr * EXPR_sval( struct sql_str *); -static struct expr * EXPR_wildcard(void); +static struct expr * EXPR_wildcard(); _____ Modified: trunk/reactos/lib/msi/sql.y --- trunk/reactos/lib/msi/sql.y 2005-01-13 21:03:02 UTC (rev 13034) +++ trunk/reactos/lib/msi/sql.y 2005-01-13 22:43:10 UTC (rev 13035) @@ -64,7 +64,7 @@ static struct expr * EXPR_column( LPWSTR ); static struct expr * EXPR_ival( struct sql_str *, int sign); static struct expr * EXPR_sval( struct sql_str *); -static struct expr * EXPR_wildcard(void); +static struct expr * EXPR_wildcard(); %}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs