aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/Wire/WireBase.h
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-06-29 12:37:10 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2012-06-29 12:40:05 -0400
commit0df7e0dc26baf8afafc1aab595b416eb70bf2dd4 (patch)
treee31620ca29e8a1f3469c951a39378e13792df365 /libraries/Wire/WireBase.h
parentab43e6240c8e5ecbc805e19d056bca8b9ee3b6ca (diff)
downloadlibrambutan-0df7e0dc26baf8afafc1aab595b416eb70bf2dd4.tar.gz
librambutan-0df7e0dc26baf8afafc1aab595b416eb70bf2dd4.zip
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>
Diffstat (limited to 'libraries/Wire/WireBase.h')
-rw-r--r--libraries/Wire/WireBase.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/libraries/Wire/WireBase.h b/libraries/Wire/WireBase.h
index 555cbaf..e154476 100644
--- a/libraries/Wire/WireBase.h
+++ b/libraries/Wire/WireBase.h
@@ -38,12 +38,11 @@
* whether it is I2C hardware or emulating software.
*/
-#include "wirish.h"
-
#ifndef _WIREBASE_H_
#define _WIREBASE_H_
-#include "i2c.h"
+#include <wirish/wirish.h>
+#include <libmaple/i2c.h>
#define WIRE_BUFSIZ 32
@@ -88,14 +87,14 @@ public:
void beginTransmission(int);
/*
- * Call the process function to process the message if the TX buffer has not
- * overflowed.
+ * Call the process function to process the message if the TX
+ * buffer has not overflowed.
*/
uint8 endTransmission(void);
/*
- * Request bytes from a slave device and process the request, storing into the
- * receiving buffer.
+ * Request bytes from a slave device and process the request,
+ * storing into the receiving buffer.
*/
uint8 requestFrom(uint8, int);
@@ -141,4 +140,4 @@ public:
uint8 receive();
};
-#endif // _WIREBASE_H_ \ No newline at end of file
+#endif // _WIREBASE_H_