aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorDavid A. Mellis <d.mellis@arduino.cc>2011-03-03 22:56:20 -0500
committerDavid A. Mellis <d.mellis@arduino.cc>2011-03-03 22:56:20 -0500
commit5e721df32a49d8f74058ba0f824ffe9686a0c9d7 (patch)
treedbbef97b4ecbdc2306854a9374621162f6d794e0 /cores
parent5515442dbb3efe23bc7572c80270829257371bb8 (diff)
Fixing warnings (David H. Lynch Jr).
Diffstat (limited to 'cores')
-rwxr-xr-xcores/arduino/Print.cpp2
-rw-r--r--cores/arduino/WString.h2
-rwxr-xr-xcores/arduino/pins_arduino.c84
3 files changed, 44 insertions, 44 deletions
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 4ee556d..fd68942 100755
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
@@ -45,7 +45,7 @@ void Print::write(const uint8_t *buffer, size_t size)
void Print::print(const String &s)
{
- for (int i = 0; i < s.length(); i++) {
+ for (unsigned int i = 0; i < s.length(); i++) {
write(s[i]);
}
}
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index cadddb9..56faf9a 100644
--- a/cores/arduino/WString.h
+++ b/cores/arduino/WString.h
@@ -67,7 +67,7 @@ class String
int lastIndexOf( char ch, unsigned int fromIndex ) const;
int lastIndexOf( const String &str ) const;
int lastIndexOf( const String &str, unsigned int fromIndex ) const;
- const unsigned int length( ) const { return _length; }
+ unsigned int length( ) const { return _length; }
void setCharAt(unsigned int index, const char ch);
unsigned char startsWith( const String &prefix ) const;
unsigned char startsWith( const String &prefix, unsigned int toffset ) const;
diff --git a/cores/arduino/pins_arduino.c b/cores/arduino/pins_arduino.c
index 0c816e9..62e10ad 100755
--- a/cores/arduino/pins_arduino.c
+++ b/cores/arduino/pins_arduino.c
@@ -81,50 +81,50 @@
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
const uint16_t PROGMEM port_to_mode_PGM[] = {
NOT_A_PORT,
- &DDRA,
- &DDRB,
- &DDRC,
- &DDRD,
- &DDRE,
- &DDRF,
- &DDRG,
- &DDRH,
+ (uint16_t) &DDRA,
+ (uint16_t) &DDRB,
+ (uint16_t) &DDRC,
+ (uint16_t) &DDRD,
+ (uint16_t) &DDRE,
+ (uint16_t) &DDRF,
+ (uint16_t) &DDRG,
+ (uint16_t) &DDRH,
NOT_A_PORT,
- &DDRJ,
- &DDRK,
- &DDRL,
+ (uint16_t) &DDRJ,
+ (uint16_t) &DDRK,
+ (uint16_t) &DDRL,
};
const uint16_t PROGMEM port_to_output_PGM[] = {
NOT_A_PORT,
- &PORTA,
- &PORTB,
- &PORTC,
- &PORTD,
- &PORTE,
- &PORTF,
- &PORTG,
- &PORTH,
+ (uint16_t) &PORTA,
+ (uint16_t) &PORTB,
+ (uint16_t) &PORTC,
+ (uint16_t) &PORTD,
+ (uint16_t) &PORTE,
+ (uint16_t) &PORTF,
+ (uint16_t) &PORTG,
+ (uint16_t) &PORTH,
NOT_A_PORT,
- &PORTJ,
- &PORTK,
- &PORTL,
+ (uint16_t) &PORTJ,
+ (uint16_t) &PORTK,
+ (uint16_t) &PORTL,
};
const uint16_t PROGMEM port_to_input_PGM[] = {
NOT_A_PIN,
- &PINA,
- &PINB,
- &PINC,
- &PIND,
- &PINE,
- &PINF,
- &PING,
- &PINH,
+ (uint16_t) &PINA,
+ (uint16_t) &PINB,
+ (uint16_t) &PINC,
+ (uint16_t) &PIND,
+ (uint16_t) &PINE,
+ (uint16_t) &PINF,
+ (uint16_t) &PING,
+ (uint16_t) &PINH,
NOT_A_PIN,
- &PINJ,
- &PINK,
- &PINL,
+ (uint16_t) &PINJ,
+ (uint16_t) &PINK,
+ (uint16_t) &PINL,
};
const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
@@ -358,25 +358,25 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
const uint16_t PROGMEM port_to_mode_PGM[] = {
NOT_A_PORT,
NOT_A_PORT,
- &DDRB,
- &DDRC,
- &DDRD,
+ (uint16_t) &DDRB,
+ (uint16_t) &DDRC,
+ (uint16_t) &DDRD,
};
const uint16_t PROGMEM port_to_output_PGM[] = {
NOT_A_PORT,
NOT_A_PORT,
- &PORTB,
- &PORTC,
- &PORTD,
+ (uint16_t) &PORTB,
+ (uint16_t) &PORTC,
+ (uint16_t) &PORTD,
};
const uint16_t PROGMEM port_to_input_PGM[] = {
NOT_A_PORT,
NOT_A_PORT,
- &PINB,
- &PINC,
- &PIND,
+ (uint16_t) &PINB,
+ (uint16_t) &PINC,
+ (uint16_t) &PIND,
};
const uint8_t PROGMEM digital_pin_to_port_PGM[] = {