giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* New function slip_write(u8_t *ptr, int len). 

* Slip active detection and current address reporting.
This commit is contained in:
bg- 2006-09-26 15:47:14 +00:00
parent 1429faa22e
commit 3de6d787c9
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/dev/slip.c
View File

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: slip.c,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $ * @(#)$Id: slip.c,v 1.2 2006/09/26 15:47:14 bg- Exp $
*/ */
@ -51,6 +51,8 @@
PROCESS(slip_process, "SLIP driver"); PROCESS(slip_process, "SLIP driver");
u8_t slip_active;
#if 1 #if 1
#define SLIP_STATISTICS(statement) #define SLIP_STATISTICS(statement)
#else #else
@ -114,6 +116,31 @@ slip_send(void)
return UIP_FW_OK; return UIP_FW_OK;
} }
u8_t
slip_write(u8_t *ptr, int len)
{
u16_t i;
u8_t c;
slip_arch_writeb(SLIP_END);
for(i = 0; i < len; ++i) {
c = *ptr++;
if(c == SLIP_END) {
slip_arch_writeb(SLIP_ESC);
c = SLIP_ESC_END;
} else if(c == SLIP_ESC) {
slip_arch_writeb(SLIP_ESC);
c = SLIP_ESC_ESC;
}
slip_arch_writeb(c);
}
slip_arch_writeb(SLIP_END);
return len;
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
rxbuf_init(void) rxbuf_init(void)
@ -194,11 +221,18 @@ PROCESS_THREAD(slip_process, ev, data)
while(1) { while(1) {
PROCESS_YIELD(); PROCESS_YIELD();
slip_active = 1;
/* Move packet from rxbuf to buffer provided by uIP. */ /* Move packet from rxbuf to buffer provided by uIP. */
uip_len = slip_poll_handler(&uip_buf[UIP_LLH_LEN], uip_len = slip_poll_handler(&uip_buf[UIP_LLH_LEN],
UIP_BUFSIZE - UIP_LLH_LEN); UIP_BUFSIZE - UIP_LLH_LEN);
if(uip_len > 0 if(uip_len == 4 && strncmp(&uip_buf[UIP_LLH_LEN], "?IPA", 4) == 0) {
char buf[8];
memcpy(&buf[0], "=IPA", 4);
memcpy(&buf[4], &uip_hostaddr, 4);
slip_write(buf, 8);
} else if(uip_len > 0
&& uip_len == (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) && uip_len == (((u16_t)(BUF->len[0]) << 8) + BUF->len[1])
&& uip_ipchksum() == 0xffff) { && uip_ipchksum() == 0xffff) {
tcpip_input(); tcpip_input();

7
core/dev/slip.h
View File

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: slip.h,v 1.1 2006/06/17 22:41:17 adamdunkels Exp $ * @(#)$Id: slip.h,v 1.2 2006/09/26 15:47:26 bg- Exp $
*/ */
#ifndef __SLIP_H__ #ifndef __SLIP_H__
@ -63,6 +63,11 @@ u8_t slip_send(void);
*/ */
int slip_input_byte(unsigned char c); int slip_input_byte(unsigned char c);
u8_t slip_write(u8_t *ptr, int len);
/* Did we receive any bytes lately? */
extern u8_t slip_active;
/* Statistics. */ /* Statistics. */
extern u16_t slip_rubbish, slip_twopackets, slip_overflow, slip_ip_drop; extern u16_t slip_rubbish, slip_twopackets, slip_overflow, slip_ip_drop;