Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build, by correcting include paths and updating xml files of USB components

Browse source 
svn path=/trunk/; revision=17751
This commit is contained in:
Hervé Poussineau 2005-09-08 20:53:17 +00:00
parent d392fa8a17
commit 67720419df
23 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/usb/miniport/linux/pci_hal.c
View file

@ -2,7 +2,7 @@
// this file is part of linux_wrapper.h // this file is part of linux_wrapper.h
//FIXME: Move this file, make its definitions more general //FIXME: Move this file, make its definitions more general
#include "../host/ohci_main.h" #include "../usbohci/ohci_main.h"
/* /*
Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory. Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory.

4
reactos/drivers/usb/miniport/usbohci/ohci-hcd.c
View file

@ -97,7 +97,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/interrupt.h> /* for in_interrupt () */ #include <linux/interrupt.h> /* for in_interrupt () */
#include <linux/usb.h> #include <linux/usb.h>
#include "../core/hcd.h" #include "hcd.h"
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
@ -108,7 +108,7 @@
#include "ohci_config.h" #include "ohci_config.h"
#include "../usb_wrapper.h" #include "../usb_wrapper.h"
#include "../core/hcd.h" #include "hcd.h"
//#define OHCI_VERBOSE_DEBUG //#define OHCI_VERBOSE_DEBUG
#endif #endif

2
reactos/drivers/usb/miniport/usbohci/ohci_main.c
View file

@ -10,7 +10,7 @@
#include <debug.h> #include <debug.h>
#include "../usb_wrapper.h" #include "../usb_wrapper.h"
#include "../core/hcd.h" #include "hcd.h"
#include "ohci_main.h" #include "ohci_main.h"
// declare basic init funcs // declare basic init funcs

7
reactos/drivers/usb/miniport/usbohci/usbohci.xml
View file

@ -1,13 +1,12 @@
<module name="ohci" type="kernelmodedriver" installbase="system32/drivers" installname="ohci.sys" warnings="true"> <module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<importlibrary definition="ohci.def" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="DEBUG_MODE" /> <define name="DEBUG_MODE" />
<include base="ntoskrnl">include</include>
<include>../linux</include> <include>../linux</include>
<include base="usbport"></include>
<library>sys_base</library> <library>sys_base</library>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>
<library>usbcore</library> <library>usbport</library>
<file>ohci-hcd.c</file> <file>ohci-hcd.c</file>
<file>ohci_main.c</file> <file>ohci_main.c</file>
<file>ohci.rc</file> <file>ohci.rc</file>

2
reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c
View file

@ -61,7 +61,7 @@
#include "uhci_config.h" #include "uhci_config.h"
#include "../usb_wrapper.h" #include "../usb_wrapper.h"
#include "../core/hcd.h" #include "hcd.h"
#include "uhci-hcd.h" #include "uhci-hcd.h"
#if 0 #if 0

4
reactos/drivers/usb/miniport/usbuhci/uhci.h
View file

@ -6,9 +6,9 @@
#include <ddk/usbiodef.h> #include <ddk/usbiodef.h>
#include <initguid.h> #include <initguid.h>
#include "../core/hcd.h" #include "hcd.h"
#include "../host/ohci_main.h" #include "../usbohci/ohci_main.h"
#define USB_UHCI_TAG TAG('u','s','b','u') #define USB_UHCI_TAG TAG('u','s','b','u')

6
reactos/drivers/usb/miniport/usbuhci/usbuhci.xml
View file

@ -1,12 +1,12 @@
<module name="uhci" type="kernelmodedriver" installbase="system32/drivers" installname="usbuhci.sys" warnings="true"> <module name="usbuhci" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="DEBUG_MODE" /> <define name="DEBUG_MODE" />
<include base="ntoskrnl">include</include>
<include>../linux</include> <include>../linux</include>
<include base="usbport"></include>
<library>sys_base</library> <library>sys_base</library>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>
<library>usbcore</library> <library>usbport</library>
<file>cleanup.c</file> <file>cleanup.c</file>
<file>close.c</file> <file>close.c</file>
<file>create.c</file> <file>create.c</file>

4
reactos/drivers/usb/usbhub/usbhub.h
View file

@ -3,8 +3,8 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ddk/usbioctl.h> #include <ddk/usbioctl.h>
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#include "../core/hub.h" #include "../usbport/hub.h"
#define USB_HUB_TAG TAG('u','s','b','h') #define USB_HUB_TAG TAG('u','s','b','h')

