From f02cdc7c8f424f9234f2c0dc88b0882a5cdf3b57 Mon Sep 17 00:00:00 2001
From: joxe <joxe>
Date: Fri, 27 Aug 2010 12:58:57 +0000
Subject: [PATCH] minor polish to the phidget sensor driver

---
 platform/z1/dev/z1-phidgets.c | 15 +++++----------
 platform/z1/dev/z1-phidgets.h | 11 +++++++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/platform/z1/dev/z1-phidgets.c b/platform/z1/dev/z1-phidgets.c
index 99b60788e..244d6f452 100644
--- a/platform/z1/dev/z1-phidgets.c
+++ b/platform/z1/dev/z1-phidgets.c
@@ -28,23 +28,22 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: z1-phidgets.c,v 1.1 2010/08/27 12:17:40 joxe Exp $
+ * $Id: z1-phidgets.c,v 1.2 2010/08/27 12:58:57 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
  * Author  : Joakim Eriksson
  * Created : 2010-02-02
- * Updated : $Date: 2010/08/27 12:17:40 $
- *           $Revision: 1.1 $
+ * Updated : $Date: 2010/08/27 12:58:57 $
+ *           $Revision: 1.2 $
  */
-#include <stdlib.h>
-
 #include <io.h>
-#include "lib/sensors.h"
 #include "contiki.h"
+#include "lib/sensors.h"
 #include "dev/z1-phidgets.h"
 
 static uint8_t adc_on;
+static uint8_t active;
 /*---------------------------------------------------------------------------*/
 static void
 sensors_activate(uint8_t type)
@@ -95,10 +94,6 @@ sensors_deactivate(uint8_t type)
   }
 }
 /*---------------------------------------------------------------------------*/
-
-const struct sensors_sensor ext_sensor;
-static uint8_t active;
-/*---------------------------------------------------------------------------*/
 static int
 value(int type)
 {
diff --git a/platform/z1/dev/z1-phidgets.h b/platform/z1/dev/z1-phidgets.h
index e3c7a1682..0493acf57 100644
--- a/platform/z1/dev/z1-phidgets.h
+++ b/platform/z1/dev/z1-phidgets.h
@@ -28,16 +28,17 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: z1-phidgets.h,v 1.1 2010/08/27 12:17:40 joxe Exp $
+ * $Id: z1-phidgets.h,v 1.2 2010/08/27 12:58:57 joxe Exp $
  *
  * -----------------------------------------------------------------
  *
  * Author  : Joakim Eriksson
  * Created : 2010-08-26
- * Updated : $Date: 2010/08/27 12:17:40 $
- *           $Revision: 1.1 $
+ * Updated : $Date: 2010/08/27 12:58:57 $
+ *           $Revision: 1.2 $
  */
-
+#ifndef __Z1_PHIDGETS_H__
+#define __Z1_PHIDGETS_H__
 
 #define PHIDGET5V_1 0
 #define PHIDGET5V_2 1
@@ -45,3 +46,5 @@
 #define PHIDGET3V_2 3
 
 extern const struct sensors_sensor phidgets;
+
+#endif /* __Z1_PHIDGETS_H__ */