From 1730132ef19c8945881a6d97aba0936a252ae213 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Thu, 21 Mar 2013 16:24:15 +0100
Subject: [PATCH] usb: fix linux header include setup phase

In usb.inc all required Linux include files of the Linux code are looked up
by 'sed'ing through the files of SRC_C and SRC_CC. The Linux include files
are then added as dependency to the SRC_C and SRC_CC files and during dependency
resolution symbolic links to the lx_emul.h will be created.

In the platform specific usb.mk file there are the Linux driver files
added, but unfortunately after including usb.inc. So, for them no dependency
to any Linux include header file is generated and so no symbolic files are
generated.

If the driver code file is compiled as first, as for asix.c, the symbolic links
of the include files are missing and compilation fails.

Add the Linux driver code files to SRC_C before including usb.inc in the
platform specific usb.mk files.
---
 dde_linux/lib/mk/platform_arndale/usb.mk | 3 ++-
 dde_linux/lib/mk/platform_panda/usb.mk   | 7 ++-----
 dde_linux/lib/mk/x86_32/usb.mk           | 4 +++-
 dde_linux/src/lib/usb/pci_driver.cc      | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dde_linux/lib/mk/platform_arndale/usb.mk b/dde_linux/lib/mk/platform_arndale/usb.mk
index 8972caa12..38ae8e280 100644
--- a/dde_linux/lib/mk/platform_arndale/usb.mk
+++ b/dde_linux/lib/mk/platform_arndale/usb.mk
@@ -1,9 +1,10 @@
+SRC_C   += usbnet.c asix.c
+
 include $(REP_DIR)/lib/mk/usb.inc
 include $(REP_DIR)/lib/mk/arm/usb.inc
 
 CC_OPT  += -DCONFIG_USB_EHCI_S5P -DCONFIG_USB_EHCI_TT_NEWSCHED
 INC_DIR += $(CONTRIB_DIR)/arch/arm/plat-samsung/include
-SRC_C   += usbnet.c asix.c
 SRC_CC  += platform.cc
 
 vpath platform.cc $(LIB_DIR)/arm/platform_arndale
diff --git a/dde_linux/lib/mk/platform_panda/usb.mk b/dde_linux/lib/mk/platform_panda/usb.mk
index 4f7f16ad6..94ee35ad1 100644
--- a/dde_linux/lib/mk/platform_panda/usb.mk
+++ b/dde_linux/lib/mk/platform_panda/usb.mk
@@ -1,13 +1,10 @@
+SRC_C   += usbnet.c smsc95xx.c
+
 include $(REP_DIR)/lib/mk/usb.inc
 include $(REP_DIR)/lib/mk/arm/usb.inc
 
 CC_OPT  += -DCONFIG_USB_EHCI_HCD_OMAP -DCONFIG_USB_EHCI_TT_NEWSCHED -DVERBOSE_DEBUG
-SRC_C   += usbnet.c smsc95xx.c
 SRC_CC  += platform.cc
 
 vpath platform.cc $(LIB_DIR)/arm/platform_panda
 vpath %.c         $(CONTRIB_DIR)/drivers/net/usb
-
-
-
-
diff --git a/dde_linux/lib/mk/x86_32/usb.mk b/dde_linux/lib/mk/x86_32/usb.mk
index be2b2bbc3..468e57938 100644
--- a/dde_linux/lib/mk/x86_32/usb.mk
+++ b/dde_linux/lib/mk/x86_32/usb.mk
@@ -1,10 +1,12 @@
+SRC_C   += $(addprefix usb/host/,pci-quirks.c uhci-hcd.c)
+
 include $(REP_DIR)/lib/mk/usb.inc
 
 CC_OPT  += -DCONFIG_PCI
 INC_DIR += $(LIB_INC_DIR)/x86
-SRC_C   += $(addprefix usb/host/,pci-quirks.c uhci-hcd.c)
 SRC_CC  += pci_driver.cc
 
 
 
 
+
diff --git a/dde_linux/src/lib/usb/pci_driver.cc b/dde_linux/src/lib/usb/pci_driver.cc
index 6806e0878..728b89f15 100644
--- a/dde_linux/src/lib/usb/pci_driver.cc
+++ b/dde_linux/src/lib/usb/pci_driver.cc
@@ -315,7 +315,6 @@ Genode::Ram_dataspace_capability Backend_memory::alloc(Genode::addr_t size,
 {
 	using namespace Genode;
 
-	PERR("use it here %u", cached);
 	if (cached)
 		return env()->ram_session()->alloc(size, cached);
 	else