Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61511: [MMEBUDDY] * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 10:14:03 2014 New Revision: 61511 URL: http://svn.reactos.org/svn/reactos?rev=61511&view=rev Log: [MMEBUDDY] * Cleanup the main header. CORE-7716 Modified: trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h Modified: trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/precomp.h [iso-8859-1] Sat Jan 4 10:14:03 2014 @@ -1,6 +1,5 @@ -#include <windows.h> -#include <mmsystem.h> +#include <stdarg.h> +#include <windef.h> #include <mmddk.h> -#include <ntddsnd.h> #include <sndtypes.h> #include <mmebuddy.h>

1 0

[akhaldi] 61510: [IP] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 10:12:37 2014 New Revision: 61510 URL: http://svn.reactos.org/svn/reactos?rev=61510&view=rev Log: [IP] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/interface.c trunk/reactos/lib/drivers/ip/network/router.c trunk/reactos/lib/drivers/ip/precomp.h Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Jan 4 10:12:37 2014 @@ -9,6 +9,8 @@ */ #include "precomp.h" + +#include <icmp.h> NTSTATUS ICMPStartup() { Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Sat Jan 4 10:12:37 2014 @@ -10,6 +10,9 @@ */ #include "precomp.h" + +#include <ntifs.h> +#include <ipifcons.h> ULONG NextDefaultAdapter = 0; Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Sat Jan 4 10:12:37 2014 @@ -13,7 +13,6 @@ */ #include "precomp.h" - LIST_ENTRY FIBListHead; KSPIN_LOCK FIBLock; Modified: trunk/reactos/lib/drivers/ip/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/precomp.h?r… ============================================================================== --- trunk/reactos/lib/drivers/ip/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/precomp.h [iso-8859-1] Sat Jan 4 10:12:37 2014 @@ -1,36 +1,19 @@ -#include <limits.h> -#include <ntddk.h> -#include <ntifs.h> #include <tags.h> -#include <tdi.h> -#include <tdistat.h> #include <tcpip.h> #include <loopback.h> -#include <ip.h> -#include <lan.h> #include <datagram.h> #include <checksum.h> -#include <address.h> #include <routines.h> #include <info.h> -#include <neighbor.h> #include <route.h> #include <receive.h> #include <transmit.h> -#include <router.h> -#include <pool.h> #include <rawip.h> -#include <icmp.h> #include <udp.h> #include <tcp.h> -#include <arp.h> #include <tilists.h> -#include <dispatch.h> #include <fileobjs.h> #include <lock.h> -#include <wait.h> #include <interface.h> #include <ports.h> -#include <ipifcons.h> #include <chew/chew.h> -#include <pseh/pseh2.h>

1 0

[akhaldi] 61509: [IP] * Properly account for checksum.S as an asm file.
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 10:11:02 2014 New Revision: 61509 URL: http://svn.reactos.org/svn/reactos?rev=61509&view=rev Log: [IP] * Properly account for checksum.S as an asm file. Modified: trunk/reactos/lib/drivers/ip/CMakeLists.txt Modified: trunk/reactos/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/CMakeLists.… ============================================================================== --- trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Sat Jan 4 10:11:02 2014 @@ -7,7 +7,7 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/lwip/src/include/ipv4) if(ARCH STREQUAL "i386") - list(APPEND SOURCE network/i386/checksum.S) + add_asm_files(ip_asm network/i386/checksum.S) endif() list(APPEND SOURCE @@ -32,6 +32,6 @@ transport/tcp/tcp.c transport/udp/udp.c) -add_library(ip ${SOURCE}) +add_library(ip ${SOURCE} ${ip_asm}) add_pch(ip precomp.h) add_dependencies(ip bugcodes)

1 0

[akhaldi] 61508: [LIBSAMPLERATE] * Create a main header and move some inclusions to it. CORE-7716
by akhaldi＠svn.reactos.org 04 Jan '14

04 Jan '14

