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

Added command context. Patch by Joakim Eriksson

Browse Source
This commit is contained in:
Niclas Finne 2012-04-20 00:33:18 +02:00
parent f328a8a483
commit 1733f3b6bc
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/ipv6/native-border-router/border-router-cmds.c
View File

@ -38,6 +38,7 @@
#include "contiki.h" #include "contiki.h"
#include "cmd.h" #include "cmd.h"
#include "border-router.h" #include "border-router.h"
#include "border-router-cmds.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "net/rpl/rpl.h" #include "net/rpl/rpl.h"
#include "net/uiplib.h" #include "net/uiplib.h"
@ -46,6 +47,9 @@
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/uip-debug.h"
uint8_t command_context;
void packet_sent(uint8_t sessionid, uint8_t status, uint8_t tx); void packet_sent(uint8_t sessionid, uint8_t status, uint8_t tx);
void nbr_print_stat(void); void nbr_print_stat(void);
@ -61,27 +65,27 @@ border_router_cmd_handler(const uint8_t *data, int len)
/* handle global repair, etc here */ /* handle global repair, etc here */
if(data[0] == '!') { if(data[0] == '!') {
PRINTF("Got configuration message of type %c\n", data[1]); PRINTF("Got configuration message of type %c\n", data[1]);
if(data[1] == 'G') { if(data[1] == 'G' && command_context == CMD_CONTEXT_STDIO) {
/* This is supposed to be from stdin */ /* This is supposed to be from stdin */
printf("Performing Global Repair...\n"); printf("Performing Global Repair...\n");
rpl_repair_root(RPL_DEFAULT_INSTANCE); rpl_repair_root(RPL_DEFAULT_INSTANCE);
return 1; return 1;
} else if(data[1] == 'M') { } else if(data[1] == 'M' && command_context == CMD_CONTEXT_RADIO) {
/* We need to know that this is from the slip-radio here. */ /* We need to know that this is from the slip-radio here. */
PRINTF("Setting MAC address\n"); PRINTF("Setting MAC address\n");
border_router_set_mac(&data[2]); border_router_set_mac(&data[2]);
return 1; return 1;
} else if(data[1] == 'C') { } else if(data[1] == 'C' && command_context == CMD_CONTEXT_RADIO) {
/* We need to know that this is from the slip-radio here. */ /* We need to know that this is from the slip-radio here. */
printf("Channel is:%d\n", data[2]); printf("Channel is:%d\n", data[2]);
return 1; return 1;
} else if(data[1] == 'R') { } else if(data[1] == 'R' && command_context == CMD_CONTEXT_RADIO) {
/* We need to know that this is from the slip-radio here. */ /* We need to know that this is from the slip-radio here. */
PRINTF("Packet data report for sid:%d st:%d tx:%d\n", PRINTF("Packet data report for sid:%d st:%d tx:%d\n",
data[2], data[3], data[4]); data[2], data[3], data[4]);
packet_sent(data[2], data[3], data[4]); packet_sent(data[2], data[3], data[4]);
return 1; return 1;
} else if(data[1] == 'D') { } else if(data[1] == 'D' && command_context == CMD_CONTEXT_RADIO) {
/* We need to know that this is from the slip-radio here... */ /* We need to know that this is from the slip-radio here... */
PRINTF("Sensor data received\n"); PRINTF("Sensor data received\n");
border_router_set_sensors((const char *)&data[2], len - 2); border_router_set_sensors((const char *)&data[2], len - 2);
@ -89,7 +93,7 @@ border_router_cmd_handler(const uint8_t *data, int len)
} }
} else if(data[0] == '?') { } else if(data[0] == '?') {
PRINTF("Got request message of type %c\n", data[1]); PRINTF("Got request message of type %c\n", data[1]);
if(data[1] == 'M') { if(data[1] == 'M' && command_context == CMD_CONTEXT_STDIO) {
uint8_t buf[20]; uint8_t buf[20];
char* hexchar = "0123456789abcdef"; char* hexchar = "0123456789abcdef";
int j; int j;
@ -102,7 +106,7 @@ border_router_cmd_handler(const uint8_t *data, int len)
} }
cmd_send(buf, 18); cmd_send(buf, 18);
return 1; return 1;
} else if(data[1] == 'C') { } else if(data[1] == 'C' && command_context == CMD_CONTEXT_STDIO) {
/* send on! */ /* send on! */
write_to_slip(data, len); write_to_slip(data, len);
return 1; return 1;
@ -134,6 +138,7 @@ PROCESS_THREAD(border_router_cmd_process, ev, data)
if(ev == serial_line_event_message && data != NULL) { if(ev == serial_line_event_message && data != NULL) {
PRINTF("Got serial data!!! %s of len: %d\n", PRINTF("Got serial data!!! %s of len: %d\n",
(char *)data, strlen((char *)data)); (char *)data, strlen((char *)data));
command_context = CMD_CONTEXT_STDIO;
cmd_input(data, strlen((char *)data)); cmd_input(data, strlen((char *)data));
} }
} }

5
examples/ipv6/native-border-router/border-router-cmds.h
View File

@ -38,6 +38,11 @@
#ifndef __BORDER_ROUTER_CMDS_H__ #ifndef __BORDER_ROUTER_CMDS_H__
#define __BORDER_ROUTER_CMDS_H__ #define __BORDER_ROUTER_CMDS_H__
#define CMD_CONTEXT_RADIO 0
#define CMD_CONTEXT_STDIO 1
extern uint8_t command_context;
PROCESS_NAME(border_router_cmd_process); PROCESS_NAME(border_router_cmd_process);
#endif /* __BORDER_ROUTER_CMDS_H__ */ #endif /* __BORDER_ROUTER_CMDS_H__ */

2
examples/ipv6/native-border-router/slip-dev.c
View File

@ -55,6 +55,7 @@
#include "net/netstack.h" #include "net/netstack.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"
#include "cmd.h" #include "cmd.h"
#include "border-router-cmds.h"
extern int slip_config_verbose; extern int slip_config_verbose;
extern int slip_config_flowcontrol; extern int slip_config_flowcontrol;
@ -206,6 +207,7 @@ serial_input(FILE *inslip)
case SLIP_END: case SLIP_END:
if(inbufptr > 0) { if(inbufptr > 0) {
if(uip.inbuf[0] == '!') { if(uip.inbuf[0] == '!') {
command_context = CMD_CONTEXT_RADIO;
cmd_input(uip.inbuf, inbufptr); cmd_input(uip.inbuf, inbufptr);
} else if(uip.inbuf[0] == '?') { } else if(uip.inbuf[0] == '?') {
#define DEBUG_LINE_MARKER '\r' #define DEBUG_LINE_MARKER '\r'