Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: cosmetic: netconsole.c checkpatch compliance

Browse Source 
Requires:
--ignore CONSIDER_KSTRTO

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
master
Joe Hershberger 13 years ago
parent 13dfe94379
commit e1902ac698
1 changed files with 62 additions and 60 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 122
      drivers/net/netconsole.c

122
drivers/net/netconsole.c
Unescape View File

@ -29,81 +29,82 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static char input_buffer[512]; static char input_buffer[512];
static int input_size = 0; /* char count in input buffer */ static int input_size; /* char count in input buffer */
static int input_offset = 0; /* offset to valid chars in input buffer */ static int input_offset; /* offset to valid chars in input buffer */
static int input_recursion = 0; static int input_recursion;
static int output_recursion = 0; static int output_recursion;
static int net_timeout; static int net_timeout;
static uchar nc_ether[6]; /* server enet address */ static uchar nc_ether[6]; /* server enet address */
static IPaddr_t nc_ip; /* server ip */ static IPaddr_t nc_ip; /* server ip */
static short nc_port; /* source/target port */ static short nc_port; /* source/target port */
static const char *output_packet; /* used by first send udp */ static const char *output_packet; /* used by first send udp */
static int output_packet_len = 0; static int output_packet_len;
static void nc_wait_arp_handler(uchar *pkt, unsigned dest, static void nc_wait_arp_handler(uchar *pkt, unsigned dest,
IPaddr_t sip, unsigned src, IPaddr_t sip, unsigned src,
unsigned len) unsigned len)
{ {
NetState = NETLOOP_SUCCESS; /* got arp reply - quit net loop */ NetState = NETLOOP_SUCCESS; /* got arp reply - quit net loop */
} }
static void nc_handler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src, static void nc_handler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
unsigned len) unsigned len)
{ {
if (input_size) if (input_size)
NetState = NETLOOP_SUCCESS; /* got input - quit net loop */ NetState = NETLOOP_SUCCESS; /* got input - quit net loop */
} }
static void nc_timeout (void) static void nc_timeout(void)
{ {
NetState = NETLOOP_SUCCESS; NetState = NETLOOP_SUCCESS;
} }
void NcStart (void) void NcStart(void)
{ {
if (!output_packet_len || memcmp (nc_ether, NetEtherNullAddr, 6)) { if (!output_packet_len || memcmp(nc_ether, NetEtherNullAddr, 6)) {
/* going to check for input packet */ /* going to check for input packet */
NetSetHandler (nc_handler); NetSetHandler(nc_handler);
NetSetTimeout (net_timeout, nc_timeout); NetSetTimeout(net_timeout, nc_timeout);
} else { } else {
/* send arp request */ /* send arp request */
uchar *pkt; uchar *pkt;
NetSetHandler (nc_wait_arp_handler); NetSetHandler(nc_wait_arp_handler);
pkt = (uchar *) NetTxPacket + NetEthHdrSize () + IP_HDR_SIZE; pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE;
memcpy (pkt, output_packet, output_packet_len); memcpy(pkt, output_packet, output_packet_len);
NetSendUDPPacket (nc_ether, nc_ip, nc_port, nc_port, output_packet_len); NetSendUDPPacket(nc_ether, nc_ip, nc_port, nc_port,
output_packet_len);
} }
} }
int nc_input_packet (uchar * pkt, unsigned dest, unsigned src, unsigned len) int nc_input_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len)
{ {
int end, chunk; int end, chunk;
if (dest != nc_port || !len) if (dest != nc_port || !len)
return 0; /* not for us */ return 0; /* not for us */
if (input_size == sizeof input_buffer) if (input_size == sizeof(input_buffer))
return 1; /* no space */ return 1; /* no space */
if (len > sizeof input_buffer - input_size) if (len > sizeof(input_buffer) - input_size)
len = sizeof input_buffer - input_size; len = sizeof(input_buffer) - input_size;
end = input_offset + input_size; end = input_offset + input_size;
if (end > sizeof input_buffer) if (end > sizeof(input_buffer))
end -= sizeof input_buffer; end -= sizeof(input_buffer);
chunk = len; chunk = len;
if (end + len > sizeof input_buffer) { if (end + len > sizeof(input_buffer)) {
chunk = sizeof input_buffer - end; chunk = sizeof(input_buffer) - end;
memcpy(input_buffer, pkt + chunk, len - chunk); memcpy(input_buffer, pkt + chunk, len - chunk);
} }
memcpy (input_buffer + end, pkt, chunk); memcpy(input_buffer + end, pkt, chunk);
input_size += len; input_size += len;
return 1; return 1;
} }
static void nc_send_packet (const char *buf, int len) static void nc_send_packet(const char *buf, int len)
{ {
struct eth_device *eth; struct eth_device *eth;
int inited = 0; int inited = 0;
@ -111,33 +112,33 @@ static void nc_send_packet (const char *buf, int len)
uchar *ether; uchar *ether;
IPaddr_t ip; IPaddr_t ip;
if ((eth = eth_get_dev ()) == NULL) { eth = eth_get_dev();
if (eth == NULL)
return; return;
}
if (!memcmp (nc_ether, NetEtherNullAddr, 6)) { if (!memcmp(nc_ether, NetEtherNullAddr, 6)) {
if (eth->state == ETH_STATE_ACTIVE) if (eth->state == ETH_STATE_ACTIVE)
return; /* inside net loop */ return; /* inside net loop */
output_packet = buf; output_packet = buf;
output_packet_len = len; output_packet_len = len;
NetLoop (NETCONS); /* wait for arp reply and send packet */ NetLoop(NETCONS); /* wait for arp reply and send packet */
output_packet_len = 0; output_packet_len = 0;
return; return;
} }
if (eth->state != ETH_STATE_ACTIVE) { if (eth->state != ETH_STATE_ACTIVE) {
if (eth_init (gd->bd) < 0) if (eth_init(gd->bd) < 0)
return; return;
inited = 1; inited = 1;
} }
pkt = (uchar *) NetTxPacket + NetEthHdrSize () + IP_HDR_SIZE; pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE;
memcpy (pkt, buf, len); memcpy(pkt, buf, len);
ether = nc_ether; ether = nc_ether;
ip = nc_ip; ip = nc_ip;
NetSendUDPPacket (ether, ip, nc_port, nc_port, len); NetSendUDPPacket(ether, ip, nc_port, nc_port, len);
if (inited) if (inited)
eth_halt (); eth_halt();
} }
static int nc_start(void) static int nc_start(void)
@ -146,26 +147,27 @@ static int nc_start(void)
nc_port = 6666; /* default port */ nc_port = 6666; /* default port */
if (getenv ("ncip")) { if (getenv("ncip")) {
char *p; char *p;
nc_ip = getenv_IPaddr ("ncip"); nc_ip = getenv_IPaddr("ncip");
if (!nc_ip) if (!nc_ip)
return -1; /* ncip is 0.0.0.0 */ return -1; /* ncip is 0.0.0.0 */
if ((p = strchr (getenv ("ncip"), ':')) != NULL) p = strchr(getenv("ncip"), ':');
nc_port = simple_strtoul (p + 1, NULL, 10); if (p != NULL)
nc_port = simple_strtoul(p + 1, NULL, 10);
} else } else
nc_ip = ~0; /* ncip is not set */ nc_ip = ~0; /* ncip is not set */
our_ip = getenv_IPaddr ("ipaddr"); our_ip = getenv_IPaddr("ipaddr");
netmask = getenv_IPaddr ("netmask"); netmask = getenv_IPaddr("netmask");
if (nc_ip == ~0 || /* 255.255.255.255 */ if (nc_ip == ~0 || /* 255.255.255.255 */
((netmask & our_ip) == (netmask & nc_ip) && /* on the same net */ ((netmask & our_ip) == (netmask & nc_ip) && /* on the same net */
(netmask | nc_ip) == ~0)) /* broadcast to our net */ (netmask | nc_ip) == ~0)) /* broadcast to our net */
memset (nc_ether, 0xff, sizeof nc_ether); memset(nc_ether, 0xff, sizeof(nc_ether));
else else
memset (nc_ether, 0, sizeof nc_ether); /* force arp request */ memset(nc_ether, 0, sizeof(nc_ether)); /* force arp request */
return 0; return 0;
} }
@ -176,7 +178,7 @@ static void nc_putc(char c)
return; return;
output_recursion = 1; output_recursion = 1;
nc_send_packet (&c, 1); nc_send_packet(&c, 1);
output_recursion = 0; output_recursion = 0;
} }
@ -208,14 +210,14 @@ static int nc_getc(void)
net_timeout = 0; /* no timeout */ net_timeout = 0; /* no timeout */
while (!input_size) while (!input_size)
NetLoop (NETCONS); NetLoop(NETCONS);
input_recursion = 0; input_recursion = 0;
c = input_buffer[input_offset++]; c = input_buffer[input_offset++];
if (input_offset >= sizeof input_buffer) if (input_offset >= sizeof(input_buffer))
input_offset -= sizeof input_buffer; input_offset -= sizeof(input_buffer);
input_size--; input_size--;
return c; return c;
@ -231,28 +233,28 @@ static int nc_tstc(void)
if (input_size) if (input_size)
return 1; return 1;
eth = eth_get_dev (); eth = eth_get_dev();
if (eth && eth->state == ETH_STATE_ACTIVE) if (eth && eth->state == ETH_STATE_ACTIVE)
return 0; /* inside net loop */ return 0; /* inside net loop */
input_recursion = 1; input_recursion = 1;
net_timeout = 1; net_timeout = 1;
NetLoop (NETCONS); /* kind of poll */ NetLoop(NETCONS); /* kind of poll */
input_recursion = 0; input_recursion = 0;
return input_size != 0; return input_size != 0;
} }
int drv_nc_init (void) int drv_nc_init(void)
{ {
struct stdio_dev dev; struct stdio_dev dev;
int rc; int rc;
memset (&dev, 0, sizeof (dev)); memset(&dev, 0, sizeof(dev));
strcpy (dev.name, "nc"); strcpy(dev.name, "nc");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.start = nc_start; dev.start = nc_start;
dev.putc = nc_putc; dev.putc = nc_putc;
@ -260,7 +262,7 @@ int drv_nc_init (void)
dev.getc = nc_getc; dev.getc = nc_getc;
dev.tstc = nc_tstc; dev.tstc = nc_tstc;
rc = stdio_register (&dev); rc = stdio_register(&dev);
return (rc == 0) ? 1 : rc; return (rc == 0) ? 1 : rc;
} }

Write Preview
Loading…
Cancel
Save