Merge branch 'avr-ravenusb'

dak664 · Mar 24, 2011 · 7c2b889 · 7c2b889
2 parents 12e3146 + aa81780
commit 7c2b889
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/examples/ravenusbstick/Makefile.ravenusbstick b/examples/ravenusbstick/Makefile.ravenusbstick
@@ -6,7 +6,7 @@ all: ravenusbstick
 CONTIKI_NO_NET=1
 #UIP_CONF_IPV6=1
 
-CONTIKI_TARGET_SOURCEFILES +=  sicslow_ethernet.c cdc_task.c
+CONTIKI_TARGET_SOURCEFILES += cdc_task.c sicslow_ethernet.c
 
 CFLAGS += -DJACKDAW=1
 CFLAGS += -include bridge-config.h

diff --git a/examples/ravenusbstick/bridge-config.h b/examples/ravenusbstick/bridge-config.h
@@ -21,7 +21,7 @@
 #define	USB_ETH_HOOK_IS_READY_FOR_INBOUND_PACKET()		rf230_is_ready_to_send()
 #define USB_ETH_HOOK_HANDLE_INBOUND_PACKET(buffer,len)	do { uip_len = len ; mac_ethernetToLowpan(buffer); } while(0)
 #define USB_ETH_HOOK_SET_PROMISCIOUS_MODE(value)	rf230_set_promiscuous_mode(value)
-#define USB_ETH_HOOK_INIT()		do { } while(0)
+#define USB_ETH_HOOK_INIT()		mac_ethernetSetup()
 
 #define RF230BB_HOOK_TX_PACKET(buffer,total_len) mac_log_802_15_4_tx(buffer,total_len)
 #define RF230BB_HOOK_RX_PACKET(buffer,total_len) mac_log_802_15_4_rx(buffer,total_len)

diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
@@ -127,10 +127,12 @@ unsigned long clock_seconds(void);
 #define USB_ETH_HOOK_READY()		status_leds_ready()
 #define USB_ETH_HOOK_INACTIVE()		status_leds_inactive()
 
+/*
 #define	USB_ETH_HOOK_IS_READY_FOR_INBOUND_PACKET()		rf230_is_ready_to_send()
 #define USB_ETH_HOOK_HANDLE_INBOUND_PACKET(buffer,len)	do { uip_len = len ; mac_ethernetToLowpan(buffer); } while(0)
 #define USB_ETH_HOOK_SET_PROMISCIOUS_MODE(value)	rf230_set_promiscuous_mode(value)
 #define USB_ETH_HOOK_INIT()		mac_ethernetSetup()
+*/
 
 /* ************************************************************************** */
 #pragma mark - RF230BB Hooks