| Message ID | 1440592560-1585-2-git-send-email-bernhard.nortmann@web.de |
|---|---|
| State | Superseded |
| Headers | show |
Hi Bernhard, On Wed, Aug 26, 2015 at 7:35 AM, Bernhard Nortmann <bernhard.nortmann@web.de> wrote: > The previous eth_device struct returned by eth_get_dev() allowed > code to directly query the state member field. However, with > CONFIG_DM_ETH this data gets encapsulated (i.e. private), and > eth_get_dev() returns a udevice struct 'abstraction' instead. > > This breaks legacy code relying on the former behaviour - e.g. > netconsole. > (see http://lists.denx.de/pipermail/u-boot/2015-June/216528.html) > > The patch introduces a method to retrieve the ethernet device > state in a 'clean' and uniform way, supporting both legacy code > and driver model. The new function eth_is_active() accepts a > device struct pointer and tests it for ETH_STATE_ACTIVE. > > Signed-off-by: Bernhard Nortmann <bernhard.nortmann@web.de> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: > - add "net:" prefix to commit message > > include/net.h | 6 ++++++ > net/eth.c | 18 +++++++++++++++++- > 2 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/include/net.h b/include/net.h > index d09bec9..c135ec4 100644 > --- a/include/net.h > +++ b/include/net.h > @@ -149,7 +149,13 @@ struct udevice *eth_get_dev(void); /* get the current device */ > */ > struct udevice *eth_get_dev_by_name(const char *devname); > unsigned char *eth_get_ethaddr(void); /* get the current device MAC */ > + > /* Used only when NetConsole is enabled */ > +# ifdef CONFIG_DM_ETH > +int eth_is_active(struct udevice *dev); /* Test device for active state */ > +# else > +int eth_is_active(struct eth_device *dev); /* Test device for active state */ > +# endif > int eth_init_state_only(void); /* Set active state */ > void eth_halt_state_only(void); /* Set passive state */ > #endif > diff --git a/net/eth.c b/net/eth.c > index d3ec8d6..d3ff7c6 100644 > --- a/net/eth.c > +++ b/net/eth.c > @@ -386,6 +386,17 @@ void eth_halt(void) > priv->state = ETH_STATE_PASSIVE; > } > > +int eth_is_active(struct udevice *dev) > +{ > + struct eth_device_priv *priv; > + > + if (!dev || !device_active(dev)) > + return 0; > + > + priv = dev->uclass_priv; You should use dev_get_uclass_priv(); > + return priv->state == ETH_STATE_ACTIVE; > +} > + > int eth_send(void *packet, int length) > { > struct udevice *current; > @@ -577,7 +588,7 @@ UCLASS_DRIVER(eth) = { > .per_device_auto_alloc_size = sizeof(struct eth_device_priv), > .flags = DM_UC_FLAG_SEQ_ALIAS, > }; > -#endif > +#endif /* #ifdef CONFIG_DM_ETH */ > > #ifndef CONFIG_DM_ETH > > @@ -915,6 +926,11 @@ void eth_halt(void) > eth_current->state = ETH_STATE_PASSIVE; > } > > +int eth_is_active(struct eth_device *dev) > +{ > + return dev && dev->state == ETH_STATE_ACTIVE; > +} > + > int eth_send(void *packet, int length) > { > if (!eth_current) > -- > 2.4.6 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/include/net.h b/include/net.h index d09bec9..c135ec4 100644 --- a/include/net.h +++ b/include/net.h @@ -149,7 +149,13 @@ struct udevice *eth_get_dev(void); /* get the current device */ */ struct udevice *eth_get_dev_by_name(const char *devname); unsigned char *eth_get_ethaddr(void); /* get the current device MAC */ + /* Used only when NetConsole is enabled */ +# ifdef CONFIG_DM_ETH +int eth_is_active(struct udevice *dev); /* Test device for active state */ +# else +int eth_is_active(struct eth_device *dev); /* Test device for active state */ +# endif int eth_init_state_only(void); /* Set active state */ void eth_halt_state_only(void); /* Set passive state */ #endif diff --git a/net/eth.c b/net/eth.c index d3ec8d6..d3ff7c6 100644 --- a/net/eth.c +++ b/net/eth.c @@ -386,6 +386,17 @@ void eth_halt(void) priv->state = ETH_STATE_PASSIVE; } +int eth_is_active(struct udevice *dev) +{ + struct eth_device_priv *priv; + + if (!dev || !device_active(dev)) + return 0; + + priv = dev->uclass_priv; + return priv->state == ETH_STATE_ACTIVE; +} + int eth_send(void *packet, int length) { struct udevice *current; @@ -577,7 +588,7 @@ UCLASS_DRIVER(eth) = { .per_device_auto_alloc_size = sizeof(struct eth_device_priv), .flags = DM_UC_FLAG_SEQ_ALIAS, }; -#endif +#endif /* #ifdef CONFIG_DM_ETH */ #ifndef CONFIG_DM_ETH @@ -915,6 +926,11 @@ void eth_halt(void) eth_current->state = ETH_STATE_PASSIVE; } +int eth_is_active(struct eth_device *dev) +{ + return dev && dev->state == ETH_STATE_ACTIVE; +} + int eth_send(void *packet, int length) { if (!eth_current)