[ros-diffs] [akhaldi] 61503: [USBHUB] * Cleanup the main header. * Improve the GUIDs situation. CORE-7716

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/CMakeLis...
==============================================================================
--- 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?re...
==============================================================================
--- 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?r...
==============================================================================
--- 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?re...
==============================================================================
--- 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.h...
==============================================================================
--- 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