[U-Boot] [PATCH V2] usbtty/omap: update to current API

[Remy Bohmer]

Hello,

2008/12/7 Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
> the doc about the CONFIG_USBD is already in the README
>
> Best Regards,
> J.

Applied to U-boot-usb tree ('next' branch)

Thanks,

Remy

>  drivers/serial/usbtty.c         |    6 ++----
>  drivers/serial/usbtty.h         |   31 +++++++++++++++++++++----------
>  drivers/usb/usbdcore_omap1510.c |    4 +++-
>  include/usbdcore_omap1510.h     |    6 +++---
>  4 files changed, 29 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
> index e738c56..7eba470 100644
> --- a/drivers/serial/usbtty.c
> +++ b/drivers/serial/usbtty.c
> @@ -22,16 +22,14 @@
>  */
>
>  #include <common.h>
> -
> +#include <config.h>
>  #include <circbuf.h>
>  #include <devices.h>
>  #include "usbtty.h"
>  #include "usb_cdc_acm.h"
>  #include "usbdescriptors.h"
> -#include <config.h>            /* If defined, override Linux identifiers with
> -                                * vendor specific ones */
>
> -#if 0
> +#ifdef DEBUG
>  #define TTYDBG(fmt,args...)\
>        serial_printf("[%s] %s %d: "fmt, __FILE__,__FUNCTION__,__LINE__,##args)
>  #else
> diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
> index 71c47bc..ecefde5 100644
> --- a/drivers/serial/usbtty.h
> +++ b/drivers/serial/usbtty.h
> @@ -24,11 +24,11 @@
>  #ifndef __USB_TTY_H__
>  #define __USB_TTY_H__
>
> -#include "usbdcore.h"
> +#include <usbdcore.h>
>  #if defined(CONFIG_PPC)
> -#include "usbdcore_mpc8xx.h"
> +#include <usbdcore_mpc8xx.h>
>  #elif defined(CONFIG_ARM)
> -#include "usbdcore_omap1510.h"
> +#include <usbdcore_omap1510.h>
>  #endif
>
>  #include <version_autogenerated.h>
> @@ -36,14 +36,25 @@
>  /* If no VendorID/ProductID is defined in config.h, pretend to be Linux
>  * DO NOT Reuse this Vendor/Product setup with protocol incompatible devices */
>
> -#define CONFIG_USBD_VENDORID 0x0525    /* Linux/NetChip */
> -#define CONFIG_USBD_PRODUCTID_GSERIAL 0xa4a6   /* gserial */
> -#define CONFIG_USBD_PRODUCTID_CDCACM  0xa4a7   /* CDC ACM */
> -#define CONFIG_USBD_MANUFACTURER "Das U-Boot"
> -#define CONFIG_USBD_PRODUCT_NAME U_BOOT_VERSION
> -
> +#ifndef CONFIG_USBD_VENDORID
> +#define CONFIG_USBD_VENDORID           0x0525  /* Linux/NetChip */
> +#endif
> +#ifndef CONFIG_USBD_PRODUCTID_GSERIAL
> +#define CONFIG_USBD_PRODUCTID_GSERIAL  0xa4a6  /* gserial */
> +#endif
> +#ifndef CONFIG_USBD_PRODUCTID_CDCACM
> +#define CONFIG_USBD_PRODUCTID_CDCACM   0xa4a7  /* CDC ACM */
> +#endif
> +#ifndef CONFIG_USBD_MANUFACTURER
> +#define CONFIG_USBD_MANUFACTURER       "Das U-Boot"
> +#endif
> +#ifndef CONFIG_USBD_PRODUCT_NAME
> +#define CONFIG_USBD_PRODUCT_NAME       U_BOOT_VERSION
> +#endif
>
> -#define CONFIG_USBD_CONFIGURATION_STR "TTY via USB"
> +#ifndef CONFIG_USBD_CONFIGURATION_STR
> +#define CONFIG_USBD_CONFIGURATION_STR  "TTY via USB"
> +#endif
>
>  #define CONFIG_USBD_SERIAL_OUT_ENDPOINT UDC_OUT_ENDPOINT
>  #define CONFIG_USBD_SERIAL_OUT_PKTSIZE UDC_OUT_PACKET_SIZE
> diff --git a/drivers/usb/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c
> index cb9dc44..6b7b61b 100644
> --- a/drivers/usb/usbdcore_omap1510.c
> +++ b/drivers/usb/usbdcore_omap1510.c
> @@ -1061,7 +1061,7 @@ void omap1510_udc_noniso_irq (void)
>  */
>
>  /* Called to start packet transmission. */
> -void udc_endpoint_write (struct usb_endpoint_instance *endpoint)
> +int udc_endpoint_write (struct usb_endpoint_instance *endpoint)
>  {
>        unsigned short epnum =
>                endpoint->endpoint_address & USB_ENDPOINT_NUMBER_MASK;
> @@ -1078,6 +1078,8 @@ void udc_endpoint_write (struct usb_endpoint_instance *endpoint)
>                /* deselect the endpoint FIFO */
>                outw (UDC_EP_Dir | epnum, UDC_EP_NUM);
>        }
> +
> +       return 0;
>  }
>
>  /* Start to initialize h/w stuff */
> diff --git a/include/usbdcore_omap1510.h b/include/usbdcore_omap1510.h
> index 526fcd9..ece0e95 100644
> --- a/include/usbdcore_omap1510.h
> +++ b/include/usbdcore_omap1510.h
> @@ -168,8 +168,8 @@
>  #define UDC_IN_ENDPOINT        1
>  #define UDC_IN_PACKET_SIZE 64
>  #define UDC_INT_ENDPOINT 5
> -#define UDC_INT_PKTSIZE        16
> -#define UDC_BULK_PKTSIZE 16
> +#define UDC_INT_PACKET_SIZE    16
> +#define UDC_BULK_PACKET_SIZE 16
>
>  void udc_irq (void);
>  /* Flow control */
> @@ -177,7 +177,7 @@ void udc_set_nak(int epid);
>  void udc_unset_nak (int epid);
>
>  /* Higher level functions for abstracting away from specific device */
> -void udc_endpoint_write(struct usb_endpoint_instance *endpoint);
> +int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
>
>  int  udc_init (void);
>
> --
> 1.5.6.5
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>