Navigation

Changeset 536

Timestamp:

04/23/08 15:53:46 (3 months ago)

Author:

agr

Message:

SAMPL NCK removed, use ACK with error_code instead

Files:

r535	r536
5	5	#include <control_pkt.h>
6	6	#include <ack_pkt.h>
7		~~#include <nck_pkt.h>~~
8	7
9	8
…	…
11	10	{
12	11	ACK_PKT_T p;
13		~~NCK_PKT_T n;~~
14	12	CONTROL_PKT_T r;
15	13	uint8_t num_pkts,i,selected,checksum;
…	…
45	43	pkt->num_msgs=1;
46	44	pkt->pkt_type=ACK_PKT;
	45	pkt->error_code=0; // set error type for NCK
47	46	}
48	47	else
…	…
54	53	printf( "%d\r\n",checksum );
55	54	// build NCK reply packet
56		n.mac_addr=my_mac;
57		pkt->payload_len = ~~nck_pkt_add( &n~~, pkt->payload,0);
	55	p.mac_addr=my_mac;
	56	pkt->payload_len = ack_pkt_add( &p, pkt->payload,0);
58	57	pkt->num_msgs=1;
59		pkt->pkt_type=NCK_PKT;
	58	pkt->pkt_type=ACK_PKT;
	59	pkt->error_code=1; // set error type for NCK
60	60	}
61	61

r535	r536
41	41	ack_aggregate(us_pkt_in, us_pkt );
42	42	break;
43		~~case NCK_PKT:~~
44		~~nck_aggregate(us_pkt_in, us_pkt );~~
45		~~break;~~
46	43	case PING_PKT:
47	44	ping_aggregate(us_pkt_in, us_pkt );

r535	r536
28	28	SRC += ../app_pkt_handlers/ping_pkt.c
29	29	SRC += ../app_pkt_handlers/ack_pkt.c
30		~~SRC += ../app_pkt_handlers/nck_pkt.c~~
31	30	SRC += ../app_pkt_handlers/route_pkt.c
32	31	SRC += ../app_pkt_handlers/trace.c