From 7bf4fa4bfff182e5876b86b81721d8ccb8e41854 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Wed, 28 Mar 2012 21:51:19 +0200
Subject: [PATCH] Removed obsolete mac pointer

---
 apps/shell/shell-sky.c                  | 5 +++--
 core/net/rime.h                         | 2 --
 core/net/rime/rime.c                    | 3 ---
 examples/sky/rssi-scanner.c             | 3 ++-
 examples/sky/sky-collect.c              | 5 +++--
 examples/z1/rssi_scanner/rssi-scanner.c | 3 ++-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
index bfdb19351..52063be7e 100644
--- a/apps/shell/shell-sky.c
+++ b/apps/shell/shell-sky.c
@@ -44,6 +44,7 @@
 #include "dev/watchdog.h"
 
 #include "net/rime.h"
+#include "net/netstack.h"
 #include "dev/cc2420.h"
 #include "dev/leds.h"
 #include "dev/sht11.h"
@@ -97,7 +98,7 @@ do_rssi(void)
   static int sample;
   int channel;
   
-  rime_mac->off(0);
+  NETSTACK_MAC.off(0);
 
   cc2420_on();
   for(channel = 11; channel <= 26; ++channel) {
@@ -105,7 +106,7 @@ do_rssi(void)
     rssi_samples[sample].channel[channel - 11] = cc2420_rssi() + 53;
   }
   
-  rime_mac->on();
+  NETSTACK_MAC.on();
   
   sample = (sample + 1) % NUM_SAMPLES;
 
diff --git a/core/net/rime.h b/core/net/rime.h
index cfd36c6fe..8db7b935e 100644
--- a/core/net/rime.h
+++ b/core/net/rime.h
@@ -89,8 +89,6 @@ void rime_input(void);
 
 int rime_output(struct channel *c);
 
-extern const struct mac_driver *rime_mac;
-
 struct rime_sniffer {
   struct rime_sniffer *next;
   void (* input_callback)(void);
diff --git a/core/net/rime/rime.c b/core/net/rime/rime.c
index 24ce008b5..2d49cc371 100644
--- a/core/net/rime/rime.c
+++ b/core/net/rime/rime.c
@@ -61,8 +61,6 @@
 
 #include "lib/list.h"
 
-const struct mac_driver *rime_mac;
-
 #ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_CHANNEL
 #define BROADCAST_ANNOUNCEMENT_CHANNEL RIME_CONF_BROADCAST_ANNOUNCEMENT_CHANNEL
 #else /* RIME_CONF_BROADCAST_ANNOUNCEMENT_CHANNEL */
@@ -130,7 +128,6 @@ init(void)
   packetbuf_clear();
   announcement_init();
 
-  rime_mac = &NETSTACK_MAC;
   chameleon_init();
   
   /* XXX This is initializes the transmission of announcements but it
diff --git a/examples/sky/rssi-scanner.c b/examples/sky/rssi-scanner.c
index 9f728626e..c30a33a17 100644
--- a/examples/sky/rssi-scanner.c
+++ b/examples/sky/rssi-scanner.c
@@ -41,6 +41,7 @@
 
 #include "contiki.h"
 #include "net/rime.h"
+#include "net/netstack.h"
 
 #include "dev/leds.h"
 #include "dev/cc2420.h"
@@ -81,7 +82,7 @@ PROCESS_THREAD(scanner_process, ev, data)
 {
   PROCESS_BEGIN();
   /* switch mac layer off, and turn radio on */
-  rime_mac->off(0);
+  NETSTACK_MAC.off(0);
   cc2420_on();
 
   while(1) {
diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c
index b2d00afa0..2a41a5a0b 100644
--- a/examples/sky/sky-collect.c
+++ b/examples/sky/sky-collect.c
@@ -39,6 +39,7 @@
  */
 
 #include "contiki.h"
+#include "net/netstack.h"
 #include "net/rime.h"
 #include "net/rime/collect.h"
 #include "net/rime/collect-neighbor.h"
@@ -133,7 +134,7 @@ do_rssi(void)
   static int sample;
   int channel;
   
-  rime_mac->off(0);
+  NETSTACK_MAC.off(0);
 
   cc2420_on();
   for(channel = 11; channel <= 26; ++channel) {
@@ -141,7 +142,7 @@ do_rssi(void)
     rssi_samples[sample].channel[channel - 11] = cc2420_rssi() + 53;
   }
   
-  rime_mac->on();
+  NETSTACK_MAC.on();
   
   sample = (sample + 1) % NUM_SAMPLES;
 
diff --git a/examples/z1/rssi_scanner/rssi-scanner.c b/examples/z1/rssi_scanner/rssi-scanner.c
index d47e61410..f9976e71a 100644
--- a/examples/z1/rssi_scanner/rssi-scanner.c
+++ b/examples/z1/rssi_scanner/rssi-scanner.c
@@ -41,6 +41,7 @@
 
 #include "contiki.h"
 #include "net/rime.h"
+#include "net/netstack.h"
 
 #include "dev/leds.h"
 #include "dev/cc2420.h"
@@ -83,7 +84,7 @@ PROCESS_THREAD(scanner_process, ev, data)
 {
   PROCESS_BEGIN();
   /* switch mac layer off, and turn radio on */
-  rime_mac->off(0);
+  NETSTACK_MAC.off(0);
   cc2420_on();
 
   while(1) {