7
reactos/drivers/usb/usbhub/usbhub.xml
View file

@ -1,12 +1,11 @@
<module name="hub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys" warnings="true"> <module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="DEBUG_MODE" /> <define name="DEBUG_MODE" />
<include base="ntoskrnl">include</include> <include>../miniport/linux</include>
<include>../linux</include>
<library>sys_base</library> <library>sys_base</library>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>
<library>usbcore</library> <library>usbport</library>
<file>createclose.c</file> <file>createclose.c</file>
<file>fdo.c</file> <file>fdo.c</file>
<file>misc.c</file> <file>misc.c</file>

2
reactos/drivers/usb/usbport/buffer_simple.c
View file

@ -5,7 +5,7 @@
* *
*/ */
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#define __KERNEL__ #define __KERNEL__
#define CONFIG_PCI #define CONFIG_PCI
#include "hcd.h" #include "hcd.h"

2
reactos/drivers/usb/usbport/config.c
View file

@ -5,7 +5,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#endif #endif
#define USB_MAXALTSETTING 128 /* Hard limit */ #define USB_MAXALTSETTING 128 /* Hard limit */

2
reactos/drivers/usb/usbport/core_drivers/usbkey.c
View file

@ -4,7 +4,7 @@
*/ */
#define NDEBUG #define NDEBUG
#include "../../usb_wrapper.h" #include "../../miniport/usb_wrapper.h"
#define keyboarddebug 0 #define keyboarddebug 0

2
reactos/drivers/usb/usbport/core_drivers/usbmouse.c
View file

@ -3,7 +3,7 @@
*/ */
#define NDEBUG #define NDEBUG
#include "../../usb_wrapper.h" #include "../../miniport/usb_wrapper.h"
extern USBPORT_INTERFACE UsbPortInterface; extern USBPORT_INTERFACE UsbPortInterface;

2
reactos/drivers/usb/usbport/hcd-pci.c
View file

@ -34,7 +34,7 @@
#include "hcd.h" #include "hcd.h"
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#include "hcd.h" #include "hcd.h"
#endif #endif

2
reactos/drivers/usb/usbport/hcd.c
View file

@ -41,7 +41,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
//#define DEBUG //#define DEBUG
#endif #endif

2
reactos/drivers/usb/usbport/hub.c
View file

@ -36,7 +36,7 @@
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#include "hcd.h" #include "hcd.h"
#include "hub.h" #include "hub.h"

2
reactos/drivers/usb/usbport/message.c
View file

@ -10,7 +10,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#endif #endif
#include "hcd.h" /* for usbcore internals */ #include "hcd.h" /* for usbcore internals */

2
reactos/drivers/usb/usbport/urb.c
View file

@ -1,4 +1,4 @@
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#include "hcd.h" #include "hcd.h"
/** /**

2
reactos/drivers/usb/usbport/usb-debug.c
View file

@ -17,7 +17,7 @@
#endif #endif
#include <linux/usb.h> #include <linux/usb.h>
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#endif #endif
static void usb_show_endpoint(struct usb_host_endpoint *endpoint) static void usb_show_endpoint(struct usb_host_endpoint *endpoint)

2
reactos/drivers/usb/usbport/usb.c
View file

@ -50,7 +50,7 @@
#include "hcd.h" #include "hcd.h"
#include "usb.h" #include "usb.h"
#else #else
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
#include "hcd.h" #include "hcd.h"
#endif #endif

2
reactos/drivers/usb/usbport/usbcore.c
View file

@ -5,7 +5,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <debug.h> #include <debug.h>
#include "../usb_wrapper.h" #include "../miniport/usb_wrapper.h"
USBPORT_INTERFACE UsbPortInterface; USBPORT_INTERFACE UsbPortInterface;

0
reactos/drivers/usb/usbport/usbcore.def → reactos/drivers/usb/usbport/usbport.def
View file

5
reactos/drivers/usb/usbport/usbport.xml
View file

@ -1,9 +1,8 @@
<module name="usbcore" type="kernelmodedriver" installbase="system32/drivers" installname="usbcore.sys" warnings="true"> <module name="usbport" type="kernelmodedriver" installbase="system32/drivers" warnings="true">
<importlibrary definition="usbcore.def" /> <importlibrary definition="usbport.def" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="DEBUG_MODE" /> <define name="DEBUG_MODE" />
<define name="DEBUG" /> <define name="DEBUG" />
<include base="ntoskrnl">include</include>
<library>sys_base</library> <library>sys_base</library>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>