deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use ticks for s.ticks.

Browse source
This commit is contained in:
bg- 2006-09-07 15:57:59 +00:00
parent e521d25241
commit 35e6053795
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/dhcpc.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: dhcpc.c,v 1.5 2006/08/27 00:07:15 oliverschmidt Exp $ * @(#)$Id: dhcpc.c,v 1.6 2006/09/07 15:57:59 bg- Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -348,10 +348,10 @@ PT_THREAD(handle_dhcp(process_event_t ev, void *data))
if((ntohs(s.lease_time[0])*65536ul + ntohs(s.lease_time[1]))*CLOCK_SECOND/2 if((ntohs(s.lease_time[0])*65536ul + ntohs(s.lease_time[1]))*CLOCK_SECOND/2
<= MAX_TICKS) { <= MAX_TICKS) {
s.ticks = (u16_t)(ntohs(s.lease_time[0])*65536ul s.ticks = (clock_time_t)((ntohs(s.lease_time[0])*65536ul
+ ntohs(s.lease_time[1]))*CLOCK_SECOND/2; + ntohs(s.lease_time[1]))*CLOCK_SECOND/2);
} else { } else {
s.ticks = (u16_t)MAX_TICKS; s.ticks = MAX_TICKS;
} }
etimer_set(&s.etimer, s.ticks); etimer_set(&s.etimer, s.ticks);

4
core/net/dhcpc.h
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: dhcpc.h,v 1.2 2006/08/09 16:13:39 bg- Exp $ * @(#)$Id: dhcpc.h,v 1.3 2006/09/07 15:57:59 bg- Exp $
*/ */
#ifndef __DHCPC_H__ #ifndef __DHCPC_H__
#define __DHCPC_H__ #define __DHCPC_H__
@ -38,7 +38,7 @@ struct dhcpc_state {
char state; char state;
struct uip_udp_conn *conn; struct uip_udp_conn *conn;
struct etimer etimer; struct etimer etimer;
u16_t ticks; clock_time_t ticks;
const void *mac_addr; const void *mac_addr;
int mac_len; int mac_len;