libraries/Wire: Cosmetics, include style touchups.

Switch to the new include style. Move includes in headers inside the
include guards, for the GCC multiple include parser optimization. Make
80-column clean. Add newlines at end of files.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index 7827e45..812132b 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -37,12 +37,12 @@
  * modifications by gke and ala42.
  */
 
-#include "wirish.h"
-#include "WireBase.h"
-
 #ifndef _WIRE_H_
 #define _WIRE_H_
 
+#include "WireBase.h"
+#include <wirish/wirish.h>
+
 /*
  * On the Maple, let the default pins be in the same location as the Arduino
  * pins
@@ -113,14 +113,15 @@ class TwoWire : public WireBase {
     uint8 process();
  public:
     /*
-     * Accept pin numbers for SCL and SDA lines. Set the delay needed to create the
-     * timing for I2C's Standard Mode and Fast Mode.
+     * Accept pin numbers for SCL and SDA lines. Set the delay needed
+     * to create the timing for I2C's Standard Mode and Fast Mode.
      */
     TwoWire(uint8 = SCL, uint8 = SDA, uint8 = SOFT_STANDARD);
 
     /*
-     * Sets pins SDA and SCL to OUPTUT_OPEN_DRAIN, joining I2C bus as master. This
-     * function overwrites the default behaviour of .begin(uint8) in WireBase
+     * Sets pins SDA and SCL to OUPTUT_OPEN_DRAIN, joining I2C bus as
+     * master. This function overwrites the default behaviour of
+     * .begin(uint8) in WireBase
      */
     void begin(uint8 = 0x00);
 
@@ -132,4 +133,4 @@ class TwoWire : public WireBase {
 
 extern TwoWire Wire();
 
-#endif // _WIRE_H_
\ No newline at end of file
+#endif // _WIRE_H_