Author: akhaldi Date: Sat Jan 4 10:08:01 2014 New Revision: 61508 URL: http://svn.reactos.org/svn/reactos?rev=61508&view=rev Log: [LIBSAMPLERATE] * Create a main header and move some inclusions to it. CORE-7716 Added: trunk/reactos/lib/3rdparty/libsamplerate/precomp.h (with props) Modified: trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c Added: trunk/reactos/lib/3rdparty/libsamplerate/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/precomp.h (added) +++ trunk/reactos/lib/3rdparty/libsamplerate/precomp.h [iso-8859-1] Sat Jan 4 10:08:01 2014 @@ -0,0 +1,11 @@ +#ifndef _LIBSAMPLERATE_PCH_ +#define _LIBSAMPLERATE_PCH_ + +#include <stdlib.h> +#include <string.h> + +#include "config.h" +#include "float_cast.h" +#include "common.h" + +#endif /* _LIBSAMPLERATE_PCH_ */ Propchange: trunk/reactos/lib/3rdparty/libsamplerate/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/samplerate.c [iso-8859-1] Sat Jan 4 10:08:01 2014 @@ -22,15 +22,7 @@ ** http://www.mega-nerd.com/SRC/procedure.html */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" - -#include "samplerate.h" -#include "float_cast.h" -#include "common.h" +#include "precomp.h" static int psrc_set_converter (SRC_PRIVATE *psrc, int converter_type) ; Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_linear.c [iso-8859-1] Sat Jan 4 10:08:01 2014 @@ -22,13 +22,7 @@ ** http://www.mega-nerd.com/SRC/procedure.html */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "float_cast.h" -#include "common.h" +#include "precomp.h" static int linear_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void linear_reset (SRC_PRIVATE *psrc) ; Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_sinc.c [iso-8859-1] Sat Jan 4 10:08:01 2014 @@ -22,13 +22,7 @@ ** http://www.mega-nerd.com/SRC/procedure.html */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "float_cast.h" -#include "common.h" +#include "precomp.h" #define SINC_MAGIC_MARKER MAKE_MAGIC (' ', 's', 'i', 'n', 'c', ' ') Modified: trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate… ============================================================================== --- trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libsamplerate/src_zoh.c [iso-8859-1] Sat Jan 4 10:08:01 2014 @@ -22,13 +22,7 @@ ** http://www.mega-nerd.com/SRC/procedure.html */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "float_cast.h" -#include "common.h" +#include "precomp.h" static int zoh_vari_process (SRC_PRIVATE *psrc, SRC_DATA *data) ; static void zoh_reset (SRC_PRIVATE *psrc) ;

1 0

