From 80e147ed2a321fa8503d3c6e0f818898d33f0a0f Mon Sep 17 00:00:00 2001
From: DizzyOfCRN <DizzyOfCRN@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 6 Aug 2014 18:23:07 +0000
Subject: [PATCH] Removed dependency of external libraries

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49249 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 rom/usb/vusbhc/vxhci/mmakefile.src    |  2 +-
 rom/usb/vusbhc/vxhci/vxhci_commands.c | 12 +++++++++++-
 rom/usb/vusbhc/vxhci/vxhci_device.c   | 32 ++++++--------------------------
 rom/usb/vusbhc/vxhci/vxhci_device.h   | 26 +++++++-------------------
 4 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/rom/usb/vusbhc/vxhci/mmakefile.src b/rom/usb/vusbhc/vxhci/mmakefile.src
index db0d013531..c31f72bcb4 100644
--- a/rom/usb/vusbhc/vxhci/mmakefile.src
+++ b/rom/usb/vusbhc/vxhci/mmakefile.src
@@ -7,4 +7,4 @@ FILES := vxhci_device vxhci_commands
     modname=vxhci modtype=device \
     moduledir=Devs/USBHardware \
     files="$(FILES)" \
-    uselibs="stdc arossupport"
+    uselibs="stdc.static arossupport"
diff --git a/rom/usb/vusbhc/vxhci/vxhci_commands.c b/rom/usb/vusbhc/vxhci/vxhci_commands.c
index 2769d69b4d..44f4cd9252 100644
--- a/rom/usb/vusbhc/vxhci/vxhci_commands.c
+++ b/rom/usb/vusbhc/vxhci/vxhci_commands.c
@@ -9,13 +9,15 @@
 #include <aros/macros.h>
 
 #include <proto/exec.h>
+#include <proto/stdc.h>
 #include <proto/arossupport.h>
 
 #include <devices/usb.h>
 #include <devices/usb_hub.h>
+#include <devices/newstyle.h>
 #include <devices/usbhardware.h>
 
-#include <stdio.h>
+#include "vxhci_device.h"
 
 #define DEBUG 1
 #include <aros/debug.h>
@@ -56,7 +58,15 @@ WORD cmdQueryDevice(struct IOUsbHWReq *ioreq) {
                 count++;
                 break;
             case UHA_Capabilities:
+#if(0)
+                if(unit->roothub.devdesc.bcdUSB == 0x200) {
+                    *((ULONG *) tag->ti_Data) = (UHCF_USB20);
+                } else {
+                    *((ULONG *) tag->ti_Data) = (UHCF_USB30);
+                }
+#else
                 *((ULONG *) tag->ti_Data) = (UHCF_USB20|UHCF_USB30);
+#endif
                 count++;
                 break;
             default:
diff --git a/rom/usb/vusbhc/vxhci/vxhci_device.c b/rom/usb/vusbhc/vxhci/vxhci_device.c
index a23ef17b33..43ca7d3dc0 100644
--- a/rom/usb/vusbhc/vxhci/vxhci_device.c
+++ b/rom/usb/vusbhc/vxhci/vxhci_device.c
@@ -6,37 +6,17 @@
     Lang: English
 */
 
+#include <aros/macros.h>
 
-#include <exec/resident.h>
-#include <exec/errors.h>
-#include <exec/memory.h>
-#include <exec/lists.h>
-#include <exec/alerts.h>
-#include <exec/tasks.h>
-#include <libraries/expansion.h>
-#include <libraries/expansionbase.h>
-#include <libraries/configvars.h>
-#include <dos/filehandler.h>
-#include <dos/dosextens.h>
-#include <dos/dostags.h>
-#include <clib/alib_protos.h>
-#include <aros/symbolsets.h>
-#include <aros/bootloader.h>
-#include <oop/oop.h>
-
-#include <proto/oop.h>
 #include <proto/exec.h>
-#include <proto/expansion.h>
-#include <proto/utility.h>
-#include <proto/bootloader.h>
-#include <proto/dos.h>
-#include <asm/io.h>
+#include <proto/stdc.h>
+#include <proto/arossupport.h>
 
 #include <devices/usb.h>
+#include <devices/usb_hub.h>
+#include <devices/newstyle.h>
 #include <devices/usbhardware.h>
 
-#include <stdio.h>
-
 #include "vxhci_device.h"
 
 #include LC_LIBDEFS_FILE
@@ -98,7 +78,7 @@ static int GM_UNIQUENAME(Init)(LIBBASETYPEPTR VXHCIBase) {
         bug("[VXHCI] Init: Created unit %d at %p %s\n", unit->number, unit, unit->name);
         struct VXHCIPort *port;
         ForeachNode(&unit->roothub.port_list, port) {
-        bug("                      port %d at %p %s\n", port->number, port, port->name);
+            bug("                      port %d at %p %s\n", port->number, port, port->name);
         }
     });
 
diff --git a/rom/usb/vusbhc/vxhci/vxhci_device.h b/rom/usb/vusbhc/vxhci/vxhci_device.h
index d3cdb45d7c..b56a34a550 100644
--- a/rom/usb/vusbhc/vxhci/vxhci_device.h
+++ b/rom/usb/vusbhc/vxhci/vxhci_device.h
@@ -8,31 +8,19 @@
 #ifndef VXHCI_DEVICE_H
 #define VXHCI_DEVICE_H
 
-#include <aros/libcall.h>
-#include <aros/asmcall.h>
-#include <aros/symbolsets.h>
-
-#include <exec/types.h>
-#include <exec/lists.h>
-#include <exec/memory.h>
-#include <exec/libraries.h>
-#include <exec/interrupts.h>
-#include <exec/semaphores.h>
-#include <exec/execbase.h>
-#include <exec/devices.h>
-#include <exec/io.h>
-#include <exec/ports.h>
-#include <exec/errors.h>
-#include <exec/resident.h>
-#include <exec/initializers.h>
+#include <aros/macros.h>
+
+#include <proto/exec.h>
+#include <proto/stdc.h>
+#include <proto/arossupport.h>
 
 #include <devices/usb.h>
 #include <devices/usb_hub.h>
-#include <devices/usbhardware.h>
 #include <devices/newstyle.h>
+#include <devices/usbhardware.h>
 
 /* Maximum number of units */
-#define VXHCI_NUMCONTROLLERS 1
+#define VXHCI_NUMCONTROLLERS 2
 
 /* Maximum number of ports per protocol (USB2.0/USB3.0) */
 #define VXHCI_NUMPORTS20 2
-- 
2.11.4.GIT