github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 01:37:44 +00:00
Code Issues Projects Releases Wiki Activity

DM USB: code clean: change some names of functions and variables

Browse Source 
Some names of functions and variables are long and not exact, this
patch is used to change them, no logic code are affected. The
changing included:

usb_data_xfer -> usb_xfer
usb_data_xfer_block -> usb_block
usb_xfer_blk_stat -> usb_block_stat
usb_data_xfer_append -> usb_block_append
USB_XFER_BLK_* -> USB_BLOCK_*

Tracked-On: #3628
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu
2019-08-25 00:28:58 +08:00
committed by wenlingz
parent dd1172ee63
commit 7445e404a8
6 changed files with 82 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
devicemodel/include/usb_core.h
View File

@@ -78,10 +78,10 @@ enum usb_dev_type {
USB_DEV_PORT_MAPPER
};
enum usb_xfer_blk_stat {
USB_XFER_BLK_FREE = 0,
USB_XFER_BLK_HANDLING,
USB_XFER_BLK_HANDLED
enum usb_block_stat {
USB_BLOCK_FREE = 0,
USB_BLOCK_HANDLING,
USB_BLOCK_HANDLED
};
enum usb_native_devtype {
@@ -96,7 +96,7 @@ enum usb_native_devtype {
struct usb_hci;
struct usb_device_request;
struct usb_data_xfer;
struct usb_xfer;
/* Device emulation handlers */
struct usb_devemu {
@@ -109,8 +109,8 @@ struct usb_devemu {
void *(*ue_init)(void *pdata, char *opt);
/* handlers */
int (*ue_request)(void *sc, struct usb_data_xfer *xfer);
int (*ue_data)(void *sc, struct usb_data_xfer *xfer, int dir,
int (*ue_request)(void *sc, struct usb_xfer *xfer);
int (*ue_data)(void *sc, struct usb_xfer *xfer, int dir,
int epctx);
int (*ue_info)(void *sc, int type, void *value, int size);
int (*ue_reset)(void *sc);
@@ -148,11 +148,11 @@ struct usb_hci {
* The device handler is to update blen to reflect on the residual size
* of the buffer, i.e. len(buf) - len(consumed).
*/
struct usb_data_xfer_block {
struct usb_block {
void *buf; /* IN or OUT pointer */
int blen; /* in:len(buf), out:len(remaining) */
int bdone; /* bytes transferred */
enum usb_xfer_blk_stat processed; /* processed status */
enum usb_block_stat stat; /* processed status */
void *hci_data; /* HCI private reference */
int ccs;
int chained;
@@ -160,9 +160,9 @@ struct usb_data_xfer_block {
uint64_t trbnext; /* next TRB guest address */
};
struct usb_data_xfer {
struct usb_xfer {
uint64_t magic;
struct usb_data_xfer_block data[USB_MAX_XFER_BLOCKS];
struct usb_block data[USB_MAX_XFER_BLOCKS];
struct usb_dev_req *requests[USB_MAX_XFER_BLOCKS];
struct usb_device_request *ureq; /* setup ctl request */
int ndata; /* # of data items */
@@ -201,9 +201,9 @@ enum USB_ERRCODE {
USB_SHORT
};
#define USB_DATA_GET_ERRCODE(x) ((x)->processed >> 8)
#define USB_DATA_GET_ERRCODE(x) ((x)->stat >> 8)
#define USB_DATA_SET_ERRCODE(x, e) \
((x)->processed = ((x)->processed & 0xFF) | (e << 8))
((x)->stat = ((x)->stat & 0xFF) | (e << 8))
#define USB_DATA_OK(x, i) ((x)->data[(i)].buf != NULL)
@@ -231,11 +231,8 @@ void usb_parse_log_level(char level);
struct usb_devemu *usb_emu_finddev(char *name);
int usb_native_is_bus_existed(uint8_t bus_num);
int usb_native_is_port_existed(uint8_t bus_num, uint8_t port_num);
struct usb_data_xfer_block *usb_data_xfer_append(struct usb_data_xfer *xfer,
void *buf,
int blen,
void *hci_data,
int ccs);
struct usb_block *usb_block_append(struct usb_xfer *xfer, void *buf, int blen,
void *hci_data, int ccs);
int usb_get_hub_port_num(struct usb_devpath *path);
char *usb_dev_path(struct usb_devpath *path);
bool usb_dev_path_cmp(struct usb_devpath *p1, struct usb_devpath *p2);

15
devicemodel/include/usb_pmapper.h
View File

@@ -61,7 +61,7 @@ struct usb_dev {
/*
* The purpose to implement struct usb_dev_req is to adapt
* struct usb_data_xfer to make a proper data format to talk
* struct usb_xfer to make a proper data format to talk
* with libusb.
*/
struct usb_dev_req {
@@ -69,18 +69,17 @@ struct usb_dev_req {
int in;
int seq;
/*
* buffer could include data from multiple
* usb_data_xfer_block, so here need some
* data to record it.
* buffer could include data from multiple usb_block,
* so here need some data to record it.
*/
uint8_t *buffer;
int buf_length;
int blk_start;
int blk_count;
struct usb_data_xfer *xfer;
struct usb_xfer *xfer;
struct libusb_transfer *trn;
struct usb_data_xfer_block *setup_blk;
struct usb_block *setup_blk;
};
/* callback type used by code from HCD layer */
@@ -127,7 +126,7 @@ void usb_dev_sys_deinit(void);
void *usb_dev_init(void *pdata, char *opt);
void usb_dev_deinit(void *pdata);
int usb_dev_info(void *pdata, int type, void *value, int size);
int usb_dev_request(void *pdata, struct usb_data_xfer *xfer);
int usb_dev_request(void *pdata, struct usb_xfer *xfer);
int usb_dev_reset(void *pdata);
int usb_dev_data(void *pdata, struct usb_data_xfer *xfer, int dir, int epctx);
int usb_dev_data(void *pdata, struct usb_xfer *xfer, int dir, int epctx);
#endif