bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: netusb: Remove multi-function array

Browse Source 
Today, we support/use only one USB configuration descriptor.
Moreover I assume multi-config support should be managed at
usb core level and not by each class driver.
Let's track one netusb function per netusb instance for now.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
This commit is contained in:
Loic Poulain 2017-11-03 14:34:50 +01:00 committed by Jukka Rissanen
parent 0188881599
commit 3870fc5928
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
subsys/usb/class/netusb/netusb.c
View File

@ -23,13 +23,10 @@
#include "netusb.h"
#include "function_ecm.h"
#define NETUSB_NUM_CONF 1
static struct __netusb {
struct net_if *iface;
u8_t conf;
u8_t conf_index;
struct netusb_function *func[NETUSB_NUM_CONF];
struct netusb_function *func;
} netusb;
static int netusb_send(struct net_if *iface, struct net_pkt *pkt)
@ -78,20 +75,20 @@ static struct usb_ep_cfg_data netusb_ep_data[] = {
static int netusb_connect_media(void)
{
if (!netusb.func[netusb.conf_index]->connect_media) {
if (!netusb.func->connect_media) {
return -ENOTSUP;
}
return netusb.func[netusb.conf_index]->connect_media(true);
return netusb.func->connect_media(true);
}
static int netusb_disconnect_media(void)
{
if (!netusb.func[netusb.conf_index]->connect_media) {
if (!netusb.func->connect_media) {
return -ENOTSUP;
}
return netusb.func[netusb.conf_index]->connect_media(false);
return netusb.func->connect_media(false);
}
static void netusb_status_configured(u8_t *conf)
@ -102,7 +99,6 @@ static void netusb_status_configured(u8_t *conf)
switch (*conf) {
case 1:
netusb.conf_index = 0;
net_if_up(netusb.iface);
netusb_connect_media();
break;
@ -260,8 +256,7 @@ static void netusb_init(struct net_if *iface)
net_if_down(iface);
#if defined(CONFIG_USB_DEVICE_NETWORK_ECM)
netusb.func[0] = ecm_register_function(iface,
CONFIG_CDC_ECM_IN_EP_ADDR);
netusb.func = ecm_register_function(iface, CONFIG_CDC_ECM_IN_EP_ADDR);
#endif
#if defined(CONFIG_USB_COMPOSITE_DEVICE)