Fix warnings in Wire

Author: facchinm

cores/arduino/wiring.c

@@ -327,9 +327,7 @@ void init()
 
 /********************************* ADC ****************************************/
 
-//#if defined(ADC0)
-
-	/************* Need to double check no other init required for ADC ***************/
+#if defined(ADC0)
 
 	/* ADC clock between 50-200KHz */
 
@@ -380,4 +378,4 @@ void init()
 /*************************** ENABLE GLOBAL INTERRUPTS *************************/
 
 	sei();
-}
+}

libraries/Wire/src/Wire.cpp

@@ -105,10 +105,10 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres
 		quantity = BUFFER_LENGTH;
 	}
 
-	uint8_t bytes_read = TWI_MasterWriteRead(address,
-											(uint8_t *) &iaddress,
-											isize,
-											quantity,
+	uint8_t bytes_read = TWI_MasterWriteRead(address,
+											(uint8_t *) &iaddress,
+											isize,
+											quantity,
 											sendStop);
 
 	/* Copy read buffer from lower layer */
@@ -306,7 +306,7 @@ void TwoWire::flush(void)
 }
 
 // behind the scenes function that is called when data is received
-void TwoWire::onReceiveService(uint8_t* inBytes, int numBytes)
+void TwoWire::onReceiveService(volatile uint8_t* inBytes, int numBytes)
 {
 	// don't bother if user hasn't registered a callback
 	if(!user_onReceive){

libraries/Wire/src/Wire.h

@@ -45,7 +45,7 @@ class TwoWire : public HardwareI2C
     static void (*user_onRequest)(void);
     static void (*user_onReceive)(int);
     static void onRequestService(void);
-    static void onReceiveService(uint8_t*, int);
+    static void onReceiveService(volatile uint8_t*, int);
   public:
     TwoWire();
     void begin();

libraries/Wire/src/utility/twi.c

@@ -150,8 +150,9 @@ void TWI_MasterSetBaud(uint32_t frequency){
 
 //		Formula is: BAUD = ((F_CLKPER/frequency) - F_CLKPER*T_RISE - 10)/2;
 //		Where T_RISE varies depending on operating frequency...
-//			From 1617 DS: 1000ns @ 100kHz / 300ns @ 400kHz / 120ns @ 1MHz
-	uint8_t t_rise;
+//			From 1617 DS: 1000ns @ 100kHz / 300ns @ 400kHz / 120ns @ 1MHz
+
+	uint16_t t_rise;
 
 	if(frequency < 200000){
 		frequency = 100000;
@@ -172,7 +173,7 @@ void TWI_MasterSetBaud(uint32_t frequency){
 
 	uint32_t baud = ((F_CPU_CORRECTED/frequency) - (((F_CPU_CORRECTED*t_rise)/1000)/1000)/1000 - 10)/2;
 	TWI0.MBAUD = (uint8_t)baud;
-
+
 }
 
 /*! \brief TWI write transaction.
@@ -694,24 +695,24 @@ void TWI_SlaveReadHandler(){
 	}	
 }
 
-/* 
- * Function twi_attachSlaveRxEvent
- * Desc     sets function called before a slave read operation
- * Input    function: callback function to use
- * Output   none
- */
-void TWI_attachSlaveRxEvent( void (*function)(uint8_t*, int) ){
-  TWI_onSlaveReceive = function;
-}
-
-/* 
- * Function twi_attachSlaveTxEvent
- * Desc     sets function called before a slave write operation
- * Input    function: callback function to use
- * Output   none
- */
-void TWI_attachSlaveTxEvent( void (*function)(void) ){
-  TWI_onSlaveTransmit = function;
+/* 
+ * Function twi_attachSlaveRxEvent
+ * Desc     sets function called before a slave read operation
+ * Input    function: callback function to use
+ * Output   none
+ */
+void TWI_attachSlaveRxEvent( void (*function)(volatile uint8_t*, int) ){
+  TWI_onSlaveReceive = function;
+}
+
+/* 
+ * Function twi_attachSlaveTxEvent
+ * Desc     sets function called before a slave write operation
+ * Input    function: callback function to use
+ * Output   none
+ */
+void TWI_attachSlaveTxEvent( void (*function)(void) ){
+  TWI_onSlaveTransmit = function;
 }
 
 

libraries/Wire/src/utility/twi.h

@@ -85,8 +85,8 @@ register8_t master_trans_status;                       /*!< Status of transactio
 register8_t master_result;                             /*!< Result of transaction */
 
 /* Slave variables */
-static void (*TWI_onSlaveTransmit)(void);
-static void (*TWI_onSlaveReceive)(uint8_t*, int);
+static void (*TWI_onSlaveTransmit)(void) __attribute__((unused));
+static void (*TWI_onSlaveReceive)(volatile uint8_t*, int) __attribute__((unused));
 register8_t slave_writeData[TWI_BUFFER_SIZE];
 register8_t slave_readData[TWI_BUFFER_SIZE];
 register8_t slave_bytesToWrite;
@@ -135,7 +135,7 @@ void TWI_SlaveStopHandler(void);
 void TWI_SlaveDataHandler(void);
 void TWI_SlaveWriteHandler(void);
 void TWI_SlaveReadHandler(void);
-void TWI_attachSlaveRxEvent( void (*function)(uint8_t*, int) );
+void TWI_attachSlaveRxEvent( void (*function)(volatile uint8_t*, int) );
 void TWI_attachSlaveTxEvent( void (*function)(void) );
 void TWI_SlaveTransactionFinished(uint8_t result);
 /*! TWI master interrupt service routine.