Merge remote-tracking branch 'u-boot-imx/master'

[platform/kernel/u-boot.git] / include / usb / s3c_udc.h

diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h
index 14dadc8..6a8fd44 100644 (file)
--- a/include/usb/s3c_udc.h
+++ b/include/usb/s3c_udc.h
@@ -24,6 +24,7 @@
 
 #include <asm/errno.h>
 #include <linux/usb/ch9.h>
+#include <usbdescriptors.h>
 #include <linux/usb/gadget.h>
 #include <linux/list.h>
 #include <usb/lin_gadget_compat.h>
@@ -102,7 +103,7 @@ struct s3c_udc {
 
        unsigned char usb_address;
 
-       unsigned req_pending:1, req_std:1, req_config:1;
+       unsigned req_pending:1, req_std:1;
 };
 
 extern struct s3c_udc *the_controller;
@@ -111,54 +112,6 @@ extern struct s3c_udc *the_controller;
 #define ep_index(EP) ((EP)->bEndpointAddress&0xF)
 #define ep_maxpacket(EP) ((EP)->ep.maxpacket)
 
-/*-------------------------------------------------------------------------*/
-/* #define DEBUG_UDC */
-#ifdef DEBUG_UDC
-#define DBG(stuff...)          printf("udc: " stuff)
-#else
-#define DBG(stuff...)          do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC_SETUP
-#define DEBUG_SETUP(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG_SETUP(fmt, args...) do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC_EP0
-#define DEBUG_EP0(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG_EP0(fmt, args...) do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC
-#define DEBUG(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG(fmt, args...) do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC_ISR
-#define DEBUG_ISR(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG_ISR(fmt, args...) do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC_OUT_EP
-#define DEBUG_OUT_EP(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG_OUT_EP(fmt, args...) do {} while (0)
-#endif
-
-#ifdef DEBUG_S3C_UDC_IN_EP
-#define DEBUG_IN_EP(fmt, args...) printk(fmt, ##args)
-#else
-#define DEBUG_IN_EP(fmt, args...) do {} while (0)
-#endif
-
-#define ERR(stuff...)          printf("ERR udc: " stuff)
-#define WARN(stuff...)         printf("WARNING udc: " stuff)
-#define INFO(stuff...)         printf("INFO udc: " stuff)
-
 extern void otg_phy_init(struct s3c_udc *dev);
 extern void otg_phy_off(struct s3c_udc *dev);