projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git]
/
drivers
/
net
/
netconsole.c
diff --git
a/drivers/net/netconsole.c
b/drivers/net/netconsole.c
index 31042a6b6ba76566a0c74bd99918b710e8f516af..350004757715011de9de0bb5b9176e36059dea1a 100644
(file)
--- a/
drivers/net/netconsole.c
+++ b/
drivers/net/netconsole.c
@@
-170,7
+170,11
@@
int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
static void nc_send_packet(const char *buf, int len)
{
static void nc_send_packet(const char *buf, int len)
{
+#ifdef CONFIG_DM_ETH
+ struct udevice *eth;
+#else
struct eth_device *eth;
struct eth_device *eth;
+#endif
int inited = 0;
uchar *pkt;
uchar *ether;
int inited = 0;
uchar *pkt;
uchar *ether;
@@
-183,7
+187,7
@@
static void nc_send_packet(const char *buf, int len)
return;
if (!memcmp(nc_ether, net_null_ethaddr, 6)) {
return;
if (!memcmp(nc_ether, net_null_ethaddr, 6)) {
- if (eth
->state == ETH_STATE_ACTIVE
)
+ if (eth
_is_active(eth)
)
return; /* inside net loop */
output_packet = buf;
output_packet_len = len;
return; /* inside net loop */
output_packet = buf;
output_packet_len = len;
@@
-194,7
+198,7
@@
static void nc_send_packet(const char *buf, int len)
return;
}
return;
}
- if (
eth->state != ETH_STATE_ACTIVE
) {
+ if (
!eth_is_active(eth)
) {
if (eth_is_on_demand_init()) {
if (eth_init() < 0)
return;
if (eth_is_on_demand_init()) {
if (eth_init() < 0)
return;
@@
-292,7
+296,11
@@
static int nc_stdio_getc(struct stdio_dev *dev)
static int nc_stdio_tstc(struct stdio_dev *dev)
{
static int nc_stdio_tstc(struct stdio_dev *dev)
{
+#ifdef CONFIG_DM_ETH
+ struct udevice *eth;
+#else
struct eth_device *eth;
struct eth_device *eth;
+#endif
if (input_recursion)
return 0;
if (input_recursion)
return 0;
@@
-301,7
+309,7
@@
static int nc_stdio_tstc(struct stdio_dev *dev)
return 1;
eth = eth_get_dev();
return 1;
eth = eth_get_dev();
- if (eth
&& eth->state == ETH_STATE_ACTIVE
)
+ if (eth
_is_active(eth)
)
return 0; /* inside net loop */
input_recursion = 1;
return 0; /* inside net loop */
input_recursion = 1;
@@
-322,7
+330,7
@@
int drv_nc_init(void)
memset(&dev, 0, sizeof(dev));
strcpy(dev.name, "nc");
memset(&dev, 0, sizeof(dev));
strcpy(dev.name, "nc");
- dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT
| DEV_FLAGS_SYSTEM
;
+ dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.start = nc_stdio_start;
dev.putc = nc_stdio_putc;
dev.puts = nc_stdio_puts;
dev.start = nc_stdio_start;
dev.putc = nc_stdio_putc;
dev.puts = nc_stdio_puts;