noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing static is not at beginning of declaration warnings (maniacbug).

This commit is contained in:
David A. Mellis 2012-01-02 12:38:23 -05:00
parent f520bb5051
commit c441bc1a0d
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/cores/arduino/WInterrupts.c
View File

@ -32,7 +32,7 @@
#include "wiring_private.h" #include "wiring_private.h"
volatile static voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS]; static volatile voidFuncPtr intFunc[EXTERNAL_NUM_INTERRUPTS];
// volatile static voidFuncPtr twiIntFunc; // volatile static voidFuncPtr twiIntFunc;
void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) { void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) {

36
hardware/arduino/variants/leonardo/pins_arduino.h
View File

@ -35,29 +35,29 @@
#define RXLED0 PORTB |= (1<<0) #define RXLED0 PORTB |= (1<<0)
#define RXLED1 PORTB &= ~(1<<0) #define RXLED1 PORTB &= ~(1<<0)
const static uint8_t SDA = 2; static const uint8_t SDA = 2;
const static uint8_t SCL = 3; static const uint8_t SCL = 3;
// Map SPI port to 'new' pins D14..D17 // Map SPI port to 'new' pins D14..D17
const static uint8_t SS = 17; static const uint8_t SS = 17;
const static uint8_t MOSI = 16; static const uint8_t MOSI = 16;
const static uint8_t MISO = 14; static const uint8_t MISO = 14;
const static uint8_t SCK = 15; static const uint8_t SCK = 15;
// Mapping of analog pins as digital I/O // Mapping of analog pins as digital I/O
// A6-A11 share with digital pins // A6-A11 share with digital pins
const static uint8_t A0 = 18; static const uint8_t A0 = 18;
const static uint8_t A1 = 19; static const uint8_t A1 = 19;
const static uint8_t A2 = 20; static const uint8_t A2 = 20;
const static uint8_t A3 = 21; static const uint8_t A3 = 21;
const static uint8_t A4 = 22; static const uint8_t A4 = 22;
const static uint8_t A5 = 23; static const uint8_t A5 = 23;
const static uint8_t A6 = 24; // D4 static const uint8_t A6 = 24; // D4
const static uint8_t A7 = 25; // D6 static const uint8_t A7 = 25; // D6
const static uint8_t A8 = 26; // D8 static const uint8_t A8 = 26; // D8
const static uint8_t A9 = 27; // D9 static const uint8_t A9 = 27; // D9
const static uint8_t A10 = 28; // D10 static const uint8_t A10 = 28; // D10
const static uint8_t A11 = 29; // D12 static const uint8_t A11 = 29; // D12
// __AVR_ATmega32U4__ has an unusual mapping of pins to channels // __AVR_ATmega32U4__ has an unusual mapping of pins to channels
extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; extern const uint8_t PROGMEM analog_pin_to_channel_PGM[];

46
hardware/arduino/variants/mega/pins_arduino.h
View File

@ -32,31 +32,31 @@
#define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1) #define analogInputToDigitalPin(p) ((p < 16) ? (p) + 54 : -1)
#define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46)) #define digitalPinHasPWM(p) (((p) >= 2 && (p) <= 13) || ((p) >= 44 && (p)<= 46))
const static uint8_t SS = 53; static const uint8_t SS = 53;
const static uint8_t MOSI = 51; static const uint8_t MOSI = 51;
const static uint8_t MISO = 50; static const uint8_t MISO = 50;
const static uint8_t SCK = 52; static const uint8_t SCK = 52;
const static uint8_t SDA = 20; static const uint8_t SDA = 20;
const static uint8_t SCL = 21; static const uint8_t SCL = 21;
const static uint8_t LED_BUILTIN = 13; static const uint8_t LED_BUILTIN = 13;
const static uint8_t A0 = 54; static const uint8_t A0 = 54;
const static uint8_t A1 = 55; static const uint8_t A1 = 55;
const static uint8_t A2 = 56; static const uint8_t A2 = 56;
const static uint8_t A3 = 57; static const uint8_t A3 = 57;
const static uint8_t A4 = 58; static const uint8_t A4 = 58;
const static uint8_t A5 = 59; static const uint8_t A5 = 59;
const static uint8_t A6 = 60; static const uint8_t A6 = 60;
const static uint8_t A7 = 61; static const uint8_t A7 = 61;
const static uint8_t A8 = 62; static const uint8_t A8 = 62;
const static uint8_t A9 = 63; static const uint8_t A9 = 63;
const static uint8_t A10 = 64; static const uint8_t A10 = 64;
const static uint8_t A11 = 65; static const uint8_t A11 = 65;
const static uint8_t A12 = 66; static const uint8_t A12 = 66;
const static uint8_t A13 = 67; static const uint8_t A13 = 67;
const static uint8_t A14 = 68; static const uint8_t A14 = 68;
const static uint8_t A15 = 69; static const uint8_t A15 = 69;
// A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins) // A majority of the pins are NOT PCINTs, SO BE WARNED (i.e. you cannot use them as receive pins)
// Only pins available for RECEIVE (TRANSMIT can be on any pin): // Only pins available for RECEIVE (TRANSMIT can be on any pin):

30
hardware/arduino/variants/standard/pins_arduino.h
View File

@ -37,23 +37,23 @@
#define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11) #define digitalPinHasPWM(p) ((p) == 3 || (p) == 5 || (p) == 6 || (p) == 9 || (p) == 10 || (p) == 11)
#endif #endif
const static uint8_t SS = 10; static const uint8_t SS = 10;
const static uint8_t MOSI = 11; static const uint8_t MOSI = 11;
const static uint8_t MISO = 12; static const uint8_t MISO = 12;
const static uint8_t SCK = 13; static const uint8_t SCK = 13;
const static uint8_t SDA = 18; static const uint8_t SDA = 18;
const static uint8_t SCL = 19; static const uint8_t SCL = 19;
const static uint8_t LED_BUILTIN = 13; static const uint8_t LED_BUILTIN = 13;
const static uint8_t A0 = 14; static const uint8_t A0 = 14;
const static uint8_t A1 = 15; static const uint8_t A1 = 15;
const static uint8_t A2 = 16; static const uint8_t A2 = 16;
const static uint8_t A3 = 17; static const uint8_t A3 = 17;
const static uint8_t A4 = 18; static const uint8_t A4 = 18;
const static uint8_t A5 = 19; static const uint8_t A5 = 19;
const static uint8_t A6 = 20; static const uint8_t A6 = 20;
const static uint8_t A7 = 21; static const uint8_t A7 = 21;
#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0)) #define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)0))
#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1)) #define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))