[aandrejevic] 61507: [NTVDM] Implement DOS functions 0x4E (Find First File) and 0x4F (Find Next File). Not tested yet.
by aandrejevic＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: aandrejevic Date: Fri Jan 3 23:41:40 2014 New Revision: 61507 URL: http://svn.reactos.org/svn/reactos?rev=61507&view=rev Log: [NTVDM] Implement DOS functions 0x4E (Find First File) and 0x4F (Find Next File). Not tested yet. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Fri Jan 3 23:41:40 2014 @@ -890,6 +890,69 @@ return TRUE; } +WORD DosFindFirstFile(LPSTR FileSpec, WORD AttribMask) +{ + BOOLEAN Success = TRUE; + WIN32_FIND_DATAA FindData; + PVDM_FIND_FILE_BLOCK FindFileBlock = (PVDM_FIND_FILE_BLOCK)FAR_POINTER(DiskTransferArea); + + /* Fill the block */ + FindFileBlock->DriveLetter = CurrentDrive + 'A'; + FindFileBlock->AttribMask = AttribMask; + FindFileBlock->SearchHandle = FindFirstFileA(FileSpec, &FindData); + if (FindFileBlock->SearchHandle == INVALID_HANDLE_VALUE) return GetLastError(); + + do + { + /* Check the attributes */ + if (!((FindData.dwFileAttributes + & (FILE_ATTRIBUTE_HIDDEN + | FILE_ATTRIBUTE_SYSTEM + | FILE_ATTRIBUTE_DIRECTORY)) + & ~AttribMask)) break; + } + while ((Success = FindNextFileA(FindFileBlock->SearchHandle, &FindData))); + + if (!Success) return GetLastError(); + + FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); + FileTimeToDosDateTime(&FindData.ftLastWriteTime, + &FindFileBlock->FileDate, + &FindFileBlock->FileTime); + FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + : FindData.nFileSizeLow; + strcpy(FindFileBlock->FileName, FindData.cAlternateFileName); + + return ERROR_SUCCESS; +} + +WORD DosFindNextFile(VOID) +{ + WIN32_FIND_DATAA FindData; + PVDM_FIND_FILE_BLOCK FindFileBlock = (PVDM_FIND_FILE_BLOCK)FAR_POINTER(DiskTransferArea); + + do + { + if (!FindNextFileA(FindFileBlock->SearchHandle, &FindData)) return GetLastError(); + + /* Update the block */ + FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); + FileTimeToDosDateTime(&FindData.ftLastWriteTime, + &FindFileBlock->FileDate, + &FindFileBlock->FileTime); + FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + : FindData.nFileSizeLow; + strcpy(FindFileBlock->FileName, FindData.cAlternateFileName); + } + while((FindData.dwFileAttributes + & (FILE_ATTRIBUTE_HIDDEN + | FILE_ATTRIBUTE_SYSTEM + | FILE_ATTRIBUTE_DIRECTORY)) + & ~FindFileBlock->AttribMask); + + return ERROR_SUCCESS; +} + BOOLEAN DosChangeDrive(BYTE Drive) { WCHAR DirectoryPath[DOS_CMDLINE_LENGTH]; @@ -2482,6 +2545,30 @@ break; } + /* Find First File */ + case 0x4E: + { + WORD Result = DosFindFirstFile(SEG_OFF_TO_PTR(getDS(), getDX()), getCX()); + + setAX(Result); + if (Result == ERROR_SUCCESS) Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + else Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + + break; + } + + /* Find Next File */ + case 0x4F: + { + WORD Result = DosFindNextFile(); + + setAX(Result); + if (Result == ERROR_SUCCESS) Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + else Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + + break; + } + /* Internal - Set Current Process ID (Set PSP Address) */ case 0x50: { Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Fri Jan 3 23:41:40 2014 @@ -118,6 +118,22 @@ CHAR DeviceName[8]; } DOS_DRIVER_HEADER, *PDOS_DRIVER_HEADER; +typedef struct _VDM_FIND_FILE_BLOCK +{ + CHAR DriveLetter; + CHAR Pattern[11]; + UCHAR AttribMask; + DWORD Unused; + HANDLE SearchHandle; + + /* The following part of the structure is documented */ + UCHAR Attributes; + WORD FileTime; + WORD FileDate; + DWORD FileSize; + CHAR FileName[13]; +} VDM_FIND_FILE_BLOCK, *PVDM_FIND_FILE_BLOCK; + #pragma pack(pop) /* FUNCTIONS ******************************************************************/

1 0

[akhaldi] 61506: [USBSTOR] * Cleanup the main header. CORE-7716
by akhaldi＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: akhaldi Date: Fri Jan 3 19:27:01 2014 New Revision: 61506 URL: http://svn.reactos.org/svn/reactos?rev=61506&view=rev Log: [USBSTOR] * Cleanup the main header. CORE-7716 Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri Jan 3 19:27:01 2014 @@ -1,18 +1,11 @@ #pragma once -#include <ntddk.h> +#include <wdm.h> #include <usbdi.h> -#include <hubbusif.h> #include <usbbusif.h> -#include <usbioctl.h> -#include <usbiodef.h> -#include <usb.h> #include <usbdlib.h> -#include <stdio.h> -#include <wdmguid.h> #include <classpnp.h> -#include <scsi.h> #define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16)

1 0

