FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-15 00:58:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: gadget: g_ffs: convert to new interface of f_rndis

Browse Source 
There is a new interface of f_rndis and g_ffs is the last to use the old one.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Andrzej Pietrasiewicz 2013-12-03 15:15:27 +01:00 committed by Felipe Balbi
parent 05de3fe3d1
commit 6e257b1421
2 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/gadget/Kconfig
View File

@ -906,6 +906,7 @@ config USB_FUNCTIONFS_RNDIS
depends on USB_FUNCTIONFS && NET depends on USB_FUNCTIONFS && NET
select USB_U_ETHER select USB_U_ETHER
select USB_U_RNDIS select USB_U_RNDIS
select USB_F_RNDIS
help help
Include a configuration with RNDIS function (Ethernet) and the Filesystem. Include a configuration with RNDIS function (Ethernet) and the Filesystem.

105
drivers/usb/gadget/g_ffs.c
View File

@ -33,29 +33,25 @@
# include "u_ecm.h" # include "u_ecm.h"
# include "u_gether.h" # include "u_gether.h"
# ifdef USB_ETH_RNDIS # ifdef USB_ETH_RNDIS
# define USB_FRNDIS_INCLUDED # include "u_rndis.h"
# include "f_rndis.c"
# include "rndis.h" # include "rndis.h"
# endif # endif
# include "u_ether.h" # include "u_ether.h"
USB_ETHERNET_MODULE_PARAMETERS(); USB_ETHERNET_MODULE_PARAMETERS();
static u8 gfs_host_mac[ETH_ALEN];
static struct eth_dev *the_dev;
# ifdef CONFIG_USB_FUNCTIONFS_ETH # ifdef CONFIG_USB_FUNCTIONFS_ETH
static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], static int eth_bind_config(struct usb_configuration *c);
struct eth_dev *dev);
static struct usb_function_instance *fi_ecm; static struct usb_function_instance *fi_ecm;
static struct usb_function *f_ecm; static struct usb_function *f_ecm;
static struct usb_function_instance *fi_geth; static struct usb_function_instance *fi_geth;
static struct usb_function *f_geth; static struct usb_function *f_geth;
# endif # endif
#else # ifdef CONFIG_USB_FUNCTIONFS_RNDIS
# define the_dev NULL static int bind_rndis_config(struct usb_configuration *c);
# define gether_cleanup(dev) do { } while (0) static struct usb_function_instance *fi_rndis;
# define gfs_host_mac NULL static struct usb_function *f_rndis;
struct eth_dev; # endif
#endif #endif
#include "f_fs.c" #include "f_fs.c"
@ -148,12 +144,11 @@ static struct usb_gadget_strings *gfs_dev_strings[] = {
struct gfs_configuration { struct gfs_configuration {
struct usb_configuration c; struct usb_configuration c;
int (*eth)(struct usb_configuration *c, u8 *ethaddr, int (*eth)(struct usb_configuration *c);
struct eth_dev *dev);
} gfs_configurations[] = { } gfs_configurations[] = {
#ifdef CONFIG_USB_FUNCTIONFS_RNDIS #ifdef CONFIG_USB_FUNCTIONFS_RNDIS
{ {
.eth = rndis_bind_config, .eth = bind_rndis_config,
}, },
#endif #endif
@ -351,7 +346,7 @@ static void functionfs_release_dev_callback(struct ffs_data *ffs_data)
*/ */
static int gfs_bind(struct usb_composite_dev *cdev) static int gfs_bind(struct usb_composite_dev *cdev)
{ {
#if defined CONFIG_USB_FUNCTIONFS_ETH #if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS
struct net_device *net; struct net_device *net;
#endif #endif
int ret, i; int ret, i;
@ -379,28 +374,38 @@ static int gfs_bind(struct usb_composite_dev *cdev)
func_inst); func_inst);
net = geth_opts->net; net = geth_opts->net;
} }
gether_set_qmult(net, qmult); #endif
#ifdef CONFIG_USB_FUNCTIONFS_RNDIS
{
struct f_rndis_opts *rndis_opts;
fi_rndis = usb_get_function_instance("rndis");
if (IS_ERR(fi_rndis)) {
ret = PTR_ERR(fi_rndis);
goto error;
}
rndis_opts = container_of(fi_rndis, struct f_rndis_opts,
func_inst);
#ifndef CONFIG_USB_FUNCTIONFS_ETH
net = rndis_opts->net;
#endif
}
#endif
#if defined CONFIG_USB_FUNCTIONFS_ETH || defined CONFIG_USB_FUNCTIONFS_RNDIS
gether_set_qmult(net, qmult);
if (!gether_set_host_addr(net, host_addr)) if (!gether_set_host_addr(net, host_addr))
pr_info("using host ethernet address: %s", host_addr); pr_info("using host ethernet address: %s", host_addr);
if (!gether_set_dev_addr(net, dev_addr)) if (!gether_set_dev_addr(net, dev_addr))
pr_info("using self ethernet address: %s", dev_addr); pr_info("using self ethernet address: %s", dev_addr);
the_dev = netdev_priv(net);
#elif defined CONFIG_USB_FUNCTIONFS_RNDIS
the_dev = gether_setup(cdev->gadget, dev_addr, host_addr, gfs_host_mac,
qmult);
#endif #endif
if (IS_ERR(the_dev))
return PTR_ERR(the_dev);
#if defined CONFIG_USB_FUNCTIONFS_RNDIS && defined CONFIG_USB_FUNCTIONFS_ETH #if defined CONFIG_USB_FUNCTIONFS_RNDIS && defined CONFIG_USB_FUNCTIONFS_ETH
gether_set_gadget(net, cdev->gadget); gether_set_gadget(net, cdev->gadget);
ret = gether_register_netdev(net); ret = gether_register_netdev(net);
if (ret) if (ret)
goto error; goto error_rndis;
if (can_support_ecm(cdev->gadget)) { if (can_support_ecm(cdev->gadget)) {
struct f_ecm_opts *ecm_opts; struct f_ecm_opts *ecm_opts;
@ -414,12 +419,13 @@ static int gfs_bind(struct usb_composite_dev *cdev)
func_inst); func_inst);
geth_opts->bound = true; geth_opts->bound = true;
} }
gether_get_host_addr_u8(net, gfs_host_mac);
rndis_borrow_net(fi_rndis, net);
#endif #endif
ret = usb_string_ids_tab(cdev, gfs_strings); ret = usb_string_ids_tab(cdev, gfs_strings);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
goto error; goto error_rndis;
gfs_dev_desc.iProduct = gfs_strings[USB_GADGET_PRODUCT_IDX].id; gfs_dev_desc.iProduct = gfs_strings[USB_GADGET_PRODUCT_IDX].id;
for (i = func_num; i--; ) { for (i = func_num; i--; ) {
@ -427,7 +433,7 @@ static int gfs_bind(struct usb_composite_dev *cdev)
if (unlikely(ret < 0)) { if (unlikely(ret < 0)) {
while (++i < func_num) while (++i < func_num)
functionfs_unbind(ffs_tab[i].ffs_data); functionfs_unbind(ffs_tab[i].ffs_data);
goto error; goto error_rndis;
} }
} }
@ -450,16 +456,16 @@ static int gfs_bind(struct usb_composite_dev *cdev)
error_unbind: error_unbind:
for (i = 0; i < func_num; i++) for (i = 0; i < func_num; i++)
functionfs_unbind(ffs_tab[i].ffs_data); functionfs_unbind(ffs_tab[i].ffs_data);
error_rndis:
#ifdef CONFIG_USB_FUNCTIONFS_RNDIS
usb_put_function_instance(fi_rndis);
error: error:
#endif
#if defined CONFIG_USB_FUNCTIONFS_ETH #if defined CONFIG_USB_FUNCTIONFS_ETH
if (can_support_ecm(cdev->gadget)) if (can_support_ecm(cdev->gadget))
usb_put_function_instance(fi_ecm); usb_put_function_instance(fi_ecm);
else else
usb_put_function_instance(fi_geth); usb_put_function_instance(fi_geth);
the_dev = NULL;
#elif defined CONFIG_USB_FUNCTIONFS_RNDIS
gether_cleanup(the_dev);
the_dev = NULL;
#endif #endif
return ret; return ret;
} }
@ -474,6 +480,11 @@ static int gfs_unbind(struct usb_composite_dev *cdev)
ENTER(); ENTER();
#ifdef CONFIG_USB_FUNCTIONFS_RNDIS
usb_put_function(f_rndis);
usb_put_function_instance(fi_rndis);
#endif
#if defined CONFIG_USB_FUNCTIONFS_ETH #if defined CONFIG_USB_FUNCTIONFS_ETH
if (can_support_ecm(cdev->gadget)) { if (can_support_ecm(cdev->gadget)) {
usb_put_function(f_ecm); usb_put_function(f_ecm);
@ -482,10 +493,6 @@ static int gfs_unbind(struct usb_composite_dev *cdev)
usb_put_function(f_geth); usb_put_function(f_geth);
usb_put_function_instance(fi_geth); usb_put_function_instance(fi_geth);
} }
the_dev = NULL;
#elif defined CONFIG_USB_FUNCTIONFS_RNDIS
gether_cleanup(the_dev);
the_dev = NULL;
#endif #endif
/* /*
@ -523,7 +530,7 @@ static int gfs_do_config(struct usb_configuration *c)
} }
if (gc->eth) { if (gc->eth) {
ret = gc->eth(c, gfs_host_mac, the_dev); ret = gc->eth(c);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
return ret; return ret;
} }
@ -552,8 +559,7 @@ static int gfs_do_config(struct usb_configuration *c)
#ifdef CONFIG_USB_FUNCTIONFS_ETH #ifdef CONFIG_USB_FUNCTIONFS_ETH
static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN], static int eth_bind_config(struct usb_configuration *c)
struct eth_dev *dev)
{ {
int status = 0; int status = 0;
@ -579,3 +585,22 @@ static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
} }
#endif #endif
#ifdef CONFIG_USB_FUNCTIONFS_RNDIS
static int bind_rndis_config(struct usb_configuration *c)
{
int status = 0;
f_rndis = usb_get_function(fi_rndis);
if (IS_ERR(f_rndis))
return PTR_ERR(f_rndis);
status = usb_add_function(c, f_rndis);
if (status < 0)
usb_put_function(f_rndis);
return status;
}
#endif