usb: move usb subsystem to subsys/usb and cleanup header inclusion

Change-Id: I5bdfd2cf5fee62af2ca772d778477f4f378a6a55
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

Kconfig.zephyr

@@ -36,8 +36,6 @@ source "subsys/Kconfig"
 
 source "ext/Kconfig"
 
-source "usb/Kconfig"
-
 source "tests/Kconfig"
 
 #

MAINTAINERS

@@ -392,6 +392,13 @@ S:	Supported
 F:	ext/lib/crypto/tinycrypt/
 F:	tests/crypto/
 
+USB
+M:	Jithu Joseph <jithu.joseph@intel.com>
+S:	Supported
+F:	subsys/usb
+F:	drivers/usb
+F:	samples/usb
+
 X86 ARCH
 M:	Benjamin Walsh <benjamin.walsh@windriver.com>
 M:	Allan Stephens <allan.stephens@windriver.com>

Makefile

@@ -579,9 +579,9 @@ endif # $(dot-config)
 # Unified kernel objects are built as a static library
 ifeq ($(CONFIG_KERNEL_V2),y)
 libs-y := kernel/unified/
-core-y := lib/ misc/ net/ boards/ ext/ usb/ subsys/ tests/ arch/
+core-y := lib/ misc/ net/ boards/ ext/ subsys/ tests/ arch/
 else
-core-y := lib/ kernel/ misc/ net/ boards/ ext/ usb/ subsys/ tests/ arch/
+core-y := lib/ kernel/ misc/ net/ boards/ ext/ subsys/ tests/ arch/
 endif
 drivers-y := drivers/
 

include/usb/usb_device.h

@@ -36,8 +36,8 @@
 #ifndef USB_DEVICE_H_
 #define USB_DEVICE_H_
 
-#include "usb_dc.h"
+#include <drivers/usb/usb_dc.h>
-#include "usbstruct.h"
+#include <usb/usbstruct.h>
 
 /*************************************************************************
  *  USB configuration

samples/usb/dfu/src/Makefile

@@ -1,3 +1 @@
-ccflags-y += -I${ZEPHYR_BASE}/include/drivers/usb -I${ZEPHYR_BASE}/include/usb/ -I${ZEPHYR_BASE}/usb/include
-
 obj-y += usb_dfu.o main.o

samples/usb/dfu/src/usb_dfu.c

@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <flash.h>
-#include "usb_device.h"
+#include <usb/usb_device.h>
 #include "usb_dfu.h"
 
 

samples/usb/dfu/src/usb_dfu.h

@@ -41,7 +41,7 @@
 #define __USB_DFU_H__
 
 #include <device.h>
-#include "usb_common.h"
+#include <usb/usb_common.h>
 
 /* Intel vendor ID */
 #define DFU_VENDOR_ID   0x8086

subsys/Kconfig

@@ -16,3 +16,6 @@
 #
 
 source "subsys/fs/Kconfig"
+
+source "subsys/usb/Kconfig"
+

subsys/Makefile

@@ -1 +1,2 @@
 obj-$(CONFIG_FILE_SYSTEM) += fs/
+obj-$(CONFIG_USB) += usb/

subsys/usb/Kconfig

@@ -45,6 +45,6 @@ config SYS_LOG_USB_LEVEL
 
 	- 4 DEBUG, write SYS_LOG_DBG in adition to previous levels
 
-source "usb/class/Kconfig"
+source "subsys/usb/class/Kconfig"
 
 endif # USB_DEVICE_STACK

subsys/usb/usb_device.c

@@ -64,7 +64,7 @@
 #if defined(USB_VUSB_EN_GPIO)
 #include <gpio.h>
 #endif
-#include "usb_device.h"
+#include <usb/usb_device.h>
 
 #define SYS_LOG_LEVEL CONFIG_SYS_LOG_USB_LEVEL
 #define SYS_LOG_NO_NEWLINE