From 9113c454f4fe1de3afe7b1a66dbbb63329041ee5 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Mon, 11 Jun 2012 13:01:27 +0200
Subject: [PATCH] Fixed Wire1 initialization. Fixed keywords for Wire library

---
 hardware/arduino/sam/libraries/Wire/Wire.cpp     | 5 +++++
 hardware/arduino/sam/libraries/Wire/keywords.txt | 1 +
 2 files changed, 6 insertions(+)

diff --git a/hardware/arduino/sam/libraries/Wire/Wire.cpp b/hardware/arduino/sam/libraries/Wire/Wire.cpp
index 62968d32f..90947cbb1 100644
--- a/hardware/arduino/sam/libraries/Wire/Wire.cpp
+++ b/hardware/arduino/sam/libraries/Wire/Wire.cpp
@@ -369,6 +369,11 @@ static void Wire1_Init(void) {
 			g_APinDescription[PIN_WIRE1_SCL].ulPinType,
 			g_APinDescription[PIN_WIRE1_SCL].ulPin,
 			g_APinDescription[PIN_WIRE1_SCL].ulPinConfiguration);
+
+	NVIC_DisableIRQ(TWI0_IRQn);
+	NVIC_ClearPendingIRQ(TWI0_IRQn);
+	NVIC_SetPriority(TWI0_IRQn, 0);
+	NVIC_EnableIRQ(TWI0_IRQn);
 }
 
 TwoWire Wire1 = TwoWire(WIRE1_INTERFACE, Wire1_Init);
diff --git a/hardware/arduino/sam/libraries/Wire/keywords.txt b/hardware/arduino/sam/libraries/Wire/keywords.txt
index 12f129b99..e75e929e2 100644
--- a/hardware/arduino/sam/libraries/Wire/keywords.txt
+++ b/hardware/arduino/sam/libraries/Wire/keywords.txt
@@ -24,6 +24,7 @@ onRequest	KEYWORD2
 #######################################
 
 Wire	KEYWORD2
+Wire1	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)