ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alexander Boettcher 2013-03-21 16:24:15 +01:00 committed by Norman Feske
parent dfe4fd177d
commit 1730132ef1
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dde_linux/lib/mk/platform_arndale/usb.mk
View File

@ -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

7
dde_linux/lib/mk/platform_panda/usb.mk
View File

@ -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

4
dde_linux/lib/mk/x86_32/usb.mk
View File

@ -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

1
dde_linux/src/lib/usb/pci_driver.cc
View File

@ -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