mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
usb: udc: add udc.h include file
Move common definitions to udc.h This allows musb_udc.h to be removed as well. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
This commit is contained in:
Troy Kisky
Marek Vasut
@@ -173,19 +173,6 @@ struct udcfifo_regs {
|
||||
u32 *fifo_p;
|
||||
};
|
||||
|
||||
/*
|
||||
* USBTTY definitions
|
||||
*/
|
||||
#define EP0_MAX_PACKET_SIZE 64
|
||||
#define UDC_INT_ENDPOINT 1
|
||||
#define UDC_INT_PACKET_SIZE 64
|
||||
#define UDC_OUT_ENDPOINT 2
|
||||
#define UDC_BULK_PACKET_SIZE 64
|
||||
#define UDC_BULK_HS_PACKET_SIZE 512
|
||||
#define UDC_IN_ENDPOINT 3
|
||||
#define UDC_OUT_PACKET_SIZE 64
|
||||
#define UDC_IN_PACKET_SIZE 64
|
||||
|
||||
/*
|
||||
* UDC endpoint definitions
|
||||
*/
|
||||
@@ -194,22 +181,4 @@ struct udcfifo_regs {
|
||||
#define UDC_EP2 2
|
||||
#define UDC_EP3 3
|
||||
|
||||
/*
|
||||
* Function declarations
|
||||
*/
|
||||
|
||||
void udc_irq(void);
|
||||
|
||||
void udc_set_nak(int epid);
|
||||
void udc_unset_nak(int epid);
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
int udc_init(void);
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
void udc_setup_ep(struct usb_device_instance *device, unsigned int ep,
|
||||
struct usb_endpoint_instance *endpoint);
|
||||
|
||||
#endif /* __DW_UDC_H */
|
||||
|
||||
@@ -111,11 +111,9 @@
|
||||
|
||||
/* UDC device defines */
|
||||
#define EP0_MAX_PACKET_SIZE EP_MAX_PKT
|
||||
#define UDC_OUT_ENDPOINT 0x02
|
||||
|
||||
#define UDC_OUT_PACKET_SIZE EP_MIN_PACKET_SIZE
|
||||
#define UDC_IN_ENDPOINT 0x03
|
||||
#define UDC_IN_PACKET_SIZE EP_MIN_PACKET_SIZE
|
||||
#define UDC_INT_ENDPOINT 0x01
|
||||
#define UDC_INT_PACKET_SIZE UDC_IN_PACKET_SIZE
|
||||
#define UDC_BULK_PACKET_SIZE EP_MIN_PACKET_SIZE
|
||||
|
||||
@@ -178,18 +176,3 @@ typedef enum mpc8xx_udc_state{
|
||||
STATE_READY,
|
||||
}mpc8xx_udc_state_t;
|
||||
|
||||
/* Declarations */
|
||||
int udc_init(void);
|
||||
void udc_irq(void);
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
void udc_setup_ep(struct usb_device_instance *device, unsigned int ep,
|
||||
struct usb_endpoint_instance *endpoint);
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
|
||||
/* Flow control */
|
||||
void udc_set_nak(int epid);
|
||||
void udc_unset_nak (int epid);
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2009 Wind River Systems, Inc.
|
||||
* Tom Rix <Tom.Rix@windriver.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
#ifndef __MUSB_UDC_H__
|
||||
#define __MUSB_UDC_H__
|
||||
|
||||
#include <usbdevice.h>
|
||||
|
||||
/* UDC level routines */
|
||||
void udc_irq(void);
|
||||
void udc_set_nak(int ep_num);
|
||||
void udc_unset_nak(int ep_num);
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
void udc_setup_ep(struct usb_device_instance *device, unsigned int id,
|
||||
struct usb_endpoint_instance *endpoint);
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
int udc_init(void);
|
||||
|
||||
/* usbtty */
|
||||
#ifdef CONFIG_USB_TTY
|
||||
|
||||
#define EP0_MAX_PACKET_SIZE 64 /* MUSB_EP0_FIFOSIZE */
|
||||
#define UDC_INT_ENDPOINT 1
|
||||
#define UDC_INT_PACKET_SIZE 64
|
||||
#define UDC_OUT_ENDPOINT 2
|
||||
#define UDC_OUT_PACKET_SIZE 64
|
||||
#define UDC_IN_ENDPOINT 3
|
||||
#define UDC_IN_PACKET_SIZE 64
|
||||
#define UDC_BULK_PACKET_SIZE 64
|
||||
|
||||
#endif /* CONFIG_USB_TTY */
|
||||
|
||||
#endif /* __MUSB_UDC_H__ */
|
||||
@@ -162,32 +162,13 @@
|
||||
#define UDC_VBUS_MODE (1 << 18)
|
||||
|
||||
/* OMAP Endpoint parameters */
|
||||
#define EP0_MAX_PACKET_SIZE 64
|
||||
#define UDC_OUT_ENDPOINT 2
|
||||
#define UDC_OUT_PACKET_SIZE 64
|
||||
#define UDC_IN_ENDPOINT 1
|
||||
#define UDC_IN_PACKET_SIZE 64
|
||||
#define UDC_INT_ENDPOINT 5
|
||||
#define UDC_OUT_PACKET_SIZE 64
|
||||
#define UDC_IN_PACKET_SIZE 64
|
||||
#define UDC_INT_PACKET_SIZE 16
|
||||
#define UDC_BULK_PACKET_SIZE 16
|
||||
#define UDC_BULK_PACKET_SIZE 16
|
||||
|
||||
void udc_irq (void);
|
||||
/* Flow control */
|
||||
void udc_set_nak(int epid);
|
||||
void udc_unset_nak (int epid);
|
||||
|
||||
/* Higher level functions for abstracting away from specific device */
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
|
||||
int udc_init (void);
|
||||
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
void udc_setup_ep(struct usb_device_instance *device, unsigned int ep, struct usb_endpoint_instance *endpoint);
|
||||
#define UDC_INT_ENDPOINT 5
|
||||
#define UDC_OUT_ENDPOINT 2
|
||||
#define UDC_IN_ENDPOINT 1
|
||||
|
||||
#endif
|
||||
|
||||
@@ -22,35 +22,11 @@
|
||||
|
||||
/* Endpoint parameters */
|
||||
#define MAX_ENDPOINTS 4
|
||||
#define EP_MAX_PACKET_SIZE 64
|
||||
|
||||
#define EP0_MAX_PACKET_SIZE 16
|
||||
|
||||
#define UDC_OUT_ENDPOINT 0x02
|
||||
#define UDC_OUT_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_IN_ENDPOINT 0x01
|
||||
#define UDC_IN_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_INT_ENDPOINT 0x05
|
||||
#define UDC_INT_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_BULK_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
|
||||
void udc_irq(void);
|
||||
/* Flow control */
|
||||
void udc_set_nak(int epid);
|
||||
void udc_unset_nak(int epid);
|
||||
|
||||
/* Higher level functions for abstracting away from specific device */
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
|
||||
int udc_init(void);
|
||||
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
void udc_setup_ep(struct usb_device_instance *device,
|
||||
unsigned int ep, struct usb_endpoint_instance *endpoint);
|
||||
|
||||
#endif
|
||||
|
||||
53
include/usb/udc.h
Normal file
53
include/usb/udc.h
Normal file
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
#ifndef USB_UDC_H
|
||||
#define USB_UDC_H
|
||||
|
||||
#ifndef EP0_MAX_PACKET_SIZE
|
||||
#define EP0_MAX_PACKET_SIZE 64
|
||||
#endif
|
||||
|
||||
#ifndef EP_MAX_PACKET_SIZE
|
||||
#define EP_MAX_PACKET_SIZE 64
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_PPC) && !defined(CONFIG_OMAP1510)
|
||||
/* omap1510_udc.h and mpc8xx_udc.h will set these values */
|
||||
#define UDC_OUT_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_IN_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_INT_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#define UDC_BULK_PACKET_SIZE EP_MAX_PACKET_SIZE
|
||||
#endif
|
||||
|
||||
#define UDC_BULK_HS_PACKET_SIZE 512
|
||||
|
||||
#ifndef UDC_INT_ENDPOINT
|
||||
#define UDC_INT_ENDPOINT 1
|
||||
#endif
|
||||
|
||||
#ifndef UDC_OUT_ENDPOINT
|
||||
#define UDC_OUT_ENDPOINT 2
|
||||
#endif
|
||||
|
||||
#ifndef UDC_IN_ENDPOINT
|
||||
#define UDC_IN_ENDPOINT 3
|
||||
#endif
|
||||
|
||||
/* function declarations */
|
||||
int udc_init(void);
|
||||
void udc_irq(void);
|
||||
int udc_endpoint_write(struct usb_endpoint_instance *endpoint);
|
||||
void udc_setup_ep(struct usb_device_instance *device, unsigned int ep,
|
||||
struct usb_endpoint_instance *endpoint);
|
||||
void udc_connect(void);
|
||||
void udc_disconnect(void);
|
||||
void udc_enable(struct usb_device_instance *device);
|
||||
void udc_disable(void);
|
||||
void udc_startup_events(struct usb_device_instance *device);
|
||||
|
||||
/* Flow control */
|
||||
void udc_set_nak(int epid);
|
||||
void udc_unset_nak(int epid);
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user