[akhaldi] 61505: [USBUHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: akhaldi Date: Fri Jan 3 19:20:35 2014 New Revision: 61505 URL: http://svn.reactos.org/svn/reactos?rev=61505&view=rev Log: [USBUHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/usb/usbuhci/guid.cpp (with props) Modified: trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt trunk/reactos/drivers/usb/usbuhci/hardware.h trunk/reactos/drivers/usb/usbuhci/interfaces.h trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/CMakeLists.txt [iso-8859-1] Fri Jan 3 19:20:35 2014 @@ -11,7 +11,8 @@ usbuhci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp) + hardware.cpp + guid.cpp) add_library(usbuhci SHARED ${SOURCE} Added: trunk/reactos/drivers/usb/usbuhci/guid.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/guid.cpp (added) +++ trunk/reactos/drivers/usb/usbuhci/guid.cpp [iso-8859-1] Fri Jan 3 19:20:35 2014 @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> +#include <libusb.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbuhci/guid.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbuhci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.h [iso-8859-1] Fri Jan 3 19:20:35 2014 @@ -188,4 +188,4 @@ #define UHCI_BULK_QUEUE 3 #define UHCI_DEBUG_QUEUE 4 -#endif +#endif /* UHCI_HARDWARE_H */ Modified: trunk/reactos/drivers/usb/usbuhci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/interfaces.h [iso-8859-1] Fri Jan 3 19:20:35 2014 @@ -1,8 +1,5 @@ - #ifndef INTERFACES_HPP #define INTERFACES_HPP - -#include "libusb.h" //--------------------------------------------------------------------------- // @@ -138,4 +135,4 @@ typedef IUHCIQueue *PUHCIQUEUE; -#endif +#endif /* INTERFACES_HPP */ Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Fri Jan 3 19:20:35 2014 @@ -1,34 +1,7 @@ #ifndef USBUHCI_H__ #define USBUHCI_H__ -#define INITGUID - -#include <ntddk.h> -#include <hubbusif.h> -#include <usbbusif.h> -#include <usbioctl.h> - -extern -"C" -{ -#include <usbdlib.h> -} - -// -// FIXME: -// #include <usbprotocoldefs.h> -// -#include <usb.h> -#include <stdio.h> -#include <wdmguid.h> - -// -// FIXME: -// the following includes are required to get kcom to compile -// -#include <portcls.h> -#include <dmusicks.h> -#include <kcom.h> +#include <libusb.h> #include "hardware.h" #include "interfaces.h"

1 0

[akhaldi] 61504: [USBOHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: akhaldi Date: Fri Jan 3 18:33:25 2014 New Revision: 61504 URL: http://svn.reactos.org/svn/reactos?rev=61504&view=rev Log: [USBOHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/usb/usbohci/guid.cpp (with props) Modified: trunk/reactos/drivers/usb/usbohci/CMakeLists.txt trunk/reactos/drivers/usb/usbohci/hardware.h trunk/reactos/drivers/usb/usbohci/interfaces.h trunk/reactos/drivers/usb/usbohci/usbohci.h Modified: trunk/reactos/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Fri Jan 3 18:33:25 2014 @@ -10,7 +10,8 @@ usbohci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp) + hardware.cpp + guid.cpp) add_library(usbohci SHARED ${SOURCE} Added: trunk/reactos/drivers/usb/usbohci/guid.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/guid.cpp (added) +++ trunk/reactos/drivers/usb/usbohci/guid.cpp [iso-8859-1] Fri Jan 3 18:33:25 2014 @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> +#include <libusb.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbohci/guid.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] Fri Jan 3 18:33:25 2014 @@ -1,6 +1,4 @@ #pragma once - -#include <ntddk.h> // // OHCI Operational Registers Modified: trunk/reactos/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/interfaces.h [iso-8859-1] Fri Jan 3 18:33:25 2014 @@ -1,12 +1,9 @@ - #ifndef INTERFACES_HPP #define INTERFACES_HPP struct _OHCI_ENDPOINT_DESCRIPTOR; struct IDMAMemoryManager; struct IUSBQueue; - -#include "libusb.h" //========================================================================================= // @@ -134,4 +131,4 @@ typedef IOHCIQueue *POHCIQUEUE; -#endif +#endif /* INTERFACES_HPP */ Modified: trunk/reactos/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohc… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] Fri Jan 3 18:33:25 2014 @@ -1,35 +1,7 @@ #ifndef USBOHCI_H__ #define USBOHCI_H__ -#define INITGUID - -#include <ntddk.h> -#include <hubbusif.h> -#include <usbbusif.h> -#include <usbioctl.h> -#include <usb100.h> - -extern -"C" -{ -#include <usbdlib.h> -} - -// -// FIXME: -// #include <usbprotocoldefs.h> -// -#include <usb.h> -#include <stdio.h> -#include <wdmguid.h> - -// -// FIXME: -// the following includes are required to get kcom to compile -// -#include <portcls.h> -#include <dmusicks.h> -#include <kcom.h> +#include <libusb.h> #include "hardware.h" #include "interfaces.h" @@ -79,4 +51,4 @@ NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest); } -#endif +#endif /* USBOHCI_H__ */

1 0

[akhaldi] 61503: [USBHUB] * Cleanup the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: akhaldi Date: Fri Jan 3 17:45:05 2014 New Revision: 61503 URL: http://svn.reactos.org/svn/reactos?rev=61503&view=rev Log: [USBHUB] * Cleanup the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/usb/usbhub/guid.c (with props) Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/CMakeLi… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Fri Jan 3 17:45:05 2014 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c usbhub.rc) +add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c guid.c usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Fri Jan 3 17:45:05 2014 @@ -9,6 +9,8 @@ */ #include "usbhub.h" + +#include <stdio.h> #define NDEBUG #include <debug.h> Added: trunk/reactos/drivers/usb/usbhub/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/guid.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/guid.c (added) +++ trunk/reactos/drivers/usb/usbhub/guid.c [iso-8859-1] Fri Jan 3 17:45:05 2014 @@ -0,0 +1,9 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <initguid.h> +#include <wdmguid.h> +#include <hubbusif.h> +#include <usbbusif.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbhub/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Fri Jan 3 17:45:05 2014 @@ -10,6 +10,8 @@ */ #include "usbhub.h" + +#include <wdmguid.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Fri Jan 3 17:45:05 2014 @@ -1,20 +1,11 @@ #pragma once -#define INITGUID - -#include <ntifs.h> #include <ntddk.h> -#include <wdmguid.h> #include <hubbusif.h> #include <usbbusif.h> -#include <usbioctl.h> -#include <usb.h> -#include <stdarg.h> -#include <stdio.h> #include <usbdlib.h> //BROKEN: #include <usbprotocoldefs.h> -#include <pseh/pseh2.h> #define USB_HUB_TAG 'hbsu' #define USB_MAXCHILDREN 127

1 0

[akhaldi] 61502: [USBEHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 03 Jan '14

03 Jan '14

Author: akhaldi Date: Fri Jan 3 17:23:55 2014 New Revision: 61502 URL: http://svn.reactos.org/svn/reactos?rev=61502&view=rev Log: [USBEHCI] * Remove inclusions that already exist in the main header. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/drivers/usb/usbehci/guid.cpp (with props) Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/hardware.h trunk/reactos/drivers/usb/usbehci/interfaces.h trunk/reactos/drivers/usb/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Fri Jan 3 17:23:55 2014 @@ -10,7 +10,8 @@ usbehci.cpp usb_request.cpp usb_queue.cpp - hardware.cpp) + hardware.cpp + guid.cpp) add_library(usbehci SHARED ${SOURCE} Added: trunk/reactos/drivers/usb/usbehci/guid.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/guid.c… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/guid.cpp (added) +++ trunk/reactos/drivers/usb/usbehci/guid.cpp [iso-8859-1] Fri Jan 3 17:23:55 2014 @@ -0,0 +1,6 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> +#include <libusb.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbehci/guid.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Fri Jan 3 17:23:55 2014 @@ -1,7 +1,4 @@ #pragma once - -#include <ntddk.h> - // // Host Controller Capability Registers @@ -325,4 +322,4 @@ #define EHCI_QH_CAPS_SCM_SHIFT 8 // Split Completion Mask #define EHCI_QH_CAPS_SCM_MASK 0xff #define EHCI_QH_CAPS_ISM_SHIFT 0 // Interrupt Schedule Mask -#define EHCI_QH_CAPS_ISM_MASK 0xff +#define EHCI_QH_CAPS_ISM_MASK 0xff Modified: trunk/reactos/drivers/usb/usbehci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] Fri Jan 3 17:23:55 2014 @@ -1,9 +1,5 @@ - #ifndef INTERFACES_HPP #define INTERFACES_HPP - -#include "libusb.h" - //========================================================================================= // @@ -152,4 +148,4 @@ typedef IEHCIQueue *PEHCIQUEUE; -#endif +#endif /* INTERFACES_HPP */ Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Fri Jan 3 17:23:55 2014 @@ -1,35 +1,7 @@ #ifndef USBEHCI_H__ #define USBEHCI_H__ -#define INITGUID - -#include <ntddk.h> -#include <hubbusif.h> -#include <usbbusif.h> -#include <usbioctl.h> - -extern "C" -{ -#include <usbdlib.h> -} - - - -// -// FIXME: -// #include <usbprotocoldefs.h> -// -#include <usb.h> -#include <stdio.h> -#include <wdmguid.h> - -// -// FIXME: -// the following includes are required to get kcom to compile -// -#include <portcls.h> -#include <dmusicks.h> -#include <kcom.h> +#include <libusb.h> #include "hardware.h" #include "interfaces.h" @@ -61,4 +33,4 @@ // NTSTATUS NTAPI InternalCreateUSBRequest(PUSBREQUEST *OutRequest); -#endif +#endif /* USBEHCI_H__ */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs